]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-4526: Merge of Tomcat/Nuxeo 5.5 upgrade work with trunk.
authorRichard Millet <richard.millet@berkeley.edu>
Mon, 28 Nov 2011 15:20:08 +0000 (15:20 +0000)
committerRichard Millet <richard.millet@berkeley.edu>
Mon, 28 Nov 2011 15:20:08 +0000 (15:20 +0000)
31 files changed:
1  2 
3rdparty/nuxeo/build.xml
3rdparty/nuxeo/nuxeo-database-templates/build.xml
3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/datasources-config.xml
3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/default-repo-config.xml
build.properties
services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml
services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml
services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
services/common/build.xml
services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml
services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml
services/group/3rdparty/nuxeo-platform-cs-group/build.xml
services/id/jaxb/pom.xml
services/imports/3rdparty/nuxeo-platform-cs-imports/build.xml
services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml
services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml
services/location/3rdparty/nuxeo-platform-cs-location/build.xml
services/media/3rdparty/nuxeo-platform-cs-media/build.xml
services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml
services/note/3rdparty/nuxeo-platform-cs-note/build.xml
services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml
services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml
services/person/3rdparty/nuxeo-platform-cs-person/build.xml
services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
services/report/3rdparty/nuxeo-platform-cs-report/build.xml
services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml
services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
services/workflow/3rdparty/nuxeo-platform-cs-workflow/build.xml

index 7bb24cf08392e838dad1621581918169d545e3e8,4ae38b65290d17b7b229f4cc8d9965b544af8aa5..b60b55686e7bb62503d0cd48ca79c4682b5e5bc5
      </target>\r
  \r
      <target name="deploy" depends="package"\r
-       description="deploy nuxeo client libs to ${jboss.server.cspace}">\r
-         <copy todir="${jboss.server.cspace}/nuxeo-client/lib">\r
-             <fileset dir="${basedir}/nuxeo-client/lib">\r
-                 <include name="*.jar"/>\r
-             </fileset>\r
-             <fileset dir="${basedir}/nuxeo-client/lib/${nuxeo.release}">\r
-                 <include name="*.jar"/>\r
-             </fileset>\r
+       description="deploy nuxeo server libs to ${jee.server.cspace}">\r
+         <copy todir="${jee.server.cspace}/nuxeo-server">\r
+            <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}"/>\r
+         </copy>\r
+         <copy todir="${jee.server.cspace}/nuxeo-server/config" overwrite="true">\r
+             <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}/config"/>\r
+             <filterset>\r
+                 <filter token="DB" value="${db}" />\r
++                              <filter token="DB_URL" value="jdbc:${db}://localhost:${db.port}/nuxeo" />\r
++                              <filter token="XA_DATASOURCE" value="${db.xaDataSource}" />\r
+                 <filter token="NUXEO_USER" value="${db.nuxeo.user}" />\r
 -                <filter token="NUXEO_PW" value="${env.DB_PASSWORD_NUXEO}" />\r
++                <filter token="NUXEO_PW" value="${db.nuxeo.user.password}" />\r
+             </filterset>\r
          </copy>\r
          <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>\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-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
index 91e1d9c4bed90c533f9f26f526ce515670f7474b,0dd719f3e5c424bb27c84aad287abacbaf8a7ab4..643d67561ae7650a2cb117a8d08298318dd2a719
@@@ -71,7 -71,9 +71,9 @@@
          </delete>
      </target>
      
 -      <target name="reset-nuxeo-config"
+       <!-- We can't process templates anymore since we're using an Embedded Nuxeo EP server -->
+       <!--
 +   <target name="reset-nuxeo-config"
        description="resets the value of the database template folder in the active Nuxeo configuration file to an empty value"
          depends="check-propertyfile-task-exists, set-nuxeo-active-config, backup-nuxeo-config"
          if="has.propertyfile.task">
index 0000000000000000000000000000000000000000,66ca8031c1cf7c3616687c2bb8a818cfee69b2ed..0f45a6354f9ce05d5d6be5167943e3e869cbaee0
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,14 +1,14 @@@
 -      <datasource name="jdbc/nxaudit" xaDataSource="org.postgresql.xa.PGXADataSource"
+ <?xml version="1.0"?>
+ <component name="config:datasources">
+   <extension target="org.nuxeo.runtime.datasource" point="datasources">
+   <!--
+     <datasource name="jdbc/nxaudit" xaDataSource="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"
+       -->
++      <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>
index 0000000000000000000000000000000000000000,fb63f09b8061f58755a700d3362809812dec9a67..bc4fab5565a26c69ad81584d9c13f6ec3c79d9e1
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,372 +1,372 @@@
 -      <xa-datasource>org.postgresql.xa.PGXADataSource</xa-datasource>
 -        <property name="URL">jdbc:postgresql://localhost:5432/nuxeo</property>
