modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 34
++++++++++
pom.xml | 20
+++++
2 files changed, 52 insertions(+), 2 deletions(-)
New commits:
commit 129ec9cdd5f6d2f10f65a179c7e490bfef51e94e
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Oct 22 11:42:19 2012 -0400
update container build to create cassandra jdbc driver module
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 5922afb..43e84e5 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -187,6 +187,40 @@
</dependencies>
</module>
]]></echo>
+
+ <echo>Adding Cassandra JDBC module to ${jboss.modules.dir}...</echo>
+ <copy
file="${settings.localRepository}/org/apache-extras/cassandra-jdbc/cassandra-jdbc/${cassandra.jdbc.version}/cassandra-jdbc-${cassandra.jdbc.version}.jar"
+ toDir="${jboss.modules.dir}/org/apache-extras/cassandra-jdbc/main"
failonerror="false" verbose="true"/>
+ <copy
file="${settings.localRepository}/org/apache/cassandra/cassandra-clientutil/${cassandra.version}/cassandra-clientutil-${cassandra.version}.jar"
+ toDir="${jboss.modules.dir}/org/apache-extras/cassandra-jdbc/main"
failonerror="false" verbose="true"/>
+ <copy
file="${settings.localRepository}/org/apache/cassandra/cassandra-thrift/${cassandra.version}/cassandra-thrift-${cassandra.version}.jar"
+ toDir="${jboss.modules.dir}/org/apache-extras/cassandra-jdbc/main"
failonerror="false" verbose="true"/>
+ <copy
file="${settings.localRepository}/org/apache/thrift/libthrift/${cassandra.thrift.version}/libthrift-${cassandra.thrift.version}.jar"
+ toDir="${jboss.modules.dir}/org/apache-extras/cassandra-jdbc/main"
failonerror="false" verbose="true"/>
+ <copy
file="${settings.localRepository}/com/google/guava/guava/${cassandra.jdbc.guava.version}/guava-${cassandra.jdbc.guava.version}.jar"
+ toDir="${jboss.modules.dir}/org/apache-extras/cassandra-jdbc/main"
failonerror="false" verbose="true"/>
+ <copy
file="${settings.localRepository}/com/google/code/findbugs/jsr305/${cassandra.jdbc.jsr305.version}/jsr305-${cassandra.jdbc.jsr305.version}.jar"
+ toDir="${jboss.modules.dir}/org/apache-extras/cassandra-jdbc/main"
failonerror="false" verbose="true"/>
+ <echo
file="${jboss.modules.dir}/org/apache-extras/cassandra-jdbc/main/module.xml">
+ <![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1"
name="org.apache-extras.cassandra-jdbc">
+ <resources>
+ <resource-root path="cassandra-jdbc-${cassandra.jdbc.version}.jar"/>
+ <resource-root
path="cassandra-clientutil-${cassandra.version}.jar"/>
+ <resource-root path="cassandra-thrift-${cassandra.version}.jar"/>
+ <resource-root path="libthrift-${cassandra.thrift}.jar"/>
+ <resource-root path="jsr305-${cassandra.jdbc.jsr305.version}.jar"/>
+ <resource-root path="guava-${cassandra.jdbc.guava.version}.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="org.slf4j"/>
+ <module name="org.apache.commons.lang"/>
+ </dependencies>
+</module>
+]]>
+ </echo>
+
<copy
file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"
toDir="${jboss.modules.dir}/org/rhq/postgres/main"
verbose="true" />
<echo
file="${jboss.modules.dir}/org/rhq/postgres/main/module.xml"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
diff --git a/pom.xml b/pom.xml
index 7b33a1a..f97b5ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,8 +138,24 @@
<powermock.version>1.4.11</powermock.version>
<arquillian.version>1.0.2.Final</arquillian.version>
<xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version> <!-- see
BZ-820629 and CVE-2009-2625 -->
- <opencsv.version>1.8</opencsv.version>
-
+ <opencsv.version>1.8</opencsv.version>
+
+ <!-- cassandra dependency versions -->
+ <cassandra.version>1.2.0-beta1</cassandra.version>
+ <cassandra.thrift.version>0.7.0</cassandra.thrift.version>
+ <cassandra.jdbc.version>1.2.0-SNAPSHOT</cassandra.jdbc.version>
+ <!--
+ This is a transitive, runtime dependency of the cassandra jdbc driver. This
property
+ is used in the container build. It should only be changed when the the
+ cassandra.jdbc.version property is changed as well.
+ -->
+ <cassandra.jdbc.guava.version>12.0</cassandra.jdbc.guava.version>
+ <!--
+ This is a transitive, runtime dependency of the cassandra jdbc driver. This
property
+ is used in the container build. It should only be changed when the the
+ cassandra.jdbc.version property is changed as well.
+ -->
+ <cassandra.jdbc.jsr305.version>1.3.9</cassandra.jdbc.jsr305.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
<rhq.db.admin.password>rhqadmin</rhq.db.admin.password>
Show replies by date