From: Sanjay Dalal Date: Thu, 26 Mar 2009 18:58:01 +0000 (+0000) Subject: CSPACE-30 hello.xsd schema changed (made it flat) to accommodate requirements of... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4f4111dd42dc447679aa72293df9e360222a6ace;p=tmp%2Fjakarta-migration.git CSPACE-30 hello.xsd schema changed (made it flat) to accommodate requirements of nuxeo repository and rest apis. HelloWorldDocService renamed to HelloWorldNuxeoService. Added support for create, update and delete in addition to list. M services/trunk/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/schemas/hello.xsd M services/trunk/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/OSGI-INF/ecm-types-contrib.xml M services/trunk/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/OSGI-INF/layouts-contrib.xml M services/trunk/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd D services/trunk/HelloWorld/HelloWorldDocService M services/trunk/HelloWorld/HelloWorldClient/nbactions.xml AM + services/trunk/HelloWorld/HelloWorldNuxeoService D services/trunk/HelloWorld/HelloWorldNuxeoService/pom.all.xml D services/trunk/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/PersonDocResource.java D services/trunk/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/HelloworldDocApplication.java AM + services/trunk/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/PersonNuxeoResource.java AM + services/trunk/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/HelloworldNuxeoApplication.java M services/trunk/HelloWorld/HelloWorldNuxeoService/src/main/webapp/WEB-INF/web.xml M services/trunk/HelloWorld/HelloWorldNuxeoService/pom.xml A + services/trunk/HelloWorld/HelloWorldNuxeoService/README.txt --- diff --git a/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/OSGI-INF/ecm-types-contrib.xml index 04790db46..02347959a 100644 --- a/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/OSGI-INF/ecm-types-contrib.xml +++ b/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/OSGI-INF/ecm-types-contrib.xml @@ -8,7 +8,7 @@ heading - person + hello @@ -47,7 +47,7 @@ true - person.cversion + cversion dataInputText @@ -61,7 +61,7 @@ true - person.firstName + firstName dataInputText @@ -74,7 +74,7 @@ true - person.lastName + lastName dataInputText @@ -87,7 +87,7 @@ true - person.street + street dataInputText @@ -100,7 +100,7 @@ true - person.city + city dataInputText @@ -113,7 +113,7 @@ true - person.state + state dataInputText @@ -126,7 +126,7 @@ true - person.zip + zip dataInputText @@ -139,7 +139,7 @@ true - person.country + country dataInputText diff --git a/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/schemas/hello.xsd b/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/schemas/hello.xsd index f8109a7e4..df2ec990f 100644 --- a/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/schemas/hello.xsd +++ b/3rdparty/nuxeo/nuxeo-platform-cs/src/main/resources/schemas/hello.xsd @@ -6,30 +6,35 @@ targetNamespace="http://collectionspace.org/hello/" version="0.1" > - + + - - - - - - - + + + + diff --git a/HelloWorld/HelloWorldClient/nbactions.xml b/HelloWorld/HelloWorldClient/nbactions.xml index 458dbd096..047c73d4e 100644 --- a/HelloWorld/HelloWorldClient/nbactions.xml +++ b/HelloWorld/HelloWorldClient/nbactions.xml @@ -13,4 +13,5 @@ true + diff --git a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/PersonDocResource.java b/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/PersonDocResource.java deleted file mode 100644 index ecad94865..000000000 --- a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/PersonDocResource.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.collectionspace.hello.services; - -import org.collectionspace.hello.services.nuxeo.NuxeoRESTClient; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import java.util.Map; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; -import org.collectionspace.hello.*; - - -import org.collectionspace.hello.People.PeopleItem; -import org.dom4j.Document; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; -import org.restlet.resource.Representation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Path("/persons") -@Consumes("application/xml") -@Produces("application/xml") -public class PersonDocResource { - - final Logger logger = LoggerFactory.getLogger(PersonDocResource.class); - - public PersonDocResource() { - } - - @GET - public People getPeople(@Context UriInfo ui) { - People p = new People(); - try { - List list = p.getPeopleItem(); - NuxeoRESTClient nxClient = getClient(); - - List pathParams = new ArrayList(); - Map queryParams = new HashMap(); - //browse default repository for People - //For sanjay, People repository id is f084243e-4b81-42a1-9a05-518e974facbd - pathParams = Arrays.asList("default", "f084243e-4b81-42a1-9a05-518e974facbd", "browse"); - Representation res = nxClient.get(pathParams, queryParams); - SAXReader reader = new SAXReader(); - Document document = reader.read(res.getStream()); - Element root = document.getRootElement(); - for (Iterator i = root.elementIterator(); i.hasNext();) { - Element element = (Element) i.next(); - PeopleItem pli = new PeopleItem(); - pli.setTitle(element.attributeValue("title")); - pli.setUri(element.attributeValue("url")); - pli.setId(element.attributeValue("id")); - list.add(pli); - } - - } catch (Exception e) { - e.printStackTrace(); - } - return p; - } - - -// private void getQueryModel() throws IOException { -// NuxeoRESTClient nxClient = getClient(); -// -// List pathParams = new ArrayList(); -// Map queryParams = new HashMap(); -// -// //query model for user documents -// pathParams = Arrays.asList("execQueryModel", "USER_DOCUMENTS"); -// queryParams.put("QP1", "Administrator"); -// queryParams.put("format", "XML"); -// -// -// Representation res = nxClient.get(pathParams, queryParams); -// String resStr = res.getText(); -// verbose("getQueryModel:" + resStr); -// -// } -// -// private void getVocabulary() throws IOException { -// NuxeoRESTClient nxClient = getClient(); -// -// List pathParams = new ArrayList(); -// Map queryParams = new HashMap(); -// //get vocabulary -// pathParams = Arrays.asList("vocabulary", "continent_country"); -// queryParams.put("lang", "en"); -// -// Representation res = nxClient.get(pathParams, queryParams); -// String resStr = res.getText(); -// verbose("getVocabulary:" + resStr); -// -// } - 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("PersonDocResource: " + msg); - } -} diff --git a/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd b/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd index 6d202933f..64a6b43b4 100644 --- a/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd +++ b/HelloWorld/HelloWorldJaxb/src/main/resources/hello.xsd @@ -59,12 +59,32 @@ + + + + + + + + + + + + + + + + + + + + - + 4.0.0 org.collectionspace.hello.services - helloworld-doc-service + helloworld-nuxeo-service war 0.1 - Helloworld Document Service + Helloworld Nuxeo Service diff --git a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/HelloworldDocApplication.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/HelloworldNuxeoApplication.java similarity index 73% rename from HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/HelloworldDocApplication.java rename to HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/HelloworldNuxeoApplication.java index 1ccfcac41..9443764b9 100644 --- a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/HelloworldDocApplication.java +++ b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/HelloworldNuxeoApplication.java @@ -4,13 +4,13 @@ import javax.ws.rs.core.Application; import java.util.HashSet; import java.util.Set; -public class HelloworldDocApplication extends Application { +public class HelloworldNuxeoApplication extends Application { private Set singletons = new HashSet(); private Set> empty = new HashSet>(); - public HelloworldDocApplication() { - singletons.add(new PersonDocResource()); + public HelloworldNuxeoApplication() { + singletons.add(new PersonNuxeoResource()); } @Override diff --git a/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/PersonNuxeoResource.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/PersonNuxeoResource.java new file mode 100644 index 000000000..a4f3974a6 --- /dev/null +++ b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/PersonNuxeoResource.java @@ -0,0 +1,292 @@ +package org.collectionspace.hello.services; + +import java.io.ByteArrayInputStream; +import org.collectionspace.hello.services.nuxeo.NuxeoRESTClient; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import java.util.Map; +import javax.ws.rs.DELETE; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.PathParam; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriBuilder; +import javax.ws.rs.core.UriInfo; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Marshaller; +import org.collectionspace.hello.*; + + +import org.collectionspace.hello.People.PeopleItem; +import org.dom4j.Document; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; +import org.restlet.resource.Representation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Path("/persons") +@Consumes("application/xml") +@Produces("application/xml") +public class PersonNuxeoResource { + + final Logger logger = LoggerFactory.getLogger(PersonNuxeoResource.class); + + public PersonNuxeoResource() { + } + + @GET + public People getPeople(@Context UriInfo ui) { + People p = new People(); + try{ + List list = p.getPeopleItem(); + NuxeoRESTClient nxClient = getClient(); + + List pathParams = new ArrayList(); + Map queryParams = new HashMap(); + //browse default repository for People + //For sanjay, People repository id is f084243e-4b81-42a1-9a05-518e974facbd + pathParams = Arrays.asList("default", "f084243e-4b81-42a1-9a05-518e974facbd", "browse"); + Representation res = nxClient.get(pathParams, queryParams); + SAXReader reader = new SAXReader(); + Document document = reader.read(res.getStream()); + Element root = document.getRootElement(); + for(Iterator i = root.elementIterator(); i.hasNext();){ + Element element = (Element) i.next(); + PeopleItem pli = new PeopleItem(); + pli.setTitle(element.attributeValue("title")); + pli.setUri(element.attributeValue("url")); + pli.setId(element.attributeValue("id")); + list.add(pli); + } + + }catch(Exception e){ + e.printStackTrace(); + } + return p; + } + + @POST + public Response createPerson(PersonNuxeo p) { + + NuxeoRESTClient nxClient = getClient(); + + List pathParams = new ArrayList(); + Map queryParams = new HashMap(); + pathParams.add("default"); + pathParams.add("f084243e-4b81-42a1-9a05-518e974facbd"); + pathParams.add("createDocument"); + queryParams.put("docType", "Hello"); + queryParams.put("dublincore:title", p.getFirstName() + " " + p.getLastName()); + queryParams.put("hello:cversion", p.getVersion()); + queryParams.put("hello:firstName", p.getFirstName()); + queryParams.put("hello:lastName", p.getLastName()); + queryParams.put("hello:street", p.getStreet()); + queryParams.put("hello:city", p.getCity()); + queryParams.put("hello:state", p.getState()); + queryParams.put("hello:zip", p.getZip()); + queryParams.put("hello:country", p.getCountry()); + ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); + Representation res = nxClient.post(pathParams, queryParams, bais); + + SAXReader reader = new SAXReader(); + try{ + Document document = reader.read(res.getStream()); + Element root = document.getRootElement(); + for(Iterator i = root.elementIterator(); i.hasNext();){ + Element element = (Element) i.next(); + if("docRef".equals(element.getName())){ + String id = (String) element.getData(); + p.setId(id); + } + } + }catch(Exception e){ + Response response = Response.status(Response.Status.NOT_FOUND).entity( + "Create failed").type("text/plain").build(); + throw new WebApplicationException(response); + } + + verbose("created person", p); + UriBuilder path = UriBuilder.fromResource(PersonNuxeoResource.class); + path.path("" + p.getId()); + Response response = Response.created(path.build()).build(); + return response; + } + + @GET + @Path("{id}") + public PersonNuxeo getPerson(@PathParam("id") String id) { + PersonNuxeo p = null; + if(p == null){ + Response response = Response.status(Response.Status.NOT_FOUND).entity( + "Get failed, the requested person ID:" + id + ": was not found.").type("text/plain").build(); + throw new WebApplicationException(response); + } + verbose("get person", p); + return p; + } + + @PUT + @Path("{id}") + public PersonNuxeo updatePerson(@PathParam("id") String id, PersonNuxeo update) { + + verbose("updating person input", update); + + NuxeoRESTClient nxClient = getClient(); + + List pathParams = new ArrayList(); + Map queryParams = new HashMap(); + pathParams.add("default"); + pathParams.add(update.getId()); + pathParams.add("updateDocumentRestlet"); + queryParams.put("dublincore:title", "change title"); + //todo: intelligent merge needed + if(update.getFirstName() != null){ + queryParams.put("hello:firstName", update.getFirstName()); + } + if(update.getLastName() != null){ + queryParams.put("hello:lastName", update.getLastName()); + } + if(update.getFirstName() != null && update.getLastName() != null){ + queryParams.put("dublincore:title", update.getFirstName() + " " + update.getLastName()); + } + if(update.getStreet() != null){ + queryParams.put("hello:street", update.getStreet()); + } + if(update.getCity() != null){ + queryParams.put("hello:city", update.getCity()); + } + if(update.getState() != null){ + queryParams.put("hello:state", update.getState()); + } + if(update.getZip() != null){ + queryParams.put("hello:zip", update.getZip()); + } + if(update.getCountry() != null){ + queryParams.put("hello:country", update.getCountry()); + } + + Representation res = nxClient.get(pathParams, queryParams); + SAXReader reader = new SAXReader(); + String status = ""; + try{ + Document document = reader.read(res.getStream()); + Element root = document.getRootElement(); + for(Iterator i = root.elementIterator(); i.hasNext();){ + Element element = (Element) i.next(); + if("docRef".equals(element.getName())){ + status = (String) element.getData(); + verbose("updatePerson: response=" + status); + } + + } + }catch(Exception e){ + //FIXME: NOT_FOUND? + Response response = Response.status(Response.Status.NOT_FOUND).entity( + "Update failed ").type("text/plain").build(); + throw new WebApplicationException(response); + } + //returning the same? ... for now + return update; + } + + @DELETE + @Path("{id}") + public void deletePerson(@PathParam("id") String id) { + verbose("deleting person with id=" + id); + NuxeoRESTClient nxClient = getClient(); + List pathParams = new ArrayList(); + Map queryParams = new HashMap(); + pathParams.add("default"); + pathParams.add(id); + pathParams.add("deleteDocumentRestlet"); + Representation res = nxClient.get(pathParams, queryParams); + SAXReader reader = new SAXReader(); + String status = ""; + try{ + Document document = reader.read(res.getStream()); + Element root = document.getRootElement(); + for(Iterator i = root.elementIterator(); i.hasNext();){ + Element element = (Element) i.next(); + if("docRef".equals(element.getName())){ + status = (String) element.getData(); + verbose("deletePerson: response=" + status); + } + + } + }catch(Exception e){ + //FIXME: NOT_FOUND? + Response response = Response.status(Response.Status.NOT_FOUND).entity( + "Delete failed ").type("text/plain").build(); + throw new WebApplicationException(response); + } + } + + private void verbose(String msg, PersonNuxeo p) { + try{ + verbose(msg); + JAXBContext jc = JAXBContext.newInstance( + PersonNuxeo.class); + + Marshaller m = jc.createMarshaller(); + m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, + Boolean.TRUE); + m.marshal(p, System.out); + }catch(Exception e){ + e.printStackTrace(); + } + + } + +// private void getQueryModel() throws IOException { +// NuxeoRESTClient nxClient = getClient(); +// +// List pathParams = new ArrayList(); +// Map queryParams = new HashMap(); +// +// //query model for user documents +// pathParams = Arrays.asList("execQueryModel", "USER_DOCUMENTS"); +// queryParams.put("QP1", "Administrator"); +// queryParams.put("format", "XML"); +// +// +// Representation res = nxClient.get(pathParams, queryParams); +// String resStr = res.getText(); +// verbose("getQueryModel:" + resStr); +// +// } +// +// private void getVocabulary() throws IOException { +// NuxeoRESTClient nxClient = getClient(); +// +// List pathParams = new ArrayList(); +// Map queryParams = new HashMap(); +// //get vocabulary +// pathParams = Arrays.asList("vocabulary", "continent_country"); +// queryParams.put("lang", "en"); +// +// Representation res = nxClient.get(pathParams, queryParams); +// String resStr = res.getText(); +// verbose("getVocabulary:" + resStr); +// +// } + 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("PersonNuxeoResource: " + msg); + } +} diff --git a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoCallback.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoCallback.java similarity index 100% rename from HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoCallback.java rename to HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoCallback.java diff --git a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoCallbackHandler.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoCallbackHandler.java similarity index 100% rename from HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoCallbackHandler.java rename to HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoCallbackHandler.java diff --git a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoLoginConfiguration.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoLoginConfiguration.java similarity index 100% rename from HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoLoginConfiguration.java rename to HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoLoginConfiguration.java diff --git a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoLoginContextFactory.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoLoginContextFactory.java similarity index 100% rename from HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoLoginContextFactory.java rename to HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoLoginContextFactory.java diff --git a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoRESTClient.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoRESTClient.java similarity index 100% rename from HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoRESTClient.java rename to HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/NuxeoRESTClient.java diff --git a/HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/PortalSSOAuthenticationProvider.java b/HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/PortalSSOAuthenticationProvider.java similarity index 100% rename from HelloWorld/HelloWorldDocService/src/main/java/org/collectionspace/hello/services/nuxeo/PortalSSOAuthenticationProvider.java rename to HelloWorld/HelloWorldNuxeoService/src/main/java/org/collectionspace/hello/services/nuxeo/PortalSSOAuthenticationProvider.java diff --git a/HelloWorld/HelloWorldDocService/src/main/resources/jndi.properties b/HelloWorld/HelloWorldNuxeoService/src/main/resources/jndi.properties similarity index 100% rename from HelloWorld/HelloWorldDocService/src/main/resources/jndi.properties rename to HelloWorld/HelloWorldNuxeoService/src/main/resources/jndi.properties diff --git a/HelloWorld/HelloWorldDocService/src/main/resources/nuxeo.properties b/HelloWorld/HelloWorldNuxeoService/src/main/resources/nuxeo.properties similarity index 100% rename from HelloWorld/HelloWorldDocService/src/main/resources/nuxeo.properties rename to HelloWorld/HelloWorldNuxeoService/src/main/resources/nuxeo.properties diff --git a/HelloWorld/HelloWorldDocService/src/main/webapp/WEB-INF/web.xml b/HelloWorld/HelloWorldNuxeoService/src/main/webapp/WEB-INF/web.xml similarity index 80% rename from HelloWorld/HelloWorldDocService/src/main/webapp/WEB-INF/web.xml rename to HelloWorld/HelloWorldNuxeoService/src/main/webapp/WEB-INF/web.xml index d6187fc0d..0c188a4fb 100644 --- a/HelloWorld/HelloWorldDocService/src/main/webapp/WEB-INF/web.xml +++ b/HelloWorld/HelloWorldNuxeoService/src/main/webapp/WEB-INF/web.xml @@ -1,16 +1,16 @@ - HelloworldDoc + HelloworldNuxeo javax.ws.rs.Application - org.collectionspace.hello.services.HelloworldDocApplication + org.collectionspace.hello.services.HelloworldNuxeoApplication resteasy.servlet.mapping.prefix - /cspace-doc + /cspace-nuxeo @@ -28,7 +28,7 @@ Resteasy - /cspace-doc/* + /cspace-nuxeo/*