From 7ecc2e898bf244265de11783e9f147ff64d2bf60 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Tue, 30 Jun 2009 21:09:37 +0000 Subject: [PATCH] CSPACE-245: First successful build through 'package' phase; also annotated several Maven POM files. --- .../id/3rdparty/nuxeo-platform-cs-id/pom.xml | 46 +-- services/id/3rdparty/pom.xml | 33 +- services/id/jaxb/build.properties | 15 - services/id/jaxb/pom.xml | 204 +++++++------ services/id/jaxb/src/main/resources/id.xsd | 125 +++++--- services/id/pom.xml | 155 ++++++---- services/id/service/pom.xml | 285 ++++++++++-------- .../collectionspace/services/IDService.java | 2 + 8 files changed, 500 insertions(+), 365 deletions(-) delete mode 100644 services/id/jaxb/build.properties diff --git a/services/id/3rdparty/nuxeo-platform-cs-id/pom.xml b/services/id/3rdparty/nuxeo-platform-cs-id/pom.xml index 15cfd8db0..ec16e55f4 100644 --- a/services/id/3rdparty/nuxeo-platform-cs-id/pom.xml +++ b/services/id/3rdparty/nuxeo-platform-cs-id/pom.xml @@ -1,7 +1,7 @@ - 4.0.0 + 4.0.0 org.nuxeo.ecm.platform @@ -9,27 +9,27 @@ 5.2-SNAPSHOT - nuxeo-platform-cs-id - jar - nuxeo-platform-cs-id - - ID Nuxeo document type - - - 5.2-SNAPSHOT - 1.5-SNAPSHOT - - - - org.nuxeo.ecm.core - nuxeo-core-schema - ${nuxeo.version.1.5} - - - org.nuxeo.ecm.platform - nuxeo-platform-types-core - ${nuxeo.version.5.2} - - + nuxeo-platform-cs-id + jar + nuxeo-platform-cs-id + ID Nuxeo document type + + + 5.2-SNAPSHOT + 1.5-SNAPSHOT + + + + + org.nuxeo.ecm.core + nuxeo-core-schema + ${nuxeo.version.1.5} + + + org.nuxeo.ecm.platform + nuxeo-platform-types-core + ${nuxeo.version.5.2} + + diff --git a/services/id/3rdparty/pom.xml b/services/id/3rdparty/pom.xml index b4e1485c1..3c0ba46be 100644 --- a/services/id/3rdparty/pom.xml +++ b/services/id/3rdparty/pom.xml @@ -1,20 +1,37 @@ + + + + 4.0.0 - - org.collectionspace.services.collectionobject + org.collectionspace.services.id org.collectionspace.services 1.0 - - org.collectionspace.services.collectionobject.3rdparty + org.collectionspace.services.id.3rdparty pom - services.collectionobject.3rdparty - - 3rd party build for collectionobject service - + services.id.3rdparty + 3rd party build for ID service diff --git a/services/id/jaxb/build.properties b/services/id/jaxb/build.properties deleted file mode 100644 index 908e58f29..000000000 --- a/services/id/jaxb/build.properties +++ /dev/null @@ -1,15 +0,0 @@ -# Example for Windows -# jboss.dir=c:/dev/jboss-4.2.3.GA -# Example for Unix -jboss.dir=/usr/local/jboss - -# Which JBoss server config to use -jboss.config=default - -# nuxeo deployment -jboss.nuxeo.ear.dir=${jboss.dir}/server/${jboss.config}/deploy/nuxeo.ear - - -# additional command line parameters for mvn commands -# e.g. to work offline: -#mvn.opts=-o diff --git a/services/id/jaxb/pom.xml b/services/id/jaxb/pom.xml index 222f54132..ef504fbee 100644 --- a/services/id/jaxb/pom.xml +++ b/services/id/jaxb/pom.xml @@ -1,101 +1,129 @@ + + + + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - org.collectionspace.services.id - org.collectionspace.services - 1.0 - - - 4.0.0 + + org.collectionspace.services.id org.collectionspace.services - org.collectionspace.services.idpattern.jaxb 1.0 - services.id.jaxb + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.id.jaxb + 1.0 + services.id.jaxb + + + + + com.sun.xml.bind + jaxb-impl + 2.0.2 + + + + org.jvnet.jaxb2-commons + property-listener-injector + 1.0 + - - + + org.jvnet.jaxb2_commons + runtime + 0.4.1.4 + + + + + + collectionspace-services-id-jaxb + install + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + + + + generate + + + + + + + javax.activation + activation + 1.1 + + com.sun.xml.bind jaxb-impl - 2.0.2 - - - org.jvnet.jaxb2-commons - property-listener-injector - 1.0 - - - org.jvnet.jaxb2_commons - runtime - 0.4.1.4 - - - - collectionspace-services-idpattern-jaxb - install - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - - - - generate - - - - - - - javax.activation - activation - 1.1 - - - com.sun.xml.bind - jaxb-impl - 2.1.2 - - - - - -XtoString - -Xinject-listener-code + 2.1.2 + + + + + -XtoString + -Xinject-listener-code - - - - - - org.jvnet.jaxb2_commons - - basic - 0.4.1 - - - - org.jvnet.jaxb2-commons - - - property-listener-injector - - 1.0 - - - - + + + + + + org.jvnet.jaxb2_commons + + basic + 0.4.1 - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - + + org.jvnet.jaxb2-commons + + + property-listener-injector + + 1.0 - - + + + + + + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + + + diff --git a/services/id/jaxb/src/main/resources/id.xsd b/services/id/jaxb/src/main/resources/id.xsd index 7c6e1c255..eb194a7a4 100644 --- a/services/id/jaxb/src/main/resources/id.xsd +++ b/services/id/jaxb/src/main/resources/id.xsd @@ -1,4 +1,27 @@ + + + + + - - - - - - - - - - + + + + + + + + + + - - + + + + + - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/services/id/pom.xml b/services/id/pom.xml index dc4de61f3..197dd5416 100644 --- a/services/id/pom.xml +++ b/services/id/pom.xml @@ -1,62 +1,101 @@ - - - org.collectionspace.services.main - org.collectionspace.services - 1.0 - - 4.0.0 + + + + + + + org.collectionspace.services.main org.collectionspace.services 1.0 - org.collectionspace.services.id - pom - services.id - - - 5.2-SNAPSHOT - 1.5-SNAPSHOT - - - - - service - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-site-plugin - - /usr/bin/unzip -o > err.txt - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.1 - - WEB-INF/lib/*.jar - - - true - - - - - - - - + + + 4.0.0 + org.collectionspace.services + 1.0 + org.collectionspace.services.id + + pom + services.id + + + 5.2-SNAPSHOT + 1.5-SNAPSHOT + + + + + jaxb + service + 3rdparty + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + org.apache.maven.plugins + maven-site-plugin + + /usr/bin/unzip -o > err.txt + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.0.1 + + WEB-INF/lib/*.jar + + + true + + + + + + + + + diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml index 396cb4b61..4a8c1e28a 100644 --- a/services/id/service/pom.xml +++ b/services/id/service/pom.xml @@ -1,136 +1,175 @@ - - - org.collectionspace.services.id - org.collectionspace.services - 1.0 - - - 4.0.0 - org.collectionspace.services - org.collectionspace.services.id.service - jar - 1.0 - services.id.service - - - - org.collectionspace.services - org.collectionspace.services.common - 1.0 - - - junit - junit - 4.1 - test - - - org.testng - testng - 5.6 - - + pom.xml + + A Maven 2 project file for the 'service' module of the ID Service project. - + This document is a part of the source code and related artifacts + for CollectionSpace, an open source collections management system + for museums and related institutions: + + http://www.collectionspace.org + http://wiki.collectionspace.org + + Based on work by Sanjay Dalal and Richard Millet. + $LastChangedBy: aron $ + $LastChangedRevision: 302 $ + $LastChangedDate: 2009-06-29 15:36:29 -0700 (Mon, 29 Jun 2009) $ +--> - - javax.security - jaas - 1.0.01 - provided - + - - dom4j - dom4j - 1.6.1 - provided - - - + + org.collectionspace.services.id + org.collectionspace.services + 1.0 + + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.id.service + jar + 1.0 + services.id.service - - org.jboss.resteasy - resteasy-jaxrs - 1.0.2.GA - - - tjws - webserver - - - - - org.jboss.resteasy - resteasy-jaxb-provider - 1.0.2.GA - - - org.jboss.resteasy - resteasy-multipart-provider - 1.0.2.GA - - - + + + + + org.collectionspace.services + org.collectionspace.services.common + 1.0 + + + + + org.collectionspace.services + org.collectionspace.services.id.jaxb + 1.0 + - - org.nuxeo.ecm.core - nuxeo-core-api - ${nuxeo.version.1.5} - - - jboss-remoting - jboss - - - + + + + junit + junit + 4.1 + test + + + + + + org.testng + testng + 5.6 + - - org.restlet - org.restlet - 1.1.5 - - - com.noelios.restlet - com.noelios.restlet.ext.httpclient - 1.1.5 - - - com.noelios.restlet - com.noelios.restlet - 1.1.5 - + + + + javax.security + jaas + 1.0.01 + provided + - + + + dom4j + dom4j + 1.6.1 + provided + + + + + + + org.jboss.resteasy + resteasy-jaxrs + 1.0.2.GA + + + tjws + webserver + + + + + + org.jboss.resteasy + resteasy-jaxb-provider + 1.0.2.GA + + + + org.jboss.resteasy + resteasy-multipart-provider + 1.0.2.GA + - - collectionspace-services-commonobject - - - org.codehaus.mojo - jboss-maven-plugin - - ${jboss.dir} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - + + + org.nuxeo.ecm.core + nuxeo-core-api + ${nuxeo.version.1.5} + + + jboss-remoting + jboss + + + + + + + org.restlet + org.restlet + 1.1.5 + + + com.noelios.restlet + com.noelios.restlet.ext.httpclient + 1.1.5 + + + com.noelios.restlet + com.noelios.restlet + 1.1.5 + + + + + + + collectionspace-services-commonobject + + + + org.codehaus.mojo + + jboss-maven-plugin + + + ${jboss.dir} + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + diff --git a/services/id/service/src/main/java/org/collectionspace/services/IDService.java b/services/id/service/src/main/java/org/collectionspace/services/IDService.java index 4ceea5cba..647a54509 100644 --- a/services/id/service/src/main/java/org/collectionspace/services/IDService.java +++ b/services/id/service/src/main/java/org/collectionspace/services/IDService.java @@ -29,6 +29,8 @@ package org.collectionspace.services; public interface IDService { + public final static String ID_SCHEMA_NAME = "id"; + // ---------------------------------------- // IDs // ---------------------------------------- -- 2.47.3