modules/core/dbutils/pom.xml
| 74 ++++++++--
modules/enterprise/server/container/pom.xml
| 31 ++--
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
| 69 ++++-----
modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
| 2
pom.xml
| 21 ++
5 files changed, 132 insertions(+), 65 deletions(-)
New commits:
commit f62d8fbeb79eb7aa419280137b8fec069f2126f9
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu Apr 1 10:20:07 2010 -0400
improve description for CSP content source type
diff --git
a/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
b/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
index 55e2a64..9f98351 100644
---
a/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
+++
b/modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml
@@ -13,7 +13,7 @@
<contentSourceType name="JBossASPatchSource"
displayName="JBoss Patch Content Source"
- description="This content source retrieves patches from the
JBoss CSP RSS feed."
+ description="a content source that retrieves package metadata
from an RSS feed; the feed must be in the format used by the JBoss CSP"
lazyLoad="true"
apiClass="org.rhq.enterprise.server.plugins.jboss.software.JBossSoftwareContentSourceAdapter">
commit 79e3d2335729acb132e4085d254353d87225e867
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu Apr 1 10:19:30 2010 -0400
use two different DBs for tests and dev-container
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 2fb6a90..9e8e258 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -93,7 +93,12 @@
return
}
- database = project.properties['rhq.test.ds.db-name']
+ db = project.properties.db
+ if (db == 'dev') {
+ database = project.properties['rhq.dev.ds.db-name']
+ } else {
+ database = project.properties['rhq.test.ds.db-name']
+ }
project.properties.dbsetup = 'true'
sql = Sql.newInstance(
@@ -141,6 +146,20 @@
<configuration>
<tasks>
<property name="settings.localRepository"
location="${user.home}/.m2/repository" />
+
+ <condition property="rhq.ds.type-mapping"
value="${rhq.dev.ds.type-mapping}"
else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.connection-url"
value="${rhq.dev.ds.connection-url}"
else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.user-name"
value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.password"
value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
<ant
antfile="${basedir}/src/main/scripts/dbsetup-build.xml">
<property name="settings.localRepository"
value="${settings.localRepository}" />
<property name="ojdbc5.version"
value="${ojdbc5.version}" />
@@ -148,10 +167,10 @@
<property name="h2.version"
value="${h2.version}" />
<property name="jtds.version"
value="${jtds.version}" />
<property name="task.classpath.property"
refid="maven.test.classpath" />
- <property name="rhq.ds.type-mapping"
value="${rhq.test.ds.type-mapping}" />
- <property name="rhq.ds.connection-url"
value="${rhq.test.ds.connection-url}" />
- <property name="rhq.ds.user-name"
value="${rhq.test.ds.user-name}" />
- <property name="rhq.ds.password"
value="${rhq.test.ds.password}" />
+ <property name="rhq.ds.type-mapping"
value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url"
value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name"
value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password"
value="${rhq.ds.password}" />
<property name="project.version"
value="${project.version}" />
<property name="db.schema.version"
value="${db.schema.version}" />
<property name="dbsetup" value="${dbsetup}"
/>
@@ -172,6 +191,20 @@
<configuration>
<tasks>
<property name="settings.localRepository"
location="${user.home}/.m2/repository" />
+
+ <condition property="rhq.ds.type-mapping"
value="${rhq.dev.ds.type-mapping}"
else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.connection-url"
value="${rhq.dev.ds.connection-url}"
else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.user-name"
value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.password"
value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml"
target="dbsetup-combine">
<property name="settings.localRepository"
value="${settings.localRepository}" />
<property name="ojdbc5.version"
value="${ojdbc5.version}" />
@@ -179,10 +212,10 @@
<property name="h2.version"
value="${h2.version}" />
<property name="jtds.version"
value="${jtds.version}" />
<property name="task.classpath.property"
refid="maven.test.classpath" />
- <property name="rhq.ds.type-mapping"
value="${rhq.test.ds.type-mapping}" />
- <property name="rhq.ds.connection-url"
value="${rhq.test.ds.connection-url}" />
- <property name="rhq.ds.user-name"
value="${rhq.test.ds.user-name}" />
- <property name="rhq.ds.password"
value="${rhq.test.ds.password}" />
+ <property name="rhq.ds.type-mapping"
value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url"
value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name"
value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password"
value="${rhq.ds.password}" />
<property name="project.version"
value="${project.version}" />
<property name="db.schema.version"
value="${db.schema.version}" />
</ant>
@@ -204,6 +237,20 @@
<configuration>
<tasks>
<property name="settings.localRepository"
location="${user.home}/.m2/repository" />
+
+ <condition property="rhq.ds.type-mapping"
value="${rhq.dev.ds.type-mapping}"
else="${rhq.test.ds.type-mapping}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.connection-url"
value="${rhq.dev.ds.connection-url}"
else="${rhq.test.ds.connection-url}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.user-name"
value="${rhq.dev.ds.user-name}" else="${rhq.test.ds.user-name}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+ <condition property="rhq.ds.password"
value="${rhq.dev.ds.password}" else="${rhq.test.ds.password}">
+ <equals arg1="${db}" arg2="dev"/>
+ </condition>
+
<ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml"
target="dbsetup-check-schema">
<property name="settings.localRepository"
value="${settings.localRepository}" />
<property name="ojdbc5.version"
value="${ojdbc5.version}" />
@@ -211,10 +258,10 @@
<property name="h2.version"
value="${h2.version}" />
<property name="jtds.version"
value="${jtds.version}" />
<property name="task.classpath.property"
refid="maven.test.classpath" />
- <property name="rhq.ds.type-mapping"
value="${rhq.test.ds.type-mapping}" />
- <property name="rhq.ds.connection-url"
value="${rhq.test.ds.connection-url}" />
- <property name="rhq.ds.user-name"
value="${rhq.test.ds.user-name}" />
- <property name="rhq.ds.password"
value="${rhq.test.ds.password}" />
+ <property name="rhq.ds.type-mapping"
value="${rhq.ds.type-mapping}" />
+ <property name="rhq.ds.connection-url"
value="${rhq.ds.connection-url}" />
+ <property name="rhq.ds.user-name"
value="${rhq.ds.user-name}" />
+ <property name="rhq.ds.password"
value="${rhq.ds.password}" />
<property name="project.version"
value="${project.version}" />
<property name="db.schema.version"
value="${db.schema.version}" />
<property name="rhq.ds.driver-class"
value="${rhq.test.ds.driver-class}" />
@@ -313,3 +360,4 @@
</profiles>
</project>
+
diff --git a/modules/enterprise/server/container/pom.xml
b/modules/enterprise/server/container/pom.xml
index 39c7122..db4bf11 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -179,20 +179,20 @@
<property name="hibernate3.version"
value="${hibernate3.version}" />
<property name="quartz.version"
value="${quartz.version}" />
- <!-- dev/test DB settings (used to init rhq-server.properties if dev
profile is active or developer prop is set) -->
- <property name="rhq.test.ds.connection-url"
value="${rhq.test.ds.connection-url}" />
- <property name="rhq.test.ds.driver-class"
value="${rhq.test.ds.driver-class}" />
- <property name="rhq.test.ds.xa-datasource-class"
value="${rhq.test.ds.xa-datasource-class}" />
- <property name="rhq.test.ds.user-name"
value="${rhq.test.ds.user-name}" />
- <property name="rhq.test.ds.password"
value="${rhq.test.ds.password}" />
- <property name="rhq.test.ds.type-mapping"
value="${rhq.test.ds.type-mapping}" />
- <property name="rhq.test.ds.server-name"
value="${rhq.test.ds.server-name}" />
- <property name="rhq.test.ds.port"
value="${rhq.test.ds.port}" />
- <property name="rhq.test.ds.db-name"
value="${rhq.test.ds.db-name}" />
- <property name="rhq.test.ds.hibernate-dialect"
value="${rhq.test.ds.hibernate-dialect}" />
- <property name="rhq.test.quartz.driverDelegateClass"
value="${rhq.test.quartz.driverDelegateClass}" />
- <property name="rhq.test.quartz.selectWithLockSQL"
value="${rhq.test.quartz.selectWithLockSQL}" />
- <property name="rhq.test.quartz.lockHandlerClass"
value="${rhq.test.quartz.lockHandlerClass}" />
+ <!-- dev DB settings (used to init rhq-server.properties if dev
profile is active or developer prop is set) -->
+ <property name="rhq.dev.ds.connection-url"
value="${rhq.dev.ds.connection-url}" />
+ <property name="rhq.dev.ds.driver-class"
value="${rhq.dev.ds.driver-class}" />
+ <property name="rhq.dev.ds.xa-datasource-class"
value="${rhq.dev.ds.xa-datasource-class}" />
+ <property name="rhq.dev.ds.user-name"
value="${rhq.dev.ds.user-name}" />
+ <property name="rhq.dev.ds.password.encrypted"
value="${rhq.dev.ds.password.encrypted}" />
+ <property name="rhq.dev.ds.type-mapping"
value="${rhq.dev.ds.type-mapping}" />
+ <property name="rhq.dev.ds.server-name"
value="${rhq.dev.ds.server-name}" />
+ <property name="rhq.dev.ds.port"
value="${rhq.dev.ds.port}" />
+ <property name="rhq.dev.ds.db-name"
value="${rhq.dev.ds.db-name}" />
+ <property name="rhq.dev.ds.hibernate-dialect"
value="${rhq.dev.ds.hibernate-dialect}" />
+ <property name="rhq.dev.quartz.driverDelegateClass"
value="${rhq.dev.quartz.driverDelegateClass}" />
+ <property name="rhq.dev.quartz.selectWithLockSQL"
value="${rhq.dev.quartz.selectWithLockSQL}" />
+ <property name="rhq.dev.quartz.lockHandlerClass"
value="${rhq.dev.quartz.lockHandlerClass}" />
<!-- default server settings used by installer -->
<property name="rhq.server.http.port"
value="${rhq.server.http.port}" />
@@ -356,4 +356,5 @@
</profiles>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
index a7e313a..f3c37fe 100644
--- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml
@@ -9,8 +9,8 @@
<property name="default.rhq.server.database.driver-class"
value="org.postgresql.Driver" />
<property name="default.rhq.server.database.xa-datasource-class"
value="org.postgresql.xa.PGXADataSource" />
<property name="default.rhq.server.database.user-name"
value="rhqadmin" />
- <!-- NOTE: The below value is "rhqadmin" encrypted. -->
- <property name="default.rhq.server.database.password"
value="1eeb2f255e832171df8592078de921bc" />
+ <property name="default.rhq.server.database.password"
value="rhqadmin" />
+ <property name="default.rhq.server.database.password.encrypted"
value="1eeb2f255e832171df8592078de921bc" />
<property name="default.rhq.server.database.type-mapping"
value="PostgreSQL" />
<!-- these are needed for the PostgreSQL XADataSource setup -->
<property name="default.rhq.server.database.server-name"
value="127.0.0.1" />
@@ -31,19 +31,19 @@
<target name="set-dev-server-props" if="predeploy">
<echo>*** Using dev database settings in
rhq-server.properties...</echo>
- <property name="rhq.server.database.hibernate-dialect"
value="${rhq.test.ds.hibernate-dialect}" />
- <property name="rhq.server.database.connection-url"
value="${rhq.test.ds.connection-url}" />
- <property name="rhq.server.database.driver-class"
value="${rhq.test.ds.driver-class}" />
- <property name="rhq.server.database.xa-datasource-class"
value="${rhq.test.ds.xa-datasource-class}" />
- <property name="rhq.server.database.user-name"
value="${rhq.test.ds.user-name}" />
- <property name="rhq.server.database.password"
value="${rhq.test.ds.password}" />
- <property name="rhq.server.database.type-mapping"
value="${rhq.test.ds.type-mapping}" />
- <property name="rhq.server.database.server-name"
value="${rhq.test.ds.server-name}" />
- <property name="rhq.server.database.port"
value="${rhq.test.ds.port}" />
- <property name="rhq.server.database.db-name"
value="${rhq.test.ds.db-name}" />
- <property name="rhq.server.quartz.driverDelegateClass"
value="${rhq.test.quartz.driverDelegateClass}" />
- <property name="rhq.server.quartz.selectWithLockSQL"
value="${rhq.test.quartz.selectWithLockSQL}" />
- <property name="rhq.server.quartz.lockHandlerClass"
value="${rhq.test.quartz.lockHandlerClass}" />
+ <property name="rhq.server.database.hibernate-dialect"
value="${rhq.dev.ds.hibernate-dialect}" />
+ <property name="rhq.server.database.connection-url"
value="${rhq.dev.ds.connection-url}" />
+ <property name="rhq.server.database.driver-class"
value="${rhq.dev.ds.driver-class}" />
+ <property name="rhq.server.database.xa-datasource-class"
value="${rhq.dev.ds.xa-datasource-class}" />
+ <property name="rhq.server.database.user-name"
value="${rhq.dev.ds.user-name}" />
+ <property name="rhq.server.database.password"
value="${rhq.dev.ds.password.encrypted}" />
+ <property name="rhq.server.database.type-mapping"
value="${rhq.dev.ds.type-mapping}" />
+ <property name="rhq.server.database.server-name"
value="${rhq.dev.ds.server-name}" />
+ <property name="rhq.server.database.port"
value="${rhq.dev.ds.port}" />
+ <property name="rhq.server.database.db-name"
value="${rhq.dev.ds.db-name}" />
+ <property name="rhq.server.quartz.driverDelegateClass"
value="${rhq.dev.quartz.driverDelegateClass}" />
+ <property name="rhq.server.quartz.selectWithLockSQL"
value="${rhq.dev.quartz.selectWithLockSQL}" />
+ <property name="rhq.server.quartz.lockHandlerClass"
value="${rhq.dev.quartz.lockHandlerClass}" />
</target>
<target name="set-default-server-props" unless="predeploy">
@@ -53,7 +53,7 @@
<property name="rhq.server.database.driver-class"
value="${default.rhq.server.database.driver-class}" />
<property name="rhq.server.database.xa-datasource-class"
value="${default.rhq.server.database.xa-datasource-class}" />
<property name="rhq.server.database.user-name"
value="${default.rhq.server.database.user-name}" />
- <property name="rhq.server.database.password"
value="${default.rhq.server.database.password}" />
+ <property name="rhq.server.database.password"
value="${default.rhq.server.database.password.encrypted}" />
<property name="rhq.server.database.type-mapping"
value="${default.rhq.server.database.type-mapping}" />
<property name="rhq.server.database.server-name"
value="${default.rhq.server.database.server-name}" />
<property name="rhq.server.database.port"
value="${default.rhq.server.database.port}" />
@@ -164,7 +164,7 @@
</not>
</condition>
- </target>
+ </target>
<target name="prepare-container"
depends="prepare-web-services-1,
@@ -212,8 +212,8 @@
<echo>Running upgrade script for JBossWS ${jbossws-native-dist.version}
</echo>
<ant antfile="${basedir}/target/${jboss-native-dir}/build.xml"
target="deploy-jboss423" dir="${basedir}/target/${jboss-native-dir}"
/>
- <echo> </echo>
- <echo>Installing safe ejb3 web invoker ...</echo>
+ <echo/>
+ <echo>Installing safe ejb3 web invoker ...</echo>
<delete verbose="true">
<fileset dir="${jboss.deploy.dir}/jbossws.sar">
<include name="safe-invoker*" />
@@ -272,7 +272,7 @@
<fileset dir="${jboss.deploy.dir}/jms">
<include name="jbossmq-destinations-service.xml" />
<include name="uil2-service.xml" />
- <include name="hsqldb-jdbc2-service.xml" /> <!-- no longer use
Hypersonic for JMS backend -->
+ <include name="hsqldb-jdbc2-service.xml" /> <!-- no longer
use Hypersonic for JMS backend -->
</fileset>
</delete>
@@ -329,16 +329,16 @@
<echo>Deploying installer webapp ...</echo>
<mkdir dir="${jboss.deploy.dir}/rhq-installer.war" />
- <unwar
src="${settings.localRepository}/org/rhq/rhq-installer/${rhq.version}/rhq-installer-${rhq.version}.war"
- dest="${jboss.deploy.dir}/rhq-installer.war" />
+ <unwar
src="${settings.localRepository}/org/rhq/rhq-installer/${rhq.version}/rhq-installer-${rhq.version}.war"
+ dest="${jboss.deploy.dir}/rhq-installer.war" />
<echo>Deploying embedded agent sar ...</echo>
- <unjar
src="${settings.localRepository}/org/rhq/rhq-enterprise-server-agent-sar/${rhq.version}/rhq-enterprise-server-agent-sar-${rhq.version}.sar"
- dest="${jboss.deploy.dir}/rhq-agent.sar" />
+ <unjar
src="${settings.localRepository}/org/rhq/rhq-enterprise-server-agent-sar/${rhq.version}/rhq-enterprise-server-agent-sar-${rhq.version}.sar"
+ dest="${jboss.deploy.dir}/rhq-agent.sar" />
<echo>Deploying RT filter jar ...</echo>
- <copy
file="${settings.localRepository}/org/rhq/rhq-rtfilter/${rhq.version}/rhq-rtfilter-${rhq.version}.jar"
- todir="${jboss.home}/server/default/lib" verbose="true"
/>
+ <copy
file="${settings.localRepository}/org/rhq/rhq-rtfilter/${rhq.version}/rhq-rtfilter-${rhq.version}.jar"
+ todir="${jboss.home}/server/default/lib" verbose="true"
/>
<!-- Delete docs dir and README files... -->
<delete dir="${jboss.home}/docs" />
@@ -354,17 +354,17 @@
<!-- deploy the agent update binary to the downloads location -->
<echo>Deploying the latest agent update binary and renaming it
rhq-enterprise-agent-${rhq.version}.jar</echo>
- <copy
file="${settings.localRepository}/org/rhq/rhq-enterprise-agentupdate/${rhq.version}/rhq-enterprise-agentupdate-${rhq.version}.jar"
-
tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-agent/rhq-enterprise-agent-${rhq.version}.jar"
- verbose="true"
- failonerror="true"/>
+ <copy
file="${settings.localRepository}/org/rhq/rhq-enterprise-agentupdate/${rhq.version}/rhq-enterprise-agentupdate-${rhq.version}.jar"
+
tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-agent/rhq-enterprise-agent-${rhq.version}.jar"
+ verbose="true"
+ failonerror="true"/>
<!-- deploy the remote client binary to the downloads location. -->
<echo>Deploying the latest remote client binary</echo>
- <copy
file="${settings.localRepository}/org/rhq/rhq-remoting-cli/${rhq.version}/rhq-remoting-cli-${rhq.version}.zip"
-
tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-client/rhq-remoting-cli-${rhq.version}.zip"
- verbose="true"
- failonerror="false"/>
+ <copy
file="${settings.localRepository}/org/rhq/rhq-remoting-cli/${rhq.version}/rhq-remoting-cli-${rhq.version}.zip"
+
tofile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-client/rhq-remoting-cli-${rhq.version}.zip"
+ verbose="true"
+ failonerror="false"/>
<!-- optionally package the connectors -->
<antcall target="package-connectors" />
@@ -895,3 +895,4 @@ rhq.autoinstall.public-endpoint-address=
</target>
</project>
+
diff --git a/pom.xml b/pom.xml
index 562120a..b3f59cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
<quartz.version>1.6.5</quartz.version>
<jna.version>3.2.2</jna.version>
- <!-- defaults for datasource used by dbsetup, unit+integration tests, and dev
container build -
+ <!-- defaults for datasource used by integration tests -
these may be overridden in ~/.m2/settings.xml -->
<rhq.test.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhq</rhq.test.ds.connection-url>
<rhq.test.ds.driver-class>org.postgresql.Driver</rhq.test.ds.driver-class>
@@ -96,6 +96,23 @@
<rhq.test.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE
LOCK_NAME = ? FOR UPDATE</rhq.test.quartz.selectWithLockSQL>
<rhq.test.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.test.quartz.lockHandlerClass>
+ <!-- defaults for datasource used by the dev container build (see dev docs on the
'dev' profile) -
+ these may be overridden in ~/.m2/settings.xml -->
+
<rhq.dev.ds.connection-url>jdbc:postgresql://127.0.0.1:5432/rhqdev</rhq.dev.ds.connection-url>
+ <rhq.dev.ds.driver-class>org.postgresql.Driver</rhq.dev.ds.driver-class>
+
<rhq.dev.ds.xa-datasource-class>org.postgresql.xa.PGXADataSource</rhq.dev.ds.xa-datasource-class>
+ <rhq.dev.ds.user-name>rhqadmin</rhq.dev.ds.user-name>
+ <rhq.dev.ds.password>rhqadmin</rhq.dev.ds.password>
+
<rhq.dev.ds.password.encrypted>1eeb2f255e832171df8592078de921bc</rhq.dev.ds.password.encrypted>
+ <rhq.dev.ds.type-mapping>PostgreSQL</rhq.dev.ds.type-mapping>
+ <rhq.dev.ds.server-name>127.0.0.1</rhq.dev.ds.server-name>
+ <rhq.dev.ds.port>5432</rhq.dev.ds.port>
+ <rhq.dev.ds.db-name>rhqdev</rhq.dev.ds.db-name>
+
<rhq.dev.ds.hibernate-dialect>org.hibernate.dialect.PostgreSQLDialect</rhq.dev.ds.hibernate-dialect>
+
<rhq.dev.quartz.driverDelegateClass>org.quartz.impl.jdbcjobstore.PostgreSQLDelegate</rhq.dev.quartz.driverDelegateClass>
+ <rhq.dev.quartz.selectWithLockSQL>SELECT * FROM {0}LOCKS ROWLOCK WHERE
LOCK_NAME = ? FOR UPDATE</rhq.dev.quartz.selectWithLockSQL>
+
<rhq.dev.quartz.lockHandlerClass>org.quartz.impl.jdbcjobstore.StdRowLockSemaphore</rhq.dev.quartz.lockHandlerClass>
+
<!-- default port numbers for RHQ server -->
<rhq.server.http.port>7080</rhq.server.http.port>
<rhq.server.https.port>7443</rhq.server.https.port>
@@ -744,7 +761,7 @@
<execution>
<id>enforce-versions</id>
<goals>
- <goal>enforce-once</goal>
+ <goal>enforce</goal>
</goals>
<configuration>
<rules>