+ <?xml version="1.0"?>
+ <component name="config:default-repository">
+   <extension target="org.nuxeo.ecm.core.repository.RepositoryService"
+       point="repository">
+     <repository name="default"
+       factory="org.nuxeo.ecm.core.storage.sql.ra.PoolingRepositoryFactory">
+       <repository name="default">
+               <!--
+         <xa-datasource>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource>
+         <property name="URL">jdbc:mysql://localhost:3306/nuxeo?relaxAutoCommit=true</property>
+               -->
++      <xa-datasource>@XA_DATASOURCE@</xa-datasource>
++        <property name="URL">@DB_URL@</property>
+       <property name="DatabaseName">nuxeo</property>
+         <property name="User">@NUXEO_USER@</property>
+         <property name="Password">@NUXEO_PW@</property>
+       <schema>
+           <field type="largetext">imd:user_comment</field> <!-- Needed for large image metadata (image_metadata) that gets inserted here. -->
+           <field type="largetext">note</field>
+           <field type="largetext">webp:content</field>
+           <field type="largetext">webc:welcomeText</field>
+           <field type="largetext">comment:comment</field>
+           <field type="largetext">post</field>
+           <field type="largetext">mail:mail</field>
+           
+           <!-- Text fields that may possibly not require largetext -->
+           <!-- designation and might need further review are marked as follows: -->
+           <!-- * -->
+           
+           <!-- =========================================================== -->
+           <!-- Acquisition -->
+           <!-- =========================================================== -->
+           <field type="largetext">acquisitionFundingSourceProvisos</field>
+           <field type="largetext">acquisitions_common:acquisitionNote</field>
+           <field type="largetext">acquisitions_common:acquisitionProvisos</field>
+           <field type="largetext">acquisitions_common:acquisitionReason</field>
+           <field type="largetext">acquisitions_common:creditLine</field>
+           
+           <!-- =========================================================== -->
+           <!-- Blob -->
+           <!-- =========================================================== -->
+           <!-- No largetext fields identified to date -->
+           <!-- =========================================================== -->
+           <!-- CollectionObject / Cataloging -->
+           <!-- =========================================================== -->
+           
+           <!-- Object Identification Information -->
+           <!-- ================================= -->
+           
+           <!-- FIXME: The following field may be removed from this configuration when it is confirmed -->
+           <!-- that the App/UI layers are using a repeatable other number group. -->
+           <field type="largetext">collectionobjects_common:otherNumber</field> <!-- * -->
+           <!-- FIXME: Change this to otherNumberValue if and when the field name itself is so changed. -->
+           <field type="largetext">numberValue</field> <!-- * -->
+           <!-- FIXME: multivalued field - need to verify schema and field name -->
+           <field type="largetext">collectionobjects_common:briefDescriptions</field>
+          
+           <!-- FIXME: multivalued field - need to verify schema and field name -->
+           <field type="largetext">collectionobjects_common:comments</field>
+           
+           <field type="largetext">collectionobjects_common:distinguishingFeatures</field>
+           
+           <field type="largetext">objectNameNote</field>
+           <field type="largetext">title</field>
+           <field type="largetext">titleTranslation</field>
+                    
+           <!-- Object Description Information -->
+           <!-- ============================== -->
+           <field type="largetext">collectionobjects_common:ageQualifier</field>
+           <field type="largetext">collectionobjects_common:color</field>
+           <field type="largetext">collectionobjects_common:contentDescription</field>
+           <field type="largetext">collectionobjects_common:contentNote</field>
+           <field type="largetext">collectionobjects_common:contentObject</field>
+           <field type="largetext">collectionobjects_common:copyNumber</field> <!-- * -->
+           <field type="largetext">collectionobjects_common:editionNumber</field> <!-- * -->
+           
+           <!-- FIXME: Will become group repeatable in a post-1.3 release -->
+           <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
+           <field type="largetext">collectionobjects_common:inscriptionContent</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentInterpretation</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentTranslation</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentTransliteration</field>
+           
+           <!-- FIXME: Will become group repeatable in a post-1.3 release -->
+           <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
+           <field type="largetext">collectionobjects_common:inscriptionDescriptionInterpretation</field>
+           
+           <field type="largetext">materialComponentNote</field>
+           <field type="largetext">materialName</field>  <!-- * -->
+           
+           <!-- FIXME: multivalued field - need to verify schema and field name -->
+           <field type="largetext">collectionobjects_common:physicalDescription</field>
+           
+           <field type="largetext">objectComponentInformation</field>
+           <!-- Object Production Information -->
+           <!-- ============================= -->
+           
+           <field type="largetext">collectionobjects_common:objectProductionNote</field>
+           
+           <!-- FIXME: multivalued field - need to verify schema and field name -->
+           <field type="largetext">collectionobjects_common:objectProductionReason</field>
+           <!-- Object History and Association Information -->
+           <!-- ========================================== -->
+           
+           <field type="largetext">assocActivityNote</field>
+           <field type="largetext">assocConceptNote</field>
+           <field type="largetext">assocCulturalContextNote</field>
+           <field type="largetext">assocDateNote</field>
+           <!-- FIXME: Will become group repeatable in a post-1.3 release. -->
+           <!-- Remove the schema name(s) from the value(s) below when this occurs. -->
+           <field type="largetext">collectionobjects_common:assocEventName</field>   <!-- * -->
+           <field type="largetext">collectionobjects_common:assocEventNote</field>
+           <field type="largetext">collectionobjects_common:assocEventType</field>   <!-- * -->
+           <field type="largetext">assocObject</field>
+           <field type="largetext">assocOrganizationNote</field>
+           <field type="largetext">assocPeopleNote</field>
+           <field type="largetext">assocPersonNote</field>
+           <field type="largetext">assocPlaceNote</field>
+           
+           <field type="largetext">collectionobjects_common:objectHistoryNote</field>
+           <field type="largetext">collectionobjects_common:ownershipExchangeNote</field>
+           <field type="largetext">usageNote</field>
+            <!-- Object Owner's Contribution Information -->
+            <!-- ======================================= -->  
+                 
+           <field type="largetext">collectionobjects_common:ownersPersonalExperience</field>
+           <field type="largetext">collectionobjects_common:ownersPersonalResponse</field>
+           
+           <!-- FIXME: multivalued field - need to verify schema and field name -->
+           <field type="largetext">collectionobjects_common:ownersReference</field>
+           
+           <field type="largetext">collectionobjects_common:ownersContributionNote</field>
+          
+           <!-- Object Viewer's Contribution Information -->
+           <!-- ======================================== -->          
+           
+           <field type="largetext">collectionobjects_common:viewersRole</field>
+           <field type="largetext">collectionobjects_common:viewersPersonalExperience</field>
+           <field type="largetext">collectionobjects_common:viewersPersonalResponse</field>
+           
+           <!-- FIXME: multivalued field - need to verify schema and field name -->
+           <field type="largetext">collectionobjects_common:viewersReference</field>
+           
+           <field type="largetext">collectionobjects_common:viewersContributionNote</field>
+           <!-- Reference Information -->
+           <!-- ===================== -->
+           
+           <field type="largetext">collectionobjects_common:catalogNumber</field> <!-- * -->
+          
+           <!-- Object Collection Information -->
+           <!-- ============================= -->      
+           <field type="largetext">collectionobjects_common:fieldCollectionNote</field>
+           <field type="largetext">collectionobjects_common:fieldCollectionNumber</field> <!-- * -->
+           
+           <!--
+               Additional non-text fields configured as 'largetext' to
+               avoid the following error when Nuxeo is configured to use MySQL:
+               
+               com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException.
+               message: Row size too large. The maximum row size for the
+               used table type, not counting BLOBs, is 65535.
+               
+               Some of the fields below may be repeatable or in
+               repeatable groups, and the schema and field names
+               below might thus require verification to match actual values.
+           -->
+   
+           <field type="largetext">collectionobjects_common:objectNumber</field>
+           <field type="largetext">collectionobjects_common:otherNumber</field>
+           <field type="largetext">collectionobjects_common:otherNumberType</field>
+           <field type="largetext">collectionobjects_common:numberOfObjects</field>
+           <field type="largetext">collectionobjects_common:collection</field>
+           <field type="largetext">collectionobjects_common:recordStatus</field>
+           <field type="largetext">collectionobjects_common:age</field>
+           <field type="largetext">collectionobjects_common:ageQualifier</field>
+           <field type="largetext">collectionobjects_common:ageUnit</field>
+       
+           <field type="largetext">collectionobjects_common:contentDate</field>
+           <field type="largetext">collectionobjects_common:contentLanguages</field>
+           <field type="largetext">collectionobjects_common:contentOrganizations</field>
+           
+           <field type="largetext">collectionobjects_common:dimensionSummary</field>
+  
+           <!-- FIXME: The set of dimensions-related fields below may be removed -->
+           <!-- altogether when it is confirmed that the App/UI layers are using -->
+           <!-- a repeatable dimensions group. -->
+           <field type="largetext">collectionobjects_common:dimension</field>
+           <field type="largetext">collectionobjects_common:dimensionMeasuredPart</field>
+           <field type="largetext">collectionobjects_common:dimensionMeasurementUnit</field>
+           <field type="largetext">collectionobjects_common:dimensionValue</field>
+           <field type="largetext">collectionobjects_common:dimensionValueDate</field>
+           <field type="largetext">collectionobjects_common:dimensionValueQualifier</field>
+           
+           <field type="largetext">collectionobjects_common:editionNumber</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentInscriber</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentDate</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentLanguage</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentMethod</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentPosition</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentScript</field>
+           <field type="largetext">collectionobjects_common:inscriptionContentType</field>
+           <field type="largetext">collectionobjects_common:inscriptionDescription</field>
+           <field type="largetext">collectionobjects_common:inscriptionDescriptionInscriber</field>
+           <field type="largetext">collectionobjects_common:inscriptionDescriptionDate</field>
+           <field type="largetext">collectionobjects_common:inscriptionDescriptionMethod</field>
+           <field type="largetext">collectionobjects_common:inscriptionDescriptionPosition</field>
+           <field type="largetext">collectionobjects_common:inscriptionDescriptionType</field>
+           <field type="largetext">collectionobjects_common:objectStatus</field>
+           <field type="largetext">collectionobjects_common:phase</field>
+           <field type="largetext">collectionobjects_common:sex</field>
+           <field type="largetext">collectionobjects_common:ownershipAccess</field>
+           <field type="largetext">collectionobjects_common:ownershipCategory</field>
+           <field type="largetext">collectionobjects_common:ownershipDates</field>
+           <field type="largetext">collectionobjects_common:ownershipExchangeMethod</field>
+           <field type="largetext">collectionobjects_common:ownershipExchangePriceCurrency</field>
+           <field type="largetext">collectionobjects_common:ownershipExchangePriceValue</field>
+           <field type="largetext">collectionobjects_common:ownershipPlace</field>
+           <field type="largetext">collectionobjects_common:fieldCollectionNumber</field>
+           <field type="largetext">collectionobjects_common:fieldCollectionMethod</field>
+           <field type="largetext">collectionobjects_common:fieldCollectionPlace</field>
+           <field type="largetext">collectionobjects_common:fieldCollectionDate</field>
+        
+           <!-- FIXME: This sample set of date field can be removed when Cataloging -->
+           <!-- records are using structured date fields, or earlier when it is confirmed that -->
+           <!-- the App/UI layers are not using this vestigial part of the Cataloging schema. -->
+           <field type="largetext">collectionobjects_common:dateAssociation</field>
+           <field type="largetext">collectionobjects_common:dateEarliestSingle</field>
+           <field type="largetext">collectionobjects_common:dateEarliestSingleCertainty</field>
+           <field type="largetext">collectionobjects_common:dateEarliestSingleQualifier</field>
+           <field type="largetext">collectionobjects_common:dateLatest</field>
+           <field type="largetext">collectionobjects_common:dateLatestCertainty</field>
+           <field type="largetext">collectionobjects_common:dateLatestQualifier</field>
+           <field type="largetext">collectionobjects_common:datePeriod</field>
+           <field type="largetext">collectionobjects_common:dateText</field>
+           <!-- =========================================================== -->
+           <!-- Contact -->
+           <!-- =========================================================== -->
+           <field type="largetext">contacts_common:addressPlace</field>
+           
+           <!-- =========================================================== -->
+           <!-- Group -->
+           <!-- =========================================================== -->
+           <field type="largetext">groups_common:scopeNote</field>
+           
+           <!-- =========================================================== -->
+           <!-- Intake -->
+           <!-- =========================================================== -->
+           
+           <field type="largetext">intakes_common:entryNote</field>
+           <field type="largetext">intakes_common:packingNote</field>
+           <field type="largetext">intakes_common:fieldCollectionNote</field>
+           <field type="largetext">intakes_common:insuranceNote</field>
+           <field type="largetext">intakes_common:conditionCheckNote</field>
+           <field type="largetext">currentLocationNote</field>
+           <!-- =========================================================== -->
+           <!-- Loan In -->
+           <!-- =========================================================== -->
+           
+           <field type="largetext">loansin_common:loanInConditions</field>
+           <field type="largetext">loansin_common:loanInNote</field>
+  
+  
+           <!-- =========================================================== -->
+           <!-- Loan Out -->
+           <!-- =========================================================== -->
+           
+           <field type="largetext">loansout_common:specialConditionsOfLoan</field>
+           <field type="largetext">loansout_common:loanOutNote</field>      
+           <field type="largetext">loansout_common:loanPurpose</field>
+           <field type="largetext">loanedObjectStatusNote</field>
+  
+           <!-- =========================================================== -->
+           <!-- Movement / Location and Movement Control -->
+           <!-- =========================================================== -->
+           
+           <field type="largetext">movements_common:currentLocationNote</field>
+           <field type="largetext">movements_common:movementNote</field>
+           <!-- =========================================================== -->
+           <!-- Media / Media Handling -->
+           <!-- =========================================================== -->
+           <field type="largetext">media_common:copyrightStatement</field>
+           <field type="largetext">media_common:description</field>
+           <field type="largetext">media_common:title</field>
+           <!-- =========================================================== -->
+           <!-- Note -->
+           <!-- =========================================================== -->
+           <field type="largetext">notes_common:content</field>
+           <!-- =========================================================== -->
+           <!-- Object Exit -->
+           <!-- =========================================================== -->
+           
+           <field type="largetext">objectexit_common:exitNote</field>
+           <field type="largetext">objectexit_common:packingNote</field>
+           <!-- =========================================================== -->
+           <!-- Organization -->
+           <!-- =========================================================== -->
+           
+           <field type="largetext">shortName</field>
+           <field type="largetext">longName</field>
+           <field type="largetext">nameAdditions</field>
+           <field type="largetext">historyNote</field>
+           <!-- =========================================================== -->
+           <!-- Person -->
+           <!-- =========================================================== -->
+           <field type="largetext">persons_common:bioNote</field>
+           <field type="largetext">persons_common:nameNote</field>
+           <!-- =========================================================== -->
+           <!-- Relation -->
+           <!-- =========================================================== -->
+           <!-- No largetext fields identified to date -->
+           <!-- =========================================================== -->
+           <!-- Storage Location / Location -->
+           <!-- =========================================================== -->
+           <field type="largetext">locations_common:name</field>
+           <!-- conditionNote will be made part of a repeatable group of fields in a future release -->
+           <field type="largetext">locations_common:conditionNote</field>
+           <field type="largetext">locations_common:securityNote</field>
+           <field type="largetext">locations_common:accessNote</field>
+          
+         </schema>
+       </repository>
+     </repository>
+   </extension>
+   
+    <extension target="org.nuxeo.ecm.core.api.repository.RepositoryManager" point="repositories">
+     <documentation>The default repository</documentation>
+     <repository name="default" label="Default Repository" />
+   </extension>
+ </component>
index 73a894d285b1b2b0d9f469d2f862e2b2c04915b3,f5a9dfa5645937dc056b3fdab78d1b83d849329a..76ccdae474590cd5422337d4d811b73edc928ab3
@@@ -69,32 -86,36 +86,38 @@@ db.base.dir=${jee.server.cspace}/cspace
  #database - select one or the other (not both!), and then uncomment the\r
  # appropriate section below the common settings\r
  #db=mysql|postgresql\r
 -# db=mysql\r
