Author: [email protected]
Date: Fri Feb 10 13:37:50 2012
New Revision: 2078
Log:
[AMDATUCASSANDRA-154] Moved Hector API to a separate bundle
Added:
trunk/amdatu-cassandra/cassandra-hector/
trunk/amdatu-cassandra/cassandra-hector/LICENSE
trunk/amdatu-cassandra/cassandra-hector/NOTICE
trunk/amdatu-cassandra/cassandra-hector/pom.xml
Modified:
trunk/amdatu-cassandra/cassandra-application/pom.xml
trunk/amdatu-cassandra/cassandra-client/pom.xml
trunk/amdatu-cassandra/cassandra-persistencemanager-hector/pom.xml
trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
trunk/amdatu-cassandra/cassandra-stores/pom.xml
trunk/amdatu-cassandra/cassandra-tools/pom.xml
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-cassandra/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
trunk/amdatu-cassandra/test-integration/tests/pom.xml
trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
trunk/amdatu-cassandra/test-unit/framework-hector/pom.xml
Modified: trunk/amdatu-cassandra/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-application/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-application/pom.xml Fri Feb 10
13:37:50 2012
@@ -45,6 +45,12 @@
<artifactId>libthrift</artifactId>
<version>0.6.0-2</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -100,7 +106,7 @@
<Embed-Dependency>!apache-cassandra|apache-cassandra-thrift|libthrift;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Private-Package>
- org.apache.cassandra.*,
+ org.apache.cassandra.*;-split-package:=merge-first,
org.apache.thrift.*,
org.amdatu.cassandra.application.*
</Private-Package>
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 13:37:50 2012
@@ -33,6 +33,12 @@
<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>
@@ -45,6 +51,12 @@
<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>
@@ -72,7 +84,7 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.client.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.client</Bundle-SymbolicName>
- <Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Embed-Dependency>!slf4j-log4j12;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
!com.ibm.uvm.tools,
Added: trunk/amdatu-cassandra/cassandra-hector/LICENSE
==============================================================================
--- (empty file)
+++ trunk/amdatu-cassandra/cassandra-hector/LICENSE Fri Feb 10 13:37:50 2012
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: trunk/amdatu-cassandra/cassandra-hector/NOTICE
==============================================================================
--- (empty file)
+++ trunk/amdatu-cassandra/cassandra-hector/NOTICE Fri Feb 10 13:37:50 2012
@@ -0,0 +1,35 @@
+Amdatu Cassandra - Hector
+Copyright 2010, 2011 The Amdatu Foundation
+
+
+I. Included Software
+
+This product includes software developed by The Apache Software Foundation
(http://www.apache.org/).
+License: Apache Software License 2.0 (see
http://www.apache.org/licenses/LICENSE-2.0.html).
+-
+This product includes Hector, developed by Ran Tavory (http://prettyprint.me/).
+Copyright 2010 Ran Tavory.
+For more information, see https://github.com/rantav/hector.
+License: MIT License (see http://www.opensource.org/licenses/mit-license.php).
+-
+This product includes Apache log4j, developed by The Apache Software
Foundation (http://www.apache.org/).
+Copyright 2007 The Apache Software Foundation.
+For more information, see http://logging.apache.org/log4j/.
+License: Apache Software License 2.0 (see
http://www.apache.org/licenses/LICENSE-2.0.html).
+-
+This product includes Apache SLF4J, developed by Ceki G�lc�.
+Copyright 2004-2005 SLF4J.ORG.
+For more information, see http://www.slf4j.org/.
+License: MIT License (see http://www.opensource.org/licenses/mit-license.php).
+
+
+II. Used Software
+
+This product uses software developed at The OSGi Alliance
(http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2007).
+License: Apache Software License 2.0 (see
http://www.apache.org/licenses/LICENSE-2.0.html).
+
+
+III. License Summary
+This products is licensed under the Apache Software License 2.0,
+see the LICENSE file included in this distribution.
Added: trunk/amdatu-cassandra/cassandra-hector/pom.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-cassandra/cassandra-hector/pom.xml Fri Feb 10 13:37:50 2012
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.verning permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra</artifactId>
+ <version>0.2.3-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <packaging>bundle</packaging>
+ <name>Amdatu Cassandra - Hector API</name>
+ <description>Wraps the Hector API in an OSGi bundle and exports its
packages.</description>
+
+ <dependencies>
+ <!-- Hector core 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-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <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"
+ </Export-Package>
+ <Embed-Dependency>!slf4j-log4j12;scope=compile</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <!-- Profile that will copy the jar to the configured
amdatu.deploy.directory when
+ the deploy profile is activated -->
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Modified: trunk/amdatu-cassandra/cassandra-persistencemanager-hector/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-persistencemanager-hector/pom.xml
(original)
+++ trunk/amdatu-cassandra/cassandra-persistencemanager-hector/pom.xml Fri Feb
10 13:37:50 2012
@@ -43,85 +43,10 @@
<artifactId>org.amdatu.cassandra.test.unit.framework</artifactId>
<type>jar</type>
</dependency>
-
- <!-- Hector core dependency -->
- <dependency>
- <groupId>me.prettyprint</groupId>
- <artifactId>hector-core</artifactId>
- <version>0.8.0-2</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- The Hector core receives this dependency from the cassandra
dependency, but
- not on our case so we include it explicitly -->
- <dependency>
- <groupId>org.cliffc.high_scale_lib</groupId>
- <artifactId>high-scale-lib</artifactId>
- <version>1.1.2</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Compile dependencies in hector-core not already provided by
cassandra-application
- (copied from https://github.com/rantav/hector/blob/0.8.0/pom.xml) -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>r09</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.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.github.stephenc.eaio-uuid</groupId>
- <artifactId>uuid</artifactId>
- <version>3.2.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.ecyrd.speed4j</groupId>
- <artifactId>speed4j</artifactId>
- <version>0.9</version>
- <scope>compile</scope>
- </dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6.1</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <type>bundle</type>
</dependency>
</dependencies>
@@ -141,30 +66,11 @@
org.amdatu.cassandra.persistencemanager.hector,
me.prettyprint.hector.api.*;version="[1.0,1.1)",
org.apache.cassandra.thrift.*;version="[1.0,2.0)",
- org.apache.thrift.*;version="[1.0,2.0)",
- !com.ibm.uvm.tools,
- !com.sun.jdmk.comm,
- !com.sun.xml.fastinfoset.stax,
- !javax.jmdns,
- !javax.jms,
- !javax.mail,
- !javax.mail.internet,
- !org.apache.cassandra.concurrent,
- !org.apache.cassandra.config,
- !org.apache.cassandra.db.*,
- !org.apache.cassandra.io.util,
- !org.apache.cassandra.locator,
- !org.apache.cassandra.service,
- !org.apache.cassandra.utils,
*
</Import-Package>
<Export-Package>
- org.amdatu.cassandra.persistencemanager.hector;version="1.0.0",
- me.prettyprint.hector.*;version="1.0.1",
- me.prettyprint.cassandra.*;version="1.0.1"
+ org.amdatu.cassandra.persistencemanager.hector;version="1.0.0"
</Export-Package>
- <Embed-Dependency>!hector-core;scope=compile</Embed-Dependency>
- <Embed-Transitive>false</Embed-Transitive>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml Fri Feb 10
13:37:50 2012
@@ -40,22 +40,11 @@
<Bundle-SymbolicName>org.amdatu.cassandra.persistencemanager</Bundle-SymbolicName>
<Import-Package>
org.amdatu.cassandra.persistencemanager,
- org.apache.cassandra.thrift.*;version="[1.0,2.0)",
- org.apache.thrift.*;version="[1.0,2.0)",
- !com.ibm.uvm.tools,
- !com.sun.jdmk.comm,
- !com.sun.xml.fastinfoset.stax,
- !javax.jmdns,
- !javax.jms,
- !javax.mail,
- !javax.mail.internet,
*
</Import-Package>
<Export-Package>
org.amdatu.cassandra.persistencemanager;version="1.1.0"
</Export-Package>
- <Embed-Dependency>*;scope=compile</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-cassandra/cassandra-stores/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-stores/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-stores/pom.xml Fri Feb 10 13:37:50 2012
@@ -31,6 +31,11 @@
<!-- Runtime -->
<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.listener</artifactId>
<type>bundle</type>
</dependency>
@@ -50,11 +55,13 @@
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.test.unit.framework</artifactId>
<type>jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.test.unit.framework.hector</artifactId>
<type>jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
Modified: trunk/amdatu-cassandra/cassandra-tools/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-tools/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-tools/pom.xml Fri Feb 10 13:37:50 2012
@@ -52,6 +52,12 @@
<artifactId>libthrift</artifactId>
<version>0.6.0-2</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Fri Feb 10 13:37:50 2012
@@ -71,6 +71,13 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -282,6 +289,7 @@
<module>config</module>
<module>cassandra-application</module>
<module>cassandra-client</module>
+ <module>cassandra-hector</module>
<module>cassandra-listener</module>
<module>cassandra-persistencemanager</module>
<module>cassandra-persistencemanager-hector</module>
Modified:
trunk/amdatu-cassandra/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
==============================================================================
---
trunk/amdatu-cassandra/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
(original)
+++
trunk/amdatu-cassandra/test-integration/base/src/main/java/org/amdatu/cassandra/test/integration/base/CassandraFixture.java
Fri Feb 10 13:37:50 2012
@@ -37,6 +37,7 @@
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.test.integration.base").versionAsInProject(),
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.application").versionAsInProject(),
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.client").versionAsInProject(),
+
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.hector").versionAsInProject(),
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.listener").versionAsInProject(),
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.persistencemanager").versionAsInProject(),
mavenBundle().groupId("org.amdatu.cassandra").artifactId("org.amdatu.cassandra.persistencemanager.hector").versionAsInProject(),
Modified: trunk/amdatu-cassandra/test-integration/tests/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-integration/tests/pom.xml (original)
+++ trunk/amdatu-cassandra/test-integration/tests/pom.xml Fri Feb 10
13:37:50 2012
@@ -127,6 +127,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.client</artifactId>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml (original)
+++ trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml Fri Feb 10
13:37:50 2012
@@ -74,6 +74,12 @@
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
+ <artifactId>org.amdatu.cassandra.hector</artifactId>
+ <scope>provided</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.client</artifactId>
<scope>provided</scope>
<type>bundle</type>
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
13:37:50 2012
@@ -52,13 +52,19 @@
<dependency>
<groupId>me.prettyprint</groupId>
<artifactId>hector-core</artifactId>
- <version>0.8.0-2</version>
+ <version>0.8.0-3</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <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>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
