From fa2ffe1f93e4cd80dc1a8378bc492b8dbb2b855b Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Fri, 10 Apr 2009 22:04:10 +0000 Subject: [PATCH] Factored the method getNuxeoClient to the abstract base class CollectionObjectResource --- .../hello/services/CollectionObjectResource.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/CollectionObjectResource.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/CollectionObjectResource.java index eeef1e171..5cdc48f98 100644 --- a/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/CollectionObjectResource.java +++ b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/CollectionObjectResource.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; @Path("/collectionobjects") @Consumes("application/xml") @Produces("application/xml") -public class CollectionObjectResource implements CollectionSpaceResource { +public class CollectionObjectResource extends CollectionSpaceResource { final static String CO_NUXEO_DOCTYPE = "CollectionObject"; final static String CO_NUXEO_SCHEMA_NAME = "collectionobject"; @@ -60,7 +60,7 @@ public class CollectionObjectResource implements CollectionSpaceResource { List pathParams = new ArrayList(); Map queryParams = new HashMap(); - pathParams = Arrays.asList("default", CS_NUXEO_WORKSPACE_UID, "browse"); + pathParams = Arrays.asList("default", CS_COLLECTIONOBJECT_WORKSPACE_UID, "browse"); Representation res = nxClient.get(pathParams, queryParams); SAXReader reader = new SAXReader(); Document document = reader.read(res.getStream()); @@ -99,7 +99,7 @@ public class CollectionObjectResource implements CollectionSpaceResource { List pathParams = new ArrayList(); Map queryParams = new HashMap(); pathParams.add("default"); - pathParams.add(CS_NUXEO_WORKSPACE_UID); + pathParams.add(CS_COLLECTIONOBJECT_WORKSPACE_UID); pathParams.add("createDocument"); queryParams.put("docType", CO_NUXEO_DOCTYPE); @@ -367,13 +367,6 @@ public class CollectionObjectResource implements CollectionSpaceResource { } } - private NuxeoRESTClient getClient() { - NuxeoRESTClient nxClient = new NuxeoRESTClient("http://127.0.0.1:8080/nuxeo"); - nxClient.setAuthType(NuxeoRESTClient.AUTH_TYPE_BASIC); - nxClient.setBasicAuthentication("Administrator", "Administrator"); - return nxClient; - } - private void verbose(String msg) { System.out.println("CollectionObjectResource. " + msg); } -- 2.47.3