--db=postgresql\r
++db=mysql\r
++# db=postgresql\r
\r
  #For mysql, uncomment this, and comment out postgres section\r
- #db.port=3306\r
- #db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar\r
- #db.jdbc.driver.class=com.mysql.jdbc.Driver\r
- #db.dialect=org.hibernate.dialect.MySQLDialect\r
- #db.typemapping=mySQL\r
- #db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter\r
- #db.spring.acl.classIdentityQuery=SELECT @@IDENTITY\r
- #db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY\r
 -# db.port=3306\r
 -# db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar\r
 -# db.jdbc.driver.class=com.mysql.jdbc.Driver\r
 -# db.dialect=org.hibernate.dialect.MySQLDialect\r
 -# db.typemapping=mySQL\r
 -# db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter\r
 -# db.spring.acl.classIdentityQuery=SELECT @@IDENTITY\r
 -# db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY\r
++db.port=3306\r
++db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar\r
++db.jdbc.driver.class=com.mysql.jdbc.Driver\r
++db.dialect=org.hibernate.dialect.MySQLDialect\r
++db.typemapping=mySQL\r
++db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter\r
++db.spring.acl.classIdentityQuery=SELECT @@IDENTITY\r
++db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY\r
++db.xaDataSource=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource\r
  \r
  #For postgresql, uncomment this, and comment out mysql section\r
