zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1087198 - in /zookeeper/bookkeeper/trunk: ./ bookkeeper-benchmark/ bookkeeper-server/ bookkeeper-server/lib/ bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ bookkeeper/
Date Thu, 31 Mar 2011 06:46:24 GMT
Author: breed
Date: Thu Mar 31 06:46:23 2011
New Revision: 1087198

URL: http://svn.apache.org/viewvc?rev=1087198&view=rev
Log:
got bookkeper work with maven

Added:
    zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml
    zookeeper/bookkeeper/trunk/bookkeeper-server/
      - copied from r1087146, zookeeper/bookkeeper/trunk/bookkeeper/
    zookeeper/bookkeeper/trunk/bookkeeper-server/lib/
    zookeeper/bookkeeper/trunk/bookkeeper-server/lib/README
    zookeeper/bookkeeper/trunk/bookkeeper-server/lib/zookeeper-test-3.3.3.jar   (with props)
    zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
Removed:
    zookeeper/bookkeeper/trunk/bookkeeper/
Modified:
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java
    zookeeper/bookkeeper/trunk/pom.xml

Added: zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml?rev=1087198&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-benchmark/pom.xml Thu Mar 31 06:46:23 2011
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>bookkeeper_project</artifactId>
+    <groupId>org.apache.bookkeeper</groupId>
+    <version>3.4.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.bookkeeper</groupId>
+  <artifactId>bookkeeper-benchmark</artifactId>
+  <version>3.4.0-SNAPSHOT</version>
+  <name>bookkeeper-benchmark</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+    	<groupId>log4j</groupId>
+    	<artifactId>log4j</artifactId>
+    	<version>1.2.14</version>
+    	<type>jar</type>
+    	<scope>compile</scope>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.zookeeper</groupId>
+    	<artifactId>zookeeper</artifactId>
+    	<version>3.3.3</version>
+    	<type>jar</type>
+    	<scope>compile</scope>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.zookeeper</groupId>
+    	<artifactId>zookeeper-test</artifactId>
+    	<version>3.3.3</version>
+    	<type>jar</type>
+    	<scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.netty</groupId>
+      <artifactId>netty</artifactId>
+      <version>3.1.2.GA</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.bookkeeper</groupId>
+      <artifactId>bookkeeper</artifactId>
+      <version>3.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>jboss.release</id>
+      <name>JBoss releases</name>
+      <url>http://repository.jboss.org/maven2</url>
+    </repository>
+  </repositories>
+</project>

