CSPACE-62 added ant builds where needed. ant also calls maven targets. ant deploy...

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
new file mode 100644 (file)
index 0000000..8f8b432
--- /dev/null
+++ b/3rdparty/build.xml
@@ -0,0 +1,102 @@
+\r
+<project name="3rdparty" default="package" basedir=".">\r
+    <description>\r
+        collectionspace authentication service\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value=".."/>\r
+    <property file="${services.trunk}/build.properties" />\r
+    <property name="mvn.opts" value="" />\r
+    <property name="src" location="src"/>\r
+    <property name="build" location="build"/>\r
+    <property name="dist"  location="dist"/>\r
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+\r
+    <target name="init">\r
+    <!-- Create the time stamp -->\r
+        <tstamp/>\r
+    <!-- Create the build directory structure used by compile -->\r
+        <mkdir dir="${build}"/>\r
+\r
+    </target>\r
+\r
+\r
+    <target name="package" depends="package-unix,package-windows"\r
+  description="Package CollectionSpace Services" />\r
+    <target name="package-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="package-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+\r
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
+        <delete dir="${build}"/>\r
+    </target>\r
+    <target name="clean-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="clean-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />\r
+    <target name="test-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="test-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="deploy" depends="package"\r
+    description="deploy 3rdparty stuff in ${jboss.server.cspace}">\r
+        <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy authentication service from ${jboss.server.cspace}">\r
+        <ant antfile="nuxeo/build.xml" target="undeploy" inheritall="false"/>\r
+    </target>\r
+\r
+\r
+</project>\r

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
new file mode 100644 (file)
index 0000000..4635579
--- /dev/null
+++ b/3rdparty/nuxeo/build.xml
@@ -0,0 +1,104 @@
+\r
+<project name="nuxeo" default="package" basedir=".">\r
+    <description>\r
+        collectionspace authentication service\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value="../.."/>\r
+    <property file="${services.trunk}/build.properties" />\r
+    <property name="mvn.opts" value="" />\r
+    <property name="src" location="src"/>\r
+    <property name="build" location="build"/>\r
+    <property name="dist"  location="dist"/>\r
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+\r
+    <target name="init">\r
+    <!-- Create the time stamp -->\r
+        <tstamp/>\r
+    <!-- Create the build directory structure used by compile -->\r
+        <mkdir dir="${build}"/>\r
+\r
+    </target>\r
+\r
+\r
+    <target name="package" depends="package-unix,package-windows"\r
+  description="Package CollectionSpace Services" />\r
+    <target name="package-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="package-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+\r
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
+        <delete dir="${build}"/>\r
+    </target>\r
+    <target name="clean-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="clean-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />\r
+    <target name="test-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="test-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="deploy" depends="package"\r
+    description="deploy nuxeo client libs to ${jboss.server.cspace}">\r
+        <copy todir="${jboss.server.cspace}/nuxeo-client">\r
+            <fileset dir="${basedir}/nuxeo-client"/>\r
+        </copy>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy nuxeo client libs from ${jboss.server.cspace}">\r
+        <delete dir="${jboss.server.cspace}/nuxeo-client"/>\r
+    </target>\r
+\r
+\r
+</project>\r

