You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by dp...@apache.org on 2011/10/04 10:47:02 UTC
svn commit: r1178722 - in /jackrabbit/sandbox/microkernel/src:
main/java/org/apache/jackrabbit/mk/cluster/ClusterNode.java
main/java/org/apache/jackrabbit/mk/server/Server.java
test/java/org/apache/jackrabbit/mk/cluster/BasicTest.java
Author: dpfister
Date: Tue Oct 4 08:47:02 2011
New Revision: 1178722
URL: http://svn.apache.org/viewvc?rev=1178722&view=rev
Log:
Replace tabs with spaces
Modified:
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/cluster/ClusterNode.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/server/Server.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/cluster/BasicTest.java
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/cluster/ClusterNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/cluster/ClusterNode.java?rev=1178722&r1=1178721&r2=1178722&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/cluster/ClusterNode.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/cluster/ClusterNode.java Tue Oct 4 08:47:02 2011
@@ -26,15 +26,15 @@ public class ClusterNode {
private MicroKernel mk;
private String lastRevision;
- public ClusterNode(MicroKernel mk) {
- this.mk = mk;
- }
-
- public void join(InetSocketAddress addr) {
- Client client = new Client(addr);
- String headRevision = client.getHeadRevision();
- if (lastRevision == null) {
- lastRevision = headRevision;
- }
- }
+ public ClusterNode(MicroKernel mk) {
+ this.mk = mk;
+ }
+
+ public void join(InetSocketAddress addr) {
+ Client client = new Client(addr);
+ String headRevision = client.getHeadRevision();
+ if (lastRevision == null) {
+ lastRevision = headRevision;
+ }
+ }
}
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/server/Server.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/server/Server.java?rev=1178722&r1=1178721&r2=1178722&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/server/Server.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/server/Server.java Tue Oct 4 08:47:02 2011
@@ -133,10 +133,10 @@ public class Server {
}
public InetSocketAddress getAddress() {
- if (!started.get() || stopped.get()) {
- return null;
- }
- return (InetSocketAddress) ss.getLocalSocketAddress();
+ if (!started.get() || stopped.get()) {
+ return null;
+ }
+ return (InetSocketAddress) ss.getLocalSocketAddress();
}
/**
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/cluster/BasicTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/cluster/BasicTest.java?rev=1178722&r1=1178721&r2=1178722&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/cluster/BasicTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/cluster/BasicTest.java Tue Oct 4 08:47:02 2011
@@ -24,41 +24,41 @@ import org.junit.Before;
import org.junit.Test;
public class BasicTest {
-
- private MicroKernel mk1;
- private Server server;
-
- private MicroKernel mk2;
-
+
+ private MicroKernel mk1;
+ private Server server;
+
+ private MicroKernel mk2;
+
@Before
public void setUp() throws Exception {
- mk1 = MicroKernelFactory.getInstance("fs:{homeDir}/target/mk1;clean");
- mk2 = MicroKernelFactory.getInstance("fs:{homeDir}/target/mk2;clean");
+ mk1 = MicroKernelFactory.getInstance("fs:{homeDir}/target/mk1;clean");
+ mk2 = MicroKernelFactory.getInstance("fs:{homeDir}/target/mk2;clean");
}
@After
public void tearDown() {
- if (mk1 != null) {
- mk1.dispose();
- }
- if (mk2 != null) {
- mk2.dispose();
- }
- if (server != null) {
- server.stop();
- }
+ if (mk1 != null) {
+ mk1.dispose();
+ }
+ if (mk2 != null) {
+ mk2.dispose();
+ }
+ if (server != null) {
+ server.stop();
+ }
}
@Test
public void test() throws Exception {
- server = new Server(mk1);
- server.setPort(0);
- server.start();
-
- ClusterNode cn = new ClusterNode(mk2);
- cn.join(server.getAddress());
-
- mk1.commit("/", "+\"test\":{}", mk1.getHeadRevision(), null);
- mk2.getNodes("/test", mk2.getHeadRevision());
+ server = new Server(mk1);
+ server.setPort(0);
+ server.start();
+
+ ClusterNode cn = new ClusterNode(mk2);
+ cn.join(server.getAddress());
+
+ mk1.commit("/", "+\"test\":{}", mk1.getHeadRevision(), null);
+ mk2.getNodes("/test", mk2.getHeadRevision());
}
}