Author: chetanm
Date: Sun Jan 4 13:43:37 2015
New Revision: 1649333
URL: http://svn.apache.org/r1649333
Log:
SLING-3479 - Upgrade to Oak 1.0
Upgraded Oak to 1.0.9
-- Add Felix JAAS bundle to the Pax Bundle list
-- Fix the setup logic in CommonTests to break if service reference is found
instead of returning back
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1649333&r1=1649332&r2=1649333&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Sun Jan 4 13:43:37 2015
@@ -36,7 +36,7 @@
WARNING make sure oak.version and sling.oak.server.version
are in sync with bundles/jcr/oak-server
-->
- <oak.version>1.0.7</oak.version>
+ <oak.version>1.0.9</oak.version>
<sling.oak.server.version>${project.version}</sling.oak.server.version>
<!-- optionally activate the webconsole -->
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java?rev=1649333&r1=1649332&r2=1649333&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
(original)
+++
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
Sun Jan 4 13:43:37 2015
@@ -565,11 +565,11 @@ public abstract class CommonTests {
while(System.currentTimeMillis() < timeoutAt) {
ref =
bundleContext.getServiceReference(ResourceResolverFactory.class.getName());
if(ref != null) {
- return;
+ break;
}
}
- assertNotNull("Expecting ResourceResolverFactory within " + timeout +
" seconds");
+ assertNotNull("Expecting ResourceResolverFactory within " + timeout +
" seconds", ref);
ResourceResolver rr = null;
try {
final ResourceResolverFactory f =
(ResourceResolverFactory)bundleContext.getService(ref);
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1649333&r1=1649332&r2=1649333&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
(original)
+++
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Sun Jan 4 13:43:37 2015
@@ -64,14 +64,12 @@ public class OakRepositoryIT extends Com
// embedded for now opt.add(mavenBundle("org.apache.jackrabbit",
"oak-jcr", oakVersion));
opt.add(mavenBundle("org.apache.jackrabbit", "oak-commons",
oakVersion));
- // not needed anymore?
- opt.add(mavenBundle("org.apache.jackrabbit", "oak-mk", oakVersion));
opt.add(mavenBundle("org.apache.jackrabbit", "oak-mk-api",
oakVersion));
- opt.add(mavenBundle("org.apache.jackrabbit", "oak-mk-remote",
oakVersion));
opt.add(mavenBundle("org.apache.jackrabbit", "oak-lucene",
oakVersion));
opt.add(mavenBundle("org.apache.jackrabbit", "oak-blob", oakVersion));
-
+ opt.add(mavenBundle("org.apache.felix", "org.apache.felix.jaas",
"0.0.2"));
+
return opt.toArray(new Option[]{});
}