diff --git a/3rdparty/nuxeo/nuxeo-client/lib/commons-logging.jar b/3rdparty/nuxeo/nuxeo-client/lib/commons-logging.jar
new file mode 100644 (file)
index 0000000..c2f1050
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 (file)
index 0000000..6c02c6d
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 (file)
index 0000000..1183df8
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 (file)
index 0000000..f748f51
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 (file)
index 0000000..3bc99db
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 (file)
index 0000000..46a7daa
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 (file)
index 0000000..3cd0e6e
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 (file)
index 0000000..0bc817a
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 (file)
index 0000000..b011b67
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 (file)
index 0000000..6999b1b
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 (file)
index 0000000..ae1efa1
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 (file)
index 0000000..36db42c
--- /dev/null
+++ b/3rdparty/nuxeo/pom.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">\r
+    <parent>\r
+        <artifactId>org.collectionspace.services.3rdparty</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
+    <packaging>pom</packaging>\r
+    <version>1.0</version>\r
+    <name>services.3rdparty.nuxeo</name>\r
+\r
+    <properties>\r
+        <jboss.version>4.2.3.GA</jboss.version>\r
+        <jboss.ejb.version>3.0</jboss.ejb.version>\r
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
+        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
+    </properties>\r
+    \r
+    <repositories>\r
+        <repository>\r
+            <id>public</id>\r
+            <url>http://maven.nuxeo.org/public</url>\r
+            <releases>\r
+            </releases>\r
+            <snapshots>\r
+                <enabled>false</enabled>\r
+            </snapshots>\r
+        </repository>\r
+        <repository>\r
+            <id>public-snapshot</id>\r
+            <url>http://maven.nuxeo.org/public-snapshot</url>\r
+            <releases>\r
+                <enabled>false</enabled>\r
+            </releases>\r
+            <snapshots/>\r
+        </repository>\r
+    </repositories>\r
+\r
+    <pluginRepositories>\r
+        <pluginRepository>\r
+            <id>public</id>\r
+            <url>http://maven.nuxeo.org/public</url>\r
+            <name>Nuxeo virtual release repository</name>\r
+            <releases>\r
+            </releases>\r
+            <snapshots>\r
+                <enabled>false</enabled>\r
+            </snapshots>\r
+        </pluginRepository>\r
+        <pluginRepository>\r
+            <id>public-snapshot</id>\r
+            <url>http://maven.nuxeo.org/public-snapshot</url>\r
+            <name>Nuxeo virtual snapshot repository</name>\r
+            <releases>\r
+                <enabled>false</enabled>\r
+            </releases>\r
+            <snapshots>\r
+            </snapshots>\r
+        </pluginRepository>\r
+    </pluginRepositories>\r
+\r
+    <dependencies>\r
+       \r
+        <!-- jboss -->\r
+        <dependency>\r
+            <groupId>jboss</groupId>\r
+            <artifactId>jboss-remoting</artifactId>\r
+            <version>2.2.2.SP8</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+        <!-- nuxeo -->\r
+\r
+        <dependency>\r
+            <groupId>org.nuxeo.common</groupId>\r
+            <artifactId>nuxeo-common</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.nuxeo.runtime</groupId>\r
+            <artifactId>nuxeo-runtime</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-api</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-client</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-query</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-schema</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-io</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-facade</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.nuxeo.runtime</groupId>\r
+            <artifactId>nuxeo-runtime-osgi</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.osgi</groupId>\r
+            <artifactId>osgi-core</artifactId>\r
+            <version>4.1</version>\r
+        </dependency>\r
+\r
+    </dependencies>\r
+    \r
+\r
+</project>\r

diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
new file mode 100644 (file)
index 0000000..b8f233b
--- /dev/null
+++ b/3rdparty/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+    <parent>
+        <artifactId>org.collectionspace.services</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.3rdparty</artifactId>
+    <packaging>pom</packaging>
+    <name>services.3rdparty</name>
+
+    <properties>
+        <jboss.version>4.2.3.GA</jboss.version>
+        <jboss.ejb.version>3.0</jboss.ejb.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
+    </properties>
+
+    <modules>
+        <module>nuxeo</module>
+    </modules>
+    
+    <dependencyManagement>
+        <dependencies>
+         </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>

diff --git a/build.properties b/build.properties
index 1f58e71de902384fb5d2c08070c2abec00fb4266..a6ad561a07f11cabc9ab7a7dbbf0f64dfaa4303b 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,17 @@
 jboss.release=jboss-4.2.3.GA\r
+#assumption: both nuxeo and cspace domains are using the same JBoss installation\r
 jboss.dir=C:/dev/${jboss.release}\r
-jboss.config=default\r
+jboss.home=${jboss.dir}\r
+jboss.domain.cspace=cspace\r
+jboss.domain.nuxeo=default\r
+jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace}\r
+jboss.deploy.cspace=${jboss.server.cspace}/deploy\r
+jboss.lib.cspace=${jboss.server.cspace}/lib\r
+jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}\r
+jboss.deploy.nuxeo="${jboss.server.nuxeo}/deploy\r
+jboss.lib.nuxeo=${jboss.server.nuxeo}/lib\r
+cspace.release=cspace-1.0\r
+cspace.services.release=services-${cspace.release}\r
 nuxeo.release=nuxeo-5.2.M4\r
 nuxeo.dir=${jboss.dir}/server/default/deploy/nuxeo.ear/system\r
 nuxeo.local.repo.dir=file:///${jboss.dir}/server/default/deploy/nuxeo.ear/system\r

