Merge branch '1.0' into 2.0

Conflicts:
	driver-core/CHANGELOG.rst

Author: Sylvain Lebresne

driver-core/CHANGELOG.rst

@@ -41,6 +41,12 @@ CHANGELOG
   first one (JAVA-88).
 
 
+1.0.5:
+------
+
+- [new] OSGi bundle (JAVA-142)
+
+
 1.0.4:
 ------
 

driver-core/pom.xml

@@ -21,7 +21,7 @@
     <version>2.0.0-beta3-SNAPSHOT</version>
   </parent>
   <artifactId>cassandra-driver-core</artifactId>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <name>DataStax Java Driver for Apache Cassandra - Core</name>
   <description>A driver for Apache Cassandra 1.2+ that works exclusively with the Cassandra Query Language version 3 (CQL3) and Cassandra's binary protocol.</description>
   <url>https://github.com/datastax/java-driver</url>

driver-examples/stress/src/main/java/com/datastax/driver/stress/Stress.java

@@ -56,6 +56,8 @@ private static OptionParser defaultParser() {
             accepts("ip", "The hosts ip to connect to").withRequiredArg().ofType(String.class).defaultsTo("127.0.0.1");
             accepts("report-file", "The name of csv file to use for reporting results").withRequiredArg().ofType(String.class).defaultsTo("last.csv");
             accepts("print-delay", "The delay in seconds at which to report on the console").withRequiredArg().ofType(Integer.class).defaultsTo(5);
+            accepts("compression", "Use compression (SNAPPY)");
+            accepts("connections-per-host", "The number of connections per hosts (default: based on the number of threads)").withRequiredArg().ofType(Integer.class);
         }};
         String msg = "Where <generator> can be one of " + generators.keySet() + "\n"
                    + "You can get more help on a particular generator with: stress <generator> -h";
@@ -201,24 +203,38 @@ public static void main(String[] args) throws Exception {
         boolean async = options.has("async");
 
         int iterations = (requests  == -1 ? -1 : requests / concurrency);
+
+        final int maxRequestsPerConnection = 128;
+        int maxConnections = options.has("connections-per-host")
+                           ? (Integer)options.valueOf("connections-per-host")
+                           : concurrency / maxRequestsPerConnection + 1;
+
+        PoolingOptions pools = new PoolingOptions();
+        pools.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, concurrency);
+        pools.setCoreConnectionsPerHost(HostDistance.LOCAL, maxConnections);
+        pools.setMaxConnectionsPerHost(HostDistance.LOCAL, maxConnections);
+        pools.setCoreConnectionsPerHost(HostDistance.REMOTE, maxConnections);
+        pools.setMaxConnectionsPerHost(HostDistance.REMOTE, maxConnections);
+
         System.out.println("Initializing stress test:");
-        System.out.println("  request count: " + (requests == -1 ? "unlimited" : requests));
-        System.out.println("  concurrency:   " + concurrency + " (" + iterations + " requests/thread)");
-        System.out.println("  mode:          " + (async ? "asynchronous" : "blocking"));
+        System.out.println("  request count:        " + (requests == -1 ? "unlimited" : requests));
+        System.out.println("  concurrency:          " + concurrency + " (" + iterations + " requests/thread)");
+        System.out.println("  mode:                 " + (async ? "asynchronous" : "blocking"));
+        System.out.println("  per-host connections: " + maxConnections);
+        System.out.println("  compression:          " + options.has("compression"));
+
+        SocketOptions socket = new SocketOptions();
+        socket.setTcpNoDelay(true);
 
         try {
             // Create session to hosts
-            Cluster cluster = new Cluster.Builder().addContactPoints(String.valueOf(options.valueOf("ip"))).build();
-
-            final int maxRequestsPerConnection = 128;
-            int maxConnections = concurrency / maxRequestsPerConnection + 1;
+            Cluster cluster = new Cluster.Builder()
+                                         .addContactPoints(String.valueOf(options.valueOf("ip")))
+                                         .withPoolingOptions(pools)
+                                         .build();
 
-            PoolingOptions pools = cluster.getConfiguration().getPoolingOptions();
-            pools.setMaxSimultaneousRequestsPerConnectionThreshold(HostDistance.LOCAL, concurrency);
-            pools.setCoreConnectionsPerHost(HostDistance.LOCAL, maxConnections);
-            pools.setMaxConnectionsPerHost(HostDistance.LOCAL, maxConnections);
-            pools.setCoreConnectionsPerHost(HostDistance.REMOTE, maxConnections);
-            pools.setMaxConnectionsPerHost(HostDistance.REMOTE, maxConnections);
+            if (options.has("compression"))
+                cluster.getConfiguration().getProtocolOptions().setCompression(ProtocolOptions.Compression.SNAPPY);
 
             Session session = cluster.connect();
 

pom.xml

@@ -105,6 +105,33 @@
         </descriptorRefs>
       </configuration>
     </plugin>
+    <plugin>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>maven-bundle-plugin</artifactId>
+      <extensions>true</extensions>
+      <version>2.4.0</version>
+      <executions>
+        <execution>
+          <id>bundle-manifest</id>
+          <phase>process-classes</phase>
+          <goals>
+            <goal>manifest</goal>
+          </goals>
+        </execution>
+      </executions>
+      <configuration>
+        <instructions>
+          <Bundle-SymbolicName>com.datastax.driver.core</Bundle-SymbolicName>
+          <Bundle-Version>${project.version}</Bundle-Version>
+          <_include>-osgi.bnd</_include>
+        </instructions>
+        <supportedProjectTypes>
+          <supportedProjectType>jar</supportedProjectType>
+          <supportedProjectType>bundle</supportedProjectType>
+          <supportedProjectType>pom</supportedProjectType>
+        </supportedProjectTypes>
+      </configuration>
+    </plugin>
     </plugins>
   </build>