]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-4747: Ridding the source tree of stale configuration files related to JNDI...
authorRichard Millet <remillet@berkeley.edu>
Fri, 2 Mar 2012 00:31:45 +0000 (16:31 -0800)
committerRichard Millet <remillet@berkeley.edu>
Fri, 2 Mar 2012 00:31:45 +0000 (16:31 -0800)
40 files changed:
3rdparty/jdbc_drivers/postgresql-9.0-802.jdbc4.jar [new file with mode: 0644]
3rdparty/nuxeo/build.xml
3rdparty/nuxeo/nuxeo-database-templates/build.xml [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml.orig [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/sql.properties [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml.orig [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/unified-nuxeo-ds.xml [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/nuxeo.defaults [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml.orig [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/sql.properties [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/default-repository-ds.xml [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/default-repository-ds.xml.orig [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/unified-nuxeo-ds.xml [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/unified-nuxeo-ds.xml.orig [deleted file]
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/nuxeo.defaults [deleted file]
3rdparty/nuxeo/nuxeo-server/5.5/config/datasources-config.xml [deleted file]
3rdparty/nuxeo/nuxeo-server/5.5/config/log4j.xml [deleted file]
3rdparty/nuxeo/nuxeo-server/5.5/config/nuxeo.properties
3rdparty/nuxeo/nuxeo-server/5.5/system.properties
README.txt
build.properties
build.xml
pom.xml
services/JaxRsServiceProvider/pom.xml
services/account/pstore/build.xml
services/authorization-mgt/import/build.xml
services/collectionobject/sample/sample/.classpath [deleted file]
services/common/src/main/cspace/config/log/jboss-log4j-release.xml [deleted file]
services/common/src/main/cspace/config/log/jboss-log4j.xml [deleted file]
services/common/src/main/cspace/config/services/tenants/XMLMerge-README.pdf [moved from services/common/src/main/cspace/config/services/tenants/XMLMerge-ReferenceDoc.pdf with 100% similarity]
services/common/src/main/java/org/collectionspace/services/svn-commit.tmp~ [deleted file]
services/contact/jaxb/pom.xml
services/organization/sample/sample/.classpath [deleted file]
services/vocabulary/sample/sample/.classpath [deleted file]
services/workflow/service/pom.xml
src/main/resources/config/cspace-ds.xml [deleted file]
src/main/resources/config/jboss-ds.xml [deleted file]

diff --git a/3rdparty/jdbc_drivers/postgresql-9.0-802.jdbc4.jar b/3rdparty/jdbc_drivers/postgresql-9.0-802.jdbc4.jar
new file mode 100644 (file)
index 0000000..9e16af0
Binary files /dev/null and b/3rdparty/jdbc_drivers/postgresql-9.0-802.jdbc4.jar differ
index c970aa706ca35fa5630017beb205c933dd5f5656..9c65cb2bb1dcf71ea7130b8fbb4d3641e752aeb4 100644 (file)
             </filterset>\r
         </copy>\r
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>\r
-               <!--\r
-                               <ant antfile="nuxeo-platform-quote/build.xml" target="deploy" inheritall="false"/>\r
-                               <ant antfile="nuxeo-platform-quote-api/build.xml" target="deploy" inheritall="false"/>\r
-                               -->\r
-        <ant antfile="nuxeo-database-templates/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
         <delete dir="${jee.server.cspace}/nuxeo-server/config"/>\r
         <delete dir="${jee.server.cspace}/nuxeo-server/lib"/>\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
-        <ant antfile="nuxeo-database-templates/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
     </target>\r
 \r
     <target name="dist"\r
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/build.xml b/3rdparty/nuxeo/nuxeo-database-templates/build.xml
deleted file mode 100644 (file)
index 2e87969..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-<project name="nuxeo-database-templates" default="package" basedir=".">
-    <description>
-       Deploys per-database templates used by Nuxeo.  Among other things, 
-       these templates designate the fields in database tables to be
-       defined as CLOB types, capable of holding large amounts of text.
-    </description>
-    <!-- set global properties for this build -->
-    <property name="services.trunk" value="../../.."/>
-    <!-- environment should be declared before reading build.properties -->
-    <property environment="env"/>
-    <property file="${services.trunk}/build.properties"/>
-    <!-- set the name of CollectionSpace's template directory, based in part -->
-    <!-- on the name of the current database specified in top-level build.properties -->
-    <property name="collectionspace.prefix" value="collectionspace_"/>
-    <!-- Uses the database name from the 'db' property in the top-level build.properties file -->
-    <property name="collectionspace.template.dir" value="${collectionspace.prefix}${db}"/>
-    <property name="collectionspace.template.dir.path" value="${basedir}/${db}/${collectionspace.template.dir}"/>
-    <property name="backup.suffix" value=".cspace.bak"/>
-
-    <target name="init"
-        description="creates a time stamp">
-        <tstamp/>
-    </target>
-    
-    <!-- Deploy-related targets -->
-
-    <target name="deploy">
-       <!-- No longer possible with an embedded Nuxeo server
-       description="deploys a database template directory to Nuxeo"
-                       depends="deploy-templates-dir">
-       -->
-    </target>
-    
-    <target name="deploy-templates-dir"
-       description="deploys a CollectionSpace-specific Nuxeo database template folder"
-        depends="check-templates-dir-exists">
-        <mkdir dir="${nuxeo.templates.dir}/${collectionspace.template.dir}"/>
-        <copy todir="${nuxeo.templates.dir}/${collectionspace.template.dir}">
-            <fileset dir="${collectionspace.template.dir.path}"/>
-        </copy>
-    </target>
-
-               <!-- 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"
-        depends="check-templates-dir-exists, check-propertyfile-task-exists, set-nuxeo-active-config, backup-nuxeo-config" if="has.propertyfile.task">
-        <echo message="Setting the Nuxeo database templates directory ..."/>
-        <propertyfile file="${nuxeo.active.config.file}">
-             <entry key="nuxeo.templates" operation="=" value="${collectionspace.template.dir}"/>
-             <entry key="nuxeo.db.user" operation="=" value="${db.nuxeo.user}"/>
-             <entry key="nuxeo.db.password" operation="=" value="${db.nuxeo.user.password}"/>
-        </propertyfile>
-    </target>
-               -->
-    
-    <!-- Undeploy-related targets -->
-
-    <target name="undeploy">
-               <!-- Obsolete now with an embedded Nuxeo server runtime.
-        description="undeploys CollectionSpace-specific Nuxeo database template folders"
-        depends="undeploy-template-dirs">
-               -->
-    </target>
-    
-    <target name="undeploy-template-dirs"
-       description="deletes CollectionSpace-specific database template folders from the deploy directory"
-        depends="check-templates-dir-exists">
-        <delete quiet="false" includeemptydirs="true">
-            <fileset id="collectionspace.template.files" dir="${nuxeo.templates.dir}">
-                <patternset>
-                    <include name="**/${collectionspace.prefix}*/**"/>
-                </patternset>
-            </fileset>
-        </delete>
-    </target>
-    
-       <!-- 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">
-        <propertyfile file="${nuxeo.active.config.file}">
-            <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">
-        <available file="${collectionspace.template.dir.path}" type="dir"
-            property="has.templates.dir"/>
-        <fail unless="has.templates.dir"
-            message="Nuxeo database templates directory ${collectionspace.template.dir.path} could not be found."/>
-    </target>
-
-    <target name="check-propertyfile-task-exists" if="has.minimum.ant.version"
-        description="checks that the PropertyFile task exists; that task is required by one or more targets in this build file"
-        depends="check-minimum-ant-version">
-        <available classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"
-            property="has.propertyfile.task"/>
-    </target>
-    
-    <target name="check-minimum-ant-version"
-        description="checks that the minimum required Ant version is available">
-        <!-- The PropertyFile task - bundled with Ant version 1.8.0 and -->
-        <!-- integral to Ant in version 1.8.2 - is required to preserve -->
-        <!-- file comments and layout when editing properties files. -->
-        <condition property="has.minimum.ant.version">
-            <antversion atleast="1.8.0"/>
-        </condition> 
-    </target>
-
-</project>
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml
deleted file mode 100644 (file)
index a5895d3..0000000
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0"?>
-<component name="default-repository-config">
-  <extension target="org.nuxeo.ecm.core.repository.RepositoryService"
-    point="repository">
-    <repository name="default"
-      factory="org.nuxeo.ecm.core.storage.sql.coremodel.SQLRepositoryFactory">
-      <repository name="default">
-        <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: 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:numberOfObjects</field>
-          <field type="largetext">collectionobjects_common:collection</field>
-          <field type="largetext">collectionobjects_common:recordStatus</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: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>
-        <indexing>
-          <fulltext>
-            <index name="default">
-              <!-- all props implied -->
-            </index>
-            <index name="title">
-              <field>dc:title</field>
-            </index>
-            <index name="description">
-              <field>dc:description</field>
-            </index>
-          </fulltext>
-        </indexing>
-      </repository>
-    </repository>
-  </extension>
-</component>
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml.orig b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml.orig
deleted file mode 100644 (file)
index 6f18473..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<component name="default-repository-config">
-  <extension target="org.nuxeo.ecm.core.repository.RepositoryService"
-    point="repository">
-    <repository name="default"
-      factory="org.nuxeo.ecm.core.storage.sql.coremodel.SQLRepositoryFactory">
-      <repository name="default">
-        <schema>
-          <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>
-        </schema>
-        <indexing>
-          <fulltext>
-            <index name="default">
-              <!-- all props implied -->
-            </index>
-            <index name="title">
-              <field>dc:title</field>
-            </index>
-            <index name="description">
-              <field>dc:description</field>
-            </index>
-          </fulltext>
-        </indexing>
-      </repository>
-    </repository>
-  </extension>
-</component>
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/sql.properties b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/sql.properties
deleted file mode 100644 (file)
index 426f693..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Jena database type and transaction mode
-org.nuxeo.ecm.sql.jena.databaseType=MySQL
-org.nuxeo.ecm.sql.jena.databaseTransactionEnabled=true
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml
deleted file mode 100644 (file)
index 3a01540..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<connection-factories>
-  <tx-connection-factory>
-    <jndi-name>NXRepository/default</jndi-name>
-    <xa-transaction/>
-    <track-connection-by-tx/>
-    <adapter-display-name>Nuxeo SQL Repository DataSource</adapter-display-name>
-    <rar-name>nuxeo.ear#nuxeo-core-storage-sql-ra-1.6.2.rar</rar-name>
-    <connection-definition>org.nuxeo.ecm.core.storage.sql.Repository</connection-definition>
-    <config-property name="name">default</config-property>
-    <max-pool-size>${nuxeo.vcs.max-pool-size}</max-pool-size>
-    
-    <config-property name="xaDataSource" type="java.lang.String">com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</config-property>
-    <config-property name="property" type="java.lang.String">URL=jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true</config-property>
-    <!-- 
-    <config-property name="property" type="java.lang.String">ServerName=${nuxeo.db.host}</config-property>
-    <config-property name="property" type="java.lang.String">PortNumber/Integer=${nuxeo.db.port}</config-property>
-    <config-property name="property" type="java.lang.String">DatabaseName=${nuxeo.db.name}</config-property>
-     -->
-    <config-property name="property" type="java.lang.String">User=${nuxeo.db.user}</config-property>
-    <config-property name="property" type="java.lang.String">Password=${nuxeo.db.password}</config-property>
-  </tx-connection-factory>
-</connection-factories>
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml.orig b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml.orig
deleted file mode 100644 (file)
index 3a01540..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<connection-factories>
-  <tx-connection-factory>
-    <jndi-name>NXRepository/default</jndi-name>
-    <xa-transaction/>
-    <track-connection-by-tx/>
-    <adapter-display-name>Nuxeo SQL Repository DataSource</adapter-display-name>
-    <rar-name>nuxeo.ear#nuxeo-core-storage-sql-ra-1.6.2.rar</rar-name>
-    <connection-definition>org.nuxeo.ecm.core.storage.sql.Repository</connection-definition>
-    <config-property name="name">default</config-property>
-    <max-pool-size>${nuxeo.vcs.max-pool-size}</max-pool-size>
-    
-    <config-property name="xaDataSource" type="java.lang.String">com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</config-property>
-    <config-property name="property" type="java.lang.String">URL=jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true</config-property>
-    <!-- 
-    <config-property name="property" type="java.lang.String">ServerName=${nuxeo.db.host}</config-property>
-    <config-property name="property" type="java.lang.String">PortNumber/Integer=${nuxeo.db.port}</config-property>
-    <config-property name="property" type="java.lang.String">DatabaseName=${nuxeo.db.name}</config-property>
-     -->
-    <config-property name="property" type="java.lang.String">User=${nuxeo.db.user}</config-property>
-    <config-property name="property" type="java.lang.String">Password=${nuxeo.db.password}</config-property>
-  </tx-connection-factory>
-</connection-factories>
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/unified-nuxeo-ds.xml b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/unified-nuxeo-ds.xml
deleted file mode 100644 (file)
index e6c5564..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
-  <local-tx-datasource>
-    <jndi-name>NuxeoDS</jndi-name>
-    <connection-url>jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true</connection-url>
-    <driver-class>com.mysql.jdbc.Driver</driver-class>
-    <user-name>${nuxeo.db.user}</user-name>
-    <password>${nuxeo.db.password}</password>
-    <min-pool-size>${nuxeo.db.min-pool-size}</min-pool-size>
-    <max-pool-size>${nuxeo.db.max-pool-size}</max-pool-size>
-  </local-tx-datasource>
-</datasources>
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/nuxeo.defaults b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/nuxeo.defaults
deleted file mode 100644 (file)
index 1c06cff..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf  ##
-nuxeo.template.includes=common
-
-nuxeo.db.host=localhost
-nuxeo.db.port=3306
-nuxeo.db.name=nuxeo
-nuxeo.db.user=nuxeo
-nuxeo.db.password=password
-nuxeo.db.min-pool-size=5
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml
deleted file mode 100644 (file)
index cfb6da7..0000000
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0"?>\r
-<component name="default-repository-config">\r
-  <extension target="org.nuxeo.ecm.core.repository.RepositoryService"\r
-    point="repository">\r
-    <repository name="default"\r
-      factory="org.nuxeo.ecm.core.storage.sql.coremodel.SQLRepositoryFactory">\r
-      <repository name="default">\r
-        <schema>\r
-          <field type="largetext">imd:user_comment</field> <!-- Needed for large image metadata (image_metadata) that gets inserted here. -->\r
-          <field type="largetext">note</field>\r
-          <field type="largetext">webp:content</field>\r
-          <field type="largetext">webc:welcomeText</field>\r
-          <field type="largetext">comment:comment</field>\r
-          <field type="largetext">post</field>\r
-          <field type="largetext">mail:mail</field>\r
-          \r
-          <!-- Text fields that may possibly not require largetext -->\r
-          <!-- designation and might need further review are marked as follows: -->\r
-          <!-- * -->\r
-          \r
-          <!-- =========================================================== -->\r
-          <!-- Acquisition -->\r
-          <!-- =========================================================== -->\r
-\r
-          <field type="largetext">acquisitionFundingSourceProvisos</field>\r
-          <field type="largetext">acquisitions_common:acquisitionNote</field>\r
-          <field type="largetext">acquisitions_common:acquisitionProvisos</field>\r
-          <field type="largetext">acquisitions_common:acquisitionReason</field>\r
-          <field type="largetext">acquisitions_common:creditLine</field>\r
-\r
-          \r
-          <!-- =========================================================== -->\r
-          <!-- Blob -->\r
-          <!-- =========================================================== -->\r
-\r
-          <!-- No largetext fields identified to date -->\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- CollectionObject / Cataloging -->\r
-          <!-- =========================================================== -->\r
-          \r
-          <!-- Object Identification Information -->\r
-          <!-- ================================= -->\r
-\r
-          <!-- FIXME: Change this to otherNumberValue if and when the field name itself is so changed. -->\r
-          <field type="largetext">numberValue</field> <!-- * -->\r
-\r
-          <!-- FIXME: multivalued field - need to verify schema and field name -->\r
-          <field type="largetext">collectionobjects_common:briefDescriptions</field>\r
-         \r
-          <!-- FIXME: multivalued field - need to verify schema and field name -->\r
-          <field type="largetext">collectionobjects_common:comments</field>\r
-          \r
-          <field type="largetext">collectionobjects_common:distinguishingFeatures</field>\r
-          \r
-          <field type="largetext">objectNameNote</field>\r
-\r
-          <field type="largetext">title</field>\r
-          <field type="largetext">titleTranslation</field>\r
-                   \r
-          <!-- Object Description Information -->\r
-          <!-- ============================== -->\r
-\r
-          <field type="largetext">collectionobjects_common:ageQualifier</field>\r
-          <field type="largetext">collectionobjects_common:color</field>\r
-          <field type="largetext">collectionobjects_common:contentDescription</field>\r
-          <field type="largetext">collectionobjects_common:contentNote</field>\r
-          <field type="largetext">collectionobjects_common:contentObject</field>\r
-          <field type="largetext">collectionobjects_common:copyNumber</field> <!-- * -->\r
-          <field type="largetext">collectionobjects_common:editionNumber</field> <!-- * -->\r
-          \r
-          <!-- FIXME: Will become group repeatable in a post-1.3 release -->\r
-          <!-- Remove the schema name(s) from the value(s) below when this occurs. -->\r
-          <field type="largetext">collectionobjects_common:inscriptionContent</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentInterpretation</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentTranslation</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentTransliteration</field>\r
-          \r
-          <!-- FIXME: Will become group repeatable in a post-1.3 release -->\r
-          <!-- Remove the schema name(s) from the value(s) below when this occurs. -->\r
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionInterpretation</field>\r
-          \r
-          <field type="largetext">materialComponentNote</field>\r
-          <field type="largetext">materialName</field>  <!-- * -->\r
-          \r
-          <!-- FIXME: multivalued field - need to verify schema and field name -->\r
-          <field type="largetext">collectionobjects_common:physicalDescription</field>\r
-          \r
-          <field type="largetext">objectComponentInformation</field>\r
-\r
-          <!-- Object Production Information -->\r
-          <!-- ============================= -->\r
-          \r
-          <field type="largetext">collectionobjects_common:objectProductionNote</field>\r
-          \r
-          <!-- FIXME: multivalued field - need to verify schema and field name -->\r
-          <field type="largetext">collectionobjects_common:objectProductionReason</field>\r
-\r
-          <!-- Object History and Association Information -->\r
-          <!-- ========================================== -->\r
-          \r
-          <field type="largetext">assocActivityNote</field>\r
-          <field type="largetext">assocConceptNote</field>\r
-          <field type="largetext">assocCulturalContextNote</field>\r
-          <field type="largetext">assocDateNote</field>\r
-\r
-          <!-- FIXME: Will become group repeatable in a post-1.3 release. -->\r
-          <!-- Remove the schema name(s) from the value(s) below when this occurs. -->\r
-          <field type="largetext">collectionobjects_common:assocEventName</field>   <!-- * -->\r
-          <field type="largetext">collectionobjects_common:assocEventNote</field>\r
-          <field type="largetext">collectionobjects_common:assocEventType</field>   <!-- * -->\r
-\r
-          <field type="largetext">assocObject</field>\r
-          <field type="largetext">assocOrganizationNote</field>\r
-          <field type="largetext">assocPeopleNote</field>\r
-          <field type="largetext">assocPersonNote</field>\r
-          <field type="largetext">assocPlaceNote</field>\r
-          \r
-          <field type="largetext">collectionobjects_common:objectHistoryNote</field>\r
-          <field type="largetext">collectionobjects_common:ownershipExchangeNote</field>\r
-          <field type="largetext">usageNote</field>\r
-\r
-           <!-- Object Owner's Contribution Information -->\r
-           <!-- ======================================= -->  \r
-                \r
-          <field type="largetext">collectionobjects_common:ownersPersonalExperience</field>\r
-          <field type="largetext">collectionobjects_common:ownersPersonalResponse</field>\r
-          \r
-          <!-- FIXME: multivalued field - need to verify schema and field name -->\r
-          <field type="largetext">collectionobjects_common:ownersReference</field>\r
-          \r
-          <field type="largetext">collectionobjects_common:ownersContributionNote</field>\r
-         \r
-          <!-- Object Viewer's Contribution Information -->\r
-          <!-- ======================================== -->          \r
-          \r
-          <field type="largetext">collectionobjects_common:viewersRole</field>\r
-          <field type="largetext">collectionobjects_common:viewersPersonalExperience</field>\r
-          <field type="largetext">collectionobjects_common:viewersPersonalResponse</field>\r
-          \r
-          <!-- FIXME: multivalued field - need to verify schema and field name -->\r
-          <field type="largetext">collectionobjects_common:viewersReference</field>\r
-          \r
-          <field type="largetext">collectionobjects_common:viewersContributionNote</field>\r
-\r
-          <!-- Reference Information -->\r
-          <!-- ===================== -->\r
-          \r
-          <field type="largetext">collectionobjects_common:catalogNumber</field> <!-- * -->\r
-         \r
-          <!-- Object Collection Information -->\r
-          <!-- ============================= -->      \r
-\r
-          <field type="largetext">collectionobjects_common:fieldCollectionNote</field>\r
-          <field type="largetext">collectionobjects_common:fieldCollectionNumber</field> <!-- * -->\r
-          \r
-          <!--\r
-              Additional non-text fields configured as 'largetext' to\r
-              avoid the following error when Nuxeo is configured to use MySQL:\r
-              \r
-              com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException.\r
-              message: Row size too large. The maximum row size for the\r
-              used table type, not counting BLOBs, is 65535.\r
-              \r
-              Some of the fields below may be repeatable or in\r
-              repeatable groups, and the schema and field names\r
-              below might thus require verification to match actual values.\r
-          -->\r
-  \r
-          <field type="largetext">collectionobjects_common:objectNumber</field>\r
-          <field type="largetext">collectionobjects_common:numberOfObjects</field>\r
-          <field type="largetext">collectionobjects_common:collection</field>\r
-          <field type="largetext">collectionobjects_common:recordStatus</field>\r
-          <field type="largetext">collectionobjects_common:ageQualifier</field>\r
-          <field type="largetext">collectionobjects_common:ageUnit</field>\r
-      \r
-          <field type="largetext">collectionobjects_common:contentDate</field>\r
-          <field type="largetext">collectionobjects_common:contentLanguages</field>\r
-          <field type="largetext">collectionobjects_common:contentOrganizations</field>\r
-          \r
-          <field type="largetext">collectionobjects_common:dimensionSummary</field>\r
\r
-          <!-- FIXME: The set of dimensions-related fields below may be removed -->\r
-          <!-- altogether when it is confirmed that the App/UI layers are using -->\r
-          <!-- a repeatable dimensions group. -->\r
-          <field type="largetext">collectionobjects_common:dimension</field>\r
-          <field type="largetext">collectionobjects_common:dimensionMeasuredPart</field>\r
-          <field type="largetext">collectionobjects_common:dimensionMeasurementUnit</field>\r
-          <field type="largetext">collectionobjects_common:dimensionValue</field>\r
-          <field type="largetext">collectionobjects_common:dimensionValueDate</field>\r
-          <field type="largetext">collectionobjects_common:dimensionValueQualifier</field>\r
-          \r
-          <field type="largetext">collectionobjects_common:editionNumber</field>\r
-\r
-          <field type="largetext">collectionobjects_common:inscriptionContentInscriber</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentDate</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentLanguage</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentMethod</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentPosition</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentScript</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionContentType</field>\r
-\r
-          <field type="largetext">collectionobjects_common:inscriptionDescription</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionInscriber</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionDate</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionMethod</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionPosition</field>\r
-          <field type="largetext">collectionobjects_common:inscriptionDescriptionType</field>\r
-\r
-          <field type="largetext">collectionobjects_common:objectStatus</field>\r
-          <field type="largetext">collectionobjects_common:phase</field>\r
-          <field type="largetext">collectionobjects_common:sex</field>\r
-          <field type="largetext">collectionobjects_common:ownershipAccess</field>\r
-          <field type="largetext">collectionobjects_common:ownershipCategory</field>\r
-          <field type="largetext">collectionobjects_common:ownershipDates</field>\r
-          <field type="largetext">collectionobjects_common:ownershipExchangeMethod</field>\r
-          <field type="largetext">collectionobjects_common:ownershipExchangePriceCurrency</field>\r
-          <field type="largetext">collectionobjects_common:ownershipPlace</field>\r
-          <field type="largetext">collectionobjects_common:fieldCollectionNumber</field>\r
-          <field type="largetext">collectionobjects_common:fieldCollectionMethod</field>\r
-          <field type="largetext">collectionobjects_common:fieldCollectionPlace</field>\r
-          <field type="largetext">collectionobjects_common:fieldCollectionDate</field>\r
-       \r
-          <!-- FIXME: This sample set of date field can be removed when Cataloging -->\r
-          <!-- records are using structured date fields, or earlier when it is confirmed that -->\r
-          <!-- the App/UI layers are not using this vestigial part of the Cataloging schema. -->\r
-          <field type="largetext">collectionobjects_common:dateAssociation</field>\r
-          <field type="largetext">collectionobjects_common:dateEarliestSingle</field>\r
-          <field type="largetext">collectionobjects_common:dateEarliestSingleCertainty</field>\r
-          <field type="largetext">collectionobjects_common:dateEarliestSingleQualifier</field>\r
-          <field type="largetext">collectionobjects_common:dateLatest</field>\r
-          <field type="largetext">collectionobjects_common:dateLatestCertainty</field>\r
-          <field type="largetext">collectionobjects_common:dateLatestQualifier</field>\r
-          <field type="largetext">collectionobjects_common:datePeriod</field>\r
-          <field type="largetext">collectionobjects_common:dateText</field>\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Contact -->\r
-          <!-- =========================================================== -->\r
-          <field type="largetext">contacts_common:addressPlace</field>\r
-          \r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Group -->\r
-          <!-- =========================================================== -->\r
-          <field type="largetext">groups_common:scopeNote</field>\r
-          \r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Intake -->\r
-          <!-- =========================================================== -->\r
-          \r
-          <field type="largetext">intakes_common:entryNote</field>\r
-          <field type="largetext">intakes_common:packingNote</field>\r
-          <field type="largetext">intakes_common:fieldCollectionNote</field>\r
-          <field type="largetext">intakes_common:insuranceNote</field>\r
-          <field type="largetext">intakes_common:conditionCheckNote</field>\r
-          <field type="largetext">currentLocationNote</field>\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Loan In -->\r
-          <!-- =========================================================== -->\r
-          \r
-          <field type="largetext">loansin_common:loanInConditions</field>\r
-          <field type="largetext">loansin_common:loanInNote</field>\r
\r
\r
-          <!-- =========================================================== -->\r
-          <!-- Loan Out -->\r
-          <!-- =========================================================== -->\r
-          \r
-          <field type="largetext">loansout_common:specialConditionsOfLoan</field>\r
-          <field type="largetext">loansout_common:loanOutNote</field>      \r
-          <field type="largetext">loansout_common:loanPurpose</field>\r
-          <field type="largetext">loanedObjectStatusNote</field>\r
-\r
\r
-          <!-- =========================================================== -->\r
-          <!-- Movement / Location and Movement Control -->\r
-          <!-- =========================================================== -->\r
-          \r
-          <field type="largetext">movements_common:currentLocationNote</field>\r
-          <field type="largetext">movements_common:movementNote</field>\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Media / Media Handling -->\r
-          <!-- =========================================================== -->\r
-\r
-          <field type="largetext">media_common:copyrightStatement</field>\r
-          <field type="largetext">media_common:description</field>\r
-          <field type="largetext">media_common:title</field>\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Note -->\r
-          <!-- =========================================================== -->\r
-\r
-          <field type="largetext">notes_common:content</field>\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Object Exit -->\r
-          <!-- =========================================================== -->\r
-          \r
-          <field type="largetext">objectexit_common:exitNote</field>\r
-          <field type="largetext">objectexit_common:packingNote</field>\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Organization -->\r
-          <!-- =========================================================== -->\r
-          \r
-          <field type="largetext">shortName</field>\r
-          <field type="largetext">longName</field>\r
-          <field type="largetext">nameAdditions</field>\r
-          <field type="largetext">historyNote</field>\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Person -->\r
-          <!-- =========================================================== -->\r
-          <field type="largetext">persons_common:bioNote</field>\r
-          <field type="largetext">persons_common:nameNote</field>\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Relation -->\r
-          <!-- =========================================================== -->\r
-\r
-          <!-- No largetext fields identified to date -->\r
-\r
-\r
-          <!-- =========================================================== -->\r
-          <!-- Storage Location / Location -->\r
-          <!-- =========================================================== -->\r
-          <field type="largetext">locations_common:name</field>\r
-          <!-- conditionNote will be made part of a repeatable group of fields in a future release -->\r
-          <field type="largetext">locations_common:conditionNote</field>\r
-          <field type="largetext">locations_common:securityNote</field>\r
-          <field type="largetext">locations_common:accessNote</field>\r
-         \r
-        </schema>\r
-        <indexing>\r
-          <fulltext analyzer="english">\r
-            <index name="default">\r
-              <!-- all props implied -->\r
-            </index>\r
-            <index name="title">\r
-              <field>dc:title</field>\r
-            </index>\r
-            <index name="description">\r
-              <field>dc:description</field>\r
-            </index>\r
-          </fulltext>\r
-        </indexing>\r
-      </repository>\r
-    </repository>\r
-  </extension>\r
-</component>\r
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml.orig b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml.orig
deleted file mode 100644 (file)
index 75bb6f9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>\r
-<component name="default-repository-config">\r
-  <extension target="org.nuxeo.ecm.core.repository.RepositoryService"\r
-    point="repository">\r
-    <repository name="default"\r
-      factory="org.nuxeo.ecm.core.storage.sql.coremodel.SQLRepositoryFactory">\r
-      <repository name="default">\r
-        <schema>\r
-          <field type="largetext">note</field>\r
-          <field type="largetext">webp:content</field>\r
-          <field type="largetext">webc:welcomeText</field>\r
-          <field type="largetext">comment:comment</field>\r
-          <field type="largetext">post</field>\r
-          <field type="largetext">mail:mail</field>\r
-        </schema>\r
-        <indexing>\r
-          <fulltext analyzer="english">\r
-            <index name="default"> \r
-              <!-- all props implied -->\r
-            </index>\r
-            <index name="title">\r
-              <field>dc:title</field>\r
-            </index>\r
-            <index name="description">\r
-              <field>dc:description</field>\r
-            </index>\r
-          </fulltext> \r
-        </indexing>\r
-      </repository>\r
-    </repository>\r
-  </extension>\r
-</component>\r
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/sql.properties b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/sql.properties
deleted file mode 100644 (file)
index 289bbf2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-# Jena database type and transaction mode\r
-org.nuxeo.ecm.sql.jena.databaseType=PostgreSQL\r
-org.nuxeo.ecm.sql.jena.databaseTransactionEnabled=true\r
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/default-repository-ds.xml b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/default-repository-ds.xml
deleted file mode 100644 (file)
index d4049ce..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>\r
-<connection-factories>\r
-  <tx-connection-factory>\r
-    <jndi-name>NXRepository/default</jndi-name>\r
-    <xa-transaction/>\r
-    <track-connection-by-tx/>\r
-    <adapter-display-name>Nuxeo SQL Repository DataSource</adapter-display-name>\r
-    <rar-name>nuxeo.ear#nuxeo-core-storage-sql-ra-1.6.2.rar</rar-name>\r
-    <connection-definition>org.nuxeo.ecm.core.storage.sql.Repository</connection-definition>\r
-    <config-property name="name">default</config-property>\r
-    <max-pool-size>${nuxeo.vcs.max-pool-size}</max-pool-size>\r
-    \r
-    <config-property name="xaDataSource" type="java.lang.String">org.postgresql.xa.PGXADataSource</config-property>\r
-    <config-property name="property" type="java.lang.String">ServerName=${nuxeo.db.host}</config-property>\r
-    <config-property name="property" type="java.lang.String">PortNumber/Integer=${nuxeo.db.port}</config-property>\r
-    <config-property name="property" type="java.lang.String">DatabaseName=${nuxeo.db.name}</config-property>\r
-    <config-property name="property" type="java.lang.String">User=${nuxeo.db.user}</config-property>\r
-    <config-property name="property" type="java.lang.String">Password=${nuxeo.db.password}</config-property>\r
-  </tx-connection-factory>\r
-</connection-factories>\r
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/default-repository-ds.xml.orig b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/default-repository-ds.xml.orig
deleted file mode 100644 (file)
index d4049ce..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>\r
-<connection-factories>\r
-  <tx-connection-factory>\r
-    <jndi-name>NXRepository/default</jndi-name>\r
-    <xa-transaction/>\r
-    <track-connection-by-tx/>\r
-    <adapter-display-name>Nuxeo SQL Repository DataSource</adapter-display-name>\r
-    <rar-name>nuxeo.ear#nuxeo-core-storage-sql-ra-1.6.2.rar</rar-name>\r
-    <connection-definition>org.nuxeo.ecm.core.storage.sql.Repository</connection-definition>\r
-    <config-property name="name">default</config-property>\r
-    <max-pool-size>${nuxeo.vcs.max-pool-size}</max-pool-size>\r
-    \r
-    <config-property name="xaDataSource" type="java.lang.String">org.postgresql.xa.PGXADataSource</config-property>\r
-    <config-property name="property" type="java.lang.String">ServerName=${nuxeo.db.host}</config-property>\r
-    <config-property name="property" type="java.lang.String">PortNumber/Integer=${nuxeo.db.port}</config-property>\r
-    <config-property name="property" type="java.lang.String">DatabaseName=${nuxeo.db.name}</config-property>\r
-    <config-property name="property" type="java.lang.String">User=${nuxeo.db.user}</config-property>\r
-    <config-property name="property" type="java.lang.String">Password=${nuxeo.db.password}</config-property>\r
-  </tx-connection-factory>\r
-</connection-factories>\r
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/unified-nuxeo-ds.xml b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/unified-nuxeo-ds.xml
deleted file mode 100644 (file)
index 517e34a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<datasources>\r
-  <xa-datasource>\r
-    <jndi-name>NuxeoDS</jndi-name>\r
-    <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>\r
-    <xa-datasource-property name="ServerName">${nuxeo.db.host}</xa-datasource-property>\r
-    <xa-datasource-property name="PortNumber">${nuxeo.db.port}</xa-datasource-property>\r
-    <xa-datasource-property name="DatabaseName">${nuxeo.db.name}</xa-datasource-property>\r
-    <xa-datasource-property name="User">${nuxeo.db.user}</xa-datasource-property>\r
-    <xa-datasource-property name="Password">${nuxeo.db.password}</xa-datasource-property>\r
-    <max-pool-size>${nuxeo.db.max-pool-size}</max-pool-size>  \r
-    <track-connection-by-tx/>\r
-  </xa-datasource>\r
-</datasources>\r
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/unified-nuxeo-ds.xml.orig b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/unified-nuxeo-ds.xml.orig
deleted file mode 100644 (file)
index 517e34a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<datasources>\r
-  <xa-datasource>\r
-    <jndi-name>NuxeoDS</jndi-name>\r
-    <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>\r
-    <xa-datasource-property name="ServerName">${nuxeo.db.host}</xa-datasource-property>\r
-    <xa-datasource-property name="PortNumber">${nuxeo.db.port}</xa-datasource-property>\r
-    <xa-datasource-property name="DatabaseName">${nuxeo.db.name}</xa-datasource-property>\r
-    <xa-datasource-property name="User">${nuxeo.db.user}</xa-datasource-property>\r
-    <xa-datasource-property name="Password">${nuxeo.db.password}</xa-datasource-property>\r
-    <max-pool-size>${nuxeo.db.max-pool-size}</max-pool-size>  \r
-    <track-connection-by-tx/>\r
-  </xa-datasource>\r
-</datasources>\r
diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/nuxeo.defaults b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/nuxeo.defaults
deleted file mode 100644 (file)
index f2df119..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-## DO NOT EDIT THIS FILE, USE nuxeo.conf  ##\r
-nuxeo.template.includes=common\r
-\r
-nuxeo.db.host=localhost\r
-nuxeo.db.port=5432\r
-nuxeo.db.name=nuxeo\r
-nuxeo.db.user=nuxeo\r
-nuxeo.db.password=password\r
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/config/datasources-config.xml b/3rdparty/nuxeo/nuxeo-server/5.5/config/datasources-config.xml
deleted file mode 100644 (file)
index 4495c3a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!-- Apparently no longer needed in Nuxeo pre-5.5 RC1 release -->
-<component name="config:datasources">
-<!-- 
-       <extension target="org.nuxeo.runtime.datasource" point="datasources">
-               <datasource name="jdbc/nxaudit" xaDataSource="@XA_DATASOURCE@"
-                       maxActive="20" maxIdle="5">
-                       <property name="databaseName">nuxeo</property>
-                       <property name="user">@NUXEO_USER@</property>
-                       <property name="password">@NUXEO_PW@</property>
-               </datasource>
-       </extension>
--->
-</component>
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/config/log4j.xml b/3rdparty/nuxeo/nuxeo-server/5.5/config/log4j.xml
deleted file mode 100644 (file)
index 83ac323..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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>
index 308ca3aff06409a739985e652c803c819b42ea79..6d44dfd1e9c2b2acb747ef38eda732bf55833a69 100644 (file)
@@ -1,11 +1,11 @@
 # application instance config
 org.nuxeo.ecm.instance.host=localhost
-org.nuxeo.ecm.instance.name=Nuxeo 5.4
+org.nuxeo.ecm.instance.name=Nuxeo 5.5
 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
+org.nuxeo.ecm.product.name=Nuxeo 5.5
+org.nuxeo.ecm.product.version=5.5
 
 # runtime remoting config
 org.nuxeo.runtime.server.enabled=false
@@ -31,6 +31,3 @@ 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
index dc6965ef81c9bd6474be92f134a969913b531f57..781612386fe1cda3818d243543424a64794a754e 100644 (file)
@@ -1,3 +1 @@
-derby.system.home=${nuxeo.data.dir}/derby
 org.nuxeo.launcher.libdirs=lib
-h2.baseDir=${nuxeo.data.dir}/h2
\ No newline at end of file
index 639425dfb404e572652f3a45492b9f2210e06d9d..ef49f8bb13328aab8e8ab0c2529e5eb50c9bb667 100644 (file)
@@ -22,7 +22,7 @@ All SSH keys deserve better.
 
 Make 1 - Edited on github
 Make 2
-Make 3
+Make 3 - Edited locally
 Make 4
 Make 5
 Make 6 - Edited on github
index 46fbc82eb43a2cdb5e6d6034d9636a992145c880..256cc0a36aa0e0d36bb2358a9566b232f88f3a35 100644 (file)
@@ -9,12 +9,8 @@ cspace.services.war=${cspace.services.context}.war
 domain.nuxeo=nuxeo-server\r
 \r
 #nuxeo\r
-#nuxeo.release=5.2.M4\r
-#nuxeo.release=5.3.2\r
-nuxeo.release=5.5-RC1\r
-#nuxeo.release=5.4.2-HF05\r
+nuxeo.release=5.5\r
 nuxeo.ear=nuxeo.ear\r
-## #old# nuxeo.system=${nuxeo.ear}/bundles\r
 nuxeo.system=bundles\r
 \r
 ## #old# nuxeo.plugins=${nuxeo.ear}/plugins\r
index bafb6936715d7563f595d0292d395681de6179b9..5c854c1562d58819ead34b97ccbc28903dee2fba 100644 (file)
--- a/build.xml
+++ b/build.xml
-\r
 <project name="services-trunk" default="package" basedir=".">\r
-    <description>\r
+       <description>\r
         collectionspace services\r
     </description>\r
-    <!-- environment should be declared before reading build.properties -->\r
-    <property environment="env" />\r
-    <!-- set global properties for this build -->\r
-    <property file="build.properties" />\r
-    <property name="mvn.opts" value="" />\r
-    <property name="src" location="src"/>\r
-\r
-    <condition property="osfamily-unix">\r
-        <os family="unix" />\r
-    </condition>\r
-    <condition property="osfamily-windows">\r
-        <os family="windows" />\r
-    </condition>\r
-\r
-    <target name="init">\r
-        <!-- Create the time stamp -->\r
-        <tstamp/>\r
-    </target>\r
-\r
-    <target name="dist" depends="package"\r
+       <!-- environment should be declared before reading build.properties -->\r
+       <property environment="env" />\r
+       <!-- set global properties for this build -->\r
+       <property file="build.properties" />\r
+       <property name="mvn.opts" value="" />\r
+       <property name="src" location="src"/>\r
+\r
+       <condition property="osfamily-unix">\r
+               <os family="unix" />\r
+       </condition>\r
+       <condition property="osfamily-windows">\r
+               <os family="windows" />\r
+       </condition>\r
+\r
+       <target name="init">\r
+               <!-- Create the time stamp -->\r
+               <tstamp/>\r
+       </target>\r
+\r
+       <target name="dist" depends="package"\r
             description="generate cspace service distribution">\r
-        <!-- Create the distribution directory -->\r
-        <mkdir dir="${basedir}/dist"/>\r
-\r
-        <!-- copy db scripts, etc. -->\r
-        <copy todir="${basedir}/${dist.server.cspace}/cspace/services">\r
-            <fileset dir="${src}/main/resources/scripts"/>\r
-        </copy>\r
-\r
-        <!-- copy datasources -->\r
-        <copy todir="${basedir}/${dist.deploy.cspace}">\r
-                                       <fileset dir="${src}/main/resources/config/${db}"/>\r
-        </copy>\r
-        <ant antfile="3rdparty/build.xml" target="dist" inheritAll="false"/>\r
-        <ant antfile="services/build.xml" target="dist" inheritAll="false"/>\r
-\r
-        <!-- bundle up everything -->\r
-        <tar destfile="${basedir}/dist/${cspace.services.release}-${jee.release}.tar.gz" compression="gzip">\r
-            <tarfileset dir="${basedir}/dist/cspace"\r
+               <!-- Create the distribution directory -->\r
+               <mkdir dir="${basedir}/dist"/>\r
+\r
+               <!-- copy db scripts, etc. -->\r
+               <copy todir="${basedir}/${dist.server.cspace}/cspace/services">\r
+                       <fileset dir="${src}/main/resources/scripts"/>\r
+               </copy>\r
+\r
+               <!-- copy datasources -->\r
+               <copy todir="${basedir}/${dist.deploy.cspace}">\r
+                       <fileset dir="${src}/main/resources/config/${db}"/>\r
+               </copy>\r
+               <ant antfile="3rdparty/build.xml" target="dist" inheritAll="false"/>\r
+               <ant antfile="services/build.xml" target="dist" inheritAll="false"/>\r
+\r
+               <!-- bundle up everything -->\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
+                       </tarfileset>\r
+               </tar>\r
+       </target>\r
 \r
-    <target name="dist-jee-domains" depends="init"\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
+               <antcall target="dist-jee-cspace"/>\r
+               <antcall target="dist-jee-nuxeo"/>\r
+       </target>\r
 \r
-    <target name="dist-jee-cspace" depends="dist"\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="${jee.dir}" type="dir"/>\r
-                </not>\r
-            </condition>\r
-        </fail>\r
-\r
-        <fail message="CSpace is not deployed or ${jee.deploy.cspace.services} not found">\r
-            <condition>\r
-                <not>\r
-                    <available file="${jee.deploy.cspace.services}" type="file"/>\r
-                </not>\r
-            </condition>\r
-        </fail>\r
-\r
-        <tar destfile="${basedir}/dist/${jee.release}-${domain.cspace}-${release.version}.tar.gz" compression="gzip">\r
-            <tarfileset dir="${jee.dir}"\r
+               <fail message="JEE container is not installed or ${jee.dir} not found">\r
+                       <condition>\r
+                               <not>\r
+                                       <available file="${jee.dir}" type="dir"/>\r
+                               </not>\r
+                       </condition>\r
+               </fail>\r
+\r
+               <fail message="CSpace is not deployed or ${jee.deploy.cspace.services} not found">\r
+                       <condition>\r
+                               <not>\r
+                                       <available file="${jee.deploy.cspace.services}" type="file"/>\r
+                               </not>\r
+                       </condition>\r
+               </fail>\r
+\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/${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-jee-nuxeo" depends="dist"\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-jee-nuxeo" depends="dist"\r
             description="generate nuxeo domain distribution" >\r
-        <fail message="JEE server is not installed or ${jee.dir} not found">\r
-            <condition>\r
-                <not>\r
-                    <available file="${jee.dir}" type="dir"/>\r
-                </not>\r
-            </condition>\r
-        </fail>\r
-\r
-        <fail message="Nuxeo is not deployed or ${jee.deploy.nuxeo.plugins} not found">\r
-            <condition>\r
-                <not>\r
-                    <available file="${jee.deploy.nuxeo.plugins}" type="dir"/>\r
-                </not>\r
-            </condition>\r
-        </fail>\r
-\r
-        <tar destfile="${basedir}/dist/${jee.release}-${domain.nuxeo}-${release.version}.tar.gz" compression="gzip">\r
-            <tarfileset dir="${jee.dir}"\r
+               <fail message="JEE server is not installed or ${jee.dir} not found">\r
+                       <condition>\r
+                               <not>\r
+                                       <available file="${jee.dir}" type="dir"/>\r
+                               </not>\r
+                       </condition>\r
+               </fail>\r
+\r
+               <fail message="Nuxeo is not deployed or ${jee.deploy.nuxeo.plugins} not found">\r
+                       <condition>\r
+                               <not>\r
+                                       <available file="${jee.deploy.nuxeo.plugins}" type="dir"/>\r
+                               </not>\r
+                       </condition>\r
+               </fail>\r
+\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/${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
-\r
-    <target name="package" depends="package-unix,package-windows"\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
+\r
+       <target name="package" depends="package-unix,package-windows"\r
             description="mvn package" />\r
-    <target name="package-unix" if="osfamily-unix">\r
-        <exec executable="mvn" failonerror="true">\r
-            <arg value="package" />\r
-            <arg value="-Dmaven.test.skip=true" />\r
-            <arg value="-f" />\r
-            <arg value="${basedir}/pom.xml" />\r
-            <arg value="-N" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-    <target name="package-windows" if="osfamily-windows">\r
-        <exec executable="cmd" failonerror="true">\r
-            <arg value="/c" />\r
-            <arg value="mvn.bat" />\r
-            <arg value="package" />\r
-            <arg value="-Dmaven.test.skip=true" />\r
-            <arg value="-f" />\r
-            <arg value="${basedir}/pom.xml" />\r
-            <arg value="-N" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-\r
-    <target name="install" depends="install-unix,install-windows"\r
+       <target name="package-unix" if="osfamily-unix">\r
+               <exec executable="mvn" failonerror="true">\r
+                       <arg value="package" />\r
+                       <arg value="-Dmaven.test.skip=true" />\r
+                       <arg value="-f" />\r
+                       <arg value="${basedir}/pom.xml" />\r
+                       <arg value="-N" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+       <target name="package-windows" if="osfamily-windows">\r
+               <exec executable="cmd" failonerror="true">\r
+                       <arg value="/c" />\r
+                       <arg value="mvn.bat" />\r
+                       <arg value="package" />\r
+                       <arg value="-Dmaven.test.skip=true" />\r
+                       <arg value="-f" />\r
+                       <arg value="${basedir}/pom.xml" />\r
+                       <arg value="-N" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+\r
+       <target name="install" depends="install-unix,install-windows"\r
             description="mvn install" />\r
-    <target name="install-unix" if="osfamily-unix">\r
-        <exec executable="mvn" failonerror="true">\r
-            <arg value="install" />\r
-            <arg value="-Dmaven.test.skip=true" />\r
-            <arg value="-f" />\r
-            <arg value="${basedir}/pom.xml" />\r
-            <arg value="-N" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-    <target name="install-windows" if="osfamily-windows">\r
-        <exec executable="cmd" failonerror="true">\r
-            <arg value="/c" />\r
-            <arg value="mvn.bat" />\r
-            <arg value="install" />\r
-            <arg value="-Dmaven.test.skip=true" />\r
-            <arg value="-f" />\r
-            <arg value="${basedir}/pom.xml" />\r
-            <arg value="-N" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-\r
-\r
-    <target name="clean" depends="clean-unix,clean-windows"\r
+       <target name="install-unix" if="osfamily-unix">\r
+               <exec executable="mvn" failonerror="true">\r
+                       <arg value="install" />\r
+                       <arg value="-Dmaven.test.skip=true" />\r
+                       <arg value="-f" />\r
+                       <arg value="${basedir}/pom.xml" />\r
+                       <arg value="-N" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+       <target name="install-windows" if="osfamily-windows">\r
+               <exec executable="cmd" failonerror="true">\r
+                       <arg value="/c" />\r
+                       <arg value="mvn.bat" />\r
+                       <arg value="install" />\r
+                       <arg value="-Dmaven.test.skip=true" />\r
+                       <arg value="-f" />\r
+                       <arg value="${basedir}/pom.xml" />\r
+                       <arg value="-N" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+\r
+       <target name="clean" depends="clean-unix,clean-windows"\r
             description="Delete target directories" >\r
-        <delete dir="${basedir}/build"/>\r
-        <delete dir="${basedir}/dist"/>\r
-    </target>\r
-    <target name="clean-unix" if="osfamily-unix">\r
-        <exec executable="mvn" failonerror="true">\r
-            <arg value="clean" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-    <target name="clean-windows" if="osfamily-windows">\r
-        <exec executable="cmd" failonerror="true">\r
-            <arg value="/c" />\r
-            <arg value="mvn.bat" />\r
-            <arg value="clean" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-\r
-    <target name="test" depends="test-unix,test-windows" description="Run tests" />\r
-    <target name="test-unix" if="osfamily-unix">\r
-        <exec executable="mvn" failonerror="true">\r
-            <arg value="test" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-    <target name="test-windows" if="osfamily-windows">\r
-        <exec executable="cmd" failonerror="true">\r
-            <arg value="/c" />\r
-            <arg value="mvn.bat" />\r
-            <arg value="test" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-\r
-    <target name="doc" description="Build Java API docs">\r
-        <ant antfile="services/build.xml" target="doc" inheritAll="false"/>\r
-    </target>\r
-\r
-    <target name="gen_ddl"\r
+               <delete dir="${basedir}/build"/>\r
+               <delete dir="${basedir}/dist"/>\r
+       </target>\r
+       <target name="clean-unix" if="osfamily-unix">\r
+               <exec executable="mvn" failonerror="true">\r
+                       <arg value="clean" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+       <target name="clean-windows" if="osfamily-windows">\r
+               <exec executable="cmd" failonerror="true">\r
+                       <arg value="/c" />\r
+                       <arg value="mvn.bat" />\r
+                       <arg value="clean" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+\r
+       <target name="test" depends="test-unix,test-windows" description="Run tests" />\r
+       <target name="test-unix" if="osfamily-unix">\r
+               <exec executable="mvn" failonerror="true">\r
+                       <arg value="test" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+       <target name="test-windows" if="osfamily-windows">\r
+               <exec executable="cmd" failonerror="true">\r
+                       <arg value="/c" />\r
+                       <arg value="mvn.bat" />\r
+                       <arg value="test" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+\r
+       <target name="doc" description="Build Java API docs">\r
+               <ant antfile="services/build.xml" target="doc" inheritAll="false"/>\r
+       </target>\r
+\r
+       <target name="gen_ddl"\r
             description="generate service-specific tables(s), indices, etc.">\r
-        <ant antfile="services/build.xml" target="gen_ddl" inheritAll="false"/>\r
-    </target>\r
+               <ant antfile="services/build.xml" target="gen_ddl" inheritAll="false"/>\r
+       </target>\r
 \r
-    <target name="create_db" depends="create_base_db"\r
+       <target name="create_db" depends="create_base_db"\r
             description="create database(s), invoke subtasks for indexes, etc.">\r
-        <ant antfile="services/build.xml" target="create_db" inheritAll="false"/>\r
-    </target>\r
+               <ant antfile="services/build.xml" target="create_db" inheritAll="false"/>\r
+       </target>\r
 \r
-    <target name="create_base_db" \r
+       <target name="create_base_db" \r
             description="create database(s), grant privileges to test users">\r
-                       <sql driver="${db.jdbc.driver.class}"\r
+               <sql driver="${db.jdbc.driver.class}"\r
              url="${db.jdbc.baseurl}"\r
              userid="${db.user}"\r
              password="${db.user.password}"\r
                                                 autocommit="true"\r
              src="${db.script.dir}/init_db.sql"\r
              >\r
-            <classpath>\r
-                <pathelement path="${db.driver.jar}"/>\r
-            </classpath>\r
-        </sql>\r
-    </target>\r
+                       <classpath>\r
+                               <pathelement path="${db.driver.jar}"/>\r
+                       </classpath>\r
+               </sql>\r
+       </target>\r
 \r
-    <target name="import"\r
+       <target name="import"\r
             description="import default configuration">\r
-        <ant antfile="services/build.xml" target="import" inheritAll="false"/>\r
-    </target>\r
+               <ant antfile="services/build.xml" target="import" inheritAll="false"/>\r
+       </target>\r
 \r
-    <target name="deploy" depends="checkvars,install,setup_cspaceds.cfg,setup_initdb.sql"\r
+       <target name="deploy" depends="checkvars,install,setup_initdb.sql"\r
             description="deploy services in ${jee.server.cspace}">\r
-        <!-- copy db scripts, etc. -->\r
+               <!-- copy db scripts, etc. -->\r
                <copy todir="${jee.server.cspace}/cspace/services/scripts">\r
                        <fileset dir="${src}/main/resources/scripts/"/>\r
-        </copy>\r
-        <!-- copy datasources, including default JEE datasource -->\r
-                               <!--\r
-                               Now handled in dependent targets\r
-        <copy todir="${jee.deploy.cspace}">\r
-                                       <fileset dir="${src}/main/resources/config/${db}"/>\r
-                               </copy>\r
-                               -->\r
-        <ant antfile="3rdparty/build.xml" target="deploy" inheritAll="false"/>\r
-        <ant antfile="services/build.xml" target="deploy" inheritAll="false"/>\r
-\r
-                       </target>\r
+               </copy>\r
+               <ant antfile="3rdparty/build.xml" target="deploy" inheritAll="false"/>\r
+               <ant antfile="services/build.xml" target="deploy" inheritAll="false"/>\r
+       </target>\r
 \r
-               <target name="checkvars">               \r
-                               <fail unless="env.CSPACE_JEESERVER_HOME" \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
+               <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
+               <fail unless="env.DB_PASSWORD_NUXEO" \r
                                                        message="Required environment variable DB_PASSWORD_NUXEO has not been set."/>\r
-                               <fail unless="env.DB_PASSWORD" \r
+               <fail unless="env.DB_PASSWORD" \r
                                                        message="Required environment variable DB_PASSWORD has not been set."/>\r
-               </target>\r
-\r
-\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="${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
-                                       <filter token="DB_DRIVER_CLASS" value="${db.jdbc.driver.class}" />\r
-                                       <filter token="DB_CSPACE_USER" value="${db.cspace.user}" />\r
-                                       <filter token="DB_NUXEO_USER" value="${db.nuxeo.user}" />\r
-                                       <filter token="DB_CSPACE_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" /> <!-- double-sub from ${db.user.password} fails -->\r
-                                       <filter token="DB_NUXEO_PASSWORD" value="${env.DB_PASSWORD_NUXEO}" /> <!-- double-sub from ${db.user.password} fails -->\r
-                                       <filter token="DB_DIALECT" value="${db.dialect}" />\r
-                                       <filter token="DB_TYPE_MAPPING" value="${db.typemapping}" />\r
-                                       <filter token="DB_EXCEPTION_SORTER" value="${db.exceptionsorter}" />\r
-                               </filterset>\r
-                       </copy>\r
-    </target>\r
-\r
-               <target name="setup_initdb.sql" description="copy init_db scripts, replacing keywords">\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_CSPACE_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" />\r
-                                       <filter token="DB_NUXEO_PASSWORD" value="${env.DB_PASSWORD_NUXEO}" />\r
-                               </filterset>\r
-                       </copy>\r
-    </target>\r
-               \r
\r
-\r
-    <target name="undeploy"\r
+       </target>\r
+\r
+       <target name="setup_initdb.sql" description="copy init_db scripts, replacing keywords">\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_CSPACE_PASSWORD" value="${env.DB_PASSWORD_CSPACE}" />\r
+                               <filter token="DB_NUXEO_PASSWORD" value="${env.DB_PASSWORD_NUXEO}" />\r
+                       </filterset>\r
+               </copy>\r
+       </target>\r
+\r
+       <target name="undeploy"\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="${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
+               <ant antfile="services/build.xml" target="undeploy" inheritAll="false"/>\r
+               <ant antfile="3rdparty/build.xml" target="undeploy" inheritAll="false"/>\r
+               <delete failonerror="false" dir="${jee.server.cspace}/cspace/services"/>\r
+               <delete failonerror="false" dir="${jee.server.cspace}/cspace/config/services"/>\r
+               <!-- Delete mysql-ds.xml to clean up pre-1.8 bundles -->\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
+       </target>\r
+\r
+       <target name="hotdeploy" depends="install"\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="eclipse" depends="eclipse-unix,eclipse-windows" description="Generate Eclipse files" />\r
-    <target name="eclipse-unix" if="osfamily-unix">\r
-        <exec executable="mvn" failonerror="true">\r
-            <arg value="eclipse:clean" />\r
-            <arg value="eclipse:eclipse" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-        <exec executable="fixeclipse" failonerror="true" />\r
-    </target>\r
-    <target name="eclipse-windows" if="osfamily-windows">\r
-        <exec executable="cmd" failonerror="true">\r
-            <arg value="/c" />\r
-            <arg value="mvn.bat" />\r
-            <arg value="eclipse:clean" />\r
-            <arg value="eclipse:eclipse" />\r
-            <arg value="${mvn.opts}" />\r
-        </exec>\r
-    </target>\r
-\r
-    <target name="dist_installer" depends="package"\r
+               <ant antfile="services/build.xml" target="hotdeploy" inheritAll="false"/>\r
+       </target>\r
+\r
+       <target name="eclipse" depends="eclipse-unix,eclipse-windows" description="Generate Eclipse files" />\r
+       <target name="eclipse-unix" if="osfamily-unix">\r
+               <exec executable="mvn" failonerror="true">\r
+                       <arg value="eclipse:clean" />\r
+                       <arg value="eclipse:eclipse" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+               <exec executable="fixeclipse" failonerror="true" />\r
+       </target>\r
+       <target name="eclipse-windows" if="osfamily-windows">\r
+               <exec executable="cmd" failonerror="true">\r
+                       <arg value="/c" />\r
+                       <arg value="mvn.bat" />\r
+                       <arg value="eclipse:clean" />\r
+                       <arg value="eclipse:eclipse" />\r
+                       <arg value="${mvn.opts}" />\r
+               </exec>\r
+       </target>\r
+\r
+       <target name="dist_installer" depends="package"\r
             description="Installer: Creates an installer distribution for the CollectionSpace services.">\r
-        <!-- copy install scripts, etc. -->\r
-        <copy todir="${basedir}/${dist.installer}">\r
-            <fileset file="${basedir}/build.properties"/>\r
-            <fileset dir="installer"/>\r
-            <fileset dir="${src}/main/resources/scripts"/>\r
-        </copy>\r
-        <ant antfile="services/build.xml" target="dist_installer" inheritAll="false"/>\r
-    </target>\r
+               <!-- copy install scripts, etc. -->\r
+               <copy todir="${basedir}/${dist.installer}">\r
+                       <fileset file="${basedir}/build.properties"/>\r
+                       <fileset dir="installer"/>\r
+                       <fileset dir="${src}/main/resources/scripts"/>\r
+               </copy>\r
+               <ant antfile="services/build.xml" target="dist_installer" inheritAll="false"/>\r
+       </target>\r
 \r
 </project>\r
diff --git a/pom.xml b/pom.xml
index f725e8b96e5d5edfca9c4ba8212ddb46819df17e..2ff980a004977ab6457e1ce1bb156872606982cf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
                                                </execution>\r
                                        </executions>\r
                                </plugin>\r
+                               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->\r
+                               <plugin>\r
+                                       <groupId>org.eclipse.m2e</groupId>\r
+                                       <artifactId>lifecycle-mapping</artifactId>\r
+                                       <version>1.0.0</version>\r
+                                       <configuration>\r
+                                               <lifecycleMappingMetadata>\r
+                                                       <pluginExecutions>\r
+                                                               <pluginExecution>\r
+                                                                       <pluginExecutionFilter>\r
+                                                                               <groupId>\r
+                                                                                       org.jvnet.hyperjaxb3\r
+                                                                               </groupId>\r
+                                                                               <artifactId>\r
+                                                                                       maven-hyperjaxb3-plugin\r
+                                                                               </artifactId>\r
+                                                                               <versionRange>\r
+                                                                                       [0.5.6,)\r
+                                                                               </versionRange>\r
+                                                                               <goals>\r
+                                                                                       <goal>generate</goal>\r
+                                                                               </goals>\r
+                                                                       </pluginExecutionFilter>\r
+                                                                       <action>\r
+                                                                               <ignore></ignore>\r
+                                                                       </action>\r
+                                                               </pluginExecution>\r
+                                                               <pluginExecution>\r
+                                                                       <pluginExecutionFilter>\r
+                                                                               <groupId>\r
+                                                                                       org.apache.maven.plugins\r
+                                                                               </groupId>\r
+                                                                               <artifactId>\r
+                                                                                       maven-antrun-plugin\r
+                                                                               </artifactId>\r
+                                                                               <versionRange>\r
+                                                                                       [1.3,)\r
+                                                                               </versionRange>\r
+                                                                               <goals>\r
+                                                                                       <goal>run</goal>\r
+                                                                               </goals>\r
+                                                                       </pluginExecutionFilter>\r
+                                                                       <action>\r
+                                                                               <ignore></ignore>\r
+                                                                       </action>\r
+                                                               </pluginExecution>\r
+                                                       </pluginExecutions>\r
+                                               </lifecycleMappingMetadata>\r
+                                       </configuration>\r
+                               </plugin>\r
                        </plugins>\r
                </pluginManagement>\r
                <plugins>\r
index 574af7305232bf6a59e4a6f3d3cc7d6b5591d73c..d1f11dbefe3b7aea2377bea7ea0fcd1f220d5dec 100644 (file)
             </plugin>\r
 \r
         </plugins>\r
+        <pluginManagement>\r
+               <plugins>\r
+                       <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->\r
+                       <plugin>\r
+                               <groupId>org.eclipse.m2e</groupId>\r
+                               <artifactId>lifecycle-mapping</artifactId>\r
+                               <version>1.0.0</version>\r
+                               <configuration>\r
+                                       <lifecycleMappingMetadata>\r
+                                               <pluginExecutions>\r
+                                                       <pluginExecution>\r
+                                                               <pluginExecutionFilter>\r
+                                                                       <groupId>\r
+                                                                               org.codehaus.mojo\r
+                                                                       </groupId>\r
+                                                                       <artifactId>\r
+                                                                               properties-maven-plugin\r
+                                                                       </artifactId>\r
+                                                                       <versionRange>\r
+                                                                               [1.0-alpha-2,)\r
+                                                                       </versionRange>\r
+                                                                       <goals>\r
+                                                                               <goal>\r
+                                                                                       read-project-properties\r
+                                                                               </goal>\r
+                                                                       </goals>\r
+                                                               </pluginExecutionFilter>\r
+                                                               <action>\r
+                                                                       <ignore></ignore>\r
+                                                               </action>\r
+                                                       </pluginExecution>\r
+                                               </pluginExecutions>\r
+                                       </lifecycleMappingMetadata>\r
+                               </configuration>\r
+                       </plugin>\r
+               </plugins>\r
+        </pluginManagement>\r
     </build>\r
 </project>\r
 \r
index 71f391bb5584fdc1da90ceedd34fd7fcf3e0ca4e..d2faa9b659c29190dba36310c74c841d895f88db 100644 (file)
             </classpath>\r
                                        </sql> -->\r
     </target>\r
+       \r
+       <!-- We are copying only the scripts that are committed to the source tree.  We're *not* copying the ones that\r
+       get generated in the target folder -->\r
     <target name="deploy" depends="install"\r
             description="deploy account service in ${jee.server.cspace}">\r
         <copy todir="${jee.server.cspace}/cspace/services">\r
index 34bf953af84d44ff7961d5dfa23cffa2dfa19be1..b3a77ee738d8d82e450ca2e9433afebdc12d5ff9 100644 (file)
     <target name="import-windows" if="osfamily-windows" depends="setup_hibernate.cfg">\r
         <exec executable="cmd" failonerror="true">\r
             <arg value="/c" />\r
-            <arg value="mvn.bat" />\r
+            <arg value="mvn.bat" /> <!-- To debug, change command here to be 'mvnDebug.bat' -->\r
             <arg value="exec:java" />\r
             <arg value="-f" />\r
             <arg value="${basedir}/pom.xml" />\r
diff --git a/services/collectionobject/sample/sample/.classpath b/services/collectionobject/sample/sample/.classpath
deleted file mode 100644 (file)
index 5a7ff6e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
diff --git a/services/common/src/main/cspace/config/log/jboss-log4j-release.xml b/services/common/src/main/cspace/config/log/jboss-log4j-release.xml
deleted file mode 100644 (file)
index ee2fea6..0000000
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- ===================================================================== --><!--                                                                       --><!--  Log4j Configuration                                                  --><!--                                                                       --><!-- ===================================================================== --><!-- $Id: jboss-log4j.xml 75507 2008-07-08 20:15:07Z stan.silvert@jboss.com $ --><!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
---><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false" threshold="null">
-
-    <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A time/date based rolling appender -->
-    <appender name="FILE"
-              class="org.jboss.logging.appender.DailyRollingFileAppender">
-        <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-        <param name="File" value="${jboss.server.log.dir}/server.log"/>
-        <param name="Append" value="false"/>
-        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-        <param name="Threshold" value="INFO"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-        </layout>
-    </appender>
-
-
-    <!-- A size based file rolling appender
-   <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/server.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-    <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-        <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-        <param name="Target" value="System.out"/>
-        <param name="Threshold" value="INFO"/>
-
-        <layout class="org.apache.log4j.PatternLayout">
-            <!-- The default pattern: Date Priority [Category] Message\n -->
-            <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-        </layout>
-    </appender>
-
-    <!-- ====================== -->
-   <!-- More Appender examples -->
-   <!-- ====================== -->
-
-   <!-- Buffer events and log them asynchronously
-   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <appender-ref ref="FILE"/>
-     <appender-ref ref="CONSOLE"/>
-     <appender-ref ref="SMTP"/>
-   </appender>
-   -->
-
-   <!-- EMail events to an administrator
-   <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Threshold" value="ERROR"/>
-     <param name="To" value="admin@myhost.domain.com"/>
-     <param name="From" value="nobody@myhost.domain.com"/>
-     <param name="Subject" value="JBoss Sever Errors"/>
-     <param name="SMTPHost" value="localhost"/>
-     <param name="BufferSize" value="10"/>
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!-- Syslog events
-   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Facility" value="LOCAL7"/>
-     <param name="FacilityPrinting" value="true"/>
-     <param name="SyslogHost" value="localhost"/>
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!-- Log events to JMS (requires a topic to be created)
-   <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Threshold" value="ERROR"/>
-     <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
-     <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
-   </appender>
-   -->
-
-   <!-- Log events through SNMP
-   <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
-     <param name="ManagementHost" value="127.0.0.1"/>
-     <param name="ManagementHostTrapListenPort" value="162"/>
-     <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
-     <param name="LocalIPAddress" value="127.0.0.1"/>
-     <param name="LocalTrapSendPort" value="161"/>
-     <param name="GenericTrapType" value="6"/>
-     <param name="SpecificTrapType" value="12345678"/>
-     <param name="CommunityString" value="public"/>
-     <param name="ForwardStackTraceWithTrap" value="true"/>
-     <param name="Threshold" value="DEBUG"/>
-     <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
-     <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!--  Emit events as JMX notifications
-   <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-
-      <param name="Threshold" value="WARN"/>
-      <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
-      </layout>
-   </appender>
-   -->
-
-   <!-- collectionspace appender -->
-    <appender name="CSLOG" class="org.jboss.logging.appender.DailyRollingFileAppender">
-        <errorHandler  class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-        <param name="Append" value="false"/>
-        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-        <param name="File" value="${jboss.server.log.dir}/collectionspace.log"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d %-5p [%t] [%c:%L] %m%n"/>
-        </layout>
-        <!--filter class="org.jboss.logging.filter.TCLFilter">
-         <param name="AcceptOnMatch" value="true"/>
-         <param name="DeployURL" value="cspace-services.war"/>
-      </filter>
-      <filter class="org.apache.log4j.varia.DenyAllFilter"></filter-->
-
-    </appender>
-
-
-
-    <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-
-   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
-    <category name="org.apache" additivity="true">
-        <priority value="INFO"/>
-    </category>
-
-    <!-- enable catalina.core to debug spring bean configuration -->
-    <category name="org.apache.catalina.core" additivity="true">
-        <priority value="INFO"/>
-    </category>
-    
-    <!-- Limit JBoss categories
-   <category name="org.jboss">
-      <priority value="INFO"/>
-   </category>
-   -->
-    <category name="org.jboss.security.auth">
-        <priority value="INFO"/>
-    </category>
-    <category name="com.arjuna"><priority value="INFO"/></category>
-    <category name="org.jboss.ejb3"><priority value="INFO"/></category>
-    <category name="org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager"><priority value="INFO"/></category>
-    <category name="org.jboss.seam">
-        <priority value="INFO"/>
-    </category>
-    <category name="org.jboss.seam.contexts.Contexts"><priority value="WARN"/></category>
-    <category name="org.jboss.seam.contexts.Lifecycle"><priority value="WARN"/></category>
-    <category name="org.jboss.mx.loading"><priority value="INFO"/></category>
-    <category name="org.jboss.remoting"><priority value="INFO"/></category>
-    <category name="org.jboss.resteasy"><priority value="INFO"/></category>
-    <category name="org.ajax4jsf"><priority value="INFO"/></category>
-    <category name="org.hibernate"><priority value="WARN"/></category>
-    <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog"><priority value="ERROR"/></category>
-    <category name="org.hibernate.impl.SessionFactoryObjectFactory"><priority value="ERROR"/></category>
-    <category name="org.hibernate.cache.EhCacheProvider"><priority value="ERROR"/></category>
-    <category name="org.hibernate.hql.ast.tree.FromElementType"><priority value="ERROR"/></category>
-    <category name="org.jbpm"><priority value="INFO"/></category>
-    <category name="org.jbpm.jpdl.xml.JpdlXmlReader"><priority value="ERROR"/></category>
-    <category name="org.compass.core.transaction"><priority value="INFO"/></category>
-    <category name="org.compass.core.lucene.engine.optimizer.ScheduledLuceneSearchEngineOptimizer"><priority value="INFO"/></category>
-    <category name="org.apache.jackrabbit.core.query.lucene.IndexMerger"><priority value="WARN"/></category>
-
-    <category name="org.nuxeo.ecm.platform.ui.web.auth"><priority value="INFO"/></category>
-    <category name="org.nuxeo.runtime.osgi.OSGiRuntimeService"><priority value="INFO"/></category>
-
-    <category name="org.apache.myfaces.renderkit.html.util.DefaultAddResource"><priority value="ERROR"/></category>
-    <category name="javax.enterprise.resource.webcontainer.jsf.renderkit"><priority value="INFO"/></category>
-    <category name="javax.enterprise.resource.webcontainer.jsf.application"><priority value="INFO"/></category>
-    <category name="javax.enterprise.resource.webcontainer.jsf.lifecycle"><priority value="INFO"/></category>
-
-    <!-- Limit the jacorb category to WARN as its INFO is verbose -->
-    <category name="jacorb" additivity="true">
-        <priority value="WARN"/>
-    </category>
-
-    <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
-    <category name="org.jgroups" additivity="true">
-        <priority value="WARN"/>
-    </category>
-
-    <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
-    <category name="org.quartz" additivity="true">
-        <priority value="INFO"/>
-    </category>
-
-    <!-- Limit JSF logging to DEBUG.  FINER and FINEST will not be logged -->
-    <category name="javax.enterprise.resource.webcontainer.jsf" additivity="true">
-        <priority value="INFO"/>
-    </category>
-
-
-
-    <!-- Limit the JSR77 categories -->
-    <category name="org.jboss.management" additivity="true">
-        <priority value="INFO"/>
-    </category>
-
-    <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
-   <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
-     <priority value="TRACE"/>
-   </category>
-   -->
-
-   <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
-    <category name="org.jboss.serial" additivity="true">
-        <priority value="INFO"/>
-    </category>
-
-    <!-- Decrease the priority threshold for the org.jboss.varia category
-   <category name="org.jboss.varia">
-     <priority value="DEBUG"/>
-   </category>
-   -->
-
-   <!-- Enable JBossWS message tracing
-   <category name="org.jboss.ws.core.MessageTrace">
-    <priority value="TRACE"/>
-   </category>
-   -->
-
-   <!--
-      | An example of enabling the custom TRACE level priority that is used
-      | by the JBoss internals to diagnose low level details. This example
-      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
-      | subpackages. This will produce A LOT of logging output.
-      |
-      | Note: since jboss AS 4.2.x, the trace level is supported natively by
-      | log4j, so although the custom org.jboss.logging.XLevel priority will
-      | still work, there is no need to use it. The two examples that follow
-      | will both enable trace logging.
-   <category name="org.jboss.system">
-     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
-   </category>
-   <category name="org.jboss.ejb.plugins">
-     <priority value="TRACE"/>
-   </category>
-   -->
-
-   <!--
-       | Logs these events to SNMP:
-           - server starts/stops
-           - cluster evolution (node death/startup)
-           - When an EJB archive is deployed (and associated verified messages)
-           - When an EAR archive is deployed
-
-   <category name="org.jboss.system.server.Server">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-
-   <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-
-   <category name="org.jboss.deployment.MainDeployer">
-     <priority value="ERROR" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-
-   <category name="org.jboss.ejb.EJBDeployer">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-
-   <category name="org.jboss.deployment.EARDeployer">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-   -->
-
-   <!-- Clustering logging -->
-   <!-- Uncomment the following to redirect the org.jgroups and
-      org.jboss.ha categories to a cluster.log file.
-
-   <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>
-   </appender>
-   <category name="org.jgroups">
-     <priority value="DEBUG" />
-     <appender-ref ref="CLUSTER"/>
-   </category>
-   <category name="org.jboss.ha">
-     <priority value="DEBUG" />
-     <appender-ref ref="CLUSTER"/>
-   </category>
-   -->
-
-
-
-    <category name="org.springframework">
-        <priority value="INFO" />
-        <appender-ref ref="CSLOG"/>
-    </category>
-
-    <category name="org.springframework.security">
-        <priority value="INFO" />
-        <appender-ref ref="CSLOG"/>
-    </category>
-
-    <category name="org.nuxeo">
-        <priority value="INFO" />
-        <appender-ref ref="CSLOG"/>
-    </category>
-
-    <category name="nuxeo">
-        <priority value="INFO" />
-        <appender-ref ref="CSLOG"/>
-    </category>
-
-    <category name="org.collectionspace">
-        <priority value="INFO" />
-        <appender-ref ref="CSLOG"/>
-    </category>
-
-
-    <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-    <root>
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE"/>
-        <appender-ref ref="CSLOG"/>
-    </root>
-
-</log4j:configuration>
diff --git a/services/common/src/main/cspace/config/log/jboss-log4j.xml b/services/common/src/main/cspace/config/log/jboss-log4j.xml
deleted file mode 100644 (file)
index da5903b..0000000
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
-<!--                                                                       -->
-<!--  Log4j Configuration                                                  -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-<!-- $Id: jboss-log4j.xml 75507 2008-07-08 20:15:07Z stan.silvert@jboss.com $ -->
-<!--
-   | For more configuration infromation and examples see the Jakarta Log4j
-   | owebsite: http://jakarta.apache.org/log4j
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false" threshold="null">
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A time/date based rolling appender
-   <appender name="FILE"
-   class="org.jboss.logging.appender.DailyRollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/server.log"/>
-     <param name="Append" value="false"/>
-     <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-     <param name="Threshold" value="INFO"/>
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!-- A size based file rolling appender -->
-   <!-- Set max-size and number of saved server.log files -->
-   <appender name="FILE"
-             class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/server.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="5"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>     
-   </appender>
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Target" value="System.out"/>
-      <param name="Threshold" value="INFO"/>
-
-      <layout class="org.apache.log4j.PatternLayout">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-      </layout>
-   </appender>
-  
-   <!-- ====================== -->
-   <!-- More Appender examples -->
-   <!-- ====================== -->
-
-   <!-- Buffer events and log them asynchronously
-   <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <appender-ref ref="FILE"/>
-     <appender-ref ref="CONSOLE"/>
-     <appender-ref ref="SMTP"/>
-   </appender>
-   -->
-
-   <!-- EMail events to an administrator
-   <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Threshold" value="ERROR"/>
-     <param name="To" value="admin@myhost.domain.com"/>
-     <param name="From" value="nobody@myhost.domain.com"/>
-     <param name="Subject" value="JBoss Sever Errors"/>
-     <param name="SMTPHost" value="localhost"/>
-     <param name="BufferSize" value="10"/>
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!-- Syslog events
-   <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Facility" value="LOCAL7"/>
-     <param name="FacilityPrinting" value="true"/>
-     <param name="SyslogHost" value="localhost"/>
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!-- Log events to JMS (requires a topic to be created)
-   <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Threshold" value="ERROR"/>
-     <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
-     <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
-   </appender>
-   -->
-
-   <!-- Log events through SNMP
-   <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
-     <param name="ManagementHost" value="127.0.0.1"/>
-     <param name="ManagementHostTrapListenPort" value="162"/>
-     <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
-     <param name="LocalIPAddress" value="127.0.0.1"/>
-     <param name="LocalTrapSendPort" value="161"/>
-     <param name="GenericTrapType" value="6"/>
-     <param name="SpecificTrapType" value="12345678"/>
-     <param name="CommunityString" value="public"/>
-     <param name="ForwardStackTraceWithTrap" value="true"/>
-     <param name="Threshold" value="DEBUG"/>
-     <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
-     <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
-     </layout>
-   </appender>
-   -->
-
-   <!--  Emit events as JMX notifications
-   <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      
-      <param name="Threshold" value="WARN"/>
-      <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
-      
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
-      </layout>
-   </appender>
-   -->
-
-   <!-- collectionspace appender
-   <appender name="CSLOG" class="org.jboss.logging.appender.DailyRollingFileAppender">
-      <errorHandler  class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="Append" value="false"/>
-     <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-      <param name="File" value="${jboss.server.log.dir}/collectionspace.log"/>
-     <param name="encoding" value="UTF-8"/>
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="%d %-5p [%t] [%c:%L] %m%n"/>
-      </layout>
-   </appender>
-   -->
-
-   <!-- A size based file rolling appender -->
-   <!-- Set max-size and number of saved server.log files -->
-   <appender name="CSLOG"
-             class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/collectionspace.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="5"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>
-   </appender>
-
-   <!-- collectionspace performance appender
-   <appender name="CSLOG_PERF" class="org.jboss.logging.appender.DailyRollingFileAppender">
-      <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-      <param name="Append" value="false"/>
-      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-      <param name="File" value="${jboss.server.log.dir}/collectionspace-perf.log"/>
-      <layout class="org.apache.log4j.PatternLayout">
-         <param name="ConversionPattern" value="&quot;%d&quot;,%m%n"/>
-      </layout>
-   </appender>
-   -->  
-
-   <!-- A size based file rolling appender -->
-   <appender name="CSLOG_PERF"
-             class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/collectionspace-perf.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="5"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>
-   </appender>
-
-   <!-- ================ -->
-   <!-- Limit categories -->
-   <!-- ================ -->
-   
-   <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
-    <category name="org.apache" additivity="true">
-      <priority value="INFO"/>
-   </category>
-
-   <!-- enable catalina.core to debug spring bean configuration -->
-   <category name="org.apache.catalina.core" additivity="true">
-      <priority value="INFO"/>
-   </category>
-
-      <!-- Limit JBoss categories
-   <category name="org.jboss">
-      <priority value="INFO"/>
-   </category>
-   -->
-    <category name="org.jboss.security.auth">
-    <priority value="INFO"/>
-    </category>
-    <category name="com.arjuna"><priority value="INFO"/></category>
-    <category name="org.jboss.ejb3"><priority value="INFO"/></category>
-    <category name="org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager"><priority value="INFO"/></category>
-    <category name="org.jboss.seam">
-    <priority value="INFO"/>
-    </category>
-    <category name="org.jboss.seam.contexts.Contexts"><priority value="WARN"/></category>
-    <category name="org.jboss.seam.contexts.Lifecycle"><priority value="WARN"/></category>
-    <category name="org.jboss.mx.loading"><priority value="INFO"/></category>
-    <category name="org.jboss.remoting"><priority value="INFO"/></category>
-    <category name="org.jboss.resteasy"><priority value="INFO"/></category>
-    <category name="org.ajax4jsf"><priority value="INFO"/></category>
-    <category name="org.hibernate"><priority value="WARN"/></category>
-    <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog"><priority value="ERROR"/></category>
-    <category name="org.hibernate.impl.SessionFactoryObjectFactory"><priority value="ERROR"/></category>
-    <category name="org.hibernate.cache.EhCacheProvider"><priority value="ERROR"/></category>
-    <category name="org.hibernate.hql.ast.tree.FromElementType"><priority value="ERROR"/></category>
-    <category name="org.jbpm"><priority value="INFO"/></category>
-    <category name="org.jbpm.jpdl.xml.JpdlXmlReader"><priority value="ERROR"/></category>
-    <category name="org.compass.core.transaction"><priority value="INFO"/></category>
-    <category name="org.compass.core.lucene.engine.optimizer.ScheduledLuceneSearchEngineOptimizer"><priority value="INFO"/></category>
-    <category name="org.apache.jackrabbit.core.query.lucene.IndexMerger"><priority value="WARN"/></category>
-
-    <category name="org.nuxeo.ecm.platform.ui.web.auth"><priority value="INFO"/></category>
-    <category name="org.nuxeo.runtime.osgi.OSGiRuntimeService"><priority value="INFO"/></category>
-
-    <category name="org.apache.myfaces.renderkit.html.util.DefaultAddResource"><priority value="ERROR"/></category>
-    <category name="javax.enterprise.resource.webcontainer.jsf.renderkit"><priority value="INFO"/></category>
-    <category name="javax.enterprise.resource.webcontainer.jsf.application"><priority value="INFO"/></category>
-    <category name="javax.enterprise.resource.webcontainer.jsf.lifecycle"><priority value="INFO"/></category>
-    
-   <!-- Limit the jacorb category to WARN as its INFO is verbose -->
-   <category name="jacorb" additivity="true">
-      <priority value="WARN"/>
-   </category>
-   
-   <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
-   <category name="org.jgroups" additivity="true">
-      <priority value="WARN"/>
-   </category>
-   
-   <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
-   <category name="org.quartz" additivity="true">
-      <priority value="INFO"/>
-   </category>
-
-   <!-- Limit JSF logging to DEBUG.  FINER and FINEST will not be logged -->
-   <category name="javax.enterprise.resource.webcontainer.jsf" additivity="true">
-      <priority value="INFO"/>
-   </category>
-                
-
-
-   <!-- Limit the JSR77 categories -->
-   <category name="org.jboss.management" additivity="true">
-      <priority value="INFO"/>
-   </category>
-
-   <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
-   <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
-     <priority value="TRACE"/>
-   </category>
-   -->
-   
-   <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
-   <category name="org.jboss.serial" additivity="true">
-      <priority value="INFO"/>
-   </category>
-   
-   <!-- Decrease the priority threshold for the org.jboss.varia category
-   <category name="org.jboss.varia">
-     <priority value="DEBUG"/>
-   </category>
-   -->
-
-   <!-- Enable JBossWS message tracing
-   <category name="org.jboss.ws.core.MessageTrace">
-    <priority value="TRACE"/>
-   </category>
-   -->
-
-   <!--
-      | An example of enabling the custom TRACE level priority that is used
-      | by the JBoss internals to diagnose low level details. This example
-      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
-      | subpackages. This will produce A LOT of logging output.
-      |
-      | Note: since jboss AS 4.2.x, the trace level is supported natively by
-      | log4j, so although the custom org.jboss.logging.XLevel priority will
-      | still work, there is no need to use it. The two examples that follow
-      | will both enable trace logging.
-   <category name="org.jboss.system">
-     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
-   </category>
-   <category name="org.jboss.ejb.plugins">
-     <priority value="TRACE"/>
-   </category>
-   -->
-  
-   <!--
-       | Logs these events to SNMP:
-           - server starts/stops
-           - cluster evolution (node death/startup)
-           - When an EJB archive is deployed (and associated verified messages)
-           - When an EAR archive is deployed
-        
-   <category name="org.jboss.system.server.Server">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-  
-   <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-
-   <category name="org.jboss.deployment.MainDeployer">
-     <priority value="ERROR" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-   
-   <category name="org.jboss.ejb.EJBDeployer">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-   
-   <category name="org.jboss.deployment.EARDeployer">
-     <priority value="INFO" />
-     <appender-ref ref="TRAP_LOG"/>
-   </category>
-   -->
-
-   <!-- Clustering logging -->
-   <!-- Uncomment the following to redirect the org.jgroups and
-      org.jboss.ha categories to a cluster.log file.
-
-   <appender name="CLUSTER"
-             class="org.jboss.logging.appender.RollingFileAppender">
-     <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
-     <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
-     <param name="Append" value="false"/>
-     <param name="MaxFileSize" value="500KB"/>
-     <param name="MaxBackupIndex" value="1"/>
-
-     <layout class="org.apache.log4j.PatternLayout">
-       <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-     </layout>
-   </appender>
-   <category name="org.jgroups">
-     <priority value="DEBUG" />
-     <appender-ref ref="CLUSTER"/>
-   </category>
-   <category name="org.jboss.ha">
-     <priority value="DEBUG" />
-     <appender-ref ref="CLUSTER"/>
-   </category>
-   -->
-
-
-
-   <category name="org.springframework">
-     <priority value="INFO" />
-     <appender-ref ref="CSLOG"/>
-   </category>
-
-   <category name="org.springframework.security">
-     <priority value="INFO" />
-     <appender-ref ref="CSLOG"/>
-   </category>
-
-   <category name="org.nuxeo">
-     <priority value="INFO" />
-     <appender-ref ref="CSLOG"/>
-   </category>
-
-   <category name="nuxeo">
-     <priority value="INFO" />
-     <appender-ref ref="CSLOG"/>
-   </category>
-
-   <category name="org.collectionspace">
-     <priority value="DEBUG" />
-     <appender-ref ref="CSLOG"/>
-   </category>
-
-   <category name="perf.collectionspace">
-     <priority value="DEBUG" />
-     <appender-ref ref="CSLOG_PERF"/>
-   </category>
-   
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</log4j:configuration>
diff --git a/services/common/src/main/java/org/collectionspace/services/svn-commit.tmp~ b/services/common/src/main/java/org/collectionspace/services/svn-commit.tmp~
deleted file mode 100644 (file)
index 58b9185..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-\r
---This line, and those below, will be ignored--\r
-\r
-M    common/repository/RepositoryClient.java\r
index 10da82ca1f673d03e8467dea80f9dab6929a1c0b..8e630f22339ab98fa89ab2bcdc9d02ee4a9b9fbe 100644 (file)
@@ -9,7 +9,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.contact.jaxb</artifactId>
     <name>services.contact.jaxb</name>
     
diff --git a/services/organization/sample/sample/.classpath b/services/organization/sample/sample/.classpath
deleted file mode 100644 (file)
index 5a7ff6e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
diff --git a/services/vocabulary/sample/sample/.classpath b/services/vocabulary/sample/sample/.classpath
deleted file mode 100644 (file)
index 5a7ff6e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
index ccd045fa25523373baa449616117ba87f4b8e636..f1a32ac739137f319ee5f0248523d29d0ce74e26 100644 (file)
@@ -8,7 +8,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.workflow.service</artifactId>
     <name>services.workflow.service</name>
     <packaging>jar</packaging>       
@@ -78,7 +77,6 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
-            <version>${nuxeo.core.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-remoting</artifactId>
diff --git a/src/main/resources/config/cspace-ds.xml b/src/main/resources/config/cspace-ds.xml
deleted file mode 100644 (file)
index c557073..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id: mysql-ds.xml 71535 2008-04-01 07:05:03Z adrian@jboss.org $ -->
-<!--  Datasource config for MySQL using 3.0.9 available from:
-http://www.mysql.com/downloads/api-jdbc-stable.html
--->
-
-<!-- REM: 11/22/2011 - After our move to Apache Tomcat, this file is obsolete?
-
-<datasources>
-  <local-tx-datasource>
-    <jndi-name>CspaceDS</jndi-name>
-    <use-java-context>false</use-java-context>
-    <connection-url>@DB_CSPACE_URL@</connection-url>
-    <driver-class>@DB_DRIVER_CLASS@</driver-class>
-    <user-name>@DB_CSPACE_USER@</user-name>
-    <password>@DB_CSPACE_PASSWORD@</password>
-    <exception-sorter-class-name>@DB_EXCEPTION_SORTER@</exception-sorter-class-name>
-    <!-- should only be used on drivers after 3.22.1 with "ping" support
-    <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLValidConnectionChecker</valid-connection-checker-class-name>
-    -->
-    <!-- sql to call when connection is created
-    <new-connection-sql>some arbitrary sql</new-connection-sql>
-      -->
-    <!-- sql to call on an existing pooled connection when it is obtained from pool - MySQLValidConnectionChecker is preferred for newer drivers
-    <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
-      -->
-
-    <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
-    <metadata>
-       <type-mapping>@DB_TYPE_MAPPING@</type-mapping>
-    </metadata>
-  </local-tx-datasource>
-  <local-tx-datasource>
-    <jndi-name>NuxeoDS</jndi-name>
-    <use-java-context>false</use-java-context>
-    <connection-url>@DB_NUXEO_URL@</connection-url>
-    <driver-class>@DB_DRIVER_CLASS@</driver-class>
-    <user-name>@DB_NUXEO_USER@</user-name>
-    <password>@DB_NUXEO_PASSWORD@</password>
-    <exception-sorter-class-name>@DB_EXCEPTION_SORTER@</exception-sorter-class-name>
-    <!-- should only be used on drivers after 3.22.1 with "ping" support
-    <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLValidConnectionChecker</valid-connection-checker-class-name>
-    -->
-    <!-- sql to call when connection is created
-    <new-connection-sql>some arbitrary sql</new-connection-sql>
-      -->
-    <!-- sql to call on an existing pooled connection when it is obtained from pool - MySQLValidConnectionChecker is preferred for newer drivers
-    <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
-      -->
-
-    <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
-    <metadata>
-       <type-mapping>@DB_TYPE_MAPPING@</type-mapping>
-    </metadata>
-  </local-tx-datasource>
-</datasources>
-
diff --git a/src/main/resources/config/jboss-ds.xml b/src/main/resources/config/jboss-ds.xml
deleted file mode 100644 (file)
index e315846..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-\r
-<!-- $Id: mysql-ds.xml 71535 2008-04-01 07:05:03Z adrian@jboss.org $ -->\r
-<!--  Datasource config for MySQL using 3.0.9 available from:\r
-http://www.mysql.com/downloads/api-jdbc-stable.html\r
--->\r
-\r
-<datasources>\r
-  <local-tx-datasource>\r
-    <jndi-name>DefaultDS</jndi-name>\r
-    <connection-url>@DB_URL@</connection-url>\r
-    <driver-class>@DB_DRIVER_CLASS@</driver-class>\r
-    <user-name>@DB_USER@</user-name>\r
-    <password>@DB_PASSWORD@</password>\r
-               <!--\r
-                       If and when there is a reliable Postgres exception sorter, can enable this\r
-                       and remove the new-connect-sql\r
-    <exception-sorter-class-name>@DB_EXCEPTION_SORTER@</exception-sorter-class-name>\r
-               <new-connection-sql>select 1</new-connection-sql>\r
-               <check-valid-connection-sql>select 1</check-valid-connection-sql>\r
-               -->\r
-    <metadata>\r
-       <type-mapping>@DB_TYPE_MAPPING@</type-mapping>\r
-    </metadata>\r
-  </local-tx-datasource>\r
-</datasources>\r
-\r