You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2012/04/10 15:54:20 UTC
svn commit: r1311725 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/core/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/
Author: mduerig
Date: Tue Apr 10 13:54:20 2012
New Revision: 1311725
URL: http://svn.apache.org/viewvc?rev=1311725&view=rev
Log:
OAK-15: Clean up oak-jcr
comment,
use mem:oak for utility constructor
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ConnectionImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ConnectionImpl.java?rev=1311725&r1=1311724&r2=1311725&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ConnectionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ConnectionImpl.java Tue Apr 10 13:54:20 2012
@@ -66,7 +66,7 @@ public class ConnectionImpl implements C
MicroKernel microKernel = MicroKernelFactory.getInstance(microKernelUrl);
- // FIXME: workspace must be done elsewhere...
+ // FIXME: workspace setup must be done elsewhere...
if (create) {
String headRev = microKernel.getHeadRevision();
if (!microKernel.nodeExists('/' + workspace, headRev)) {
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java?rev=1311725&r1=1311724&r2=1311725&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/GlobalContext.java Tue Apr 10 13:54:20 2012
@@ -34,7 +34,6 @@ import static java.text.MessageFormat.fo
/**
* Poor man's dependency injection
* todo: OAK-17: replace by some more sophisticated mechanism
- * todo: OAK-20: remove usages of mk on oak-jcr
* This class implements a poor man's dependency injection mechanism.
* It should be replaced by a more sophisticated mechanism for compile
* time dependency injection mechanism.
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java?rev=1311725&r1=1311724&r2=1311725&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java Tue Apr 10 13:54:20 2012
@@ -47,7 +47,7 @@ public class RepositoryImpl implements R
* newly constructed Oak repository.
*/
public RepositoryImpl() {
- context = null; // fixme this(new GlobalContext(new MicroKernelImpl()));
+ context = new GlobalContext("mem:oak");
}
public RepositoryImpl(GlobalContext context) {