Author: [email protected]
Date: Fri Feb 10 17:11:10 2012
New Revision: 2082
Log:
[AMDATUCASSANDRA-154] Moved all Thrift packages to hector bundle, which is now
the only bundle that exports Thrift and hector packages. All other bundles
should depend on this one.
Modified:
trunk/amdatu-cassandra/cassandra-client/pom.xml
trunk/amdatu-cassandra/cassandra-hector/pom.xml
trunk/amdatu-cassandra/cassandra-listener/pom.xml
trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml
trunk/amdatu-cassandra/test-unit/framework/pom.xml
Modified: trunk/amdatu-cassandra/cassandra-client/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-client/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-client/pom.xml Fri Feb 10 17:11:10 2012
@@ -29,46 +29,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-all</artifactId>
- <version>${cassandra.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra-thrift</artifactId>
- <version>${cassandra.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.6.1</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <type>bundle</type>
</dependency>
</dependencies>
@@ -84,33 +47,8 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.client.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.client</Bundle-SymbolicName>
- <Embed-Dependency>!slf4j-log4j12;scope=compile</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- <Import-Package>
- !com.ibm.uvm.tools,
- !com.sun.jdmk.comm,
- !com.sun.jna,
- !com.thoughtworks.paranamer,
- !edu.emory.mathcs.backport.java.util,
- !javax.jmdns,
- !javax.jms,
- !javax.mail.*,
- !javax.swing.*,
- !joptsimple,
- !junit.framework,
- !org.apache.avalon.framework.logger,
- !org.apache.hadoop.*,
- !org.apache.log,
- !org.apache.tools.ant.*,
- !org.apache.velocity.*,
- !org.jboss.netty.*,
- !org.joda.time,
- *
- </Import-Package>
<Export-Package>
org.amdatu.cassandra.client;version="1.0.0",
-
org.apache.cassandra.thrift;-split-package:=merge-first;version="1.0.0",
- org.apache.thrift.*;version="1.0.0",
</Export-Package>
</instructions>
</configuration>
Modified: trunk/amdatu-cassandra/cassandra-hector/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-hector/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-hector/pom.xml Fri Feb 10 17:11:10 2012
@@ -34,6 +34,12 @@
<artifactId>hector-core</artifactId>
<version>0.8.0-3</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -55,17 +61,15 @@
<instructions>
<Bundle-SymbolicName>org.amdatu.cassandra.hector</Bundle-SymbolicName>
<Import-Package>
- !com.sun.jdmk.comm,
!com.sun.xml.fastinfoset.stax,
- !javax.jms,
- !javax.mail,
- !javax.mail.internet,
!org.apache.http.*,
*
</Import-Package>
<Export-Package>
me.prettyprint.hector.*;version="1.0.1",
- me.prettyprint.cassandra.*;version="1.0.1"
+ me.prettyprint.cassandra.*;version="1.0.1",
+ org.apache.cassandra.thrift.*;version="1.0.0",
+ org.apache.thrift.*;version="1.0.0",
</Export-Package>
<Embed-Dependency>!slf4j-log4j12;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
Modified: trunk/amdatu-cassandra/cassandra-listener/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-listener/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-listener/pom.xml Fri Feb 10 17:11:10 2012
@@ -35,6 +35,11 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml (original)
+++ trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml Fri Feb 10
17:11:10 2012
@@ -50,24 +50,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>me.prettyprint</groupId>
- <artifactId>hector-core</artifactId>
- <version>0.8.0-3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
Modified: trunk/amdatu-cassandra/test-unit/framework/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-unit/framework/pom.xml (original)
+++ trunk/amdatu-cassandra/test-unit/framework/pom.xml Fri Feb 10 17:11:10 2012
@@ -27,4 +27,24 @@
<name>Amdatu Cassandra - Unit test framework</name>
<description>This component holds the generic Unit test framework
classes</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.application</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <type>bundle</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
