From: Sanjay Dalal Date: Wed, 1 Jul 2009 19:40:39 +0000 (+0000) Subject: CSPACE-62 added ant builds where needed. ant also calls maven targets. ant deploy... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=1af8f691d25c3bac565b9ce06d232167c4222275;p=tmp%2Fjakarta-migration.git CSPACE-62 added ant builds where needed. ant also calls maven targets. ant deploy/undeploy tasks could be used to copy necessary war, jar, config, etc. files to proper locations in JBoss domain provider build.properties are pointing to the correct jboss home. deploy/undeploy targets of a parent call these on children as well. --- diff --git a/3rdparty/build.xml b/3rdparty/build.xml new file mode 100644 index 000000000..8f8b43231 --- /dev/null +++ b/3rdparty/build.xml @@ -0,0 +1,102 @@ + + + + collectionspace authentication service + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml new file mode 100644 index 000000000..46355799e --- /dev/null +++ b/3rdparty/nuxeo/build.xml @@ -0,0 +1,104 @@ + + + + collectionspace authentication service + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/3rdparty/nuxeo/nuxeo-client/lib/commons-logging.jar b/3rdparty/nuxeo/nuxeo-client/lib/commons-logging.jar new file mode 100644 index 000000000..c2f10503c Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/commons-logging.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/jbossall-client-4.2.3.GA.jar b/3rdparty/nuxeo/nuxeo-client/lib/jbossall-client-4.2.3.GA.jar new file mode 100644 index 000000000..6c02c6dde Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/jbossall-client-4.2.3.GA.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/log4j.jar b/3rdparty/nuxeo/nuxeo-client/lib/log4j.jar new file mode 100644 index 000000000..1183df881 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/log4j.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-common-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-common-1.5-SNAPSHOT.jar new file mode 100644 index 000000000..f748f514e Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-common-1.5-SNAPSHOT.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-api-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-api-1.5-SNAPSHOT.jar new file mode 100644 index 000000000..3bc99dbe1 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-api-1.5-SNAPSHOT.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-query-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-query-1.5-SNAPSHOT.jar new file mode 100644 index 000000000..46a7daa21 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-query-1.5-SNAPSHOT.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-schema-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-schema-1.5-SNAPSHOT.jar new file mode 100644 index 000000000..3cd0e6e56 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-core-schema-1.5-SNAPSHOT.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-1.5-SNAPSHOT.jar new file mode 100644 index 000000000..0bc817aa4 Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-1.5-SNAPSHOT.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar new file mode 100644 index 000000000..b011b67ef Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/nuxeo-runtime-osgi-1.5-SNAPSHOT.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/osgi-core-4.1.jar b/3rdparty/nuxeo/nuxeo-client/lib/osgi-core-4.1.jar new file mode 100644 index 000000000..6999b1bae Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/osgi-core-4.1.jar differ diff --git a/3rdparty/nuxeo/nuxeo-client/lib/xsom-20060306.jar b/3rdparty/nuxeo/nuxeo-client/lib/xsom-20060306.jar new file mode 100644 index 000000000..ae1efa1bd Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-client/lib/xsom-20060306.jar differ diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml new file mode 100644 index 000000000..36db42cef --- /dev/null +++ b/3rdparty/nuxeo/pom.xml @@ -0,0 +1,132 @@ + + + + org.collectionspace.services.3rdparty + org.collectionspace.services + 1.0 + + 4.0.0 + org.collectionspace.services + org.collectionspace.services.3rdparty.nuxeo + pom + 1.0 + services.3rdparty.nuxeo + + + 4.2.3.GA + 3.0 + UTF-8 + 5.2-SNAPSHOT + 1.5-SNAPSHOT + + + + + public + http://maven.nuxeo.org/public + + + + false + + + + public-snapshot + http://maven.nuxeo.org/public-snapshot + + false + + + + + + + + public + http://maven.nuxeo.org/public + Nuxeo virtual release repository + + + + false + + + + public-snapshot + http://maven.nuxeo.org/public-snapshot + Nuxeo virtual snapshot repository + + false + + + + + + + + + + + jboss + jboss-remoting + 2.2.2.SP8 + provided + + + + + org.nuxeo.common + nuxeo-common + ${nuxeo.version.1.5} + provided + + + org.nuxeo.runtime + nuxeo-runtime + ${nuxeo.version.1.5} + + + org.nuxeo.ecm.core + nuxeo-core-api + ${nuxeo.version.1.5} + + + org.nuxeo.ecm.core + nuxeo-core-client + ${nuxeo.version.1.5} + + + org.nuxeo.ecm.core + nuxeo-core-query + ${nuxeo.version.1.5} + + + org.nuxeo.ecm.core + nuxeo-core-schema + ${nuxeo.version.1.5} + + + org.nuxeo.ecm.core + nuxeo-core-io + ${nuxeo.version.1.5} + + + org.nuxeo.ecm.core + nuxeo-core-facade + ${nuxeo.version.1.5} + + + org.nuxeo.runtime + nuxeo-runtime-osgi + ${nuxeo.version.1.5} + + + org.osgi + osgi-core + 4.1 + + + + + + diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml new file mode 100644 index 000000000..b8f233ba4 --- /dev/null +++ b/3rdparty/pom.xml @@ -0,0 +1,47 @@ + + + + org.collectionspace.services + org.collectionspace.services + 1.0 + + 4.0.0 + org.collectionspace.services + 1.0 + org.collectionspace.services.3rdparty + pom + services.3rdparty + + + 4.2.3.GA + 3.0 + UTF-8 + 5.2-SNAPSHOT + 1.5-SNAPSHOT + + + + nuxeo + + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + + + diff --git a/build.properties b/build.properties index 1f58e71de..a6ad561a0 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,17 @@ jboss.release=jboss-4.2.3.GA +#assumption: both nuxeo and cspace domains are using the same JBoss installation jboss.dir=C:/dev/${jboss.release} -jboss.config=default +jboss.home=${jboss.dir} +jboss.domain.cspace=cspace +jboss.domain.nuxeo=default +jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace} +jboss.deploy.cspace=${jboss.server.cspace}/deploy +jboss.lib.cspace=${jboss.server.cspace}/lib +jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo} +jboss.deploy.nuxeo="${jboss.server.nuxeo}/deploy +jboss.lib.nuxeo=${jboss.server.nuxeo}/lib +cspace.release=cspace-1.0 +cspace.services.release=services-${cspace.release} nuxeo.release=nuxeo-5.2.M4 nuxeo.dir=${jboss.dir}/server/default/deploy/nuxeo.ear/system nuxeo.local.repo.dir=file:///${jboss.dir}/server/default/deploy/nuxeo.ear/system diff --git a/build.xml b/build.xml index 57b86fc57..f8e34c8cc 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ - + collectionspace services @@ -10,16 +10,9 @@ - - - + + - - - - - - @@ -29,7 +22,7 @@ - + @@ -44,8 +37,34 @@ - + + + + + + + + + + + + + + + + + + + + + + + @@ -62,14 +81,13 @@ - - + - - - + + + @@ -79,7 +97,7 @@ - @@ -141,6 +159,35 @@ + + + + + + + + + + + + + + + + + + + + @@ -161,4 +208,5 @@ + diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml index 4fd6f9f47..d984b062e 100644 --- a/services/JaxRsServiceProvider/build.xml +++ b/services/JaxRsServiceProvider/build.xml @@ -1,13 +1,104 @@ - - - + + + collectionspace authentication service + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - diff --git a/services/authentication/build.xml b/services/authentication/build.xml new file mode 100644 index 000000000..9978f2a07 --- /dev/null +++ b/services/authentication/build.xml @@ -0,0 +1,107 @@ + + + + collectionspace authentication service + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/build.xml b/services/build.xml new file mode 100644 index 000000000..ca6a44565 --- /dev/null +++ b/services/build.xml @@ -0,0 +1,100 @@ + + + + collectionspace services root + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/collectionobject/nbactions.xml b/services/collectionobject/nbactions.xml new file mode 100644 index 000000000..458dbd096 --- /dev/null +++ b/services/collectionobject/nbactions.xml @@ -0,0 +1,16 @@ + + + + rebuild + + * + + + clean + install + + + true + + + diff --git a/services/common/build.xml b/services/common/build.xml new file mode 100644 index 000000000..6a8076574 --- /dev/null +++ b/services/common/build.xml @@ -0,0 +1,103 @@ + + + + collectionspace authentication service + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +