</target>\r
\r
<target name="deploy" depends="package"\r
- description="deploy 3rdparty in ${jboss.server.cspace}">\r
+ description="deploy 3rdparty in ${jee.server.cspace}">\r
+ <copy todir="${db.base.dir}/jdbc_drivers">\r
+ <fileset dir="${basedir}/jdbc_drivers"/>\r
+ </copy>\r
+\r
<ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy 3rdparty from ${jboss.server.cspace}">\r
+ description="undeploy 3rdparty from ${jee.server.cspace}">\r
<ant antfile="nuxeo/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\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/lib/${nuxeo.release}"/>\r
+ description="deploy nuxeo client libs to ${jee.server.cspace}">\r
+ <copy todir="${jee.server.cspace}/nuxeo-server">\r
+ <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}"/>\r
</copy>\r
<ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>\r
<!--\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
+ description="undeploy nuxeo client libs from ${jee.server.cspace}">\r
+ <delete dir="${jee.server.cspace}/nuxeo-client"/>\r
<ant antfile="nuxeo-platform-collectionspace/build.xml" target="undeploy" inheritall="false"/>\r
<ant antfile="nuxeo-platform-quote/build.xml" target="undeploy" inheritall="false"/>\r
<ant antfile="nuxeo-platform-quote-api/build.xml" target="undeploy" inheritall="false"/>\r
</copy>
</target>
- <!-- Set the value of the property pointing to the active templates directory
+ <!-- Set the value of the property pointing to the active templates directory
OBSOLETE - this is now handled by a deploy task at the root.
<target name="update-nuxeo-config"
description="updates the active Nuxeo configuration file to specify the database template folder to use for CollectionSpace"
<entry key="nuxeo.db.password" operation="=" value="${db.nuxeo.user.password}"/>
</propertyfile>
</target>
- -->
+ -->
<!-- Undeploy-related targets -->
<target name="undeploy"
description="undeploys CollectionSpace-specific Nuxeo database template folders"
- depends="undeploy-template-dirs, reset-nuxeo-config">
+ depends="undeploy-template-dirs">
</target>
<target name="undeploy-template-dirs"
</delete>
</target>
- <target name="reset-nuxeo-config"
+ <!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+ <!--
+ <target name="reset-nuxeo-config"
description="resets the value of the database template folder in the active Nuxeo configuration file to an empty value"
depends="check-propertyfile-task-exists, set-nuxeo-active-config, backup-nuxeo-config"
if="has.propertyfile.task">
<entry key="nuxeo.templates" operation="=" value=""/>
</propertyfile>
</target>
+ -->
<!-- Utility targets -->
+ <!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+ <!--
<target name="set-nuxeo-active-config"
description="Sets the path to the active Nuxeo configuration file"
depends="set-nuxeo-active-config-with-env, set-nuxeo-active-config-without-env">
</target>
+ -->
+ <!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+ <!--
<target name="set-nuxeo-active-config-with-env" if="env.NUXEO_CONF"
description="Sets the path to the active Nuxeo configuration file, if set in the NUXEO_CONF environment variable">
<property name="nuxeo.active.config.file" value="${env.NUXEO_CONF}"/>
</target>
+ -->
+ <!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+ <!--
<target name="set-nuxeo-active-config-without-env" unless="env.NUXEO_CONF"
description="Sets the path to the active Nuxeo configuration file, in the absence of a NUXEO_CONF environment variable">
<property name="nuxeo.active.config.file" value="${nuxeo.main.config.file}"/>
</target>
+ -->
+ <!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+ <!--
<target name="backup-nuxeo-config"
description="makes a single backup copy of the active, main Nuxeo configuration file, overwriting the previous backup">
<copy file="${nuxeo.active.config.file}" tofile="${nuxeo.active.config.file}${backup.suffix}" overwrite="true"/>
</target>
+ -->
<target name="check-templates-dir-exists"
description="checks for the existence of a Nuxeo database template folder for the ${db} database">
</target>
<target name="deploy" depends="install"
- description="deploy collectionspace core doctype in ${jboss.server.nuxeo}">
+ description="deploy collectionspace core doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.collectionspace_core.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy collectionspace core doctype from ${jboss.server.nuxeo}">
+ description="undeploy collectionspace core doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
- <include name="${nuxeo.collectionspace_core.jars.all}"/>
- </fileset>
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
+ <include name="${nuxeo.collectionspace_core.jars.all}"/>
+ </fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.collectionspace_core.jars.all}"/>
</fileset>
</delete>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>
<target name="deploy" depends="install"
- description="deploy collectionspace core doctype in ${jboss.server.nuxeo}">
+ description="deploy collectionspace core doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.collectionspace.quote.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy collectionspace Quote service from ${jboss.server.nuxeo}">
+ description="undeploy collectionspace Quote service from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.collectionspace.quote.jar.all}"/>
</fileset>
</delete>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<groupId>org.collectionspace.services</groupId>\r
</target>
<target name="deploy" depends="install"
- description="deploy collectionspace core doctype in ${jboss.server.nuxeo}">
+ description="deploy collectionspace core doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.collectionspace.quote.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy collectionspace Quote service from ${jboss.server.nuxeo}">
+ description="undeploy collectionspace Quote service from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.collectionspace.quote.jar.all}"/>
</fileset>
</delete>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty.nuxeo</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<groupId>org.collectionspace.services</groupId>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.3rdparty</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<target name="deploy" description="Deploy">
- <copy todir="${jboss.dir}/server/default/deploy">
+ <copy todir="${jee.dir}/server/default/deploy">
<fileset file="${basedir}/target/helloworld.war" />
</copy>
</target>
host=127.0.0.1\r
#cspace\r
-release.version=1.14\r
+release.version=2.0\r
cspace.release=${release.version}-SNAPSHOT\r
cspace.services.release=cspace-services-${cspace.release}\r
-cspace.services.war=cspace-services.war\r
domain.cspace=cspace-services\r
+cspace.services.context=${domain.cspace}\r
+cspace.services.war=${cspace.services.context}.war\r
domain.nuxeo=nuxeo-server\r
\r
#nuxeo\r
#nuxeo.release=5.2.M4\r
#nuxeo.release=5.3.2\r
+#nuxeo.release=5.5-I20111104_1115\r
nuxeo.release=5.4.2-HF05\r
nuxeo.ear=nuxeo.ear\r
## #old# nuxeo.system=${nuxeo.ear}/bundles\r
\r
## #old# dist cspace domain\r
dist.domain.cspace=${domain.cspace}\r
-dist.server.cspace=${dist.cspace}/server/${jboss.domain.cspace}\r
+dist.server.cspace=${dist.cspace}/server/${jee.domain.cspace}\r
dist.deploy.cspace=${dist.server.cspace}/deploy\r
dist.lib.cspace=${dist.server.cspace}/lib\r
\r
## #old# dist nuxeo domain\r
dist.domain.nuxeo=${domain.nuxeo}\r
-dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}\r
+dist.server.nuxeo=${dist.nuxeo}/server/${jee.domain.nuxeo}\r
dist.deploy.nuxeo=${dist.server.nuxeo}/deploy\r
dist.lib.nuxeo=${dist.server.nuxeo}/lib\r
dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}\r
dist.deploy.nuxeo.plugins=${dist.deploy.nuxeo}/${nuxeo.plugins}\r
\r
-#jboss\r
-#assumption: both nuxeo and cspace domains are using the same JBoss installation\r
-#jboss.release=jboss-4.2.3.GA\r
+#JEE Application Server\r
jee.release=tomcat-6\r
jee.dir=${env.CSPACE_JEESERVER_HOME}\r
jee.home=${jee.dir}\r
jee.bin=${jee.home}/bin\r
\r
-#jboss cspace domain\r
+#JEE Application Server cspace domain\r
jee.domain.cspace=${domain.cspace}\r
jee.domain.cspace.port=8180\r
jee.server.cspace=${jee.home}\r
jee.lib.cspace=${jee.server.cspace}/lib\r
jee.deploy.cspace.services=${jee.deploy.cspace}/${cspace.services.war}\r
\r
-#jboss nuxeo domain\r
+#JEE Application Server nuxeo domain\r
jee.domain.nuxeo=${domain.nuxeo}\r
##old# #jee.domain.nuxeo.port=8080\r
jee.server.nuxeo=${jee.home}/${jee.domain.nuxeo}\r
##old# nuxeo.templates.dir=${jboss.home}/${nuxeo.templates}\r
\r
#nuxeo main config file\r
-nuxeo.main.config.file=${jboss.bin}/nuxeo.conf\r
+nuxeo.main.config.file=${jee.bin}/nuxeo.conf\r
+#nuxeo database templates directory\r
+nuxeo.templates.dir=${jee.home}/${nuxeo.templates}\r
+\r
+db.base.dir=${jee.server.cspace}/cspace/services/db\r
\r
#database - select one or the other (not both!), and then uncomment the\r
# appropriate section below the common settings\r
db=mysql\r
#For mysql, uncomment this, and comment out postgres section\r
db.port=3306\r
-db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar\r
+db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar\r
db.jdbc.driver.class=com.mysql.jdbc.Driver\r
db.dialect=org.hibernate.dialect.MySQLDialect\r
db.typemapping=mySQL\r
\r
#For postgresql, uncomment this, and comment out mysql section\r
#db.port=5432\r
-#db.driver.jar=${jboss.lib.cspace}/postgresql-8.4-702.jdbc4.jar\r
+#db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-8.4-702.jdbc4.jar\r
#db.jdbc.driver.class=org.postgresql.Driver\r
#db.dialect=org.hibernate.dialect.PostgreSQLDialect\r
#db.typemapping=PostgreSQL 8.0\r
hibernate.dialect=${db.dialect}\r
\r
#database common settings\r
-db.script.dir=${jboss.server.cspace}/cspace/services/db/${db}\r
+db.script.dir=${jee.server.cspace}/cspace/services/db/${db}\r
db.user=${env.DB_USER}\r
db.user.password=${env.DB_PASSWORD}\r
db.nuxeo.user=nuxeo\r
<ant antfile="services/build.xml" target="dist" inheritAll="false"/>\r
\r
<!-- bundle up everything -->\r
- <tar destfile="${basedir}/dist/${cspace.services.release}-${jboss.release}.tar.gz" compression="gzip">\r
+ <tar destfile="${basedir}/dist/${cspace.services.release}-${jee.release}.tar.gz" compression="gzip">\r
<tarfileset dir="${basedir}/dist/cspace"\r
preserveLeadingSlashes="true">\r
</tarfileset>\r
</tar>\r
</target>\r
\r
- <target name="dist-jboss-domains" depends="init"\r
- description="create jboss distributions for cspace and nuxeo">\r
- <antcall target="dist-jboss-cspace"/>\r
- <antcall target="dist-jboss-nuxeo"/>\r
+ <target name="dist-jee-domains" depends="init"\r
+ description="create JEE distributions for cspace and nuxeo">\r
+ <antcall target="dist-jee-cspace"/>\r
+ <antcall target="dist-jee-nuxeo"/>\r
</target>\r
\r
- <target name="dist-jboss-cspace" depends="dist"\r
- description="generate jboss distribution for cspace">\r
- <fail message="JBoss is not installed or ${jboss.dir} not found">\r
+ <target name="dist-jee-cspace" depends="dist"\r
+ description="generate JEE distribution for cspace">\r
+ <fail message="JEE container is not installed or ${jee.dir} not found">\r
<condition>\r
<not>\r
- <available file="${jboss.dir}" type="dir"/>\r
+ <available file="${jee.dir}" type="dir"/>\r
</not>\r
</condition>\r
</fail>\r
\r
- <fail message="CSpace is not deployed or ${jboss.deploy.cspace.services} not found">\r
+ <fail message="CSpace is not deployed or ${jee.deploy.cspace.services} not found">\r
<condition>\r
<not>\r
- <available file="${jboss.deploy.cspace.services}" type="file"/>\r
+ <available file="${jee.deploy.cspace.services}" type="file"/>\r
</not>\r
</condition>\r
</fail>\r
\r
- <tar destfile="${basedir}/dist/${jboss.release}-${domain.cspace}-${release.version}.tar.gz" compression="gzip">\r
- <tarfileset dir="${jboss.dir}"\r
- prefix="${jboss.release}"\r
+ <tar destfile="${basedir}/dist/${jee.release}-${domain.cspace}-${release.version}.tar.gz" compression="gzip">\r
+ <tarfileset dir="${jee.dir}"\r
+ prefix="${jee.release}"\r
preserveLeadingSlashes="true">\r
- <exclude name="server/${jboss.domain.nuxeo}/**"/>\r
- <exclude name="server/${jboss.domain.cspace}/log/**"/>\r
- <exclude name="server/${jboss.domain.cspace}/tmp/**"/>\r
+ <exclude name="server/${jee.domain.nuxeo}/**"/>\r
+ <exclude name="server/${jee.domain.cspace}/log/**"/>\r
+ <exclude name="server/${jee.domain.cspace}/tmp/**"/>\r
</tarfileset>\r
</tar>\r
</target>\r
\r
- <target name="dist-jboss-nuxeo" depends="dist"\r
+ <target name="dist-jee-nuxeo" depends="dist"\r
description="generate nuxeo domain distribution" >\r
- <fail message="JBoss is not installed or ${jboss.dir} not found">\r
+ <fail message="JEE server is not installed or ${jee.dir} not found">\r
<condition>\r
<not>\r
- <available file="${jboss.dir}" type="dir"/>\r
+ <available file="${jee.dir}" type="dir"/>\r
</not>\r
</condition>\r
</fail>\r
\r
- <fail message="Nuxeo is not deployed or ${jboss.deploy.nuxeo.plugins} not found">\r
+ <fail message="Nuxeo is not deployed or ${jee.deploy.nuxeo.plugins} not found">\r
<condition>\r
<not>\r
- <available file="${jboss.deploy.nuxeo.plugins}" type="dir"/>\r
+ <available file="${jee.deploy.nuxeo.plugins}" type="dir"/>\r
</not>\r
</condition>\r
</fail>\r
\r
- <tar destfile="${basedir}/dist/${jboss.release}-${domain.nuxeo}-${release.version}.tar.gz" compression="gzip">\r
- <tarfileset dir="${jboss.dir}"\r
- prefix="${jboss.release}"\r
+ <tar destfile="${basedir}/dist/${jee.release}-${domain.nuxeo}-${release.version}.tar.gz" compression="gzip">\r
+ <tarfileset dir="${jee.dir}"\r
+ prefix="${jee.release}"\r
preserveLeadingSlashes="true">\r
- <exclude name="server/${jboss.domain.cspace}/**"/>\r
- <exclude name="server/${jboss.domain.nuxeo}/log/**"/>\r
- <exclude name="server/${jboss.domain.nuxeo}/tmp/**"/>\r
+ <exclude name="server/${jee.domain.cspace}/**"/>\r
+ <exclude name="server/${jee.domain.nuxeo}/log/**"/>\r
+ <exclude name="server/${jee.domain.nuxeo}/tmp/**"/>\r
</tarfileset>\r
</tar>\r
</target>\r
</target>\r
\r
<target name="deploy" depends="checkvars,install,setup_nuxeo.conf,setup_cspaceds.cfg,setup_initdb.sql"\r
- description="deploy services in ${jboss.server.cspace}">\r
+ description="deploy services in ${jee.server.cspace}">\r
<!-- copy db scripts, etc. -->\r
- <copy todir="${jboss.server.cspace}/cspace/services/scripts">\r
- <fileset dir="${src}/main/resources/scripts/"/>\r
+ <copy todir="${jee.server.cspace}/cspace/services/scripts">\r
+ <fileset dir="${src}/main/resources/scripts/"/>\r
</copy>\r
- <!-- copy datasources, including default jboss ds -->\r
+ <!-- copy datasources, including default JEE datasource -->\r
<!--\r
Now handled in dependent targets\r
- <copy todir="${jboss.deploy.cspace}">\r
+ <copy todir="${jee.deploy.cspace}">\r
<fileset dir="${src}/main/resources/config/${db}"/>\r
</copy>\r
-->\r
\r
</target>\r
\r
- <target name="checkvars">\r
- <fail unless="env.JBOSS_HOME" \r
- message="Required environment variable JBOSS_HOME has not been set."/>\r
+ <target name="checkvars"> \r
+ <fail unless="env.CSPACE_JEESERVER_HOME" \r
+ message="Required environment variable CSPACE_JEESERVER_HOME has not been set."/>\r
<fail unless="env.DB_PASSWORD_CSPACE" \r
message="Required environment variable DB_PASSWORD_CSPACE has not been set."/>\r
<fail unless="env.DB_PASSWORD_NUXEO" \r
<target name="setup_nuxeo.conf"\r
description="copy nuxeo.conf, replacing keyword to set DB dialect">\r
<property name="src.nuxeo.conf" value="${src}/main/resources/config/nuxeo.conf"/>\r
- <delete file="${jboss.bin}/nuxeo.conf" failonerror="false" />\r
- <copy file="${src.nuxeo.conf}" todir="${jboss.bin}">\r
+ <delete file="${jee.bin}/nuxeo.conf" failonerror="false" />\r
+ <copy file="${src.nuxeo.conf}" todir="${jee.bin}">\r
<filterset>\r
<filter token="DB" value="${db}" />\r
<filter token="NUXEO_USER" value="${db.nuxeo.user}" />\r
<target name="setup_cspaceds.cfg"\r
description="copy cspace-ds.xml, replacing keywords">\r
<property name="src.cspaceds.cfg" value="${src}/main/resources/config/cspace-ds.xml"/>\r
- <delete file="${jboss.deploy.cspace}/cspace-ds.xml" failonerror="false" />\r
- <copy file="${src.cspaceds.cfg}" todir="${jboss.deploy.cspace}">\r
+ <delete file="${jee.deploy.cspace}/cspace-ds.xml" failonerror="false" />\r
+ <copy file="${src.cspaceds.cfg}" todir="${jee.deploy.cspace}">\r
<filterset>\r
<filter token="DB_CSPACE_URL" value="${db.jdbc.cspace.url}" />\r
<filter token="DB_NUXEO_URL" value="${db.jdbc.nuxeo.url}" />\r
</target>\r
\r
<target name="setup_initdb.sql" description="copy init_db scripts, replacing keywords">\r
- <copy todir="${jboss.server.cspace}/cspace/services/db">\r
+ <copy todir="${jee.server.cspace}/cspace/services/db">\r
<fileset dir="${src}/main/resources/db"/>\r
<filterset>\r
<!-- Note: double-subs from ${db.xyz.password} fail -->\r
<filter token="DB_CSPACE_USER" value="${db.cspace.user}" />\r
<filter token="DB_NUXEO_USER" value="${db.nuxeo.user}" />\r
- <filter token="DB_JBOSS_USER" value="${db.jboss.user}" />\r
<filter token="DB_CSPACE_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" />\r
<filter token="DB_NUXEO_PASSWORD" value="${env.DB_PASSWORD_NUXEO}" />\r
- <filter token="DB_JBOSS_PASSWORD" value="${env.DB_PASSWORD_JBOSS}" />\r
</filterset>\r
</copy>\r
</target>\r
\r
\r
<target name="undeploy"\r
- description="undeploy services from ${jboss.server.cspace}">\r
+ description="undeploy services from ${jee.server.cspace}">\r
<ant antfile="services/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="3rdparty/build.xml" target="undeploy" inheritAll="false"/>\r
<!-- Delete mysql-ds.xml to clean up pre-1.8 bundles -->\r
- <delete failonerror="false" file="${jboss.deploy.cspace}/mysql-ds.xml"/>\r
- <delete failonerror="false" file="${jboss.deploy.cspace}/jboss-ds.xml"/>\r
- <delete failonerror="false" file="${jboss.deploy.cspace}/cspace-ds.xml"/>\r
- <delete failonerror="false" dir="${jboss.server.cspace}/cspace/services"/>\r
- <delete failonerror="false" dir="${jboss.server.cspace}/cspace/config/services"/>\r
+ <delete failonerror="false" file="${jee.deploy.cspace}/mysql-ds.xml"/>\r
+ <delete failonerror="false" file="${jee.deploy.cspace}/jee-ds.xml"/>\r
+ <delete failonerror="false" file="${jee.deploy.cspace}/cspace-ds.xml"/>\r
+ <delete failonerror="false" dir="${jee.server.cspace}/cspace/services"/>\r
+ <delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services"/>\r
</target>\r
\r
\r
<target name="hotdeploy" depends="install"\r
- description="deploy services in running ${jboss.server.cspace}">\r
+ description="deploy services in running ${jee.server.cspace}">\r
<ant antfile="services/build.xml" target="hotdeploy" inheritAll="false"/>\r
</target>\r
\r
<target name="install"\r
description="Installer: Copy artifacts for CollectionSpace Nuxeo doctypes">\r
<!-- cspace\server\cspace --> \r
- <copy todir="${jboss.server.cspace}/cspace">\r
+ <copy todir="${jee.server.cspace}/cspace">\r
<fileset dir="${services.trunk}/${dist.server.cspace}/cspace"/>\r
</copy>\r
<!-- cspace\server\cspace\deploy --> \r
- <copy todir="${jboss.server.cspace}/deploy">\r
+ <copy todir="${jee.server.cspace}/deploy">\r
<fileset dir="${services.trunk}/${dist.server.cspace}/deploy">\r
<include name="*"/>\r
</fileset>\r
</copy>\r
<!-- cspace\server\cspace\lib --> \r
- <copy todir="${jboss.server.cspace}/lib">\r
+ <copy todir="${jee.server.cspace}/lib">\r
<fileset dir="${services.trunk}/${dist.server.cspace}/lib"/>\r
</copy> \r
<!-- cspace\server\cspace\nuxeo-client\lib --> \r
- <copy todir="${jboss.server.cspace}/nuxeo-client/lib">\r
+ <copy todir="${jee.server.cspace}/nuxeo-client/lib">\r
<fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib">\r
<include name="*.jar"/>\r
</fileset>\r
</copy>\r
<!-- cspace\server\cspace\nuxeo-client\lib (5.2GA) --> \r
- <copy todir="${jboss.server.cspace}/nuxeo-client/lib">\r
+ <copy todir="${jee.server.cspace}/nuxeo-client/lib">\r
<fileset dir="${services.trunk}/${dist.server.cspace}/nuxeo-client/lib/${nuxeo.release}">\r
<include name="*.jar"/>\r
</fileset>\r
<?xml version="1.0" encoding="UTF-8"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
\r
- <modelVersion>4.0.0</modelVersion>\r
- <groupId>org.collectionspace.services</groupId>\r
- <artifactId>org.collectionspace.services</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
- <packaging>pom</packaging>\r
- <name>services</name>\r
+ <modelVersion>4.0.0</modelVersion>\r
+ <groupId>org.collectionspace.services</groupId>\r
+
<artifactId>org.collectionspace.services</artifactId>
\r+ <version>2.0-SNAPSHOT</version>\r
+
<packaging>pom</packaging>
\r+ <name>services</name>\r
\r
- <properties>\r
- <jboss.version>5.1.0.GA</jboss.version>\r
- <jboss.ejb.version>3.0</jboss.ejb.version>\r
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> \r
- <nuxeo.shell.version>5.4.2-HF05</nuxeo.shell.version>\r
+ <properties>\r
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+ <nuxeo.shell.version>5.4.2-HF05</nuxeo.shell.version>\r
<nuxeo.platform.version>5.4.2-HF05</nuxeo.platform.version>\r
- <nuxeo.core.version>5.4.2-HF05</nuxeo.core.version>\r
- <cspace.services.version>1.14-SNAPSHOT</cspace.services.version>\r
- <cspace.services.client.version>1.14-SNAPSHOT</cspace.services.client.version>\r
- </properties>\r
+ <nuxeo.core.version>5.4.2-HF05</nuxeo.core.version>\r
+ <cspace.services.version>2.0-SNAPSHOT</cspace.services.version>\r
+ <cspace.services.client.version>2.0-SNAPSHOT</cspace.services.client.version>\r
+ </properties>\r
\r
- <distributionManagement>\r
- <repository>\r
- <id>libs-releases-local</id>\r
- <name>libs-releases-local</name>\r
- <url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>\r
- </repository>\r
- <snapshotRepository>\r
- <id>libs-snapshots-local</id>\r
- <name>libs-snapshots-local</name>\r
- <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>\r
- </snapshotRepository>\r
- </distributionManagement>\r
+ <distributionManagement>\r
+ <repository>\r
+ <id>libs-releases-local</id>\r
+ <name>libs-releases-local</name>\r
+ <url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>\r
+ </repository>\r
+ <snapshotRepository>\r
+ <id>libs-snapshots-local</id>\r
+ <name>libs-snapshots-local</name>\r
+ <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>\r
+ </snapshotRepository>\r
+ </distributionManagement>\r
\r
- <modules>\r
- <module>3rdparty</module>\r
- <module>services</module>\r
- </modules>\r
+ <modules>\r
+ <module>3rdparty</module>\r
+ <module>services</module>\r
+ </modules>\r
\r
- <repositories>\r
- <repository>\r
- <id>collectionspace-remote-repos</id>\r
- <name>collectionspace-remote-repos</name>\r
- <url>http://source.collectionspace.org:8081/artifactory/remote-repos</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots> \r
- </repository>\r
- <repository>\r
- <id>repo1</id>\r
- <name>Maven repo1</name>\r
- <url>http://repo1.maven.org/maven2</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
- <repository>\r
- <id>repo2</id>\r
- <name>Maven repo2</name>\r
- <url>http://repo2.maven.org/maven2</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
- <repository>\r
- <id>maven2-repository.dev.java.net</id>\r
- <name>Java.net Maven 2 Repository</name>\r
- <url>http://download.java.net/maven/2</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
-<!-- <repository>\r
- <id>maven1-repository.dev.java.net</id>\r
- <name>Java.net Maven 1 Repository</name>\r
- <url>http://download.java.net/maven/1</url>\r
- <layout>legacy</layout>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>-->\r
+ <repositories>\r
+ <repository>\r
+ <id>collectionspace-remote-repos</id>\r
+ <name>collectionspace-remote-repos</name>\r
+ <url>http://source.collectionspace.org:8081/artifactory/remote-repos</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
+ <repository>\r
+ <id>repo1</id>\r
+ <name>Maven repo1</name>\r
+ <url>http://repo1.maven.org/maven2</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
+ <repository>\r
+ <id>repo2</id>\r
+ <name>Maven repo2</name>\r
+ <url>http://repo2.maven.org/maven2</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
+ <repository>\r
+ <id>maven2-repository.dev.java.net</id>\r
+ <name>Java.net Maven 2 Repository</name>\r
+ <url>http://download.java.net/maven/2</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
+ <!-- <repository> <id>maven1-repository.dev.java.net</id> <name>Java.net \r
+ Maven 1 Repository</name> <url>http://download.java.net/maven/1</url> <layout>legacy</layout> \r
+ <snapshots> <enabled>false</enabled> </snapshots> </repository> -->\r
\r
- <repository>\r
- <id>jboss.org</id>\r
- <url>https://repository.jboss.org/nexus</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
- <!-- some security binaries available under .com only perhaps due to licensing issues -->\r
- <repository>\r
- <id>jboss.com</id>\r
- <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
+ <repository>\r
+ <id>jboss.org</id>\r
+ <url>https://repository.jboss.org/nexus</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
+ <!-- some security binaries available under .com only perhaps due to licensing \r
+ issues -->\r
+ <repository>\r
+ <id>jboss.com</id>\r
+ <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
\r
- <repository>\r
- <id>codehaus repo</id>\r
- <name>codehaus repo</name>\r
- <url>http://repository.codehaus.org</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
+ <repository>\r
+ <id>codehaus repo</id>\r
+ <name>codehaus repo</name>\r
+ <url>http://repository.codehaus.org</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
\r
- <repository>\r
- <id>public-snapshot</id>\r
- <url>http://maven.nuxeo.org/public-snapshot</url>\r
- <!-- Nuxeo Snapshots Repository is disabled. -->\r
- <releases>\r
- <enabled>false</enabled>\r
- </releases>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- <!--<updatePolicy>never</updatePolicy>-->\r
- </snapshots>\r
- </repository>\r
+ <repository>\r
+ <id>public-snapshot</id>\r
+ <url>http://maven.nuxeo.org/public-snapshot</url>\r
+ <!-- Nuxeo Snapshots Repository is disabled. -->\r
+ <releases>\r
+ <enabled>false</enabled>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ <!--<updatePolicy>never</updatePolicy> -->\r
+ </snapshots>\r
+ </repository>\r
\r
- <repository>\r
- <id>public</id>\r
- <url>http://maven.nuxeo.org/public</url>\r
- <!-- Nuxeo Releases Repository is disabled. -->\r
- <releases>\r
- <enabled>true</enabled>\r
- </releases>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
+ <repository>\r
+ <id>public</id>\r
+ <url>http://maven.nuxeo.org/public</url>\r
+ <!-- Nuxeo Releases Repository is disabled. -->\r
+ <releases>\r
+ <enabled>true</enabled>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
\r
- <repository>\r
- <id>nuxeo-public</id>\r
- <name>nuxeo-public</name>\r
- <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>\r
- <releases>\r
- <enabled>true</enabled>\r
- </releases>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </repository>\r
-<!-- This should no longer be needed since we're using only "releases" artifacts \r
- <repository>\r
- <id>nuxeo-public-snapshot</id>\r
- <name>nuxeo-public-snapshot</name>\r
- <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>\r
- <releases>\r
- <enabled>false</enabled>\r
- </releases>\r
- <snapshots>\r
- <enabled>true</enabled>\r
- <updatePolicy>never</updatePolicy>\r
- </snapshots>\r
- </repository>\r
--->\r
+ <repository>\r
+ <id>nuxeo-public</id>\r
+ <name>nuxeo-public</name>\r
+ <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>\r
+ <releases>\r
+ <enabled>true</enabled>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </repository>\r
+ <!-- This should no longer be needed since we're using only "releases" \r
+ artifacts <repository> <id>nuxeo-public-snapshot</id> <name>nuxeo-public-snapshot</name> \r
+ <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url> \r
+ <releases> <enabled>false</enabled> </releases> <snapshots> <enabled>true</enabled> \r
+ <updatePolicy>never</updatePolicy> </snapshots> </repository> -->\r
\r
- <repository>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- <releases>\r
- <enabled>true</enabled>\r
- </releases>\r
- <id>el4jReleaseRepositoryExternal</id>\r
- <name>External release repository of the EL4J project</name>\r
- <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>\r
- </repository>\r
- \r
+ <repository>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ <releases>\r
+ <enabled>true</enabled>\r
+ </releases>\r
+ <id>el4jReleaseRepositoryExternal</id>\r
+ <name>External release repository of the EL4J project</name>\r
+ <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>\r
+ </repository>\r
\r
- </repositories>\r
\r
- <pluginRepositories>\r
- <pluginRepository>\r
- <id>collectionspace-plugins-remote-repos</id>\r
- <name>collectionspace-plugins-remote-repos</name>\r
- <url>http://source.collectionspace.org:8081/artifactory/plugins-remote-repos</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </pluginRepository>\r
- <pluginRepository>\r
- <id>repo1</id>\r
- <name>Maven repo1</name>\r
- <url>http://repo1.maven.org/maven2</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </pluginRepository>\r
- <pluginRepository>\r
- <id>maven repo</id>\r
- <name>maven repo</name>\r
- <url>http://repo2.maven.org/maven2</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </pluginRepository>\r
- <pluginRepository>\r
- <id>maven2-repository.dev.java.net</id>\r
- <url>http://download.java.net/maven/2</url>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </pluginRepository>\r
- <pluginRepository>\r
- <id>Codehaus Repository</id>\r
- <url>http://repository.codehaus.org/</url>\r
- <releases>\r
- <enabled>true</enabled>\r
- </releases>\r
- <snapshots>\r
- <enabled>false</enabled>\r
- </snapshots>\r
- </pluginRepository>\r
- </pluginRepositories>\r
+ </repositories>\r
\r
- <build>\r
- <pluginManagement>\r
- <plugins>\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-javadoc-plugin</artifactId>\r
- <version>2.6.1</version>\r
- <configuration>\r
- <show>public</show>\r
- </configuration>\r
- </plugin>\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId> \r
- <artifactId>maven-compiler-plugin</artifactId>\r
- <version>2.3</version>\r
- <configuration>\r
- <source>1.6</source>\r
- <target>1.6</target>\r
- </configuration>\r
- </plugin>\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-assembly-plugin</artifactId>\r
- <configuration> </configuration>\r
- </plugin>\r
- <!-- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-site-plugin</artifactId>\r
- <configuration>\r
- <dependencyLocationEnabled>false</dependencyLocationEnabled>\r
- <unzipCommand>/usr/bin/unzip -o > err.txt</unzipCommand>\r
- </configuration>\r
- </plugin> -->\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-war-plugin</artifactId>\r
- <version>2.0</version>\r
- <configuration>\r
- <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
- <archive>\r
- <manifest>\r
- <addClasspath>true</addClasspath>\r
- </manifest>\r
- </archive>\r
- </configuration>\r
- </plugin>\r
+ <pluginRepositories>\r
+ <pluginRepository>\r
+ <id>collectionspace-plugins-remote-repos</id>\r
+ <name>collectionspace-plugins-remote-repos</name>\r
+ <url>http://source.collectionspace.org:8081/artifactory/plugins-remote-repos</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </pluginRepository>\r
+ <pluginRepository>\r
+ <id>repo1</id>\r
+ <name>Maven repo1</name>\r
+ <url>http://repo1.maven.org/maven2</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </pluginRepository>\r
+ <pluginRepository>\r
+ <id>maven repo</id>\r
+ <name>maven repo</name>\r
+ <url>http://repo2.maven.org/maven2</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </pluginRepository>\r
+ <pluginRepository>\r
+ <id>maven2-repository.dev.java.net</id>\r
+ <url>http://download.java.net/maven/2</url>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </pluginRepository>\r
+ <pluginRepository>\r
+ <id>Codehaus Repository</id>\r
+ <url>http://repository.codehaus.org/</url>\r
+ <releases>\r
+ <enabled>true</enabled>\r
+ </releases>\r
+ <snapshots>\r
+ <enabled>false</enabled>\r
+ </snapshots>\r
+ </pluginRepository>\r
+ </pluginRepositories>\r
\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-jar-plugin</artifactId>\r
- <version>2.2</version>\r
- </plugin>\r
+ <build>\r
+ <pluginManagement>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-javadoc-plugin</artifactId>\r
+ <version>2.6.1</version>\r
+ <configuration>\r
+ <show>public</show>\r
+ </configuration>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-compiler-plugin</artifactId>\r
+ <version>2.3</version>\r
+ <configuration>\r
+ <source>1.6</source>\r
+ <target>1.6</target>\r
+ </configuration>\r
+ </plugin>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-assembly-plugin</artifactId>\r
+ <configuration>\r
+ </configuration>\r
+ </plugin>\r
+ <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> \r
+ <configuration> <dependencyLocationEnabled>false</dependencyLocationEnabled> \r
+ <unzipCommand>/usr/bin/unzip -o > err.txt</unzipCommand> </configuration> \r
+ </plugin> -->\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-war-plugin</artifactId>\r
+ <version>2.0</version>\r
+ <configuration>\r
+ <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
+ <archive>\r
+ <manifest>\r
+ <addClasspath>true</addClasspath>\r
+ </manifest>\r
+ </archive>\r
+ </configuration>\r
+ </plugin>\r
\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-dependency-plugin</artifactId>\r
- <executions>\r
- <execution>\r
- <id>classpath</id>\r
- <goals>\r
- <goal>build-classpath</goal>\r
- </goals>\r
- <configuration>\r
- <outputFile>classpath</outputFile>\r
- </configuration>\r
- </execution>\r
- </executions>\r
- </plugin>\r
- </plugins>\r
- </pluginManagement>\r
- <plugins>\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-compiler-plugin</artifactId>\r
- </plugin>\r
- </plugins>\r
- </build>\r
- \r
- <dependencyManagement>\r
- <dependencies>\r
- <dependency>\r
- <groupId>org.slf4j</groupId>\r
- <artifactId>slf4j-api</artifactId>\r
- <version>1.5.8</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.slf4j</groupId>\r
- <artifactId>slf4j-log4j12</artifactId>\r
- <version>1.5.8</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>javax.ejb</groupId>\r
- <artifactId>ejb</artifactId>\r
- <version>${jboss.ejb.version}</version>\r
- <scope>provided</scope>\r
- </dependency>\r
- <dependency>\r
- <groupId>javax.annotation</groupId>\r
- <artifactId>jsr250-api</artifactId>\r
- <version>1.0</version>\r
- <scope>provided</scope>\r
- </dependency>\r
- <dependency>\r
- <groupId>javax.jms</groupId>\r
- <artifactId>jms</artifactId>\r
- <version>1.1</version>\r
- <scope>provided</scope>\r
- </dependency>\r
- <dependency>\r
- <groupId>javax.transaction</groupId>\r
- <artifactId>jta</artifactId>\r
- <version>1.1</version>\r
- <scope>provided</scope>\r
- </dependency>\r
- \r
- <dependency>\r
- <groupId>org.jboss.remoting</groupId>\r
- <artifactId>jboss-remoting</artifactId>\r
- <version>2.5.1</version>\r
- <scope>provided</scope>\r
- </dependency>\r
- <dependency>\r
- <groupId>jboss</groupId>\r
- <artifactId>jboss-annotations-ejb3</artifactId>\r
- <version>3.0-RC8</version>\r
- <scope>provided</scope>\r
- </dependency> \r
- <dependency>\r
- <groupId>org.jboss.javaee</groupId>\r
- <artifactId>jboss-javaee</artifactId>\r
- <version>5.0.1.GA</version>\r
- <scope>provided</scope>\r
- </dependency>\r
- \r
- <!--\r
- <dependency>\r
- <groupId>jboss</groupId>\r
- <artifactId>jboss-j2ee</artifactId>\r
- <version>${jboss.version}</version>\r
- <scope>provided</scope>\r
- </dependency>\r
- -->\r
- <dependency>\r
- <groupId>javax.ejb</groupId>\r
- <artifactId>ejb-api</artifactId>\r
- <version>3.0</version>\r
- <scope>provided</scope>\r
- </dependency>\r
-<!-- <dependency>\r
- <groupId>net.java.dev.jaxb2-commons</groupId>\r
- <artifactId>jaxb-fluent-api</artifactId>\r
- <version>2.0.2</version>\r
- </dependency> -->\r
-<!--` <dependency>\r
- <groupId>org.testng</groupId>\r
- <artifactId>testng</artifactId>\r
- <version>5.6</version>\r
- <scope>test</scope>\r
- <classifier>jdk15</classifier>\r
- </dependency> -->\r
-<!-- <dependency>\r
- <groupId>mysql</groupId>\r
- <artifactId>mysql-connector-java</artifactId>\r
- <version>5.1.5</version>\r
- <scope>test</scope>\r
- </dependency> -->\r
- </dependencies>\r
- </dependencyManagement>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-jar-plugin</artifactId>\r
+ <version>2.2</version>\r
+ </plugin>\r
\r
- <reporting>\r
- <plugins>\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-project-info-reports-plugin</artifactId>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-dependency-plugin</artifactId>\r
+ <executions>\r
+ <execution>\r
+ <id>classpath</id>\r
+ <goals>\r
+ <goal>build-classpath</goal>\r
+ </goals>\r
+ <configuration>\r
+ <outputFile>classpath</outputFile>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
+ </plugins>\r
+ </pluginManagement>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-compiler-plugin</artifactId>\r
+ </plugin>\r
+ </plugins>\r
+ </build>\r
+\r
+ <dependencyManagement>\r
+ <dependencies>\r
+ <dependency>\r
+ <groupId>org.slf4j</groupId>\r
+ <artifactId>slf4j-api</artifactId>\r
+ <version>1.5.8</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.slf4j</groupId>\r
+ <artifactId>slf4j-log4j12</artifactId>\r
+ <version>1.5.8</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>javax.ejb</groupId>\r
+ <artifactId>ejb</artifactId>\r
+ <version>${jboss.ejb.version}</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>javax.annotation</groupId>\r
+ <artifactId>jsr250-api</artifactId>\r
+ <version>1.0</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>javax.jms</groupId>\r
+ <artifactId>jms</artifactId>\r
+ <version>1.1</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>javax.transaction</groupId>\r
+ <artifactId>jta</artifactId>\r
+ <version>1.1</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+\r
+ <dependency>\r
+ <groupId>org.jboss.remoting</groupId>\r
+ <artifactId>jboss-remoting</artifactId>\r
+ <version>2.5.1</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>jboss</groupId>\r
+ <artifactId>jboss-annotations-ejb3</artifactId>\r
+ <version>3.0-RC8</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.jboss.javaee</groupId>\r
+ <artifactId>jboss-javaee</artifactId>\r
+ <version>5.0.1.GA</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+\r
+ <dependency>\r
+ <groupId>javax.ejb</groupId>\r
+ <artifactId>ejb-api</artifactId>\r
+ <version>3.0</version>\r
+ <scope>provided</scope>\r
+ </dependency>\r
+ </dependencies>\r
+ </dependencyManagement>\r
+\r
+ <reporting>\r
+ <plugins>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-project-info-reports-plugin</artifactId>\r
<version>2.3.1</version>\r
- <configuration> </configuration>\r
- <reportSets>\r
- <reportSet>\r
- <reports>\r
- <report>dependencies</report>\r
- </reports>\r
- </reportSet>\r
- </reportSets>\r
- </plugin>\r
- <!-- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-javadoc-plugin</artifactId>\r
- <version>2.6.1</version>\r
- <configuration>\r
- <show>public</show>\r
- </configuration>\r
- </plugin> -->\r
- </plugins>\r
- </reporting>\r
+ <configuration>\r
+ </configuration>\r
+ <reportSets>\r
+ <reportSet>\r
+ <reports>\r
+ <report>dependencies</report>\r
+ </reports>\r
+ </reportSet>\r
+ </reportSets>\r
+ </plugin>\r
+ <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> \r
+ <version>2.6.1</version> <configuration> <show>public</show> </configuration> \r
+ </plugin> -->\r
+ </plugins>\r
+ </reporting>\r
\r
</project>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>
<target name="deploy" depends="package"
- description="deploy cspace services in ${jboss.server.cspace}">
- <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
+ description="deploy cspace services in ${jee.server.cspace}">
+ <delete dir="${jee.deploy.cspace}/${cspace.services.context}"/>
+ <copy file="${basedir}/target/${cspace-services.war}" todir="${jee.deploy.cspace}"/>
</target>
<target name="undeploy"
- description="undeploy cspace services from ${jboss.server.cspace}">
- <delete file="${jboss.server.cspace}/deploy/${cspace-services.war}"/>
+ description="undeploy cspace services from ${jee.server.cspace}">
+ <delete file="${jee.deploy.cspace}/${cspace-services.war}"/>
+ <delete dir="${jee.deploy.cspace}/${cspace.services.context}"/>
</target>
<target name="dist"
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
\r
public class CSpaceResteasyBootstrap extends ResteasyBootstrap {\r
\r
- public void contextInitialized(ServletContextEvent event) {\r
- if (true) {\r
- System.out.print("Pausing 1 seconds in RESTEasy bootstrap for you to attached the debugger");\r
- long startTime, currentTime;\r
- currentTime = startTime = System.currentTimeMillis();\r
- long stopTime = startTime + 1 * 1000; //5 seconds\r
- do {\r
- if (currentTime % 1000 == 0) {\r
- System.out.print(".");\r
- }\r
- currentTime = System.currentTimeMillis();\r
- } while (currentTime < stopTime);\r
- \r
- System.out.println();\r
- System.out.println("Resuming RESTEasy bootstrap initialization.");\r
- }\r
- \r
+ public void contextInitialized(ServletContextEvent event) { \r
//\r
// This call to super instantiates and initializes our JAX-RS application class.\r
// The application class is org.collectionspace.services.jaxrs.CollectionSpaceJaxRsApplication.\r
+++ /dev/null
-<?xml version="1.0"?>
-<component name="config:datasources">
- <extension target="org.nuxeo.runtime.datasource" point="datasources">
- <datasource name="jdbc/nxaudit" xaDataSource="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"
- maxActive="20" maxIdle="5">
- <property name="databaseName">nuxeo</property>
- <property name="user">nuxeo</property>
- <property name="password">nuxpw</property>
- </datasource>
- </extension>
-</component>
+++ /dev/null
-<?xml version="1.0"?>
-<component name="config:default-repository">
- <extension target="org.nuxeo.ecm.core.repository.RepositoryService"
- point="repository">
- <repository name="default"
- factory="org.nuxeo.ecm.core.storage.sql.ra.PoolingRepositoryFactory">
- <repository name="default">
- <xa-datasource>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource>
- <property name="URL">jdbc:mysql://localhost:3306/nuxeo?relaxAutoCommit=true</property>
- <property name="User">nuxeo</property>
- <property name="Password">nuxpw</property>
- <schema>
- <field type="largetext">imd:user_comment</field> <!-- Needed for large image metadata (image_metadata) that gets inserted here. -->
- <field type="largetext">note</field>
- <field type="largetext">webp:content</field>
- <field type="largetext">webc:welcomeText</field>
- <field type="largetext">comment:comment</field>
- <field type="largetext">post</field>
- <field type="largetext">mail:mail</field>
-
- <!-- Text fields that may possibly not require largetext -->
- <!-- designation and might need further review are marked as follows: -->
- <!-- * -->
-
- <!-- =========================================================== -->
- <!-- Acquisition -->
- <!-- =========================================================== -->
-
- <field type="largetext">acquisitionFundingSourceProvisos</field>
- <field type="largetext">acquisitions_common:acquisitionNote</field>
- <field type="largetext">acquisitions_common:acquisitionProvisos</field>
- <field type="largetext">acquisitions_common:acquisitionReason</field>
- <field type="largetext">acquisitions_common:creditLine</field>
-
-
- <!-- =========================================================== -->
- <!-- Blob -->
- <!-- =========================================================== -->
-
- <!-- No largetext fields identified to date -->
-
-
- <!-- =========================================================== -->
- <!-- CollectionObject / Cataloging -->
- <!-- =========================================================== -->
-
- <!-- Object Identification Information -->
- <!-- ================================= -->
-
- <!-- FIXME: The following field may be removed from this configuration when it is confirmed -->
- <!-- that the App/UI layers are using a repeatable other number group. -->
- <field type="largetext">collectionobjects_common:otherNumber</field> <!-- * -->
-
- <!-- FIXME: Change this to otherNumberValue if and when the field name itself is so changed. -->
- <field type="largetext">numberValue</field> <!-- * -->
-
- <!-- FIXME: multivalued field - need to verify schema and field name -->
- <field type="largetext">collectionobjects_common:briefDescriptions</field>
-
- <!-- FIXME: multivalued field - need to verify schema and field name -->
- <field type="largetext">collectionobjects_common:comments</field>
-
- <field type="largetext">collectionobjects_common:distinguishingFeatures</field>
-
- <field type="largetext">objectNameNote</field>
-
- <field type="largetext">title</field>
- <field type="largetext">titleTranslation</field>
-
- <!-- Object Description Information -->
- <!-- ============================== -->
-
- <field type="largetext">collectionobjects_common:ageQualifier</field>
- <field type="largetext">collectionobjects_common:color</field>
- <field type="largetext">collectionobjects_common:contentDescription</field>
- <field type="largetext">collectionobjects_common:contentNote</field>
- <field type="largetext">collectionobjects_common:contentObject</field>
- <field type="largetext">collectionobjects_common:copyNumber</field> <!-- * -->
- <field type="largetext">collectionobjects_common:editionNumber</field> <!-- * -->
-
- <!-- FIXME: Will become group repeatable in a post-1.3 release -->
- <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
- <field type="largetext">collectionobjects_common:inscriptionContent</field>
- <field type="largetext">collectionobjects_common:inscriptionContentInterpretation</field>
- <field type="largetext">collectionobjects_common:inscriptionContentTranslation</field>
- <field type="largetext">collectionobjects_common:inscriptionContentTransliteration</field>
-
- <!-- FIXME: Will become group repeatable in a post-1.3 release -->
- <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
- <field type="largetext">collectionobjects_common:inscriptionDescriptionInterpretation</field>
-
- <field type="largetext">materialComponentNote</field>
- <field type="largetext">materialName</field> <!-- * -->
-
- <!-- FIXME: multivalued field - need to verify schema and field name -->
- <field type="largetext">collectionobjects_common:physicalDescription</field>
-
- <field type="largetext">objectComponentInformation</field>
-
- <!-- Object Production Information -->
- <!-- ============================= -->
-
- <field type="largetext">collectionobjects_common:objectProductionNote</field>
-
- <!-- FIXME: multivalued field - need to verify schema and field name -->
- <field type="largetext">collectionobjects_common:objectProductionReason</field>
-
- <!-- Object History and Association Information -->
- <!-- ========================================== -->
-
- <field type="largetext">assocActivityNote</field>
- <field type="largetext">assocConceptNote</field>
- <field type="largetext">assocCulturalContextNote</field>
- <field type="largetext">assocDateNote</field>
-
- <!-- FIXME: Will become group repeatable in a post-1.3 release. -->
- <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
- <field type="largetext">collectionobjects_common:assocEventName</field> <!-- * -->
- <field type="largetext">collectionobjects_common:assocEventNote</field>
- <field type="largetext">collectionobjects_common:assocEventType</field> <!-- * -->
-
- <field type="largetext">assocObject</field>
- <field type="largetext">assocOrganizationNote</field>
- <field type="largetext">assocPeopleNote</field>
- <field type="largetext">assocPersonNote</field>
- <field type="largetext">assocPlaceNote</field>
-
- <field type="largetext">collectionobjects_common:objectHistoryNote</field>
- <field type="largetext">collectionobjects_common:ownershipExchangeNote</field>
- <field type="largetext">usageNote</field>
-
- <!-- Object Owner's Contribution Information -->
- <!-- ======================================= -->
-
- <field type="largetext">collectionobjects_common:ownersPersonalExperience</field>
- <field type="largetext">collectionobjects_common:ownersPersonalResponse</field>
-
- <!-- FIXME: multivalued field - need to verify schema and field name -->
- <field type="largetext">collectionobjects_common:ownersReference</field>
-
- <field type="largetext">collectionobjects_common:ownersContributionNote</field>
-
- <!-- Object Viewer's Contribution Information -->
- <!-- ======================================== -->
-
- <field type="largetext">collectionobjects_common:viewersRole</field>
- <field type="largetext">collectionobjects_common:viewersPersonalExperience</field>
- <field type="largetext">collectionobjects_common:viewersPersonalResponse</field>
-
- <!-- FIXME: multivalued field - need to verify schema and field name -->
- <field type="largetext">collectionobjects_common:viewersReference</field>
-
- <field type="largetext">collectionobjects_common:viewersContributionNote</field>
-
- <!-- Reference Information -->
- <!-- ===================== -->
-
- <field type="largetext">collectionobjects_common:catalogNumber</field> <!-- * -->
-
- <!-- Object Collection Information -->
- <!-- ============================= -->
-
- <field type="largetext">collectionobjects_common:fieldCollectionNote</field>
- <field type="largetext">collectionobjects_common:fieldCollectionNumber</field> <!-- * -->
-
- <!--
- Additional non-text fields configured as 'largetext' to
- avoid the following error when Nuxeo is configured to use MySQL:
-
- com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException.
- message: Row size too large. The maximum row size for the
- used table type, not counting BLOBs, is 65535.
-
- Some of the fields below may be repeatable or in
- repeatable groups, and the schema and field names
- below might thus require verification to match actual values.
- -->
-
- <field type="largetext">collectionobjects_common:objectNumber</field>
- <field type="largetext">collectionobjects_common:otherNumber</field>
- <field type="largetext">collectionobjects_common:otherNumberType</field>
- <field type="largetext">collectionobjects_common:numberOfObjects</field>
- <field type="largetext">collectionobjects_common:collection</field>
- <field type="largetext">collectionobjects_common:recordStatus</field>
- <field type="largetext">collectionobjects_common:age</field>
- <field type="largetext">collectionobjects_common:ageQualifier</field>
- <field type="largetext">collectionobjects_common:ageUnit</field>
-
- <field type="largetext">collectionobjects_common:contentDate</field>
- <field type="largetext">collectionobjects_common:contentLanguages</field>
- <field type="largetext">collectionobjects_common:contentOrganizations</field>
-
- <field type="largetext">collectionobjects_common:dimensionSummary</field>
-
- <!-- FIXME: The set of dimensions-related fields below may be removed -->
- <!-- altogether when it is confirmed that the App/UI layers are using -->
- <!-- a repeatable dimensions group. -->
- <field type="largetext">collectionobjects_common:dimension</field>
- <field type="largetext">collectionobjects_common:dimensionMeasuredPart</field>
- <field type="largetext">collectionobjects_common:dimensionMeasurementUnit</field>
- <field type="largetext">collectionobjects_common:dimensionValue</field>
- <field type="largetext">collectionobjects_common:dimensionValueDate</field>
- <field type="largetext">collectionobjects_common:dimensionValueQualifier</field>
-
- <field type="largetext">collectionobjects_common:editionNumber</field>
-
- <field type="largetext">collectionobjects_common:inscriptionContentInscriber</field>
- <field type="largetext">collectionobjects_common:inscriptionContentDate</field>
- <field type="largetext">collectionobjects_common:inscriptionContentLanguage</field>
- <field type="largetext">collectionobjects_common:inscriptionContentMethod</field>
- <field type="largetext">collectionobjects_common:inscriptionContentPosition</field>
- <field type="largetext">collectionobjects_common:inscriptionContentScript</field>
- <field type="largetext">collectionobjects_common:inscriptionContentType</field>
-
- <field type="largetext">collectionobjects_common:inscriptionDescription</field>
- <field type="largetext">collectionobjects_common:inscriptionDescriptionInscriber</field>
- <field type="largetext">collectionobjects_common:inscriptionDescriptionDate</field>
- <field type="largetext">collectionobjects_common:inscriptionDescriptionMethod</field>
- <field type="largetext">collectionobjects_common:inscriptionDescriptionPosition</field>
- <field type="largetext">collectionobjects_common:inscriptionDescriptionType</field>
-
- <field type="largetext">collectionobjects_common:objectStatus</field>
- <field type="largetext">collectionobjects_common:phase</field>
- <field type="largetext">collectionobjects_common:sex</field>
- <field type="largetext">collectionobjects_common:ownershipAccess</field>
- <field type="largetext">collectionobjects_common:ownershipCategory</field>
- <field type="largetext">collectionobjects_common:ownershipDates</field>
- <field type="largetext">collectionobjects_common:ownershipExchangeMethod</field>
- <field type="largetext">collectionobjects_common:ownershipExchangePriceCurrency</field>
- <field type="largetext">collectionobjects_common:ownershipExchangePriceValue</field>
- <field type="largetext">collectionobjects_common:ownershipPlace</field>
- <field type="largetext">collectionobjects_common:fieldCollectionNumber</field>
- <field type="largetext">collectionobjects_common:fieldCollectionMethod</field>
- <field type="largetext">collectionobjects_common:fieldCollectionPlace</field>
- <field type="largetext">collectionobjects_common:fieldCollectionDate</field>
-
- <!-- FIXME: This sample set of date field can be removed when Cataloging -->
- <!-- records are using structured date fields, or earlier when it is confirmed that -->
- <!-- the App/UI layers are not using this vestigial part of the Cataloging schema. -->
- <field type="largetext">collectionobjects_common:dateAssociation</field>
- <field type="largetext">collectionobjects_common:dateEarliestSingle</field>
- <field type="largetext">collectionobjects_common:dateEarliestSingleCertainty</field>
- <field type="largetext">collectionobjects_common:dateEarliestSingleQualifier</field>
- <field type="largetext">collectionobjects_common:dateLatest</field>
- <field type="largetext">collectionobjects_common:dateLatestCertainty</field>
- <field type="largetext">collectionobjects_common:dateLatestQualifier</field>
- <field type="largetext">collectionobjects_common:datePeriod</field>
- <field type="largetext">collectionobjects_common:dateText</field>
-
-
- <!-- =========================================================== -->
- <!-- Contact -->
- <!-- =========================================================== -->
- <field type="largetext">contacts_common:addressPlace</field>
-
-
- <!-- =========================================================== -->
- <!-- Group -->
- <!-- =========================================================== -->
- <field type="largetext">groups_common:scopeNote</field>
-
-
- <!-- =========================================================== -->
- <!-- Intake -->
- <!-- =========================================================== -->
-
- <field type="largetext">intakes_common:entryNote</field>
- <field type="largetext">intakes_common:packingNote</field>
- <field type="largetext">intakes_common:fieldCollectionNote</field>
- <field type="largetext">intakes_common:insuranceNote</field>
- <field type="largetext">intakes_common:conditionCheckNote</field>
- <field type="largetext">currentLocationNote</field>
-
-
- <!-- =========================================================== -->
- <!-- Loan In -->
- <!-- =========================================================== -->
-
- <field type="largetext">loansin_common:loanInConditions</field>
- <field type="largetext">loansin_common:loanInNote</field>
-
-
- <!-- =========================================================== -->
- <!-- Loan Out -->
- <!-- =========================================================== -->
-
- <field type="largetext">loansout_common:specialConditionsOfLoan</field>
- <field type="largetext">loansout_common:loanOutNote</field>
- <field type="largetext">loansout_common:loanPurpose</field>
- <field type="largetext">loanedObjectStatusNote</field>
-
-
- <!-- =========================================================== -->
- <!-- Movement / Location and Movement Control -->
- <!-- =========================================================== -->
-
- <field type="largetext">movements_common:currentLocationNote</field>
- <field type="largetext">movements_common:movementNote</field>
-
-
- <!-- =========================================================== -->
- <!-- Media / Media Handling -->
- <!-- =========================================================== -->
-
- <field type="largetext">media_common:copyrightStatement</field>
- <field type="largetext">media_common:description</field>
- <field type="largetext">media_common:title</field>
-
-
- <!-- =========================================================== -->
- <!-- Note -->
- <!-- =========================================================== -->
-
- <field type="largetext">notes_common:content</field>
-
-
- <!-- =========================================================== -->
- <!-- Object Exit -->
- <!-- =========================================================== -->
-
- <field type="largetext">objectexit_common:exitNote</field>
- <field type="largetext">objectexit_common:packingNote</field>
-
-
- <!-- =========================================================== -->
- <!-- Organization -->
- <!-- =========================================================== -->
-
- <field type="largetext">shortName</field>
- <field type="largetext">longName</field>
- <field type="largetext">nameAdditions</field>
- <field type="largetext">historyNote</field>
-
-
- <!-- =========================================================== -->
- <!-- Person -->
- <!-- =========================================================== -->
- <field type="largetext">persons_common:bioNote</field>
- <field type="largetext">persons_common:nameNote</field>
-
-
- <!-- =========================================================== -->
- <!-- Relation -->
- <!-- =========================================================== -->
-
- <!-- No largetext fields identified to date -->
-
-
- <!-- =========================================================== -->
- <!-- Storage Location / Location -->
- <!-- =========================================================== -->
- <field type="largetext">locations_common:name</field>
- <!-- conditionNote will be made part of a repeatable group of fields in a future release -->
- <field type="largetext">locations_common:conditionNote</field>
- <field type="largetext">locations_common:securityNote</field>
- <field type="largetext">locations_common:accessNote</field>
-
- </schema>
- </repository>
- </repository>
- </extension>
-
- <extension target="org.nuxeo.ecm.core.api.repository.RepositoryManager" point="repositories">
- <documentation>The default repository</documentation>
- <repository name="default" label="Default Repository" />
- </extension>
-</component>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
- debug="false">
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler" />
- <!-- <param name="Target" value="System.out" />-->
- <layout class="org.apache.log4j.PatternLayout">
- <!-- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" /> -->
- <param name="ConversionPattern" value="%m%n" />
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="log/nxshell.log" />
- <param name="Append" value="false" />
- <!-- <param name="MaxFileSize" value="10MB" />-->
- <param name="MaxBackupIndex" value="3" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
- </layout>
- </appender>
-
- <!-- Specific appenders for some important nxshell commands -->
- <appender name="import" class="org.apache.log4j.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler" />
- <param name="File" value="log/import.log" />
- <param name="Append" value="true" />
- <param name="MaxFileSize" value="30MB" />
- <param name="MaxBackupIndex" value="5" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ISO8601} %-5p [%c] %m%n" />
- </layout>
- </appender>
-
- <!-- Main logger -->
- <logger name="org.nuxeo">
- <level value="INFO" />
- </logger>
- <!-- Console output -->
- <logger name="org.nuxeo.ecm.shell">
- <level value="INFO" />
- <appender-ref ref="CONSOLE" />
- </logger>
- <!-- Loggers for import commands -->
- <logger name="org.nuxeo.ecm.shell.commands.io.ImportCommand">
- <level value="INFO" />
- <appender-ref ref="import" />
- </logger>
- <logger name="org.nuxeo.ecm.shell.commands.repository.FSImportCommand">
- <level value="INFO" />
- <appender-ref ref="import" />
- </logger>
- <logger name="org.nuxeo.ecm.shell.commands.repository.MTFSImportCommand">
- <level value="INFO" />
- <appender-ref ref="import" />
- </logger>
- <logger name="org.nuxeo.ecm.shell.commands.repository.ThreadedImportTask">
- <level value="INFO" />
- <appender-ref ref="import" />
- </logger>
-
- <root>
- <level value="WARN" />
- <appender-ref ref="FILE" />
- </root>
-
-</log4j:configuration>
+++ /dev/null
-<?xml version="1.0"?>
-
-<component name="org.nuxeo.ecm.platform.login.LoginConfig" version="1.0">
- <documentation>
- Login modules used on JBoss
- @author Bogdan Stefanescu (bs@nuxeo.com)
- </documentation>
-
-
- <extension target="org.nuxeo.runtime.LoginComponent" point="domains">
-
- <domain name="nuxeo-system-login">
- <login-module code="org.nuxeo.runtime.api.login.SystemLoginModule" flag="required"/>
- <login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
- <option name="password-stacking">true</option>
- <option name="multi-threaded">true</option>
- </login-module>
- </domain>
-
-
- <domain name="nuxeo-webengine">
- <login-module code = "org.nuxeo.ecm.platform.login.NuxeoLoginModule"
- flag = "required">
- <option name="principalClassName">org.nuxeo.ecm.platform.login.NuxeoPrincipal</option>
- <option name="useUserIdentificationInfoCB">true</option>
- </login-module>
- <!--login-module code="org.nuxeo.ecm.core.api.local.ClientLoginModule" flag="required">
- <option name="password-stacking">true</option>
- <option name="multi-threaded">true</option>
- </login-module-->
- </domain>
-
- </extension>
-
-
-</component>
+++ /dev/null
-NuxeoContainer.autoactivation=true
+++ /dev/null
-# application instance config
-org.nuxeo.ecm.instance.host=localhost
-org.nuxeo.ecm.instance.name=Nuxeo 5.4
-org.nuxeo.ecm.instance.description=Nuxeo ECM server
-
-# product config
-org.nuxeo.ecm.product.name=Nuxeo 5.4
-org.nuxeo.ecm.product.version=5.4.2-SNAPSHOT
-
-# runtime remoting config
-org.nuxeo.runtime.server.enabled=false
-org.nuxeo.runtime.server.host=${org.nuxeo.ecm.instance.host}
-org.nuxeo.runtime.server.locator=socket://0.0.0.0:62474/?datatype=nuxeo
-
-# streaming config
-org.nuxeo.runtime.streaming.isServer=false
-org.nuxeo.runtime.streaming.serverLocator=socket://${org.nuxeo.ecm.instance.host}:62474/?datatype=nuxeo
-
-# which sample to run
-org.nuxeo.ecm.sample.class=org.nuxeo.ecm.sample.streaming.StreamingExample
-
-# needed for the JNDI auto configuration of clients
-# you need to change this if using JNDI through HTTP
-nuxeo-client-jndi.java.naming.provider.url=jnp://%s:%s
-nuxeo-client-jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-nuxeo-client-jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-
-# avoid initializing nuxeo relations at startup (for faster startup)
-org.nuxeo.ecm.platform.relations.initOnStartup=false
-
-# context path of the application
-org.nuxeo.ecm.contextPath=/nuxeo
-
-# cspace
-#nuxeo.client.on.jboss=true
-#org.nuxeo.client.remote=true
+++ /dev/null
-org.nuxeo.app.bundles=bundles/*:plugins/*
+++ /dev/null
-This folder contains the external modules on top of the nuxeo platform
\ No newline at end of file
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy account service in ${jboss.server.cspace}">\r
+ description="deploy account service in ${jee.server.cspace}">\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy account service from ${jboss.server.cspace}">\r
+ description="undeploy account service from ${jee.server.cspace}">\r
</target>\r
\r
<target name="dist"\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.account</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.account</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</sql> -->\r
</target>\r
<target name="deploy" depends="install"\r
- description="deploy account service in ${jboss.server.cspace}">\r
- <copy todir="${jboss.server.cspace}/cspace/services">\r
+ description="deploy account service in ${jee.server.cspace}">\r
+ <copy todir="${jee.server.cspace}/cspace/services">\r
<fileset dir="${src}/main/resources/"/>\r
</copy>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy account service from ${jboss.server.cspace}"\r
+ description="undeploy account service from ${jee.server.cspace}"\r
depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">\r
<delete>\r
<fileset dir="${db.scripts.deploy.dir}"\r
</target>\r
\r
<target name="check.db.scripts.deploy.dir">\r
- <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>\r
+ <property name="db.scripts.deploy.dir" value="${jee.server.cspace}/cspace/services/db/${db}"/>\r
<condition property="db.scripts.deploy.dir.exists">\r
<available file="${db.scripts.deploy.dir}" type="dir"/>\r
</condition>\r
<parent>\r
<artifactId>org.collectionspace.services.account</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<dependency>\r
<groupId>mysql</groupId>\r
<artifactId>mysql-connector-java</artifactId>\r
- <version>5.1.5</version>\r
</dependency>\r
<dependency>\r
<groupId>postgresql</groupId>\r
<artifactId>postgresql</artifactId>\r
- <version>8.4-702.jdbc4</version>\r
</dependency>\r
</dependencies>\r
</plugin>\r
<parent>\r
<artifactId>org.collectionspace.services.account</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy acquisition in ${jboss.server.nuxeo}">\r
+ description="deploy acquisition in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-acquisition/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy acquisition from ${jboss.server.nuxeo}">\r
+ description="undeploy acquisition from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-acquisition/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>
<target name="deploy" depends="install"
- description="deploy acquisition doctype in ${jboss.server.nuxeo}">
+ description="deploy acquisition doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.acquisition.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy acquisition doctype from ${jboss.server.nuxeo}">
+ description="undeploy acquisition doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.acquisition.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.acquisition.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.acquisition.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.acquisition</artifactId>\r
- <version>1.14-SNAPSHOT</version> \r
+ <version>2.0-SNAPSHOT</version> \r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.acquisition</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.acquisition</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<artifactId>org.collectionspace.services.acquisition</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy authentication service in ${jboss.server.cspace}">\r
+ description="deploy authentication service in ${jee.server.cspace}">\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy authentication service from ${jboss.server.cspace}">\r
+ description="undeploy authentication service from ${jee.server.cspace}">\r
</target>\r
\r
<target name="dist"\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authentication</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.authentication</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy authentication service in ${jboss.server.cspace}">\r
- <copy todir="${jboss.server.cspace}/cspace/services">\r
+ description="deploy authentication service in ${jee.server.cspace}">\r
+ <copy todir="${jee.server.cspace}/cspace/services">\r
<fileset dir="${src}/main/resources/"/>\r
</copy>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy authentication service from ${jboss.server.cspace}"\r
+ description="undeploy authentication service from ${jee.server.cspace}"\r
depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">\r
<delete>\r
<fileset dir="${db.scripts.deploy.dir}"\r
</target>\r
\r
<target name="check.db.scripts.deploy.dir">\r
- <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>\r
+ <property name="db.scripts.deploy.dir" value="${jee.server.cspace}/cspace/services/db/${db}"/>\r
<condition property="db.scripts.deploy.dir.exists">\r
<available file="${db.scripts.deploy.dir}" type="dir"/>\r
</condition>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authentication</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<dependency>\r
<groupId>mysql</groupId>\r
<artifactId>mysql-connector-java</artifactId>\r
- <!-- <version>5.1.5</version> -->\r
</dependency>\r
- <dependency>\r
- <groupId>postgresql</groupId>\r
- <artifactId>postgresql</artifactId>\r
- <!-- <version>8.4-702.jdbc4</version> -->\r
- </dependency>\r
+ <dependency>\r
+ <groupId>postgresql</groupId>\r
+ <artifactId>postgresql</artifactId>\r
+ </dependency>\r
</dependencies>\r
</plugin>\r
<plugin>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy authentication service in ${jboss.server.cspace}">\r
- <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>\r
- <copy tofile="${jboss.server.cspace}/conf/login-config.xml.org"\r
- file="${jboss.server.cspace}/conf/login-config.xml"\r
- overwrite="false"/>\r
- \r
- <copy tofile="${jboss.server.cspace}/conf/login-config.xml"\r
+ description="deploy authentication service in ${jee.server.cspace}">\r
+ <copy file="${basedir}/target/${authentication.jar}" todir="${jee.server.cspace}/lib"/>\r
+ <!-- This is JBoss specific and no longer needed\r
+ <copy tofile="${jee.server.cspace}/conf/login-config.xml.org"\r
+ file="${jee.server.cspace}/conf/login-config.xml"\r
+ overwrite="false"/> -->\r
+ <!-- This is JBoss specific and no longer needed\r
+ <copy tofile="${jee.server.cspace}/conf/login-config.xml"\r
file="${src}/main/resources/config/login-config.xml"\r
- overwrite="true"/>\r
- <copy todir="${jboss.server.cspace}/cspace/services">\r
+ overwrite="true"/> -->\r
+ <copy todir="${jee.server.cspace}/cspace/services">\r
<fileset dir="${src}/main/resources/"/>\r
</copy>\r
<echo message="Check out Authentication Service Configuration Guide on wiki.collectionspace.org for more details" />\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
- <copy tofile="${jboss.server.cspace}/conf/login-config.xml"\r
- file="${jboss.server.cspace}/conf/login-config.xml.org"\r
- overwrite="true" failonerror="false" />\r
+ description="undeploy authentication service from ${jee.server.cspace}">\r
+ <delete file="${jee.server.cspace}/lib/${authentication.jar}"/>\r
+ <!-- This is JBoss specific and no longer needed\r
+ <copy tofile="${jee.server.cspace}/conf/login-config.xml"\r
+ file="${jee.server.cspace}/conf/login-config.xml.org"\r
+ overwrite="true" failonerror="false" /> -->\r
<echo message="Check out Authentication Service Configuration Guide on wiki.collectionspace.org for more details"/>\r
</target>\r
\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.authentication</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<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> -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.security.version>3.0.2.RELEASE</spring.security.version>
</properties>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy common elements in ${jboss.server.cspace}"> \r
+ description="deploy common elements in ${jee.server.cspace}"> \r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy common elements from ${jboss.server.cspace}">\r
+ description="undeploy common elements from ${jee.server.cspace}">\r
</target>\r
\r
<target name="dist"\r
<parent>
<artifactId>org.collectionspace.services.authority</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authority</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
\r
\r
<target name="deploy" depends="install"\r
- description="deploy authorization-mgt service in ${jboss.server.cspace}">\r
+ description="deploy authorization-mgt service in ${jee.server.cspace}">\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy authorization-mgt service from ${jboss.server.cspace}">\r
+ description="undeploy authorization-mgt service from ${jee.server.cspace}">\r
</target>\r
\r
<target name="dist"\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<filter token="DB_URL" value="${db.jdbc.cspace.url}" />\r
<filter token="DB_DRIVER_CLASS" value="${db.jdbc.driver.class}" />\r
<filter token="DB_USER" value="${db.cspace.user}" /> <!-- double-sub from ${db.user} fails -->\r
- <filter token="DB_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" /> <!-- double-sub from ${db.jboss.user.password} fails -->\r
+ <filter token="DB_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" /> <!-- double-sub from ${db.j2ee.user.password} fails -->\r
<filter token="DB_DIALECT" value="${db.dialect}" />\r
<filter token="CLASS_ID_QUERY" value="${db.spring.acl.classIdentityQuery}" />\r
<filter token="SID_ID_QUERY" value="${db.spring.acl.sidIdentityQuery}" />\r
\r
\r
<target name="deploy" depends="install"\r
- description="deploy authorization-mgt import in ${jboss.server.cspace}">\r
+ description="deploy authorization-mgt import in ${jee.server.cspace}">\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy authorization-mgt import from ${jboss.server.cspace}">\r
+ description="undeploy authorization-mgt import from ${jee.server.cspace}">\r
</target>\r
\r
<target name="dist"\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</resource>\r
</resources>\r
<plugins>\r
- <groupId>org.apache.maven.plugins</groupId>\r
-
<artifactId>maven-resources-plugin</artifactId>
\r- <version>2.5</version>\r
- <executions>\r
- <execution>\r
-
<phase>process-resources</phase>
\r- <goals>\r
- <goal>resources</goal>\r
- </goals>\r
- </execution>\r
- </executions>\r
- </plugin>\r
+ <plugin>\r
+ <groupId>org.apache.maven.plugins</groupId>\r
+ <artifactId>maven-resources-plugin</artifactId>\r
+ <version>2.5</version>\r
+ <executions>\r
+ <execution>\r
+ <phase>process-resources</phase>\r
+ <goals>\r
+ <goal>resources</goal>\r
+ </goals>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
<plugin>\r
<groupId>org.codehaus.mojo</groupId>\r
<artifactId>exec-maven-plugin</artifactId>\r
<systemProperties>\r
</systemProperties>\r
</configuration>\r
+ \r
<dependencies>\r
<dependency>\r
<groupId>mysql</groupId>\r
<artifactId>mysql-connector-java</artifactId>\r
- <version>5.1.5</version>\r
+ <version>${mysql.driver.version}</version>\r
</dependency>\r
- <dependency>\r
- <groupId>postgresql</groupId>\r
-
<artifactId>postgresql</artifactId>
\r- <version>8.4-702.jdbc4</version>\r
- </dependency>\r
+ <dependency>\r
+ <groupId>postgresql</groupId>\r
+ <artifactId>postgresql</artifactId>\r
+ <version>${postgres.driver.version}</version>\r
+ </dependency>\r
</dependencies>\r
+ \r
</plugin>\r
</plugins>\r
\r
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
\r
<!--\r
<target name="deploy" depends="install"\r
- description="deploy authorization service in ${jboss.server.cspace}">\r
- <copy file="${basedir}/target/${authorization.jar}" todir="${jboss.server.cspace}/lib"/>\r
+ description="deploy authorization service in ${jee.server.cspace}">\r
+ <copy file="${basedir}/target/${authorization.jar}" todir="${jee.server.cspace}/lib"/>\r
<echo message="Check out authorization Service Configuration Guide on wiki.collectionspace.org for more details" />\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy authorization service from ${jboss.server.cspace}">\r
- <delete file="${jboss.server.cspace}/lib/${authorization.jar}"/>\r
+ description="undeploy authorization service from ${jee.server.cspace}">\r
+ <delete file="${jee.server.cspace}/lib/${authorization.jar}"/>\r
<echo message="Check out authorization Service Configuration Guide on wiki.collectionspace.org for more details"/>\r
</target>\r
--> \r
<parent>\r
<artifactId>org.collectionspace.services.authorization-mgt</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.authorization-mgt.service</artifactId>\r
<url>http://www.collectionspace.org</url>\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
<spring.version>3.0.0.RELEASE</spring.version>\r
<spring.security.version>3.0.2.RELEASE</spring.security.version>\r
<parent>\r
<artifactId>org.collectionspace.services.authorization</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.authorization</artifactId>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy authorization service in ${jboss.server.cspace}">\r
- <copy todir="${jboss.server.cspace}/cspace/services">\r
+ description="deploy authorization service in ${jee.server.cspace}">\r
+ <copy todir="${jee.server.cspace}/cspace/services">\r
<fileset dir="${src}/main/resources/"/>\r
</copy>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy authorization service from ${jboss.server.cspace}"\r
+ description="undeploy authorization service from ${jee.server.cspace}"\r
depends="check.db.scripts.deploy.dir" if="${db.scripts.deploy.dir.exists}">\r
<delete>\r
<fileset dir="${db.scripts.deploy.dir}"\r
</target>\r
\r
<target name="check.db.scripts.deploy.dir">\r
- <property name="db.scripts.deploy.dir" value="${jboss.server.cspace}/cspace/services/db/${db}"/>\r
+ <property name="db.scripts.deploy.dir" value="${jee.server.cspace}/cspace/services/db/${db}"/>\r
<condition property="db.scripts.deploy.dir.exists">\r
<available file="${db.scripts.deploy.dir}" type="dir"/>\r
</condition>\r
<parent>\r
<artifactId>org.collectionspace.services.authorization</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<id>ddl</id>\r
<build>\r
<plugins>\r
- <groupId>org.codehaus.mojo</groupId>\r
-
<artifactId>properties-maven-plugin</artifactId>
\r- <version>1.0-alpha-2</version>\r
- <executions>\r
- <execution>\r
-
<phase>initialize</phase>
\r- <goals>\r
- <goal>read-project-properties</goal>\r
- </goals>\r
- <configuration>\r
- <files>\r
- <file>${basedir}/../../../build.properties</file>\r
- </files>\r
- </configuration>\r
- </execution>\r
- </executions>\r
- </plugin>\r
+ <plugin>\r
+ <groupId>org.codehaus.mojo</groupId>\r
+ <artifactId>properties-maven-plugin</artifactId>\r
+ <version>1.0-alpha-2</version>\r
+ <executions>\r
+ <execution>\r
+ <phase>initialize</phase>\r
+ <goals>\r
+ <goal>read-project-properties</goal>\r
+ </goals>\r
+ <configuration>\r
+ <files>\r
+ <file>${basedir}/../../../build.properties</file>\r
+ </files>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin>\r
<plugin>\r
<groupId>org.codehaus.mojo</groupId>\r
<artifactId>hibernate3-maven-plugin</artifactId>\r
<dependency>\r
<groupId>mysql</groupId>\r
<artifactId>mysql-connector-java</artifactId>\r
- <!-- <version>5.1.5</version> -->\r
</dependency>\r
- <dependency>\r
- <groupId>postgresql</groupId>\r
- <artifactId>postgresql</artifactId>\r
- <!-- <version>8.4-702.jdbc4</version> -->\r
- </dependency>\r
+ <dependency>\r
+ <groupId>postgresql</groupId>\r
+ <artifactId>postgresql</artifactId>\r
+ </dependency>\r
</dependencies>\r
</plugin>\r
<plugin>\r
<phase>process-test-resources</phase>\r
<configuration>\r
<tasks>\r
- <copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${db}/${sql.file}"/>\r
+ <copy file="${basedir}/target/hibernate3/sql/${sql.file}" tofile="${sql.dir}/${db}/${sql.file}"/>\r
</tasks>\r
</configuration>\r
<goals>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy authorization service in ${jboss.server.cspace}">\r
- <copy file="${basedir}/target/${authorization.jar}" todir="${jboss.server.cspace}/lib"/>\r
+ description="deploy authorization service in ${jee.server.cspace}">\r
+ <copy file="${basedir}/target/${authorization.jar}" todir="${jee.server.cspace}/lib"/>\r
<echo message="Check out authorization Service Configuration Guide on wiki.collectionspace.org for more details" />\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy authorization service from ${jboss.server.cspace}">\r
- <delete file="${jboss.server.cspace}/lib/${authorization.jar}"/>\r
+ description="undeploy authorization service from ${jee.server.cspace}">\r
+ <delete file="${jee.server.cspace}/lib/${authorization.jar}"/>\r
<echo message="Check out authorization Service Configuration Guide on wiki.collectionspace.org for more details"/>\r
</target>\r
\r
<parent>
<artifactId>org.collectionspace.services.authorization</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.authorization.service</artifactId>
<url>http://www.collectionspace.org</url>
<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>
<spring.version>3.0.0.RELEASE</spring.version>
<spring.security.version>3.0.2.RELEASE</spring.security.version>
</target>
<target name="deploy" depends="install"
- description="deploy batch in ${jboss.server.nuxeo}">
+ description="deploy batch in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-batch/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy batch from ${jboss.server.nuxeo}">
+ description="undeploy batch from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-batch/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy batch doctype in ${jboss.server.nuxeo}">
+ description="deploy batch doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.batch.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy batch doctype from ${jboss.server.nuxeo}">
+ description="undeploy batch doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.batch.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.batch.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.batch.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.batch</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.batch</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.batch</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.batch</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>
<target name="deploy" depends="install"
- description="deploy blob in ${jboss.server.nuxeo}">
+ description="deploy blob in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-blob/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy blob from ${jboss.server.nuxeo}">
+ description="undeploy blob from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-blob/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy blob doctype in ${jboss.server.nuxeo}">
+ description="deploy blob doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.blob.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy blob doctype from ${jboss.server.nuxeo}">
+ description="undeploy blob doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.blob.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.blob.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.blob.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<parent>
<artifactId>org.collectionspace.services.blob</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.blob</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.blob</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<modules>
<module>service</module>
<module>3rdparty</module>
+ <!-- Not working with embedded Nuxeo EP instance on Tomcat
<module>client</module>
+ -->
</modules>
</project>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.blob</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
\r
<!-- this target is called in order based on the dependencies between the services -->\r
<target name="deploy" depends="install"\r
- description="deploy services in ${jboss.server.cspace}">\r
+ description="deploy services in ${jee.server.cspace}">\r
<ant antfile="authentication/build.xml" target="deploy" inheritAll="false"/>\r
<ant antfile="authorization/build.xml" target="deploy" inheritAll="false"/>\r
<ant antfile="authority/build.xml" target="deploy" inheritAll="false"/>\r
\r
<!-- this target is called in reverse order of deploy targets -->\r
<target name="undeploy"\r
- description="undeploy services from ${jboss.server.cspace}">\r
+ description="undeploy services from ${jee.server.cspace}">\r
<ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="vocabulary/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="organization/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="loanin/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="media/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="intake/build.xml" target="undeploy" inheritAll="false"/>\r
+ <ant antfile="imports/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="group/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="collectionobject/build.xml" target="undeploy" inheritAll="false"/>\r
<ant antfile="note/build.xml" target="undeploy" inheritAll="false"/>\r
</target>\r
\r
<target name="hotdeploy" depends="install"\r
- description="deploy services in running ${jboss.server.cspace}">\r
+ description="deploy services in running ${jee.server.cspace}">\r
<ant antfile="JaxRsServiceProvider/build.xml" target="hotdeploy" inheritAll="false"/>\r
</target>\r
\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
#url of the collectionspace server\r
-cspace.url=http://localhost:8081/cspace-services/\r
+cspace.url=http://localhost:8180/cspace-services/\r
#cspace.url=http://nightly.collectionspace.org:8180/cspace-services/\r
\r
#cspace.url=http://localhost:8200/cspace-services/\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy collectionobject in ${jboss.server.nuxeo}">\r
+ description="deploy collectionobject in ${jee.server.nuxeo}">\r
<ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="deploy" inheritall="false"/>\r
<ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy collectionobject from ${jboss.server.nuxeo}">\r
+ description="undeploy collectionobject from ${jee.server.nuxeo}">\r
<ant antfile="${nuxeo-platform-collectionobject}/build.xml" target="undeploy" inheritall="false"/>\r
<ant antfile="${nuxeo-platform-collectionobject-lifesci}/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy collectionobject doctype in ${jboss.server.nuxeo}">\r
+ description="deploy collectionobject doctype in ${jee.server.nuxeo}">\r
<copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
- todir="${jboss.deploy.nuxeo.plugins}"/>\r
+ todir="${jee.deploy.nuxeo.plugins}"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">\r
+ description="undeploy collectionobject doctype from ${jee.server.nuxeo}">\r
<delete>\r
- <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
+ <fileset dir="${jee.deploy.nuxeo.plugins}">\r
<include name="${nuxeo.collectionobject.jars.all}"/>\r
</fileset>\r
<!-- Legacy deployment location through release 0.6 -->\r
- <fileset dir="${jboss.deploy.nuxeo.system}">\r
+ <fileset dir="${jee.deploy.nuxeo.system}">\r
<include name="${nuxeo.collectionobject.jars.all}"/>\r
</fileset>\r
</delete>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="Deploy CollectionObjectsCommon doctype in ${jboss.server.nuxeo}">\r
+ description="Deploy CollectionObjectsCommon doctype in ${jee.server.nuxeo}">\r
<copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
- todir="${jboss.deploy.nuxeo.plugins}"/>\r
+ todir="${jee.deploy.nuxeo.plugins}"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="Undeploy CollectionObjectsCommon doctype from ${jboss.server.nuxeo}">\r
+ description="Undeploy CollectionObjectsCommon doctype from ${jee.server.nuxeo}">\r
<delete>\r
- <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
+ <fileset dir="${jee.deploy.nuxeo.plugins}">\r
<include name="${nuxeo.collectionobject.jars.all}"/>\r
</fileset>\r
<!-- Legacy deployment location through release 0.6 -->\r
- <fileset dir="${jboss.deploy.nuxeo.system}">\r
+ <fileset dir="${jee.deploy.nuxeo.system}">\r
<include name="${nuxeo.collectionobject.jars.all}"/>\r
</fileset>\r
</delete>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<xs:element name="otherNumber" type="xs:string"/>\r
<xs:element name="otherNumberType" type="xs:string"/>\r
<!-- end of two elements to be removed -->\r
- <xs:element name="briefDescriptions" type="xs:string">\r
+ <xs:element name="briefDescriptions">\r
<xs:complexType>\r
<xs:sequence>\r
- <xs:element name="briefDescription" type="xs:string"\r
- minOccurs="0" maxOccurs="unbounded"/>\r
+ <xs:element name="briefDescription" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
</xs:sequence>\r
</xs:complexType>\r
</xs:element>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.collectionobject</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.collectionobject</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<exec executable="echo">\r
<arg value="Installer: Executing CollectionObject Service's 'install' target." />\r
</exec>\r
- <copy todir="${jboss.deploy.nuxeo.plugins}">\r
+ <copy todir="${jee.deploy.nuxeo.plugins}">\r
<fileset file="nuxeo/*.jar"/>\r
</copy>\r
</target>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.collectionobject</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version> \r
+ <version>2.0-SNAPSHOT</version> \r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.collectionobject.client.samples</artifactId>
<packaging>pom</packaging>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<name>collectionobject.client.samples</name>
<modules>
<artifactId>org.collectionspace.services.collectionobject.client.sample</artifactId>
<packaging>jar</packaging>
<name>collectionobject.client.sample</name>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<dependencies>
<!-- keep slf4j dependencies on the top -->
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.collectionobject</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.common-test</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<name>services.common-test</name>
<url>http://maven.apache.org</url>
<packaging>jar</packaging>
<project name="common" default="package" basedir=".">
<description>
- collectionspace services common
+ Collectionspace Services common module
</description>
<!-- set global properties for this build -->
<property name="services.trunk" value="../.."/>
</exec>
</target>
- <target name="deploy_jpa" description="deploy jpa binaries in ${jboss.server.cspace}">
- <move todir="${jboss.server.cspace}/jpa-upgrade/lib" overwrite="false">
-
- <fileset dir="${jboss.server.cspace}/lib">
- <include name="hibernate-annotations*.jar"/>
- <include name="hibernate-entitymanager*.jar"/>
- <include name="ejb3-persistence*.jar"/>
- </fileset>
- </move>
- <copy todir="${jboss.server.cspace}/lib">
- <fileset dir="${basedir}/lib/jpa-upgrade"/>
- </copy>
-
- </target>
-
<target name="deploy_spring"
- description="deploy spring binaries in ${jboss.server.cspace}">
- <copy todir="${jboss.server.cspace}/lib">
+ description="deploy spring binaries in ${jee.server.cspace}">
+ <copy todir="${jee.server.cspace}/lib">
<fileset dir="${basedir}/lib/spring"/>
</copy>
</target>
<target name="deploy_slf4j"
- description="deploy spring binaries in ${jboss.server.cspace}">
- <copy todir="${jboss.server.cspace}/lib">
+ description="deploy spring binaries in ${jee.server.cspace}">
+ <copy todir="${jee.server.cspace}/lib">
<fileset dir="${basedir}/lib/slf4j"/>
</copy>
</target>
<target name="deploy_xmlmerge"
- description="deploy XMLMerge binaries in ${jboss.server.cspace}">
- <copy todir="${jboss.server.cspace}/lib">
+ description="deploy XMLMerge binaries in ${jee.server.cspace}">
+ <copy todir="${jee.server.cspace}/lib">
<fileset dir="${basedir}/lib/xmlmerge"/>
</copy>
</target>
<target name="deploy" depends="install"
- description="deploy common elements in ${jboss.server.cspace}">
- <copy tofile="${jboss.server.cspace}/conf/jboss-log4j.xml.org"
- file="${jboss.server.cspace}/conf/jboss-log4j.xml"
+ description="deploy common elements in ${jee.server.cspace}">
+ <!--
+ <copy tofile="${jee.server.cspace}/conf/jboss-log4j.xml.org"
+ file="${jee.server.cspace}/conf/jboss-log4j.xml"
overwrite="false"/>
-
- <copy tofile="${jboss.server.cspace}/conf/jboss-log4j.xml"
+ <copy tofile="${jee.server.cspace}/conf/jboss-log4j.xml"
file="${src}/main/cspace/config/log/jboss-log4j.xml"
overwrite="true"/>
- <copy todir="${jboss.server.cspace}/conf"
- file="${src}/main/cspace/config/log/jboss-log4j-release.xml"
- />
- <antcall target="deploy_jpa" />
+ <copy todir="${jee.server.cspace}/conf"
+ file="${src}/main/cspace/config/log/jboss-log4j-release.xml"/>
+ -->
<antcall target="deploy_spring" />
<antcall target="deploy_slf4j" />
<antcall target="deploy_xmlmerge" />
- <copy todir="${jboss.server.cspace}/cspace/config/services">
+ <copy todir="${jee.server.cspace}/cspace/config/services">
<fileset dir="${basedir}/src/main/cspace/config/services"/>
</copy>
</target>
<target name="undeploy"
- description="undeploy common elements from ${jboss.server.cspace}">
+ description="undeploy common elements from ${jee.server.cspace}">
<antcall target="undeploy_spring" />
<antcall target="undeploy_slf4j" />
- <copy tofile="${jboss.server.cspace}/conf/jboss-log4j.xml"
- file="${jboss.server.cspace}/conf/jboss-log4j.xml.org"
+ <antcall target="undeploy_xmlmerge" />
+ <!--
+ <copy tofile="${jee.server.cspace}/conf/jboss-log4j.xml"
+ file="${jee.server.cspace}/conf/jboss-log4j.xml.org"
overwrite="true" failonerror="false" />
- <delete failonerror="false" file="${jboss.server.cspace}/conf/jboss-log4j-release.xml"/>
- <delete failonerror="false" dir="${jboss.server.cspace}/cspace/config/services"/>
+ -->
+ <!--
+ <delete failonerror="false" file="${jee.server.cspace}/conf/jboss-log4j-release.xml"/>
+ -->
+ <delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services"/>
</target>
<target name="undeploy_spring"
- description="undeploy spring binaries from ${jboss.server.cspace}">
+ description="undeploy spring binaries from ${jee.server.cspace}">
<delete>
- <fileset dir="${jboss.server.cspace}/lib" includes="org.springframework.*.jar"/>
- <fileset dir="${jboss.server.cspace}/lib" includes="spring-security*.jar"/>
+ <fileset dir="${jee.server.cspace}/lib" includes="org.springframework.*.jar"/>
+ <fileset dir="${jee.server.cspace}/lib" includes="spring-security*.jar"/>
</delete>
</target>
<target name="undeploy_slf4j"
- description="undeploy spring binaries from ${jboss.server.cspace}">
+ description="undeploy SLF4J binaries from ${jee.server.cspace}">
<delete>
- <fileset dir="${jboss.server.cspace}/lib" includes="slf4j*.jar"/>
+ <fileset dir="${jee.server.cspace}/lib" includes="slf4j*.jar"/>
</delete>
</target>
-
- <target name="dist_jpa"
- description="dist jpa binaries in ${dist.server.cspace}">
- <copy todir="${services.trunk}/${dist.server.cspace}/lib">
- <fileset dir="${basedir}/lib/jpa-upgrade"/>
- </copy>
-
+ <target name="undeploy_xmlmerge"
+ description="undeploy XMLMerge binaries from ${jee.server.cspace}">
+ <delete>
+ <fileset dir="${jee.server.cspace}/lib" includes="module-xml_merge*.jar"/>
+ </delete>
</target>
-
+
<target name="dist_spring"
description="dist spring binaries in ${dist.server.cspace}">
<copy todir="${services.trunk}/${dist.server.cspace}/lib">
<target name="dist"
description="generate distribution for common elements" depends="package">
- <antcall target="dist_jpa" />
-
<antcall target="dist_spring" />
<copy todir="${services.trunk}/${dist.server.cspace}/cspace/config/services">
<fileset dir="${basedir}/src/main/cspace/config/services"/>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
}\r
\r
private void initialize() throws Exception {\r
- if (logger.isDebugEnabled() == true) {\r
+ if (logger.isTraceEnabled() == true) {\r
System.out.print("Pausing 5 seconds for you to attached the debugger");\r
long startTime, currentTime;\r
currentTime = startTime = System.currentTimeMillis();\r
</target>
<target name="deploy" depends="install"
- description="deploy contact in ${jboss.server.nuxeo}">
+ description="deploy contact in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-contact/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy contact from ${jboss.server.nuxeo}">
+ description="undeploy contact from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-contact/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy contact doctype in ${jboss.server.nuxeo}">
+ description="deploy contact doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.contact.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy contact doctype from ${jboss.server.nuxeo}">
+ description="undeploy contact doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.contact.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.contact.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.contact.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.contact</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.contact</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.contact</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.main</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.contact</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy dimension in ${jboss.server.nuxeo}">\r
+ description="deploy dimension in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-dimension/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy dimension from ${jboss.server.nuxeo}">\r
+ description="undeploy dimension from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-dimension/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>
<target name="deploy" depends="install"
- description="deploy dimension doctype in ${jboss.server.nuxeo}">
+ description="deploy dimension doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.dimension.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy dimension doctype from ${jboss.server.nuxeo}">
+ description="undeploy dimension doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.dimension.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.dimension.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.dimension.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.dimension</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.dimension</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.dimension</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.dimension</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>
<target name="deploy" depends="install"
- description="deploy group in ${jboss.server.nuxeo}">
+ description="deploy group in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-group/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy group from ${jboss.server.nuxeo}">
+ description="undeploy group from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-group/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy group doctype in ${jboss.server.nuxeo}">
+ description="deploy group doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.group.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy group doctype from ${jboss.server.nuxeo}">
+ description="undeploy group doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.group.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.group.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.group.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.group</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.group</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.group</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.group</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.id</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.id</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<dependency>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.id.service</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>test</scope>
<type>jar</type>
</dependency>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.id</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<target name="deploy" depends="install"
description="deploy id service">
- <copy todir="${jboss.server.cspace}/cspace/services">
+ <copy todir="${jee.server.cspace}/cspace/services">
<fileset dir="${src}/main/resources/"/>
</copy>
</target>
<parent>
<artifactId>org.collectionspace.services.id</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>
<target name="deploy" depends="install"
- description="deploy imports in ${jboss.server.nuxeo}">
+ description="deploy imports in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-imports/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy imports from ${jboss.server.nuxeo}">
+ description="undeploy imports from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-imports/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy imports doctype in ${jboss.server.nuxeo}">
+ description="deploy imports doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.imports.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy imports doctype from ${jboss.server.nuxeo}">
+ description="undeploy imports doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.imports.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.imports.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.imports.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.imports</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
description="deploy imports service">
<ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
<!-- REM - This logic should be pushed down into the "service" module -->
- <copy todir="${jboss.server.cspace}/cspace/config/services/resources/templates">
+ <copy todir="${jee.server.cspace}/cspace/config/services/resources/templates">
<fileset dir="${basedir}/service/src/main/resources/templates"/>
</copy>
</target>
<parent>
<artifactId>org.collectionspace.services.imports</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.imports</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy intake in ${jboss.server.nuxeo}">\r
+ description="deploy intake in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-intake/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy intake from ${jboss.server.nuxeo}">\r
+ description="undeploy intake from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-intake/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>
<target name="deploy" depends="install"
- description="deploy intake doctype in ${jboss.server.nuxeo}">
+ description="deploy intake doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.intake.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy intake doctype from ${jboss.server.nuxeo}">
+ description="undeploy intake doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.intake.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.intake.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<artifactId>org.collectionspace.services.intake</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.intake</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.intake</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.intake</artifactId> \r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>
<target name="deploy" depends="install"
- description="deploy loanin in ${jboss.server.nuxeo}">
+ description="deploy loanin in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-loanin/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy loanin from ${jboss.server.nuxeo}">
+ description="undeploy loanin from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-loanin/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy loanin doctype in ${jboss.server.nuxeo}">
+ description="deploy loanin doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.loanin.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy loanin doctype from ${jboss.server.nuxeo}">
+ description="undeploy loanin doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.loanin.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.loanin.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanin.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.loanin</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanin</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.loanin</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanin</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>
<target name="deploy" depends="install"
- description="deploy loanout in ${jboss.server.nuxeo}">
+ description="deploy loanout in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-loanout/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy loanout from ${jboss.server.nuxeo}">
+ description="undeploy loanout from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-loanout/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy loanout doctype in ${jboss.server.nuxeo}">
+ description="deploy loanout doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.loanout.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy loanout doctype from ${jboss.server.nuxeo}">
+ description="undeploy loanout doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.loanout.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.loanout.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanout.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.loanout</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanout</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.loanout</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.loanout</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy location in ${jboss.server.nuxeo}">\r
+ description="deploy location in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-location/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy location from ${jboss.server.nuxeo}">\r
+ description="undeploy location from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-location/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>
<target name="deploy" depends="install"
- description="deploy location doctype in ${jboss.server.nuxeo}">
+ description="deploy location doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.location.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy location doctype from ${jboss.server.nuxeo}">
+ description="undeploy location doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.location.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.location.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.location.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.location</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.location</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arg value="Installer: Executing location Service's 'install' target." />\r
</exec>\r
<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->\r
- <copy todir="${jboss.deploy.nuxeo.plugins}">\r
+ <copy todir="${jee.deploy.nuxeo.plugins}">\r
<fileset file="nuxeo/*.jar"/>\r
</copy> \r
</target> \r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.location</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.location</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>
<target name="deploy" depends="install"
- description="deploy media in ${jboss.server.nuxeo}">
+ description="deploy media in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-media/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy media from ${jboss.server.nuxeo}">
+ description="undeploy media from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-media/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy media doctype in ${jboss.server.nuxeo}">
+ description="deploy media doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.media.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy media doctype from ${jboss.server.nuxeo}">
+ description="undeploy media doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.media.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.media.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.media.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.media</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.media</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.media</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<module>jaxb</module>
<module>service</module>
<module>3rdparty</module>
+ <!-- Not working with embedded Nuxeo EP instance on Tomcat
<module>client</module>
+ -->
</modules>
</project>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.media</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>
<target name="deploy" depends="install"
- description="deploy movement in ${jboss.server.nuxeo}">
+ description="deploy movement in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-movement/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy movement from ${jboss.server.nuxeo}">
+ description="undeploy movement from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-movement/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy movement doctype in ${jboss.server.nuxeo}">
+ description="deploy movement doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.movement.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy movement doctype from ${jboss.server.nuxeo}">
+ description="undeploy movement doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.movement.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.movement.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.movement.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.movement</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.movement</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.movement</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.movement</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy note in ${jboss.server.nuxeo}">\r
+ description="deploy note in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-note/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy note from ${jboss.server.nuxeo}">\r
+ description="undeploy note from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-note/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy note doctype in ${jboss.server.nuxeo}">\r
+ description="deploy note doctype in ${jee.server.nuxeo}">\r
<copy file="${basedir}/target/${nuxeo.note.jar}"\r
- todir="${jboss.deploy.nuxeo.plugins}"/>\r
+ todir="${jee.deploy.nuxeo.plugins}"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy note doctype from ${jboss.server.nuxeo}">\r
+ description="undeploy note doctype from ${jee.server.nuxeo}">\r
<delete>\r
- <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
+ <fileset dir="${jee.deploy.nuxeo.plugins}">\r
<include name="${nuxeo.note.jars.all}"/>\r
</fileset>\r
<!-- Legacy deployment location through release 0.6 -->\r
- <fileset dir="${jboss.deploy.nuxeo.system}">\r
+ <fileset dir="${jee.deploy.nuxeo.system}">\r
<include name="${nuxeo.note.jars.all}"/>\r
</fileset>\r
</delete>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.note.3rdparty</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.note</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<artifactId>org.collectionspace.services.note</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.note</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<artifactId>org.collectionspace.services.note</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>
<target name="deploy" depends="install"
- description="deploy objectexit in ${jboss.server.nuxeo}">
+ description="deploy objectexit in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-objectexit/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy objectexit from ${jboss.server.nuxeo}">
+ description="undeploy objectexit from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-objectexit/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy objectexit doctype in ${jboss.server.nuxeo}">
+ description="deploy objectexit doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.objectexit.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy objectexit doctype from ${jboss.server.nuxeo}">
+ description="undeploy objectexit doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.objectexit.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.objectexit.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.objectexit.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.objectexit</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.objectexit</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.objectexit</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.objectexit</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy organization in ${jboss.server.nuxeo}">\r
+ description="deploy organization in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-organization/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy organization from ${jboss.server.nuxeo}">\r
+ description="undeploy organization from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-organization/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>
<target name="deploy" depends="install"
- description="deploy organization doctype in ${jboss.server.nuxeo}">
+ description="deploy organization doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.organization.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy organization doctype from ${jboss.server.nuxeo}">
+ description="undeploy organization doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.organization.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.organization.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.organization.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arg value="Installer: Executing Organization Service's 'install' target." />\r
</exec>\r
<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->\r
- <copy todir="${jboss.deploy.nuxeo.plugins}">\r
+ <copy todir="${jee.deploy.nuxeo.plugins}">\r
<fileset file="nuxeo/*.jar"/>\r
</copy> \r
</target> \r
<parent>
<artifactId>org.collectionspace.services.organization</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization.client.samples</artifactId>\r
<packaging>pom</packaging>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
<name>organization.client.samples</name>\r
\r
<modules>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization.client.sample</artifactId>\r
<packaging>jar</packaging>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
<name>organization.client.sample</name>\r
\r
<dependencies>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.organization</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy person in ${jboss.server.nuxeo}">\r
+ description="deploy person in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-person/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy person from ${jboss.server.nuxeo}">\r
+ description="undeploy person from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-person/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>
<target name="deploy" depends="install"
- description="deploy person doctype in ${jboss.server.nuxeo}">
+ description="deploy person doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.person.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy person doctype from ${jboss.server.nuxeo}">
+ description="undeploy person doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.person.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.person.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.person.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arg value="Installer: Executing person Service's 'install' target." />\r
</exec>\r
<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->\r
- <copy todir="${jboss.deploy.nuxeo.plugins}">\r
+ <copy todir="${jee.deploy.nuxeo.plugins}">\r
<fileset file="nuxeo/*.jar"/>\r
</copy> \r
</target> \r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.person</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person.jaxb</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.client</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</dependency>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person.client</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</dependency>\r
</dependencies>\r
\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.person</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<jaxb2-basics.version>0.6.2</jaxb2-basics.version>
<maven-jaxb2-plugin.version>0.8.0</maven-jaxb2-plugin.version>
<jaxb.version>2.2.4-1</jaxb.version>
+ <mysql.driver.version>5.1.7</mysql.driver.version>
+ <postgres.driver.version>8.4-702.jdbc4</postgres.driver.version>
</properties>
<!--
<module>common-api</module>
<module>authentication</module>
<module>authorization</module>
- <!--
<module>blob</module>
- -->
<module>client</module>
<module>jaxb</module>
<module>hyperjaxb</module>
<module>intake</module>
<module>loanin</module>
<module>loanout</module>
- <!--
- <module>media</module>
- -->
<module>objectexit</module>
<module>batch</module>
<module>imports</module>
<module>dimension</module>
<module>contact</module>
<module>workflow</module>
+ <module>media</module>
<module>JaxRsServiceProvider</module>
<!--module>sdk</module-->
<module>IntegrationTests</module>
<artifactId>hibernate-entitymanager</artifactId>
<version>3.4.0.GA</version>
</dependency>
- <!-- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.4.0.GA</version>
- </dependency> -->
<dependency>
<groupId>org.jvnet.hyperjaxb3</groupId>
<!-- for time type adapters -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.5</version>
+ <version>${mysql.driver.version}</version>
</dependency>
- <dependency>
- <groupId>postgresql</groupId>
-
<artifactId>postgresql</artifactId>
- <version>8.4-702.jdbc4</version>
- </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgres.driver.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.query</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy relation in ${jboss.server.nuxeo}">\r
+ description="deploy relation in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-relation/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy relation from ${jboss.server.nuxeo}">\r
+ description="undeploy relation from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-relation/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy relation doctype in ${jboss.server.cspace}">\r
+ description="deploy relation doctype in ${jee.server.cspace}">\r
<copy file="${basedir}/target/${nuxeo.relation.jar}"\r
- todir="${jboss.deploy.nuxeo.plugins}"/>\r
+ todir="${jee.deploy.nuxeo.plugins}"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy relation doctype from ${jboss.server.cspace}">\r
+ description="undeploy relation doctype from ${jee.server.cspace}">\r
<delete>\r
- <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
+ <fileset dir="${jee.deploy.nuxeo.plugins}">\r
<include name="${nuxeo.relation.jars.all}"/>\r
</fileset>\r
<!-- Legacy deployment location through release 0.6 -->\r
- <fileset dir="${jboss.deploy.nuxeo.system}">\r
+ <fileset dir="${jee.deploy.nuxeo.system}">\r
<include name="${nuxeo.relation.jars.all}"/>\r
</fileset>\r
</delete>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.relation.3rdparty</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.relation</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.relation</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.relation</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>\r
\r
<target name="deploy_jasper_samples" \r
- description="Copy sample jasper files to ${jboss.server.cspace}/cspace/reports">\r
- <copy todir="${jboss.server.cspace}/cspace/reports">\r
+ description="Copy sample jasper files to ${jee.server.cspace}/cspace/reports">\r
+ <copy todir="${jee.server.cspace}/cspace/reports">\r
<fileset dir="${basedir}/jasper-cs-report/src/main/resources"\r
includes="*.jasper"/>\r
</copy>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy report in ${jboss.server.nuxeo}">\r
+ description="deploy report in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-report/build.xml" target="deploy" inheritall="false"/>\r
<antcall target="deploy_jasper_samples" />\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy report from ${jboss.server.nuxeo}">\r
+ description="undeploy report from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-report/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>
<target name="deploy" depends="install"
- description="deploy report doctype in ${jboss.server.nuxeo}">
+ description="deploy report doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.report.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy report doctype from ${jboss.server.nuxeo}">
+ description="undeploy report doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.report.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.report.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.report.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<artifactId>org.collectionspace.services.report</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.report</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>
<artifactId>org.collectionspace.services.report</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.report</artifactId> \r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>org.collectionspace.services.sdk</artifactId>\r
<packaging>pom</packaging>\r
<name>services.sdk</name>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
\r
<distributionManagement>\r
<repository>\r
<artifactId>org.collectionspace.services.client.sample</artifactId>\r
<packaging>jar</packaging>\r
<name>client.sample</name>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
\r
<dependencies>\r
<dependency>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</dependency>\r
<dependency>\r
<groupId>org.slf4j</groupId>\r
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy security service in ${jboss.server.cspace}">\r
+ description="deploy security service in ${jee.server.cspace}">\r
\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy security service from ${jboss.server.cspace}">\r
+ description="undeploy security service from ${jee.server.cspace}">\r
</target>\r
\r
<target name="dist"\r
<parent>\r
<artifactId>org.collectionspace.services.security</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>
<target name="deploy" depends="install"
- description="deploy taxonomy in ${jboss.server.nuxeo}">
+ description="deploy taxonomy in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-taxonomy/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy taxonomy from ${jboss.server.nuxeo}">
+ description="undeploy taxonomy from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-taxonomy/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy taxonomy doctype in ${jboss.server.nuxeo}">
+ description="deploy taxonomy doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.taxonomy.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy taxonomy doctype from ${jboss.server.nuxeo}">
+ description="undeploy taxonomy doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.taxonomy.jars.all}"/>
</fileset>
<!-- Legacy deployment taxonomy through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.taxonomy.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.taxonomy</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</target>\r
\r
<target name="deploy" depends="install"\r
- description="deploy vocabulary in ${jboss.server.nuxeo}">\r
+ description="deploy vocabulary in ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="deploy" inheritall="false"/>\r
</target>\r
\r
<target name="undeploy"\r
- description="undeploy vocabulary from ${jboss.server.nuxeo}">\r
+ description="undeploy vocabulary from ${jee.server.nuxeo}">\r
<ant antfile="nuxeo-platform-cs-vocabulary/build.xml" target="undeploy" inheritall="false"/>\r
</target>\r
\r
</target>
<target name="deploy" depends="install"
- description="deploy vocabulary doctype in ${jboss.server.nuxeo}">
+ description="deploy vocabulary doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.vocabulary.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy vocabulary doctype from ${jboss.server.nuxeo}">
+ description="undeploy vocabulary doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.vocabulary.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.vocabulary.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.vocabulary.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.vocabulary</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.vocabulary</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<arg value="Installer: Executing Vocabulary Service's 'install' target." />\r
</exec>\r
<!-- Copy the Nuxeo DocType jar files to the Nuxeo app server domain -->\r
- <copy todir="${jboss.deploy.nuxeo.plugins}">\r
+ <copy todir="${jee.deploy.nuxeo.plugins}">\r
<fileset file="nuxeo/*.jar"/>\r
</copy> \r
</target> \r
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.vocabulary</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>\r
<artifactId>org.collectionspace.services.main</artifactId>\r
<groupId>org.collectionspace.services</groupId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.vocabulary.client.sample</artifactId>\r
<packaging>jar</packaging>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
<name>vocabulary.client.sample</name>\r
\r
<dependencies>\r
<parent>\r
<groupId>org.collectionspace.services</groupId>\r
<artifactId>org.collectionspace.services.vocabulary</artifactId>\r
- <version>1.14-SNAPSHOT</version>\r
+ <version>2.0-SNAPSHOT</version>\r
</parent>\r
\r
<modelVersion>4.0.0</modelVersion>\r
</target>
<target name="deploy" depends="install"
- description="deploy workflow in ${jboss.server.nuxeo}">
+ description="deploy workflow in ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-workflow/build.xml" target="deploy" inheritall="false"/>
</target>
<target name="undeploy"
- description="undeploy workflow from ${jboss.server.nuxeo}">
+ description="undeploy workflow from ${jee.server.nuxeo}">
<ant antfile="nuxeo-platform-cs-workflow/build.xml" target="undeploy" inheritall="false"/>
</target>
</target>
<target name="deploy" depends="install"
- description="deploy workflow doctype in ${jboss.server.nuxeo}">
+ description="deploy workflow doctype in ${jee.server.nuxeo}">
<copy file="${basedir}/target/${nuxeo.workflow.jar}"
- todir="${jboss.deploy.nuxeo.plugins}"/>
+ todir="${jee.deploy.nuxeo.plugins}"/>
</target>
<target name="undeploy"
- description="undeploy workflow doctype from ${jboss.server.nuxeo}">
+ description="undeploy workflow doctype from ${jee.server.nuxeo}">
<delete>
- <fileset dir="${jboss.deploy.nuxeo.plugins}">
+ <fileset dir="${jee.deploy.nuxeo.plugins}">
<include name="${nuxeo.workflow.jars.all}"/>
</fileset>
<!-- Legacy deployment location through release 0.6 -->
- <fileset dir="${jboss.deploy.nuxeo.system}">
+ <fileset dir="${jee.deploy.nuxeo.system}">
<include name="${nuxeo.workflow.jars.all}"/>
</fileset>
</delete>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.workflow.3rdparty</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<groupId>org.collectionspace.services</groupId>
<parent>
<artifactId>org.collectionspace.services.workflow</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.workflow</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>org.collectionspace.services.workflow</artifactId>
<groupId>org.collectionspace.services</groupId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.main</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.collectionspace.services</groupId>
<artifactId>org.collectionspace.services.workflow</artifactId>
- <version>1.14-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
projects / tmp / jakarta-migration.git / commitdiff