From: Richard Millet Date: Fri, 2 Mar 2012 00:31:45 +0000 (-0800) Subject: CSPACE-4747: Ridding the source tree of stale configuration files related to JNDI... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=4ad61cf3cae3f8db45aecc4ac266414b5714a034;p=tmp%2Fjakarta-migration.git CSPACE-4747: Ridding the source tree of stale configuration files related to JNDI data source issues. Many of the stale files were artifacts of our previous JBoss deployment environment. Also removing the Nuxeo DM database template files since the CollectionSpace services no longer run inside the Nuxeo DM. --- 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 index 000000000..9e16af0e4 Binary files /dev/null and b/3rdparty/jdbc_drivers/postgresql-9.0-802.jdbc4.jar differ diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml index c970aa706..9c65cb2bb 100644 --- a/3rdparty/nuxeo/build.xml +++ b/3rdparty/nuxeo/build.xml @@ -129,11 +129,6 @@ - - - - - + + - - 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. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 index a5895d3c8..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - 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 - - - - - - - - - - - - - - - - - - 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:numberOfObjects - collectionobjects_common:collection - collectionobjects_common:recordStatus - 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: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 - - - - - - - - - dc:title - - - dc:description - - - - - - - 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 index 6f18473b4..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml.orig +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - note - webp:content - webc:welcomeText - comment:comment - post - mail:mail - - - - - - - - dc:title - - - dc:description - - - - - - - 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 index 426f6938a..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/sql.properties +++ /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 index 3a01540f8..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - NXRepository/default - - - Nuxeo SQL Repository DataSource - nuxeo.ear#nuxeo-core-storage-sql-ra-1.6.2.rar - org.nuxeo.ecm.core.storage.sql.Repository - default - ${nuxeo.vcs.max-pool-size} - - com.mysql.jdbc.jdbc2.optional.MysqlXADataSource - URL=jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true - - User=${nuxeo.db.user} - Password=${nuxeo.db.password} - - 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 index 3a01540f8..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml.orig +++ /dev/null @@ -1,23 +0,0 @@ - - - - NXRepository/default - - - Nuxeo SQL Repository DataSource - nuxeo.ear#nuxeo-core-storage-sql-ra-1.6.2.rar - org.nuxeo.ecm.core.storage.sql.Repository - default - ${nuxeo.vcs.max-pool-size} - - com.mysql.jdbc.jdbc2.optional.MysqlXADataSource - URL=jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true - - User=${nuxeo.db.user} - Password=${nuxeo.db.password} - - 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 index e6c556402..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/unified-nuxeo-ds.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - NuxeoDS - jdbc:mysql://${nuxeo.db.host}:${nuxeo.db.port}/${nuxeo.db.name}?relaxAutoCommit=true - com.mysql.jdbc.Driver - ${nuxeo.db.user} - ${nuxeo.db.password} - ${nuxeo.db.min-pool-size} - ${nuxeo.db.max-pool-size} - - 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 index 1c06cff88..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/nuxeo.defaults +++ /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 index cfb6da7ee..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - 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 - - - - - - - - - - - - - - - - - - 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:numberOfObjects - collectionobjects_common:collection - collectionobjects_common:recordStatus - 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: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 - - - - - - - - - dc:title - - - dc:description - - - - - - - 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 index 75bb6f9ed..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml.orig +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - note - webp:content - webc:welcomeText - comment:comment - post - mail:mail - - - - - - - - dc:title - - - dc:description - - - - - - - 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 index 289bbf2b1..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/sql.properties +++ /dev/null @@ -1,3 +0,0 @@ -# Jena database type and transaction mode -org.nuxeo.ecm.sql.jena.databaseType=PostgreSQL -org.nuxeo.ecm.sql.jena.databaseTransactionEnabled=true 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 index d4049ce4d..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/default-repository-ds.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - NXRepository/default - - - Nuxeo SQL Repository DataSource - nuxeo.ear#nuxeo-core-storage-sql-ra-1.6.2.rar - org.nuxeo.ecm.core.storage.sql.Repository - default - ${nuxeo.vcs.max-pool-size} - - org.postgresql.xa.PGXADataSource - ServerName=${nuxeo.db.host} - PortNumber/Integer=${nuxeo.db.port} - DatabaseName=${nuxeo.db.name} - User=${nuxeo.db.user} - Password=${nuxeo.db.password} - - 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 index d4049ce4d..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/default-repository-ds.xml.orig +++ /dev/null @@ -1,20 +0,0 @@ - - - - NXRepository/default - - - Nuxeo SQL Repository DataSource - nuxeo.ear#nuxeo-core-storage-sql-ra-1.6.2.rar - org.nuxeo.ecm.core.storage.sql.Repository - default - ${nuxeo.vcs.max-pool-size} - - org.postgresql.xa.PGXADataSource - ServerName=${nuxeo.db.host} - PortNumber/Integer=${nuxeo.db.port} - DatabaseName=${nuxeo.db.name} - User=${nuxeo.db.user} - Password=${nuxeo.db.password} - - 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 index 517e34a7c..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/unified-nuxeo-ds.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - NuxeoDS - org.postgresql.xa.PGXADataSource - ${nuxeo.db.host} - ${nuxeo.db.port} - ${nuxeo.db.name} - ${nuxeo.db.user} - ${nuxeo.db.password} - ${nuxeo.db.max-pool-size} - - - 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 index 517e34a7c..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/datasources/unified-nuxeo-ds.xml.orig +++ /dev/null @@ -1,14 +0,0 @@ - - - - NuxeoDS - org.postgresql.xa.PGXADataSource - ${nuxeo.db.host} - ${nuxeo.db.port} - ${nuxeo.db.name} - ${nuxeo.db.user} - ${nuxeo.db.password} - ${nuxeo.db.max-pool-size} - - - 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 index f2df11912..000000000 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/nuxeo.defaults +++ /dev/null @@ -1,8 +0,0 @@ -## DO NOT EDIT THIS FILE, USE nuxeo.conf ## -nuxeo.template.includes=common - -nuxeo.db.host=localhost -nuxeo.db.port=5432 -nuxeo.db.name=nuxeo -nuxeo.db.user=nuxeo -nuxeo.db.password=password 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 index 4495c3a4b..000000000 --- a/3rdparty/nuxeo/nuxeo-server/5.5/config/datasources-config.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 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 index 83ac32321..000000000 --- a/3rdparty/nuxeo/nuxeo-server/5.5/config/log4j.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/config/nuxeo.properties b/3rdparty/nuxeo/nuxeo-server/5.5/config/nuxeo.properties index 308ca3aff..6d44dfd1e 100644 --- a/3rdparty/nuxeo/nuxeo-server/5.5/config/nuxeo.properties +++ b/3rdparty/nuxeo/nuxeo-server/5.5/config/nuxeo.properties @@ -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 diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/system.properties b/3rdparty/nuxeo/nuxeo-server/5.5/system.properties index dc6965ef8..781612386 100644 --- a/3rdparty/nuxeo/nuxeo-server/5.5/system.properties +++ b/3rdparty/nuxeo/nuxeo-server/5.5/system.properties @@ -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 diff --git a/README.txt b/README.txt index 639425dfb..ef49f8bb1 100644 --- a/README.txt +++ b/README.txt @@ -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 diff --git a/build.properties b/build.properties index 46fbc82eb..256cc0a36 100644 --- a/build.properties +++ b/build.properties @@ -9,12 +9,8 @@ cspace.services.war=${cspace.services.context}.war domain.nuxeo=nuxeo-server #nuxeo -#nuxeo.release=5.2.M4 -#nuxeo.release=5.3.2 -nuxeo.release=5.5-RC1 -#nuxeo.release=5.4.2-HF05 +nuxeo.release=5.5 nuxeo.ear=nuxeo.ear -## #old# nuxeo.system=${nuxeo.ear}/bundles nuxeo.system=bundles ## #old# nuxeo.plugins=${nuxeo.ear}/plugins diff --git a/build.xml b/build.xml index bafb69367..5c854c156 100644 --- a/build.xml +++ b/build.xml @@ -1,348 +1,314 @@ - - + collectionspace services - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + - - - - - - - + + + + + - - - + + - - + - - - - - - - + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/pom.xml b/pom.xml index f725e8b96..2ff980a00 100644 --- a/pom.xml +++ b/pom.xml @@ -280,6 +280,56 @@ + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.jvnet.hyperjaxb3 + + + maven-hyperjaxb3-plugin + + + [0.5.6,) + + + generate + + + + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + + [1.3,) + + + run + + + + + + + + + + diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml index 574af7305..d1f11dbef 100644 --- a/services/JaxRsServiceProvider/pom.xml +++ b/services/JaxRsServiceProvider/pom.xml @@ -697,6 +697,43 @@ + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + properties-maven-plugin + + + [1.0-alpha-2,) + + + + read-project-properties + + + + + + + + + + + + + diff --git a/services/account/pstore/build.xml b/services/account/pstore/build.xml index 71f391bb5..d2faa9b65 100644 --- a/services/account/pstore/build.xml +++ b/services/account/pstore/build.xml @@ -184,6 +184,9 @@ --> + + diff --git a/services/authorization-mgt/import/build.xml b/services/authorization-mgt/import/build.xml index 34bf953af..b3a77ee73 100644 --- a/services/authorization-mgt/import/build.xml +++ b/services/authorization-mgt/import/build.xml @@ -124,7 +124,7 @@ - + diff --git a/services/collectionobject/sample/sample/.classpath b/services/collectionobject/sample/sample/.classpath deleted file mode 100644 index 5a7ff6e2a..000000000 --- a/services/collectionobject/sample/sample/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - 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 index ee2fea60d..000000000 --- a/services/common/src/main/cspace/config/log/jboss-log4j-release.xml +++ /dev/null @@ -1,373 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 index da5903bf0..000000000 --- a/services/common/src/main/cspace/config/log/jboss-log4j.xml +++ /dev/null @@ -1,421 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/common/src/main/cspace/config/services/tenants/XMLMerge-ReferenceDoc.pdf b/services/common/src/main/cspace/config/services/tenants/XMLMerge-README.pdf similarity index 100% rename from services/common/src/main/cspace/config/services/tenants/XMLMerge-ReferenceDoc.pdf rename to services/common/src/main/cspace/config/services/tenants/XMLMerge-README.pdf 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 index 58b9185a4..000000000 --- a/services/common/src/main/java/org/collectionspace/services/svn-commit.tmp~ +++ /dev/null @@ -1,4 +0,0 @@ - ---This line, and those below, will be ignored-- - -M common/repository/RepositoryClient.java diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml index 10da82ca1..8e630f223 100644 --- a/services/contact/jaxb/pom.xml +++ b/services/contact/jaxb/pom.xml @@ -9,7 +9,6 @@ 4.0.0 - org.collectionspace.services org.collectionspace.services.contact.jaxb services.contact.jaxb diff --git a/services/organization/sample/sample/.classpath b/services/organization/sample/sample/.classpath deleted file mode 100644 index 5a7ff6e2a..000000000 --- a/services/organization/sample/sample/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/services/vocabulary/sample/sample/.classpath b/services/vocabulary/sample/sample/.classpath deleted file mode 100644 index 5a7ff6e2a..000000000 --- a/services/vocabulary/sample/sample/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/services/workflow/service/pom.xml b/services/workflow/service/pom.xml index ccd045fa2..f1a32ac73 100644 --- a/services/workflow/service/pom.xml +++ b/services/workflow/service/pom.xml @@ -8,7 +8,6 @@ 4.0.0 - org.collectionspace.services org.collectionspace.services.workflow.service services.workflow.service jar @@ -78,7 +77,6 @@ org.nuxeo.ecm.core nuxeo-core-api - ${nuxeo.core.version} jboss-remoting diff --git a/src/main/resources/config/cspace-ds.xml b/src/main/resources/config/cspace-ds.xml deleted file mode 100644 index c5570734d..000000000 --- a/src/main/resources/config/cspace-ds.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - @DB_TYPE_MAPPING@ - - - - NuxeoDS - false - @DB_NUXEO_URL@ - @DB_DRIVER_CLASS@ - @DB_NUXEO_USER@ - @DB_NUXEO_PASSWORD@ - @DB_EXCEPTION_SORTER@ - - - - - - - @DB_TYPE_MAPPING@ - - - - diff --git a/src/main/resources/config/jboss-ds.xml b/src/main/resources/config/jboss-ds.xml deleted file mode 100644 index e315846d9..000000000 --- a/src/main/resources/config/jboss-ds.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - DefaultDS - @DB_URL@ - @DB_DRIVER_CLASS@ - @DB_USER@ - @DB_PASSWORD@ - - - @DB_TYPE_MAPPING@ - - - -