--db.port=5432\r
- db.driver.jar=${jboss.lib.cspace}/postgresql-8.4-702.jdbc4.jar\r
 -db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-8.4-702.jdbc4.jar\r
--db.jdbc.driver.class=org.postgresql.Driver\r
--db.dialect=org.hibernate.dialect.PostgreSQLDialect\r
--db.typemapping=PostgreSQL 8.0\r
++# db.port=5432\r
++# db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-8.4-702.jdbc4.jar\r
++# db.jdbc.driver.class=org.postgresql.Driver\r
++# db.dialect=org.hibernate.dialect.PostgreSQLDialect\r
++# db.typemapping=PostgreSQL 8.0\r
  # Should be org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter\r
  # but current JBoss does not seem to include it...\r
--db.exceptionsorter= \r
--db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))\r
--db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))\r
++# db.exceptionsorter= \r
++# db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id'))\r
++# db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id'))\r
++# db.xaDataSource=org.postgresql.xa.PGXADataSource\r
  \r
+ #Hibernate properties for Ant and Maven plugins\r
+ hibernate.dialect=${db.dialect}\r
  \r
  #database common settings\r
- db.script.dir=${jboss.server.cspace}/cspace/services/db/${db}\r
+ db.script.dir=${jee.server.cspace}/cspace/services/db/${db}\r
  db.user=${env.DB_USER}\r
  db.user.password=${env.DB_PASSWORD}\r
  db.nuxeo.user=nuxeo\r
