dev/null
|binary
modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml |
23 ++++++++--
modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties |
2
modules/common/cassandra-schema/pom.xml |
16 ------
modules/enterprise/server/installer/pom.xml |
3 -
modules/enterprise/server/installer/src/main/resources/module/main/module.xml |
2
modules/enterprise/server/server-metrics/pom.xml |
16 ------
pom.xml |
1
8 files changed, 23 insertions(+), 40 deletions(-)
New commits:
commit 79ae5d20ebe5abe556856e7a7b058d815b2da17d
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Feb 26 16:03:48 2013 -0500
several updates to support using forked version of snappy-java
The datastax driver uses snappy-java for compression. The snappy-java native
library would not load in JBoss AS due to snappy-java using the root class
loader. I have since forked snappy-java so that it loads its native library
using the same class loader that other snappy classes.
Also making some JNA upgrades necessary for C* 1.2.1. The JNA libraries are no
longer stored in git. When creating the C* bundle, the ant script (that creates
the bundle) copies the JNA artifacts from the local maven repo.
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
index e738ef2..82530a7 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
@@ -14,6 +14,7 @@
<properties>
<local.repo>${settings.localRepository}</local.repo>
+ <cassandra.jna.version>3.5.1</cassandra.jna.version>
</properties>
<dependencies>
@@ -50,11 +51,24 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>3.2.7</version>
+ <version>${cassandra.jna.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>platform</artifactId>
+ <version>${cassandra.jna.version}</version>
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -131,10 +145,11 @@
value="${project.build.outputDirectory}/${cassandra.distro.filename}"/>
<copy
file="${settings.localRepository}/org/rhq/rhq-cassandra-auth/${project.version}/rhq-cassandra-auth-${project.version}.jar"
todir="${cassandra.dir}/lib"/>
+ <copy
file="${settings.localRepository}/net/java/dev/jna/platform/${cassandra.jna.version}/platform-${cassandra.jna.version}.jar"
+ todir="${cassandra.dir}/lib"/>
+ <copy
file="${settings.localRepository}/net/java/dev/jna/jna/${cassandra.jna.version}/jna-${cassandra.jna.version}.jar"
+ todir="${cassandra.dir}/lib"/>
<move file="${project.build.outputDirectory}/cassandra/conf"
todir="${cassandra.dir}"/>
- <move file="${project.build.outputDirectory}/cassandra/lib"
todir="${cassandra.dir}"/>
- <!--<move
file="${project.build.outputDirectory}/passwd.properties"
todir="${cassandra.dir}/conf"/>-->
- <!--<move
file="${project.build.outputDirectory}/access.properties"
todir="${cassandra.dir}/conf"/>-->
<zip basedir="${cassandra.dir}"
destfile="${cassandra.distro.zip}"/>
<delete dir="${cassandra.dir}"/>
<zip basedir="${project.build.outputDirectory}"
diff --git
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
index 84687cb..67e33bb 100644
---
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
+++
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties
@@ -8,7 +8,7 @@ rhq.cassandra.bundle.version=1.0
# The directory in which Cassandra is installed. This property must be
# specified.
-rhq.cassandra.basedir=
+rhq.cassandra.basedir=${rhq.rootDir}
# The username with which to authenticate requests to Cassandra.
rhq.cassandra.username=rhqadmin
diff --git
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra/lib/jna-3.4.1.jar
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra/lib/jna-3.4.1.jar
deleted file mode 100644
index 4e05a4a..0000000
Binary files
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra/lib/jna-3.4.1.jar
and /dev/null differ
diff --git
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra/lib/platform-3.4.1.jar
b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra/lib/platform-3.4.1.jar
deleted file mode 100644
index 8357d2e..0000000
Binary files
a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra/lib/platform-3.4.1.jar
and /dev/null differ
diff --git a/modules/common/cassandra-schema/pom.xml
b/modules/common/cassandra-schema/pom.xml
index 5ea1ce3..9433b46 100644
--- a/modules/common/cassandra-schema/pom.xml
+++ b/modules/common/cassandra-schema/pom.xml
@@ -28,22 +28,6 @@
<profiles>
<profile>
- <id>snappy-mac-workaround</id>
- <activation>
- <os>
- <family>Mac</family>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>1.0.5-M3</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>dev</id>
<properties>
<rhq.rootDir>../../..</rhq.rootDir>
diff --git a/modules/enterprise/server/installer/pom.xml
b/modules/enterprise/server/installer/pom.xml
index d5f09e2..7f30db5 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -229,8 +229,7 @@
<artifactItem>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>1.0.4.1</version>
- <!--<version>1.0.5-M3</version>-->
+
<version>${cassandra.driver.snappy.version}</version>
</artifactItem>
<artifactItem>
<groupId>com.ning</groupId>
diff --git a/modules/enterprise/server/installer/src/main/resources/module/main/module.xml
b/modules/enterprise/server/installer/src/main/resources/module/main/module.xml
index a1448ce..8449d46 100644
--- a/modules/enterprise/server/installer/src/main/resources/module/main/module.xml
+++ b/modules/enterprise/server/installer/src/main/resources/module/main/module.xml
@@ -33,7 +33,7 @@
<resource-root
path="libthrift-${cassandra.thrift.version}.jar"/>
<resource-root path="jackson-mapper-asl-1.4.0.jar"/>
<resource-root path="jackson-core-asl-1.4.0.jar"/>
- <resource-root path="snappy-java-1.0.4.1.jar"/>
+ <resource-root
path="snappy-java-${cassandra.driver.snappy.version}.jar"/>
<!-- end rhq-cassandra-schema dependencies -->
<resource-root path="commons-codec-1.2.jar"/>
</resources>
diff --git a/modules/enterprise/server/server-metrics/pom.xml
b/modules/enterprise/server/server-metrics/pom.xml
index e5417e3..0db7f68 100644
--- a/modules/enterprise/server/server-metrics/pom.xml
+++ b/modules/enterprise/server/server-metrics/pom.xml
@@ -158,22 +158,6 @@
<profiles>
<profile>
- <id>snappy-mac-workaround</id>
- <activation>
- <os>
- <family>Mac</family>
- </os>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>1.0.5-M3</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>dev</id>
<properties>
<rhq.rootDir>../../..</rhq.rootDir>
diff --git a/pom.xml b/pom.xml
index 222e8e9..6e9e489 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,7 @@
<cassandra.version>1.2.1</cassandra.version>
<cassandra.thrift.version>0.7.0</cassandra.thrift.version>
<cassandra.driver.version>1.0.0-beta1</cassandra.driver.version>
+
<cassandra.driver.snappy.version>1.0.5-M3-p1</cassandra.driver.snappy.version>
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
<rhq.db.admin.password>rhqadmin</rhq.db.admin.password>
Show replies by date