diff --git a/build.xml b/build.xml
index 57b86fc5755f581118407c21ab5f07312f65235a..f8e34c8cc4b9148e77a35db9362b276106e43dc4 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 \r
-<project name="services" default="package" basedir=".">\r
+<project name="services-trunk" default="package" basedir=".">\r
     <description>\r
         collectionspace services\r
     </description>\r
@@ -10,16 +10,9 @@
     <property name="build" location="build"/>\r
     <property name="dist"  location="dist"/>\r
 \r
-    <target name="set.jboss.home" unless="jboss.home">\r
-        <property name="jboss.home" value="${jboss.dir}" />\r
-    </target>\r
+    <property name="db" value="mysql"/>\r
+    <property name="db.script.dir" location="${basedir}/src/main/resources/scripts/db/${db}"/>\r
 \r
-    <target name="setproperties" unless="jboss.server" depends="set.jboss.home">\r
-        <property name="jboss.server" value="${jboss.home}/server/${jboss.config}" />\r
-        <property name="jboss.deploy" value="${jboss.server}/deploy" />\r
-        <property name="jboss.lib" value="${jboss.server}/lib" />\r
-        <property name="nuxeo.deploy" value="${jboss.deploy}/nuxeo.ear" />\r
-    </target>\r
 \r
 \r
     <condition property="osfamily-unix">\r
@@ -29,7 +22,7 @@
         <os family="windows" />\r
     </condition>\r
 \r
-    <target name="init" depends="setproperties">\r
+    <target name="init" depends="setup">\r
     <!-- Create the time stamp -->\r
         <tstamp/>\r
     <!-- Create the build directory structure used by compile -->\r
@@ -44,8 +37,34 @@
 \r
     </target>\r
 \r
-    <target name="dist" depends="compile"\r
-        description="generate the distribution" >\r
+    <target name="dist" depends="package"\r
+    description="generate cspace service an nuxeo distribution">\r
+        <!-- Create the distribution directory -->\r
+        <mkdir dir="${dist}"/>\r
+        <antcall name="dist-cspace"/>\r
+        <antcall name="dist-nuxeo"/>\r
+    </target>\r
+\r
+    <target name="dist-cspace" depends="package"\r
+    description="generate cspace service distribution">\r
+\r
+        <tar destfile="${dist}/${jboss.release}.${cspace.services.release}.tar.gz" compression="gzip">\r
+            <tarfileset dir="${basedir}/services"\r
+              preserveLeadingSlashes="true">\r
+                <include name="/services/JaxRsServiceProvider/target/*.war"/>\r
+                <exclude name="server/${jboss.domain.cspace}/tmp/**"/>\r
+                <exclude name="server/${jboss.domain.cspace}/deploy/helloworld.war"/>\r
+            </tarfileset>\r
+            <tarfileset dir="${src}/main/resources"\r
+              preserveLeadingSlashes="true">\r
+                <exclude name="schemas/**"/>\r
+            </tarfileset>\r
+\r
+        </tar>\r
+    </target>\r
+\r
+    <target name="dist-nuxeo" depends="compile"\r
+        description="generate nuxeo domain distribution" >\r
         <fail message="JBoss is not installed or ${jboss.dir} not found">\r
             <condition>\r
                 <not>\r
@@ -62,14 +81,13 @@
             </condition>\r
         </fail>\r
 \r
-    <!-- Create the distribution directory -->\r
-        <mkdir dir="${dist}"/>\r
+\r
         <tar destfile="${dist}/${jboss.release}.${nuxeo.release}.tar.gz" compression="gzip">\r
             <tarfileset dir="${jboss.dir}"\r
               preserveLeadingSlashes="true">\r
-                <exclude name="server/${jboss.config}/log/**"/>\r
-                <exclude name="server/${jboss.config}/tmp/**"/>\r
-                <exclude name="server/${jboss.config}/deploy/helloworld.war"/>\r
+                <exclude name="server/${jboss.domain.nuxeo}/log/**"/>\r
+                <exclude name="server/${jboss.domain.nuxeo}/tmp/**"/>\r
+                <exclude name="server/${jboss.domain.nuxeo}/deploy/cspace*.*"/>\r
             </tarfileset>\r
             <tarfileset dir="${src}/main/resources"\r
               preserveLeadingSlashes="true">\r