index a14848557eb9c0ed0cf6a67666f30c0706a5c44d,e2c9d81dc27f5656d97f7057e0079399247a3669..b6c08eabcd164926acda415648e669f8e3f2498b
      </target>
  
      <target name="undeploy"
-         description="undeploy acquisition doctype from ${jboss.server.nuxeo}">
+         description="undeploy acquisition doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.acquisition.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.acquisition.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.acquisition.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index dda9125ca8630296fdce12f422b34a73c187255a,514cd024b0be24053563ddfbba76c6c5b51e559d..523fac579bd644f13833313dcc9c441d9d88e219
      </target>
  
      <target name="undeploy"
-         description="undeploy batch doctype from ${jboss.server.nuxeo}">
+         description="undeploy batch doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.batch.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.batch.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.batch.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index c17cc92bf9ddbf9453916b07b3c3aa8c5ae66b14,2f017d927e883b15041d0baaf12061a11cbd1430..c33fb5d6eab17d2ac9cf5f480e3c4737991ff3c9
      </target>
  
      <target name="undeploy"
-         description="undeploy blob doctype from ${jboss.server.nuxeo}">
+         description="undeploy blob doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.blob.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.blob.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.blob.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 071e28a9008a476013e530979aa06e6bf205c96b,50ef5e52403dbff435f532ae4f7585fdb566e04e..28ddb613d67bf095cbf08aa3048cd53707527cc1
      </target>\r
  \r
      <target name="undeploy"\r
