modules/core/dbutils/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+)
New commits: commit 199a3c56e9f11068bf16fda06544e73197b61184 Author: John Mazzitelli mazz@redhat.com Date: Mon Oct 1 13:37:48 2012 -0400
fix the use-case when you specific -Pdev -Ddbsetup while building the dbutils module
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 9c8a9b2..33c0072 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -170,6 +170,7 @@ </property> </activation>
+ <!-- these are defined in the dev profile also - see below in that profile for why --> <properties> <rhq.ds.type-mapping>${rhq.dev.ds.type-mapping}</rhq.ds.type-mapping> <rhq.ds.server-name>${rhq.dev.ds.server-name}</rhq.ds.server-name> @@ -368,6 +369,18 @@ <rhq.rootDir>../../..</rhq.rootDir> <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> <rhq.deploymentDir>${rhq.containerDir}/jbossas/standalone/deployments/${rhq.earName}/lib</rhq.deploymentDir> + + <!-- these are defined in the db.dev profile also - but if you just use -Pdev without -Ddb=dev or -Pdb.dev + then you won't be using the dev DB. These properties allow -Pdev -Ddbsetup to do what you'd expect + (that is, setup the dev DB) + --> + <rhq.ds.type-mapping>${rhq.dev.ds.type-mapping}</rhq.ds.type-mapping> + <rhq.ds.server-name>${rhq.dev.ds.server-name}</rhq.ds.server-name> + <rhq.ds.db-name>${rhq.dev.ds.db-name}</rhq.ds.db-name> + <rhq.ds.connection-url>${rhq.dev.ds.connection-url}</rhq.ds.connection-url> + <rhq.ds.user-name>${rhq.dev.ds.user-name}</rhq.ds.user-name> + <rhq.ds.password>${rhq.dev.ds.password}</rhq.ds.password> + <rhq.ds.driver-class>${rhq.dev.ds.driver-class}</rhq.ds.driver-class> </properties> <build> <plugins>
rhq-commits@lists.fedorahosted.org