@@ -79,7 +97,7 @@
         </tar>\r
     </target>\r
 \r
-    <target name="package" depends="setproperties,package-unix,package-windows"\r
+    <target name="package" depends="setup,package-unix,package-windows"\r
   description="Package CollectionSpace Services" />\r
     <target name="package-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\r
@@ -141,6 +159,35 @@
         </exec>\r
     </target>\r
 \r
+    <target name="create_db"\r
+    description="create database(s), grant privileges to test users"\r
+    depends="setup">\r
+        <sql driver="com.mysql.jdbc.Driver"\r
+        url="jdbc:mysql://localhost:3306/cspace"\r
+        userid="root"\r
+        password="admin"\r
+        src="${db.script.dir}/init_db.sql"\r
+        >\r
+            <classpath>\r
+                <pathelement path="${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar"/>\r
+            </classpath>\r
+        </sql>\r
+    </target>\r
+\r
+    <target name="deploy" depends="package"\r
+    description="deploy services in ${jboss.server.cspace}">\r
+        <ant antfile="services/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
+        <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.lib.cspace}"/>\r
+    </target>\r
+\r
+    <target name="undeploy" depends="setup"\r
+    description="undeploy authentication service from ${jboss.server.cspace}">\r
+        <ant antfile="services/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
+        <delete file="${jboss.lib.cspace}/${cspace-services.war}"/>\r
+    </target>\r
+\r
 \r
     <target name="eclipse" depends="eclipse-unix,eclipse-windows" description="Generate Eclipse files" />\r
     <target name="eclipse-unix" if="osfamily-unix">\r
@@ -161,4 +208,5 @@
         </exec>\r
     </target>\r
 \r
+\r
 </project>\r

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 4fd6f9f4749e636ceabe719db04d88507dcd23af..d984b062e2f14813df7074e06c000bd50cc488f5 100644 (file)
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -1,13 +1,104 @@
-<?xml version="1.0"?>
-<project name="helloworld" default="deploy" basedir=".">
 
-  <property file="build.properties" />
+<project name="jaxrs.provider" default="package" basedir=".">
+    <description>
+        collectionspace authentication service
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../.."/>
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="" />
+    <property name="src" location="src"/>
+    <property name="build" location="build"/>
+    <property name="dist"  location="dist"/>
+    <property name="cspace-services.war" value="cspace-services.war"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init">
+    <!-- Create the time stamp -->
+        <tstamp/>
+    <!-- Create the build directory structure used by compile -->
+        <mkdir dir="${build}"/>
+
+    </target>
+
+
+    <target name="package" depends="package-unix,package-windows"
+  description="Package CollectionSpace Services" />
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+
+    <target name="clean" depends="clean-unix,clean-windows"
+  description="Delete target directories" >
+        <delete dir="${build}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="package"
+    description="deploy authentication service in ${jboss.server.cspace}">
+        <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy authentication service from ${jboss.server.cspace}">
+        <delete file="${jboss.server.cspace}/deploy/${cspace-services.war}"/>
+    </target>
 
 
-  <target name="deploy" description="Deploy">
-    <copy todir="${jboss.dir}/server/default/deploy">
-      <fileset file="${basedir}/target/CollectionSpace.war" />
-    </copy>
-  </target>
 
 </project>

diff --git a/services/authentication/build.xml b/services/authentication/build.xml
new file mode 100644 (file)
index 0000000..9978f2a
--- /dev/null
+++ b/services/authentication/build.xml
@@ -0,0 +1,107 @@
+\r
+<project name="authentication" default="package" basedir=".">\r
+    <description>\r
+        collectionspace authentication service\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value="../.."/>\r
+    <property file="${services.trunk}/build.properties" />\r
+    <property name="mvn.opts" value="" />\r
+    <property name="src" location="src"/>\r
+    <property name="build" location="build"/>\r
+    <property name="dist"  location="dist"/>\r
+    <property name="authentication.jar" value="cspace-services-authn.jar"/>\r
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+\r
+    <target name="init">\r
+    <!-- Create the time stamp -->\r
+        <tstamp/>\r
+    <!-- Create the build directory structure used by compile -->\r
+        <mkdir dir="${build}"/>\r
+\r
+    </target>\r
+\r
+\r
+    <target name="package" depends="package-unix,package-windows"\r
+  description="Package CollectionSpace Services" />\r
+    <target name="package-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="package-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+\r
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
+        <delete dir="${build}"/>\r
+    </target>\r
+    <target name="clean-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="clean-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />\r
+    <target name="test-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="test-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="deploy" depends="package"\r
+    description="deploy authentication service in ${jboss.server.cspace}">\r
+        <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>\r
+        <echo message="Add authentication-policy to ${jboss.server.cspace}/conf/login-config.xml"/>\r
+        <echo message="Make sure cspace-ds.xml exists in ${jboss.server.cspace}/deploy"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy authentication service from ${jboss.server.cspace}">\r
+        <delete file="${jboss.server.cspace}/lib/${authentication.jar}"/>\r
+        <echo message="Remove authentication-policy from ${jboss.server.cspace}/conf/login-config.xml"/>\r
+    </target>\r
+\r
+\r
+\r
+</project>\r