-         description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">\r
+         description="undeploy collectionobject doctype from ${jee.server.nuxeo}">\r
          <delete>\r
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
-                 <include name="${nuxeo.collectionobject.jars.all}"/>\r
-             </fileset>\r
-             <!-- Legacy deployment location through release 0.6 -->\r
-             <fileset dir="${jboss.deploy.nuxeo.system}">\r
+             <fileset dir="${jee.deploy.nuxeo.plugins}">\r
                  <include name="${nuxeo.collectionobject.jars.all}"/>\r
              </fileset>\r
 -            <!-- Legacy deployment location through release 0.6 -->\r
 -            <fileset dir="${jee.deploy.nuxeo.system}">\r
 -                <include name="${nuxeo.collectionobject.jars.all}"/>\r
 -            </fileset>\r
          </delete>\r
      </target>\r
  \r
index ac93534b1120f942111048cacce96f876e64bcc9,683923f6bacbda18e272422d0dafe8e6bc83fa49..3a341aaa35249cd304706accc33fbdf84e4f7dca
      </target>\r
  \r
      <target name="undeploy"\r
-         description="Undeploy CollectionObjectsCommon doctype from ${jboss.server.nuxeo}">\r
+         description="Undeploy CollectionObjectsCommon doctype from ${jee.server.nuxeo}">\r
          <delete>\r
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
-                 <include name="${nuxeo.collectionobject.jars.all}"/>\r
-             </fileset>\r
-             <!-- Legacy deployment location through release 0.6 -->\r
-             <fileset dir="${jboss.deploy.nuxeo.system}">\r
+             <fileset dir="${jee.deploy.nuxeo.plugins}">\r
                  <include name="${nuxeo.collectionobject.jars.all}"/>\r
              </fileset>\r
 -            <!-- Legacy deployment location through release 0.6 -->\r
 -            <fileset dir="${jee.deploy.nuxeo.system}">\r
 -                <include name="${nuxeo.collectionobject.jars.all}"/>\r
 -            </fileset>\r
          </delete>\r
      </target>\r
  \r
Simple merge
index a5ce14f84f9517a225b6edf182a6a3723d114c87,308221de52ad718f71959f4e2bf3f0cb2a712a2d..c1ec17fd258bdbfc8533929e4fac2ec1f3d8c6e0
      </target>
  
      <target name="undeploy"
-         description="undeploy contact doctype from ${jboss.server.nuxeo}">
+         description="undeploy contact doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.contact.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.contact.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.contact.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 647c71fc786ec682f410a1f617e9ffa1f304eb0b,139ecc335119e3b3ed1834dd69f1b99ca0a0c6ed..aef608e61067528063a6281ea7701cdf8bb4ff71
      </target>
  
      <target name="undeploy"
-         description="undeploy dimension doctype from ${jboss.server.nuxeo}">
+         description="undeploy dimension doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.dimension.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.dimension.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.dimension.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 03f1a75a745ae64f52aec78068cd080d3cc2e3ce,efa1a635ae4c30a841317c9fba6eebe20ca7fbac..2c6d8c5e25b421983fcd92062ce2ed9431812467
      </target>
  
      <target name="undeploy"
