Author: angela
Date: Mon Mar 30 08:06:02 2015
New Revision: 1670001
URL: http://svn.apache.org/r1670001
Log:
OAK-2693 : Retire oak-mk-remote (WIP)
Removed:
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/ClientFixture.java
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/ClientServerFixture.java
Modified:
jackrabbit/oak/trunk/README.md
jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md
jackrabbit/oak/trunk/oak-it/mk/pom.xml
jackrabbit/oak/trunk/oak-it/osgi/pom.xml
jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
jackrabbit/oak/trunk/oak-run/README.md
jackrabbit/oak/trunk/oak-run/pom.xml
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
jackrabbit/oak/trunk/pom.xml
Modified: jackrabbit/oak/trunk/README.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/README.md?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
--- jackrabbit/oak/trunk/README.md (original)
+++ jackrabbit/oak/trunk/README.md Mon Mar 30 08:06:02 2015
@@ -52,7 +52,6 @@ The build consists of the following main
- oak-commons - shared utility code
- oak-mk-api - MicroKernel API
- oak-mk - default MicroKernel implementation
- - oak-mk-remote - MicroKernel remoting
- [oak-core][1] - Oak repository API and implementation
- oak-jcr - JCR binding for the Oak repository
- oak-sling - integration with Apache Sling
@@ -70,6 +69,14 @@ The build consists of the following main
[1]: oak-core/README.md
+Archive
+-------
+
+The following components have been moved to the Jackrabbit Attic:
+
+ - oak-mk-remote - MicroKernel remoting (see OAK-2693)
+
+
License
-------
Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md
(original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/dev_getting_started.md Mon
Mar 30 08:06:02 2015
@@ -64,7 +64,6 @@ The build consists of the following main
- oak-commons - shared utility code
- oak-mk-api - MicroKernel API
- oak-mk - default MicroKernel implementation
- - oak-mk-remote - MicroKernel remoting
- [oak-core][1] - Oak repository API and implementation
- oak-jcr - JCR binding for the Oak repository
- oak-sling - integration with Apache Sling
@@ -79,4 +78,15 @@ The build consists of the following main
- oak-it/mk - integration tests for MicroKernel
- oak-it/osgi - integration tests for OSGi
+
+Archive
+-------
+
+The following components have been moved to the Jackrabbit Attic:
+
+ - oak-mk-remote - MicroKernel remoting (see [OAK-2693][2])
+
+
[1]: https://github.com/apache/jackrabbit-oak/blob/trunk/oak-core/README.md
+ [2]: https://issues.apache.org/jira/browse/OAK-2693
+
Modified: jackrabbit/oak/trunk/oak-it/mk/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/pom.xml?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/mk/pom.xml Mon Mar 30 08:06:02 2015
@@ -79,12 +79,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk-remote</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<scope>test</scope>
Modified: jackrabbit/oak/trunk/oak-it/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/pom.xml?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/pom.xml Mon Mar 30 08:06:02 2015
@@ -83,12 +83,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk-remote</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml Mon Mar 30 08:06:02 2015
@@ -36,7 +36,6 @@
<include>org.apache.jackrabbit:jackrabbit-jcr-commons</include>
<include>org.apache.jackrabbit:oak-commons</include>
<include>org.apache.jackrabbit:oak-mk-api</include>
- <include>org.apache.jackrabbit:oak-mk-remote</include>
<include>org.apache.jackrabbit:oak-core</include>
<include>org.apache.jackrabbit:oak-jcr</include>
<include>org.apache.jackrabbit:oak-lucene</include>
Modified: jackrabbit/oak/trunk/oak-run/README.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/README.md?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/README.md (original)
+++ jackrabbit/oak/trunk/oak-run/README.md Mon Mar 30 08:06:02 2015
@@ -222,8 +222,7 @@ Oak server mode
The Oak server mode starts a MicroKernel or full Oak instance with the
standard JCR plugins and makes it available over a simple HTTP mapping
-defined in the `oak-http` and `oak-mk-remote` components. To start this
-mode, use:
+defined in the `oak-http`. To start this mode, use:
$ java -jar oak-run-*.jar server [uri] [fixture] [options]
@@ -267,12 +266,10 @@ Depending on the fixture the following o
Examples:
$ java -jar oak-run-*.jar server
- $ java -jar oak-run-*.jar server -mk
$ java -jar oak-run-*.jar server http://localhost:4503 Oak-Tar --base myOak
$ java -jar oak-run-*.jar server http://localhost:4502 Oak-Mongo --db
myOak --clusterIds c1,c2,c3
-See the documentation in the `oak-http` and `oak-mk-remote` components for
details
-about the available functionality.
+See the documentation in the `oak-http` components for details about the
available functionality.
Benchmark mode
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Mon Mar 30 08:06:02 2015
@@ -278,11 +278,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk-remote</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-tarmk-standby</artifactId>
<version>${project.version}</version>
</dependency>
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
Mon Mar 30 08:06:02 2015
@@ -27,8 +27,6 @@ import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.URL;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
@@ -995,7 +993,6 @@ public class Main {
private static void server(String defaultUri, String[] args) throws
Exception {
OptionParser parser = new OptionParser();
- OptionSpec<Void> mkServer = parser.accepts("mk", "MicroKernel server");
OptionSpec<Integer> cache = parser.accepts("cache", "cache size
(MB)").withRequiredArg().ofType(Integer.class).defaultsTo(100);
// tar/h2 specific option
@@ -1068,14 +1065,7 @@ public class Main {
throw new IllegalArgumentException("Unsupported repository setup "
+ fix);
}
- if (options.has(mkServer)) {
- if (!cIds.isEmpty()) {
- System.out.println("WARNING: clusterIds option is ignored when
mk option is specified");
- }
- startMkServer(oakFixture, uri);
- } else {
- startOakServer(oakFixture, uri, cIds);
- }
+ startOakServer(oakFixture, uri, cIds);
}
private static void startOakServer(OakFixture oakFixture, String uri,
List<Integer> cIds) throws Exception {
@@ -1094,20 +1084,6 @@ public class Main {
new HttpServer(uri, m);
}
- private static void startMkServer(OakFixture oakFixture, String uri)
throws Exception {
- org.apache.jackrabbit.mk.server.Server server =
- new
org.apache.jackrabbit.mk.server.Server(oakFixture.getMicroKernel());
-
- URL url = new URL(uri);
- server.setBindAddress(InetAddress.getByName(url.getHost()));
- if (url.getPort() > 0) {
- server.setPort(url.getPort());
- } else {
- server.setPort(28080);
- }
- server.start();
- }
-
public static class HttpServer {
private final ServletContextHandler context;
Modified: jackrabbit/oak/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1670001&r1=1670000&r2=1670001&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Mon Mar 30 08:06:02 2015
@@ -42,7 +42,6 @@
<module>oak-blob-cloud</module>
<module>oak-mk-api</module>
<module>oak-mk</module>
- <module>oak-mk-remote</module>
<module>oak-core</module>
<module>oak-jcr</module>
<module>oak-upgrade</module>
