You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2011/09/14 15:03:01 UTC
svn commit: r1170587 - in
/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src:
main/java/org/apache/jackrabbit/spi2microkernel/Paths.java
test/java/org/apache/jackrabbit/spi2microkernel/QueryTest.java
test/resources/queryPlans.txt
Author: mduerig
Date: Wed Sep 14 13:03:01 2011
New Revision: 1170587
URL: http://svn.apache.org/viewvc?rev=1170587&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
name space test conflicts with name space used by TCK: revert changes from 1170579 and fix correctly
Modified:
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Paths.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/QueryTest.java
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/queryPlans.txt
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Paths.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Paths.java?rev=1170587&r1=1170586&r2=1170587&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Paths.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Paths.java Wed Sep 14 13:03:01 2011
@@ -107,8 +107,8 @@ public final class Paths {
// fixme don't static here!
public static void addKnownNamespace(String prefix, String uri) {
- KNOWN_NAME_SPACES.putIfAbsent(prefix, uri);
- KNOWN_PREFIXES.putIfAbsent(uri, prefix);
+ KNOWN_NAME_SPACES.put(prefix, uri);
+ KNOWN_PREFIXES.put(uri, prefix);
}
//------------------------------------------< private >---
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/QueryTest.java?rev=1170587&r1=1170586&r2=1170587&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/QueryTest.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/QueryTest.java Wed Sep 14 13:03:01 2011
@@ -13,10 +13,12 @@
*/
package org.apache.jackrabbit.spi2microkernel;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.util.Collections;
+import java.util.Iterator;
import javax.imageio.spi.ServiceRegistry;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
@@ -29,13 +31,9 @@ import javax.jcr.query.Query;
import javax.jcr.query.QueryResult;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
-import java.util.Collections;
-import java.util.Iterator;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
public class QueryTest {
private static final String BASE_URL = "fs:target/repository-test/repository";
@@ -56,7 +54,7 @@ public class QueryTest {
@Before
public void setup() throws RepositoryException {
Session s = getSession();
- s.getWorkspace().getNamespaceRegistry().registerNamespace("query-test", "query-test-uri");
+ s.getWorkspace().getNamespaceRegistry().registerNamespace("test", "test");
s.save();
}
@@ -73,15 +71,15 @@ public class QueryTest {
Session s = getSession();
Node test;
test = s.getRootNode().addNode("test");
- test.setProperty("query-test:vanityPath", "/a");
- test.setProperty("query-test:redirect", "/content/a");
+ test.setProperty("test:vanityPath", "/a");
+ test.setProperty("test:redirect", "/content/a");
s.save();
test = s.getRootNode().addNode("test2");
- test.setProperty("query-test:vanityPath", "/b");
- test.setProperty("query-test:redirect", "/content/a");
+ test.setProperty("test:vanityPath", "/b");
+ test.setProperty("test:redirect", "/content/a");
s.save();
Query q = s.getWorkspace().getQueryManager().createQuery(
- "SELECT query-test:vanityPath, query-test:redirect FROM query-test:VanityPath", Query.JCR_SQL2);
+ "SELECT test:vanityPath, test:redirect FROM test:VanityPath", Query.JCR_SQL2);
QueryResult res = q.execute();
NodeIterator it = res.getNodes();
Node n = it.nextNode();
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/queryPlans.txt
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/queryPlans.txt?rev=1170587&r1=1170586&r2=1170587&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/queryPlans.txt (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/resources/queryPlans.txt Wed Sep 14 13:03:01 2011
@@ -1,12 +1,12 @@
# vanity urls ======================
index
-{query-test}vanityPath
+{test}vanityPath
propertyIndex
nonUnique
plan
-SELECT query-test:vanityPath, query-test:redirect FROM query-test:VanityPath
-{query-test}vanityPath
+SELECT test:vanityPath, test:redirect FROM test:VanityPath
+{test}vanityPath
testPath,redirect
test:vanityPath,test:redirect