-         description="undeploy group doctype from ${jboss.server.nuxeo}">
+         description="undeploy group doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.group.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.group.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.group.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 487748d338b31390de2d51c4720c0f78c1cb3121,27321bb87f6cb9f0d2addb20336580a3fef35798..a226e94fac06921589d5164ed0d6e79eb9dd07ef
    <name>services.id.jaxb</name>
  
    <dependencies>
-     <dependency>
-       <groupId>com.sun.xml.bind</groupId>
-       <artifactId>jaxb-impl</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.jvnet.jaxb2-commons</groupId>
-       <artifactId>property-listener-injector</artifactId>
-     </dependency>
 -      <dependency>
 -              <groupId>org.jvnet.jaxb2_commons</groupId>
 +    <dependency>
 +      <groupId>org.jvnet.jaxb2_commons</groupId>
-       <artifactId>runtime</artifactId>
+               <artifactId>jaxb2-basics-runtime</artifactId>
 -      </dependency>
 +    </dependency>
    </dependencies>
  
    <build>
index 6c38f00f1ed73b1aff360e5f205cd6626b4df25a,de9fe342ef5142cdc520b8c4e3a9f28caafbfb53..9d2ec16fe77d9fd981a4f3890dab71035afb7e9a
      </target>
  
      <target name="undeploy"
-         description="undeploy imports doctype from ${jboss.server.nuxeo}">
+         description="undeploy imports doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.imports.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.imports.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.imports.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 8eb9f1a053fa0df5b12f3daee8af6792e60032f0,e3750faa9dad4038603fa5a58ca4a6c5b408136c..e7cd6419c607c4f310e4e13d005db22b34cdcb24
      </target>
  
      <target name="undeploy"
-         description="undeploy intake doctype from ${jboss.server.nuxeo}">
+         description="undeploy intake doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.intake.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.intake.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.intake.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index fe213ee0a7182b47df374aba15712f84a213c76b,2bccf241d761697b8de9091fed420288cc680bae..ad4c9d6e5c25526e4f310d685e065af9eccff36e
      </target>
  
      <target name="undeploy"
-         description="undeploy loanin doctype from ${jboss.server.nuxeo}">
+         description="undeploy loanin doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.loanin.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.loanin.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.loanin.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 0ccd3bbafdce65158361ab90192c2fb7d18e7aa4,aaf4a9b7f002e2c3aec5c42ed601c07726283d29..fa5d5c97acc793289e45bed9c29a97377b4d99ac
      </target>
  
      <target name="undeploy"
-         description="undeploy loanout doctype from ${jboss.server.nuxeo}">
+         description="undeploy loanout doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.loanout.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.loanout.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.loanout.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index c0a26cd3cbe52c7aa5a36c4a32f76c5d7c34cbce,54df2fbe99346feb19389e02cfa528dd2c6ae91f..0b8b4f3d9009db2f643ad5cf294632e761c6380f
      </target>
  
      <target name="undeploy"
-         description="undeploy location doctype from ${jboss.server.nuxeo}">
+         description="undeploy location doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.location.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.location.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.location.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 1c2ee8e3f0c9e41d2b2d1187dd798cee801cbb01,87427cac483d5a773e6ef7a7e43918ea347c80c0..09dc8935246209a0b0d73bdd0f2e1c5d22cb39e7
      </target>
  
      <target name="undeploy"
-         description="undeploy media doctype from ${jboss.server.nuxeo}">
+         description="undeploy media doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.media.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.media.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.media.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index a37c3c06aebe28d9c6ddc7dfd5f1e867a7105639,8b3255a24afb3d8624b2ee15b53cff259e6cf5bf..8f0378e36a4cc06196d254c3749ab391da23a419
      </target>
  
      <target name="undeploy"
-         description="undeploy movement doctype from ${jboss.server.nuxeo}">
+         description="undeploy movement doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.movement.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.movement.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.movement.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 9d9262e0b19b367cc8d23af671dcbb66fab51544,5dc24367aaa7aaf74fc0c627e9e4c1b31068dacd..77870ffe0ee8769c4547d471c8564edf719205d5
      </target>\r
  \r
      <target name="undeploy"\r
-         description="undeploy note doctype from ${jboss.server.nuxeo}">\r
+         description="undeploy note doctype from ${jee.server.nuxeo}">\r
          <delete>\r
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
-                 <include name="${nuxeo.note.jars.all}"/>\r
-             </fileset>\r
-             <!-- Legacy deployment location through release 0.6 -->\r
-             <fileset dir="${jboss.deploy.nuxeo.system}">\r
+             <fileset dir="${jee.deploy.nuxeo.plugins}">\r
                  <include name="${nuxeo.note.jars.all}"/>\r
              </fileset>\r
 -            <!-- Legacy deployment location through release 0.6 -->\r
 -            <fileset dir="${jee.deploy.nuxeo.system}">\r
 -                <include name="${nuxeo.note.jars.all}"/>\r
 -            </fileset>\r
          </delete>\r
      </target>\r
  \r
