incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1521163 - in /sling/whiteboard/bdelacretaz: bdelacretaz-oak-server/ bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/ it-repository/src/test/java/org/apache/sling/jcr/repository/it/ oak-launchpad/src/main/bundles/
Date Mon, 09 Sep 2013 15:42:16 GMT
Author: bdelacretaz
Date: Mon Sep  9 15:42:15 2013
New Revision: 1521163

URL: http://svn.apache.org/r1521163
Log:
SLING-2788 - move to Oak 0.9-SNAPSHOT

Added:
    sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
      - copied, changed from r1521075, sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/SlingRepositoryImpl.java
Removed:
    sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/SlingRepositoryImpl.java
Modified:
    sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml
    sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
    sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml

Modified: sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml?rev=1521163&r1=1521162&r2=1521163&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml (original)
+++ sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/pom.xml Mon Sep  9 15:42:15 2013
@@ -65,11 +65,6 @@
                         <Private-Package>
                             org.apache.sling.oak.server.*
                         </Private-Package>
-                        <Embed-Transitive>true</Embed-Transitive>
-                        <Embed-Dependency>
-                            <!-- TODO embeds should'n be needed...missing package exports
in oak-jcr -->                                
-                            oak-jcr
-                        </Embed-Dependency>
                     </instructions>
                 </configuration>                
             </plugin>

Copied: sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
(from r1521075, sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/SlingRepositoryImpl.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java?p2=sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java&p1=sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/SlingRepositoryImpl.java&r1=1521075&r2=1521163&rev=1521163&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/SlingRepositoryImpl.java
(original)
+++ sling/whiteboard/bdelacretaz/bdelacretaz-oak-server/src/main/java/org/apache/sling/oak/server/OakSlingRepository.java
Mon Sep  9 15:42:15 2013
@@ -32,20 +32,8 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Service;
 import org.apache.jackrabbit.oak.Oak;
 import org.apache.jackrabbit.oak.jcr.Jcr;
-import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider;
-import org.apache.jackrabbit.oak.plugins.commit.JcrConflictHandler;
 import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
 import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider;
-import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
-import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
-import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexProvider;
-import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider;
-import org.apache.jackrabbit.oak.plugins.name.NamespaceValidatorProvider;
-import org.apache.jackrabbit.oak.plugins.nodetype.RegistrationEditorProvider;
-import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
-import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
-import org.apache.jackrabbit.oak.plugins.version.VersionEditorProvider;
-import org.apache.jackrabbit.oak.spi.commit.EditorHook;
 import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -59,7 +47,7 @@ import org.osgi.service.component.Compon
  */
 @Component(immediate = true, metatype = true)
 @Service(value = { SlingRepository.class, Repository.class })
-public class SlingRepositoryImpl extends AbstractNamespaceMappingRepository
+public class OakSlingRepository extends AbstractNamespaceMappingRepository
         implements SlingRepository {
 
     private Repository oakRepository;
@@ -69,34 +57,13 @@ public class SlingRepositoryImpl extends
     
     @Activate
     protected void activate(ComponentContext ctx) {
-        // TODO OpenSecurityProvider does not check anything, should use 
-        // at least a SecurityProviderImpl, but that doesn't work with oak 0.8
-        // (LoginModule class not found)
         final SecurityProvider sp = new OpenSecurityProvider();
         
         oakRepository = new Jcr(new Oak(nodeStore))
         .with(sp)
-        .with(new InitialContent())
-
-        .with(JcrConflictHandler.JCR_CONFLICT_HANDLER)
-        .with(new EditorHook(new VersionEditorProvider()))
-
-        .with(new NameValidatorProvider())
-        .with(new NamespaceValidatorProvider())
-        .with(new TypeEditorProvider())
-        .with(new RegistrationEditorProvider())
-        .with(new ConflictValidatorProvider())
-
-        // index stuff
-        .with(new PropertyIndexEditorProvider())
-
-        .with(new PropertyIndexProvider())
-        .with(new NodeTypeIndexProvider())
-
         .with(new LuceneIndexEditorProvider())
         .with(new LuceneIndexProvider())
-
-        //.withAsyncIndexing() // TODO oak 0.9?
+        .withAsyncIndexing()
         .createRepository();
         
         setup(ctx.getBundleContext());

Modified: sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1521163&r1=1521162&r2=1521163&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
(original)
+++ sling/whiteboard/bdelacretaz/it-repository/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Mon Sep  9 15:42:15 2013
@@ -104,7 +104,7 @@ public class OakRepositoryIT extends Sli
                 mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-commons", "2.8-SNAPSHOT"),
                 mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-rmi", "2.4.2"),
                 mavenBundle("org.apache.jackrabbit", "oak-core", oakVersion),
-                //embedded in server bundle for now mavenBundle("org.apache.jackrabbit",
"oak-jcr", oakVersion),
+                mavenBundle("org.apache.jackrabbit", "oak-jcr", oakVersion),
                 mavenBundle("org.apache.jackrabbit", "oak-commons", oakVersion),
                 mavenBundle("org.apache.jackrabbit", "oak-mk", oakVersion),
                 mavenBundle("org.apache.jackrabbit", "oak-mk-api", oakVersion),

Modified: sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml?rev=1521163&r1=1521162&r2=1521163&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml (original)
+++ sling/whiteboard/bdelacretaz/oak-launchpad/src/main/bundles/list.xml Mon Sep  9 15:42:15
2013
@@ -355,6 +355,11 @@
             <version>1.0.4</version>
         </bundle>
         <bundle>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.jaas</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </bundle>
+        <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.json</artifactId>
             <version>2.0.6</version>
@@ -472,7 +477,7 @@
         <bundle>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>13.0.1</version>
+            <version>14.0.1</version>
         </bundle>
         <bundle>
             <groupId>com.google.code.findbugs</groupId>
@@ -482,12 +487,12 @@
         <bundle>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-api</artifactId>
-            <version>2.7.0</version>
+            <version>2.8-SNAPSHOT</version>
         </bundle>
         <bundle>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-commons</artifactId>
-            <version>2.7.0</version>
+            <version>2.8-SNAPSHOT</version>
         </bundle>
         <bundle>
             <groupId>org.apache.jackrabbit</groupId>
@@ -499,13 +504,11 @@
             <artifactId>oak-core</artifactId>
             <version>0.9-SNAPSHOT</version>
         </bundle>
-        <!-- omitted for now, embedded in oak server bundle 
         <bundle>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-jcr</artifactId>
             <version>0.9-SNAPSHOT</version>
         </bundle>
-         -->
         <bundle>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-commons</artifactId>



Mime
View raw message