From: Aron Roberts Date: Wed, 15 Dec 2010 00:33:28 +0000 (+0000) Subject: CSPACE-3251: Added deployment and undeployment of the Nuxeo database configuration... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=11ab941625d992f44ffc39611fbe8c2a9a190f8d;p=tmp%2Fjakarta-migration.git CSPACE-3251: Added deployment and undeployment of the Nuxeo database configuration template folder, initially for MySQL, to the services 'ant deploy' and 'ant undeploy' targets. --- diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml index 625438c27..694736bdd 100644 --- a/3rdparty/nuxeo/build.xml +++ b/3rdparty/nuxeo/build.xml @@ -124,12 +124,14 @@ + + + + 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 new file mode 100644 index 000000000..0589203c8 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml @@ -0,0 +1,344 @@ + + + + + + + note + webp:content + webc:welcomeText + comment:comment + post + mail:mail + + + + + + + + + + acquisitions_common:acquisitionNote + acquisitions_common:acquisitionProvisos + acquisitions_common:acquisitionReason + + + + + + + + + + + + + + collectionobjects_common:otherNumber + + + + collectionobjects_common:briefDescriptions + + + collectionobjects_common:comments + + collectionobjects_common:distinguishingFeatures + + + collectionobjects_common:objectNameNote + + + collectionobjects_common:title + collectionobjects_common: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 + + + collectionobjects_common:materialComponentNote + collectionobjects_common:materialName + + + collectionobjects_common:physicalDescription + + + collectionobjects_common:objectComponentInformation + + + + + collectionobjects_common:objectProductionNote + + + collectionobjects_common:objectProductionReason + + + + + + collectionobjects_common:assocActivityNote + + collectionobjects_common:assocConceptNote + collectionobjects_common:assocCulturalContextNote + collectionobjects_common:assocDateNote + collectionobjects_common:assocEventNote + collectionobjects_common:assocObject + collectionobjects_common:assocOrganizationNote + collectionobjects_common:assocPeopleNote + collectionobjects_common:assocPersonNote + collectionobjects_common:assocPlaceNote + + collectionobjects_common:objectHistoryNote + collectionobjects_common:ownershipExchangeNote + collectionobjects_common: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:titleTranslationLanguage + collectionobjects_common:titleType + collectionobjects_common:recordStatus + collectionobjects_common:age + collectionobjects_common:ageQualifier + collectionobjects_common:ageUnit + + collectionobjects_common:contentDate + collectionobjects_common:contentEventName + collectionobjects_common:contentEventNameType + collectionobjects_common:contentLanguages + collectionobjects_common:contentObjectType + collectionobjects_common:contentOrganizations + collectionobjects_common:contentOther + collectionobjects_common:contentOtherType + + 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:assocObjectType + collectionobjects_common:ownershipAccess + collectionobjects_common:ownershipCategory + collectionobjects_common:ownershipDates + collectionobjects_common:ownershipExchangeMethod + collectionobjects_common:ownershipExchangePriceCurrency + collectionobjects_common:ownershipExchangePriceValue + collectionobjects_common:ownershipPlace + collectionobjects_common:usage + collectionobjects_common:fieldCollectionNumber + collectionobjects_common:fieldCollectionMethod + collectionobjects_common:fieldCollectionPlace + + + + 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 + + + + + + + intakes_common:entryNote + intakes_common:packingNote + intakes_common:fieldCollectionNote + intakes_common:insuranceNote + intakes_common:conditionCheckNote + + + intakes_common:conditionCheckReasons + intakes_common:currentLocationNote + + + + + + + loansin_common:loanInConditions + loansin_common:loanInNote + + + + + + + loansout_common:specialConditionsOfLoan + loansout_common:loanOutNote + + + + + + + movements_common:currentLocationNote + movements_common:movementNote + + + + + + + + + + objectexit_common:exitNote + objectexit_common:packingNote + + + + + + + organizations_common:shortName + organizations_common:longName + organizations_common:nameAdditions + + + organizations_common:historyNotes + + + + + + persons_common:bioNote + persons_common:nameNote + + + + + + locations_common:displayName + locations_common:name + 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 new file mode 100644 index 000000000..6f18473b4 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml.orig @@ -0,0 +1,32 @@ + + + + + + + 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 new file mode 100644 index 000000000..426f6938a --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/sql.properties @@ -0,0 +1,3 @@ +# 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 new file mode 100644 index 000000000..3a01540f8 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml @@ -0,0 +1,23 @@ + + + + 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 new file mode 100644 index 000000000..3a01540f8 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/default-repository-ds.xml.orig @@ -0,0 +1,23 @@ + + + + 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 new file mode 100644 index 000000000..e6c556402 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/datasources/unified-nuxeo-ds.xml @@ -0,0 +1,12 @@ + + + + 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 new file mode 100644 index 000000000..1c06cff88 --- /dev/null +++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/nuxeo.defaults @@ -0,0 +1,9 @@ +## 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/build.properties b/build.properties index a3e413b44..98a7352f2 100644 --- a/build.properties +++ b/build.properties @@ -12,6 +12,7 @@ nuxeo.release=5.3.2 nuxeo.ear=nuxeo.ear nuxeo.system=${nuxeo.ear}/system nuxeo.plugins=${nuxeo.ear}/plugins +nuxeo.templates=templates #distribution dist=dist @@ -20,7 +21,6 @@ dist.nuxeo=${dist}/nuxeo dist.installer=${dist}/installer dist.installer.services=${dist.installer}/services - #dist cspace domain dist.domain.cspace=${domain.cspace} dist.server.cspace=${dist.cspace}/server/${jboss.domain.cspace} @@ -58,6 +58,9 @@ jboss.lib.nuxeo=${jboss.server.nuxeo}/lib jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system} jboss.deploy.nuxeo.plugins=${jboss.deploy.nuxeo}/${nuxeo.plugins} +#nuxeo database templates +jboss.deploy.nuxeo.templates=${jboss.home}/${nuxeo.templates} + #database db=mysql db.script.dir=${basedir}/src/main/resources/db/${db} @@ -69,3 +72,4 @@ db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar db.jdbc.url=jdbc:${db}://${db.host}:${db.port}/cspace db.jdbc.driver.class=com.mysql.jdbc.Driver db.dialect=org.hibernate.dialect.MySQLDialect +