index b3f141c03059d900fa458d43df311e833ab6830b,8d1cc986dabb3d08c9ea77c18263070f26bbdaf3..d7c670bc129246d158e194cfded826902820db11
      </target>
  
      <target name="undeploy"
-         description="undeploy objectexit doctype from ${jboss.server.nuxeo}">
+         description="undeploy objectexit doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.objectexit.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.objectexit.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.objectexit.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 9421bece212ce7fc09a9b67979bdb412bea32d22,2b20ad25b496fe010de699b019a52ebb1b76cd9d..56186e4750289a16c9abb23bbe66e946a50fe27f
      </target>
  
      <target name="undeploy"
-         description="undeploy organization doctype from ${jboss.server.nuxeo}">
+         description="undeploy organization doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.organization.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.organization.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.organization.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 699adae2e27f9bd25269b729531935ebf9de3ee8,10e45f3a6e8b937c58798bccc210e9e2c992c66b..17ee14683bff36d8885731a6b0ec351b5f051140
      </target>
  
      <target name="undeploy"
-         description="undeploy person doctype from ${jboss.server.nuxeo}">
+         description="undeploy person doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.person.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.person.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.person.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 154c0e2baf4050da578281c94952191e887e571e,32e0ae00985ea3969235896ea2c8c52d11f4eca0..00f8f22cf3d5c0db3057cfdb288277d1370dec18
      </target>\r
  \r
      <target name="undeploy"\r
-         description="undeploy relation doctype from ${jboss.server.cspace}">\r
+         description="undeploy relation doctype from ${jee.server.cspace}">\r
          <delete>\r
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">\r
-                 <include name="${nuxeo.relation.jars.all}"/>\r
-             </fileset>\r
-             <!-- Legacy deployment location through release 0.6 -->\r
-             <fileset dir="${jboss.deploy.nuxeo.system}">\r
+             <fileset dir="${jee.deploy.nuxeo.plugins}">\r
                  <include name="${nuxeo.relation.jars.all}"/>\r
              </fileset>\r
 -            <!-- Legacy deployment location through release 0.6 -->\r
 -            <fileset dir="${jee.deploy.nuxeo.system}">\r
 -                <include name="${nuxeo.relation.jars.all}"/>\r
 -            </fileset>\r
          </delete>\r
      </target>\r
  \r
index 202d5b2f7544296572433d5efdf5ab6e57873922,08b1d6acc8cb3bc2ba17cf36a803cee14cf4d30c..f0e23bcb72bd554ec3acf482789708f4f54229b7
      </target>
  
      <target name="undeploy"
-         description="undeploy report doctype from ${jboss.server.nuxeo}">
+         description="undeploy report doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.report.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.report.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.report.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 3e3cbec5788f9c9753af0c5443814beb68e9b73e,082b459ce0046d2e0aba70bd2a90371917ef4f1a..61975694f502e68404e3d1b625aea53953529929
      </target>
  
      <target name="undeploy"
-         description="undeploy taxonomy doctype from ${jboss.server.nuxeo}">
+         description="undeploy taxonomy doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.taxonomy.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment taxonomy through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.taxonomy.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment taxonomy through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.taxonomy.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 62259be9c341a740441a95de3c96a1cff9c2bf88,a1b7ff6d3d41c81c59e810b339e57d7f5099e775..04f5183b96be7295835d35d3fa5f14ab853d4fd1
      </target>
  
      <target name="undeploy"
-         description="undeploy vocabulary doctype from ${jboss.server.nuxeo}">
+         description="undeploy vocabulary doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.vocabulary.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.vocabulary.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.vocabulary.jars.all}"/>
 -            </fileset>
          </delete>
      </target>
  
index 0e43e442d92cf37333821d6088c2819688f2a8b0,de90f3d22e0b178c2be13edfee58d09654671412..25940c80a2823ceb61fe0952e32f257eaef3f84e
      </target>
  
      <target name="undeploy"
-         description="undeploy workflow doctype from ${jboss.server.nuxeo}">
+         description="undeploy workflow doctype from ${jee.server.nuxeo}">
          <delete>
-             <fileset dir="${jboss.deploy.nuxeo.plugins}">
-                 <include name="${nuxeo.workflow.jars.all}"/>
-             </fileset>
-             <!-- Legacy deployment location through release 0.6 -->
-             <fileset dir="${jboss.deploy.nuxeo.system}">
+             <fileset dir="${jee.deploy.nuxeo.plugins}">
                  <include name="${nuxeo.workflow.jars.all}"/>
              </fileset>
 -            <!-- Legacy deployment location through release 0.6 -->
 -            <fileset dir="${jee.deploy.nuxeo.system}">
 -                <include name="${nuxeo.workflow.jars.all}"/>
 -            </fileset>
          </delete>
      </target>