[Unicore-cvs-commits] SF.net SVN: unicore:[20050] wsrflite/trunk

[<bsc...@us...>]

Revision: 20050
          http://sourceforge.net/p/unicore/svn/20050
Author:   bschuller
Date:     2016-01-20 16:18:29 +0000 (Wed, 20 Jan 2016)
Log Message:
-----------
use released secutils

Modified Paths:
--------------
    wsrflite/trunk/pom.xml
    wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/rest/Registries.java
    wsrflite/trunk/use-cxf/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/TestSecurityInfoRenderer.java
    wsrflite/trunk/use-cxf/src/test/java/eu/unicore/services/ws/MockResource.java

Modified: wsrflite/trunk/pom.xml
===================================================================
--- wsrflite/trunk/pom.xml	2016-01-20 15:09:32 UTC (rev 20049)
+++ wsrflite/trunk/pom.xml	2016-01-20 16:18:29 UTC (rev 20050)
@@ -67,7 +67,7 @@
   <properties>
     <compiler.fork>false</compiler.fork>
     <seclib.version>4.3.0</seclib.version>
-    <secutils.version>1.4.0-SNAPSHOT</secutils.version>
+    <secutils.version>1.4.0</secutils.version>
     <httpclient.version>4.5.1</httpclient.version>
     <jetty.version>9.3.4.v20151007</jetty.version>
     <cxf.version>3.1.4</cxf.version>

Modified: wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/rest/Registries.java
===================================================================
--- wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/rest/Registries.java	2016-01-20 15:09:32 UTC (rev 20049)
+++ wsrflite/trunk/use-cxf/src/main/java/eu/unicore/services/rest/Registries.java	2016-01-20 16:18:29 UTC (rev 20050)
@@ -71,9 +71,10 @@
 	private static final Map<String,String>conv = new HashMap<String,String>();
 	
 	static{
-		conv.put("StorageManagement", "storages");
-		conv.put("TargetSystemFactoryService", "factories");
-		conv.put("StorageFactory", "storagefactories");
+		conv.put("StorageManagement", "core/storages");
+		conv.put("TargetSystemFactoryService", "core/factories");
+		conv.put("StorageFactory", "core/storagefactories");
+		conv.put("WorkflowFactory", "workflows");
 	}
 	
 	/**
@@ -85,10 +86,10 @@
 		if(!m.matches())return null;
 		String scheme=m.group(1);
 		String base=m.group(2);
-		String serviceName=conv.get(m.group(3));
-		if(serviceName==null)return null;
+		String restPathElement=conv.get(m.group(3));
+		if(restPathElement==null)return null;
 		String resID=m.group(4);
-		String restURL = scheme+"://"+base+"/rest/core/"+serviceName+"/"+resID;
+		String restURL = scheme+"://"+base+"/rest/"+restPathElement+"/"+resID;
 		return restURL;
 	}
 }

Modified: wsrflite/trunk/use-cxf/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/TestSecurityInfoRenderer.java
===================================================================
--- wsrflite/trunk/use-cxf/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/TestSecurityInfoRenderer.java	2016-01-20 15:09:32 UTC (rev 20049)
+++ wsrflite/trunk/use-cxf/src/test/java/de/fzj/unicore/wsrflite/xmlbeans/TestSecurityInfoRenderer.java	2016-01-20 16:18:29 UTC (rev 20050)
@@ -42,6 +42,7 @@
 import eu.unicore.security.OperationType;
 import eu.unicore.security.SecurityTokens;
 import eu.unicore.security.SubjectAttributesHolder;
+import eu.unicore.services.ws.MockResource;
 import eu.unicore.services.ws.client.TestClientSSL;
 import eu.unicore.services.ws.cxf.CXFServiceFactory;
 import eu.unicore.services.ws.testutils.AbstractClientTest;
@@ -58,6 +59,7 @@
 
 	@Before
 	public void addServices() throws Exception{
+		MockResource.publish = false;
 		super.addServices();
 		if(kernel.getService("Registry")!=null)return;
 		CXFServiceFactory.createAndDeployService(kernel,"Registry",Registry.class,LocalRegistryHomeImpl.class,true);

Modified: wsrflite/trunk/use-cxf/src/test/java/eu/unicore/services/ws/MockResource.java
===================================================================
--- wsrflite/trunk/use-cxf/src/test/java/eu/unicore/services/ws/MockResource.java	2016-01-20 15:09:32 UTC (rev 20049)
+++ wsrflite/trunk/use-cxf/src/test/java/eu/unicore/services/ws/MockResource.java	2016-01-20 16:18:29 UTC (rev 20050)
@@ -67,6 +67,8 @@
 		return super.GetResourceProperty(in);
 	}
 
+	public static boolean publish = true;
+	
 	@Override
 	public void initialise(String serviceName, Map<String, Object> initParams)
 			throws Exception {
@@ -75,7 +77,7 @@
 
 		ACLEntry e = new ACLEntry(OperationType.read, "CN=Test", MatchType.DN);
 		m.getAcl().add(e);
-		publish();
+		if(publish)publish();
 	}
 	
 }
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.