Added: zookeeper/bookkeeper/trunk/bookkeeper-server/lib/README
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/lib/README?rev=1087198&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/lib/README (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/lib/README Thu Mar 31 06:46:23 2011
@@ -0,0 +1,5 @@
+the zookeeper test classes are not part of the standard distribution,
+so we need to manually install a jar file with the test classes.
+use the following command:
+
+mvn -q install:install-file -Dfile=zookeeper-test-3.3.3.jar -DgroupId=org.apache.zookeeper
-DartifactId=zookeeper-test -Dpackaging=jar  -Dversion=3.3.3

Added: zookeeper/bookkeeper/trunk/bookkeeper-server/lib/zookeeper-test-3.3.3.jar
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/lib/zookeeper-test-3.3.3.jar?rev=1087198&view=auto
==============================================================================
Binary file - no diff available.

Propchange: zookeeper/bookkeeper/trunk/bookkeeper-server/lib/zookeeper-test-3.3.3.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml?rev=1087198&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml Thu Mar 31 06:46:23 2011
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>bookkeeper_project</artifactId>
+    <groupId>org.apache.bookkeeper</groupId>
+    <version>3.4.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.bookkeeper</groupId>
+  <artifactId>bookkeeper-server</artifactId>
+  <version>3.4.0-SNAPSHOT</version>
+  <name>bookkeeper-server</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+    	<groupId>log4j</groupId>
+    	<artifactId>log4j</artifactId>
+    	<version>1.2.14</version>
+    	<type>jar</type>
+    	<scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper</artifactId>
+      <version>3.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.zookeeper</groupId>
+      <artifactId>zookeeper-test</artifactId>
+      <version>3.4.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.netty</groupId>
+      <artifactId>netty</artifactId>
+      <version>3.1.2.GA</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>jboss.release</id>
+      <name>JBoss releases</name>
+      <url>http://repository.jboss.org/maven2</url>
+    </repository>
+  </repositories>
+</project>

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java?rev=1087198&r1=1087146&r2=1087198&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LocalBookKeeper.java
Thu Mar 31 06:46:23 2011
@@ -38,7 +38,7 @@ import org.apache.zookeeper.WatchedEvent
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.ZooDefs.Ids;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
+import org.apache.zookeeper.server.NIOServerCnxn.Factory;
 import org.apache.zookeeper.server.ZooKeeperServer;
 
 public class LocalBookKeeper {
@@ -62,7 +62,7 @@ public class LocalBookKeeper {
 	}
 	
 	private final String HOSTPORT = "127.0.0.1:2181";
-	NIOServerCnxnFactory serverFactory;
+	Factory serverFactory;
 	ZooKeeperServer zks;
 	ZooKeeper zkc;
 	int ZooKeeperDefaultPort = 2181;
@@ -88,8 +88,8 @@ public class LocalBookKeeper {
 		    
 		try {
 			zks = new ZooKeeperServer(ZkTmpDir, ZkTmpDir, ZooKeeperDefaultPort);
-			serverFactory =  new NIOServerCnxnFactory();
-			serverFactory.configure(new InetSocketAddress(ZooKeeperDefaultPort), maxCC);
+			serverFactory =  new Factory(new InetSocketAddress(ZooKeeperDefaultPort));
+			//serverFactory.configure(new InetSocketAddress(ZooKeeperDefaultPort), maxCC);
 			serverFactory.startup(zks);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java?rev=1087198&r1=1087146&r2=1087198&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java
Thu Mar 31 06:46:23 2011
@@ -37,7 +37,7 @@ import org.apache.zookeeper.WatchedEvent
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.ZooDefs.Ids;
-import org.apache.zookeeper.server.NIOServerCnxnFactory;
+import org.apache.zookeeper.server.NIOServerCnxn.Factory;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.test.ClientBase;
 import org.junit.After;
@@ -56,7 +56,7 @@ public abstract class BaseTestCase exten
     static Integer ZooKeeperDefaultPort = 2181;
     ZooKeeperServer zks;
     ZooKeeper zkc; // zookeeper client
-    NIOServerCnxnFactory serverFactory;
+    Factory serverFactory;
     File ZkTmpDir;
 
     // BookKeeper
@@ -89,8 +89,8 @@ public abstract class BaseTestCase exten
         ZkTmpDir.mkdir();
 
         zks = new ZooKeeperServer(ZkTmpDir, ZkTmpDir, ZooKeeperDefaultPort);
-        serverFactory = new NIOServerCnxnFactory();
-        serverFactory.configure(new InetSocketAddress(ZooKeeperDefaultPort), 100);
+        serverFactory = new Factory(new InetSocketAddress(ZooKeeperDefaultPort));
+        //serverFactory.configure(new InetSocketAddress(ZooKeeperDefaultPort), 100);
         serverFactory.startup(zks);
 
         boolean b = ClientBase.waitForServerUp(HOSTPORT, ClientBase.CONNECTION_TIMEOUT);

Modified: zookeeper/bookkeeper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/pom.xml?rev=1087198&r1=1087197&r2=1087198&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/pom.xml Thu Mar 31 06:46:23 2011
@@ -29,7 +29,7 @@
   	<module>hedwig-client</module>
   	<module>hedwig-server</module>
   	<module>hedwig-protocol</module>
-  	<module>bookkeeper</module>
+  	<module>bookkeeper-server</module>
   	<module>bookkeeper-benchmark</module>
   </modules>
   <repositories>



Mime
View raw message