From: Richard Millet Date: Mon, 28 Nov 2011 15:20:08 +0000 (+0000) Subject: CSPACE-4526: Merge of Tomcat/Nuxeo 5.5 upgrade work with trunk. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=52ff365178d4bd3d428cce3737d6e89c74150b2b;p=tmp%2Fjakarta-migration.git CSPACE-4526: Merge of Tomcat/Nuxeo 5.5 upgrade work with trunk. --- 52ff365178d4bd3d428cce3737d6e89c74150b2b diff --cc 3rdparty/nuxeo/build.xml index 7bb24cf08,4ae38b652..b60b55686 --- a/3rdparty/nuxeo/build.xml +++ b/3rdparty/nuxeo/build.xml @@@ -114,18 -114,23 +114,25 @@@ - - - - - - - + description="deploy nuxeo server libs to ${jee.server.cspace}"> + + + + + + + ++ ++ + - ++ + - - + diff --cc 3rdparty/nuxeo/nuxeo-database-templates/build.xml index 91e1d9c4b,0dd719f3e..643d67561 --- a/3rdparty/nuxeo/nuxeo-database-templates/build.xml +++ b/3rdparty/nuxeo/nuxeo-database-templates/build.xml @@@ -71,7 -71,9 +71,9 @@@ + + - + nuxeo + @NUXEO_USER@ + @NUXEO_PW@ + + + diff --cc 3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/default-repo-config.xml index 000000000,fb63f09b8..bc4fab556 mode 000000,100644..100644 --- a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/default-repo-config.xml +++ b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/default-repo-config.xml @@@ -1,0 -1,372 +1,372 @@@ + + + + + + - org.postgresql.xa.PGXADataSource - jdbc:postgresql://localhost:5432/nuxeo ++ @XA_DATASOURCE@ ++ @DB_URL@ + nuxeo + @NUXEO_USER@ + @NUXEO_PW@ + + imd:user_comment + note + webp:content + webc:welcomeText + comment:comment + post + mail:mail + + + + + + + + + + acquisitionFundingSourceProvisos + acquisitions_common:acquisitionNote + acquisitions_common:acquisitionProvisos + acquisitions_common:acquisitionReason + acquisitions_common:creditLine + + + + + + + + + + + + + + + + + + + collectionobjects_common:otherNumber + + + numberValue + + + collectionobjects_common:briefDescriptions + + + collectionobjects_common:comments + + collectionobjects_common:distinguishingFeatures + + objectNameNote + + title + titleTranslation + + + + + collectionobjects_common:ageQualifier + collectionobjects_common:color + collectionobjects_common:contentDescription + collectionobjects_common:contentNote + collectionobjects_common:contentObject + collectionobjects_common:copyNumber + collectionobjects_common:editionNumber + + + + collectionobjects_common:inscriptionContent + collectionobjects_common:inscriptionContentInterpretation + collectionobjects_common:inscriptionContentTranslation + collectionobjects_common:inscriptionContentTransliteration + + + + collectionobjects_common:inscriptionDescriptionInterpretation + + materialComponentNote + materialName + + + collectionobjects_common:physicalDescription + + objectComponentInformation + + + + + collectionobjects_common:objectProductionNote + + + collectionobjects_common:objectProductionReason + + + + + assocActivityNote + assocConceptNote + assocCulturalContextNote + assocDateNote + + + + collectionobjects_common:assocEventName + collectionobjects_common:assocEventNote + collectionobjects_common:assocEventType + + assocObject + assocOrganizationNote + assocPeopleNote + assocPersonNote + assocPlaceNote + + collectionobjects_common:objectHistoryNote + collectionobjects_common:ownershipExchangeNote + usageNote + + + + + collectionobjects_common:ownersPersonalExperience + collectionobjects_common:ownersPersonalResponse + + + collectionobjects_common:ownersReference + + collectionobjects_common:ownersContributionNote + + + + + collectionobjects_common:viewersRole + collectionobjects_common:viewersPersonalExperience + collectionobjects_common:viewersPersonalResponse + + + collectionobjects_common:viewersReference + + collectionobjects_common:viewersContributionNote + + + + + collectionobjects_common:catalogNumber + + + + + collectionobjects_common:fieldCollectionNote + collectionobjects_common:fieldCollectionNumber + + + + collectionobjects_common:objectNumber + collectionobjects_common:otherNumber + collectionobjects_common:otherNumberType + collectionobjects_common:numberOfObjects + collectionobjects_common:collection + collectionobjects_common:recordStatus + collectionobjects_common:age + collectionobjects_common:ageQualifier + collectionobjects_common:ageUnit + + collectionobjects_common:contentDate + collectionobjects_common:contentLanguages + collectionobjects_common:contentOrganizations + + collectionobjects_common:dimensionSummary + + + + + collectionobjects_common:dimension + collectionobjects_common:dimensionMeasuredPart + collectionobjects_common:dimensionMeasurementUnit + collectionobjects_common:dimensionValue + collectionobjects_common:dimensionValueDate + collectionobjects_common:dimensionValueQualifier + + collectionobjects_common:editionNumber + + collectionobjects_common:inscriptionContentInscriber + collectionobjects_common:inscriptionContentDate + collectionobjects_common:inscriptionContentLanguage + collectionobjects_common:inscriptionContentMethod + collectionobjects_common:inscriptionContentPosition + collectionobjects_common:inscriptionContentScript + collectionobjects_common:inscriptionContentType + + collectionobjects_common:inscriptionDescription + collectionobjects_common:inscriptionDescriptionInscriber + collectionobjects_common:inscriptionDescriptionDate + collectionobjects_common:inscriptionDescriptionMethod + collectionobjects_common:inscriptionDescriptionPosition + collectionobjects_common:inscriptionDescriptionType + + collectionobjects_common:objectStatus + collectionobjects_common:phase + collectionobjects_common:sex + collectionobjects_common:ownershipAccess + collectionobjects_common:ownershipCategory + collectionobjects_common:ownershipDates + collectionobjects_common:ownershipExchangeMethod + collectionobjects_common:ownershipExchangePriceCurrency + collectionobjects_common:ownershipExchangePriceValue + collectionobjects_common:ownershipPlace + collectionobjects_common:fieldCollectionNumber + collectionobjects_common:fieldCollectionMethod + collectionobjects_common:fieldCollectionPlace + collectionobjects_common:fieldCollectionDate + + + + + collectionobjects_common:dateAssociation + collectionobjects_common:dateEarliestSingle + collectionobjects_common:dateEarliestSingleCertainty + collectionobjects_common:dateEarliestSingleQualifier + collectionobjects_common:dateLatest + collectionobjects_common:dateLatestCertainty + collectionobjects_common:dateLatestQualifier + collectionobjects_common:datePeriod + collectionobjects_common:dateText + + + + + + contacts_common:addressPlace + + + + + + groups_common:scopeNote + + + + + + + intakes_common:entryNote + intakes_common:packingNote + intakes_common:fieldCollectionNote + intakes_common:insuranceNote + intakes_common:conditionCheckNote + currentLocationNote + + + + + + + loansin_common:loanInConditions + loansin_common:loanInNote + + + + + + + loansout_common:specialConditionsOfLoan + loansout_common:loanOutNote + loansout_common:loanPurpose + loanedObjectStatusNote + + + + + + + movements_common:currentLocationNote + movements_common:movementNote + + + + + + + media_common:copyrightStatement + media_common:description + media_common:title + + + + + + + notes_common:content + + + + + + + objectexit_common:exitNote + objectexit_common:packingNote + + + + + + + shortName + longName + nameAdditions + historyNote + + + + + + persons_common:bioNote + persons_common:nameNote + + + + + + + + + + + + + locations_common:name + + locations_common:conditionNote + locations_common:securityNote + locations_common:accessNote + + + + + + + + The default repository + + + diff --cc build.properties index 73a894d28,f5a9dfa56..76ccdae47 --- a/build.properties +++ b/build.properties @@@ -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 # appropriate section below the common settings #db=mysql|postgresql -# db=mysql --db=postgresql ++db=mysql ++# db=postgresql + #For mysql, uncomment this, and comment out postgres section - #db.port=3306 - #db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar - #db.jdbc.driver.class=com.mysql.jdbc.Driver - #db.dialect=org.hibernate.dialect.MySQLDialect - #db.typemapping=mySQL - #db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter - #db.spring.acl.classIdentityQuery=SELECT @@IDENTITY - #db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY -# db.port=3306 -# db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar -# db.jdbc.driver.class=com.mysql.jdbc.Driver -# db.dialect=org.hibernate.dialect.MySQLDialect -# db.typemapping=mySQL -# db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter -# db.spring.acl.classIdentityQuery=SELECT @@IDENTITY -# db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY ++db.port=3306 ++db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar ++db.jdbc.driver.class=com.mysql.jdbc.Driver ++db.dialect=org.hibernate.dialect.MySQLDialect ++db.typemapping=mySQL ++db.exceptionsorter=org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter ++db.spring.acl.classIdentityQuery=SELECT @@IDENTITY ++db.spring.acl.sidIdentityQuery=SELECT @@IDENTITY ++db.xaDataSource=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource #For postgresql, uncomment this, and comment out mysql section --db.port=5432 - db.driver.jar=${jboss.lib.cspace}/postgresql-8.4-702.jdbc4.jar -db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-8.4-702.jdbc4.jar --db.jdbc.driver.class=org.postgresql.Driver --db.dialect=org.hibernate.dialect.PostgreSQLDialect --db.typemapping=PostgreSQL 8.0 ++# db.port=5432 ++# db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-8.4-702.jdbc4.jar ++# db.jdbc.driver.class=org.postgresql.Driver ++# db.dialect=org.hibernate.dialect.PostgreSQLDialect ++# db.typemapping=PostgreSQL 8.0 # Should be org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter # but current JBoss does not seem to include it... --db.exceptionsorter= --db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id')) --db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id')) ++# db.exceptionsorter= ++# db.spring.acl.classIdentityQuery=select currval(pg_get_serial_sequence('acl_class', 'id')) ++# db.spring.acl.sidIdentityQuery=select currval(pg_get_serial_sequence('acl_sid', 'id')) ++# db.xaDataSource=org.postgresql.xa.PGXADataSource + #Hibernate properties for Ant and Maven plugins + hibernate.dialect=${db.dialect} #database common settings - db.script.dir=${jboss.server.cspace}/cspace/services/db/${db} + db.script.dir=${jee.server.cspace}/cspace/services/db/${db} db.user=${env.DB_USER} db.user.password=${env.DB_PASSWORD} db.nuxeo.user=nuxeo diff --cc services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml index a14848557,e2c9d81dc..b6c08eabc --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy acquisition doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml index dda9125ca,514cd024b..523fac579 --- a/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml +++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy batch doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml index c17cc92bf,2f017d927..c33fb5d6e --- a/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml +++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy blob doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml index 071e28a90,50ef5e524..28ddb613d --- a/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-collectionobject-lifesci/build.xml @@@ -123,15 -123,15 +123,11 @@@ + description="undeploy collectionobject doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml index ac93534b1,683923f6b..3a341aaa3 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml @@@ -123,15 -123,15 +123,11 @@@ + description="Undeploy CollectionObjectsCommon doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml index a5ce14f84,308221de5..c1ec17fd2 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/build.xml @@@ -121,15 -121,15 +121,11 @@@ + description="undeploy contact doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml index 647c71fc7,139ecc335..aef608e61 --- a/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml +++ b/services/dimension/3rdparty/nuxeo-platform-cs-dimension/build.xml @@@ -121,15 -121,15 +121,11 @@@ + description="undeploy dimension doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/group/3rdparty/nuxeo-platform-cs-group/build.xml index 03f1a75a7,efa1a635a..2c6d8c5e2 --- a/services/group/3rdparty/nuxeo-platform-cs-group/build.xml +++ b/services/group/3rdparty/nuxeo-platform-cs-group/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy group doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/id/jaxb/pom.xml index 487748d33,27321bb87..a226e94fa --- a/services/id/jaxb/pom.xml +++ b/services/id/jaxb/pom.xml @@@ -34,18 -34,10 +34,10 @@@ services.id.jaxb - - com.sun.xml.bind - jaxb-impl - - - org.jvnet.jaxb2-commons - property-listener-injector - - - org.jvnet.jaxb2_commons + + org.jvnet.jaxb2_commons - runtime + jaxb2-basics-runtime - + diff --cc services/imports/3rdparty/nuxeo-platform-cs-imports/build.xml index 6c38f00f1,de9fe342e..9d2ec16fe --- a/services/imports/3rdparty/nuxeo-platform-cs-imports/build.xml +++ b/services/imports/3rdparty/nuxeo-platform-cs-imports/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy imports doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml index 8eb9f1a05,e3750faa9..e7cd6419c --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy intake doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml index fe213ee0a,2bccf241d..ad4c9d6e5 --- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml +++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy loanin doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml index 0ccd3bbaf,aaf4a9b7f..fa5d5c97a --- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml +++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy loanout doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/location/3rdparty/nuxeo-platform-cs-location/build.xml index c0a26cd3c,54df2fbe9..0b8b4f3d9 --- a/services/location/3rdparty/nuxeo-platform-cs-location/build.xml +++ b/services/location/3rdparty/nuxeo-platform-cs-location/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy location doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/media/3rdparty/nuxeo-platform-cs-media/build.xml index 1c2ee8e3f,87427cac4..09dc89352 --- a/services/media/3rdparty/nuxeo-platform-cs-media/build.xml +++ b/services/media/3rdparty/nuxeo-platform-cs-media/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy media doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml index a37c3c06a,8b3255a24..8f0378e36 --- a/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml +++ b/services/movement/3rdparty/nuxeo-platform-cs-movement/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy movement doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/note/3rdparty/nuxeo-platform-cs-note/build.xml index 9d9262e0b,5dc24367a..77870ffe0 --- a/services/note/3rdparty/nuxeo-platform-cs-note/build.xml +++ b/services/note/3rdparty/nuxeo-platform-cs-note/build.xml @@@ -121,15 -121,15 +121,11 @@@ + description="undeploy note doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml index b3f141c03,8d1cc986d..d7c670bc1 --- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml +++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy objectexit doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml index 9421bece2,2b20ad25b..56186e475 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy organization doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/person/3rdparty/nuxeo-platform-cs-person/build.xml index 699adae2e,10e45f3a6..17ee14683 --- a/services/person/3rdparty/nuxeo-platform-cs-person/build.xml +++ b/services/person/3rdparty/nuxeo-platform-cs-person/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy person doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml index 154c0e2ba,32e0ae009..00f8f22cf --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy relation doctype from ${jee.server.cspace}"> - - - - - + - - - - diff --cc services/report/3rdparty/nuxeo-platform-cs-report/build.xml index 202d5b2f7,08b1d6acc..f0e23bcb7 --- a/services/report/3rdparty/nuxeo-platform-cs-report/build.xml +++ b/services/report/3rdparty/nuxeo-platform-cs-report/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy report doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml index 3e3cbec57,082b459ce..61975694f --- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml +++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy taxonomy doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml index 62259be9c,a1b7ff6d3..04f5183b9 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy vocabulary doctype from ${jee.server.nuxeo}"> - - - - - + - - - - diff --cc services/workflow/3rdparty/nuxeo-platform-cs-workflow/build.xml index 0e43e442d,de90f3d22..25940c80a --- a/services/workflow/3rdparty/nuxeo-platform-cs-workflow/build.xml +++ b/services/workflow/3rdparty/nuxeo-platform-cs-workflow/build.xml @@@ -119,15 -119,15 +119,11 @@@ + description="undeploy workflow doctype from ${jee.server.nuxeo}"> - - - - - + - - - -