diff --git a/services/build.xml b/services/build.xml
new file mode 100644 (file)
index 0000000..ca6a445
--- /dev/null
+++ b/services/build.xml
@@ -0,0 +1,100 @@
+\r
+<project name="services-main" default="package" basedir=".">\r
+    <description>\r
+        collectionspace services root\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value=".."/>\r
+    <property file="${services.trunk}/build.properties" />\r
+    <property name="mvn.opts" value="" />\r
+    <property name="src" location="src"/>\r
+    <property name="build" location="build"/>\r
+    <property name="dist"  location="dist"/>\r
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+\r
+    <target name="package" depends="package-unix,package-windows"\r
+  description="Package CollectionSpace Services" />\r
+  \r
+    <target name="package-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    \r
+    <target name="package-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+\r
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
+        <delete dir="${build}"/>\r
+    </target>\r
+    <target name="clean-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="clean-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />\r
+    <target name="test-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="test-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="deploy" depends="package"\r
+    description="deploy services in ${jboss.server.cspace}">\r
+        <ant antfile="authentication/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="common/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy authentication service from ${jboss.server.cspace}">\r
+        <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="common/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>\r
+    </target>\r
+\r
+\r
+\r
+</project>\r

diff --git a/services/collectionobject/nbactions.xml b/services/collectionobject/nbactions.xml
new file mode 100644 (file)
index 0000000..458dbd0
--- /dev/null
+++ b/services/collectionobject/nbactions.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<actions>\r
+        <action>\r
+            <actionName>rebuild</actionName>\r
+            <packagings>\r
+                <packaging>*</packaging>\r
+            </packagings>\r
+            <goals>\r
+                <goal>clean</goal>\r
+                <goal>install</goal>\r
+            </goals>\r
+            <properties>\r
+                <maven.test.skip>true</maven.test.skip>\r
+            </properties>\r
+        </action>\r
+    </actions>\r

diff --git a/services/common/build.xml b/services/common/build.xml
new file mode 100644 (file)
index 0000000..6a80765
--- /dev/null
+++ b/services/common/build.xml
@@ -0,0 +1,103 @@
+\r
+<project name="common" default="package" basedir=".">\r
+    <description>\r
+        collectionspace authentication service\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value="../.."/>\r
+    <property file="${services.trunk}/build.properties" />\r
+    <property name="mvn.opts" value="" />\r
+    <property name="src" location="src"/>\r
+    <property name="build" location="build"/>\r
+    <property name="dist"  location="dist"/>\r
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+\r
+    <target name="init" >\r
+    <!-- Create the time stamp -->\r
+        <tstamp/>\r
+    <!-- Create the build directory structure used by compile -->\r
+        <mkdir dir="${build}"/>\r
+\r
+    </target>\r
+\r
+    <target name="package" depends="package-unix,package-windows"\r
+  description="Package CollectionSpace Services" />\r
+    <target name="package-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="package-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+\r
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
+        <delete dir="${build}"/>\r
+    </target>\r
+    <target name="clean-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="clean-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />\r
+    <target name="test-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="test-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+    <target name="deploy" depends="package"\r
+    description="deploy common elements in ${jboss.server.cspace}">\r
+        <copy file="${basedir}/src/main/config/service-config.xml"\r
+        todir="${jboss.server.cspace}/cspace/config/services"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy common elements from ${jboss.server.cspace}">\r
+        <delete file="${jboss.server.cspace}/cspace/config/services/service-config.xml"/>\r
+    </target>\r
+\r
+\r
+\r
+</project>\r