svn commit: r633141 - in /incubator/sling/trunk/jcr/base: ./ src/main/java/org/apache/sling/jcr/base/ src/main/java/org/apache/sling/jcr/base/internal/ src/main/java/org/apache/sling/jcr/base/internal/loader/

[fm...@apache.org]

Author: fmeschbe
Date: Mon Mar  3 07:50:13 2008
New Revision: 633141

URL: http://svn.apache.org/viewvc?rev=633141&view=rev
Log:
SLING-185 Move implementation stuff from jcr/api to jcr/base module

Added:
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java
      - copied, changed from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/NodeTypeLoader.java
      - copied, changed from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/NamespaceMapper.java
      - copied, changed from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/NamespaceMapper.java
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/PooledSession.java
      - copied, changed from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/PooledSession.java
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPool.java
      - copied, changed from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolFactory.java
      - copied, changed from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolFactory.java
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolManager.java
      - copied, changed from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolManager.java
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/
    incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java
      - copied, changed from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/loader/Loader.java
Modified:
    incubator/sling/trunk/jcr/base/pom.xml

Modified: incubator/sling/trunk/jcr/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/pom.xml?rev=633141&r1=633140&r2=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/base/pom.xml (original)
+++ incubator/sling/trunk/jcr/base/pom.xml Mon Mar  3 07:50:13 2008
@@ -53,6 +53,10 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
@@ -61,9 +65,11 @@
                             sling,jcr,jackrabbit
                         </Bundle-Category>
                         <Export-Package>
+                            org.apache.sling.jcr.base;
                             org.apache.sling.jcr.base.util;version=${pom.version},
                         </Export-Package>
                         <Private-Package>
+                            org.apache.sling.jcr.base.internal.*,
                             org.apache.jackrabbit.rmi.*
                         </Private-Package>
                         <Import-Package>
@@ -82,18 +88,28 @@
             <version>2.0.0-incubator-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>javax.jcr</groupId>
-            <artifactId>jcr</artifactId>
-            <scope>compile</scope>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.jcr.api</artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
         </dependency>
-          <dependency>
+        <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-jcr-rmi</artifactId>
             <scope>compile</scope>
         </dependency>
+        <!-- OSGi Libraries -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
 

Copied: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java (from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java?p2=incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java&r1=631987&r2=633141&rev=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepository.java Mon Mar  3 07:50:13 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.api;
+package org.apache.sling.jcr.base;
 
 import java.util.Dictionary;
 
@@ -30,10 +30,11 @@
 import javax.jcr.Workspace;
 
 import org.apache.jackrabbit.api.JackrabbitWorkspace;
-import org.apache.sling.jcr.api.internal.SessionPool;
-import org.apache.sling.jcr.api.internal.SessionPoolFactory;
-import org.apache.sling.jcr.api.internal.SessionPoolManager;
-import org.apache.sling.jcr.api.internal.loader.Loader;
+import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.jcr.base.internal.SessionPool;
+import org.apache.sling.jcr.base.internal.SessionPoolFactory;
+import org.apache.sling.jcr.base.internal.SessionPoolManager;
+import org.apache.sling.jcr.base.internal.loader.Loader;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.SynchronousBundleListener;
@@ -61,6 +62,7 @@
  *  scr.property value=&quot;10&quot; type=&quot;Integer&quot; name=&quot;pool.maxIdle&quot;
  *  scr.property value=&quot;256&quot; type=&quot;Integer&quot; name=&quot;pool.maxActiveWait&quot;
  * </pre>
+ * @scr.component
  */
 public abstract class AbstractSlingRepository
     implements SlingRepository, SynchronousBundleListener {
@@ -336,14 +338,15 @@
         componentContext.getBundleContext().addBundleListener(this);
 
         // TODO: Consider running this in the background !!
-        Bundle[] bundles = componentContext.getBundleContext().getBundles();
-        for (int i = 0; i < bundles.length; i++) {
-            if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
-                // load content for bundles which are neither INSTALLED nor
-                // UNINSTALLED
-                this.loader.registerBundle(bundles[i]);
-            }
-        }
+        // FIXME: Commented while SLING-132 is still unfixed
+//        Bundle[] bundles = componentContext.getBundleContext().getBundles();
+//        for (int i = 0; i < bundles.length; i++) {
+//            if ((bundles[i].getState() & (Bundle.INSTALLED | Bundle.UNINSTALLED)) == 0) {
+//                // load content for bundles which are neither INSTALLED nor
+//                // UNINSTALLED
+//                this.loader.registerBundle(bundles[i]);
+//            }
+//        }
     }
 
     /**

Copied: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/NodeTypeLoader.java (from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/NodeTypeLoader.java?p2=incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/NodeTypeLoader.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java&r1=631987&r2=633141&rev=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/NodeTypeLoader.java Mon Mar  3 07:50:13 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.api;
+package org.apache.sling.jcr.base;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -138,7 +138,7 @@
             }
         }
 
-        log.warn("Repository is not Jackrabbit based, cannot import node types");
+        log.warn("Repository does not implement JackrabbitNodeTypeManager, cannot import node types");
         return false;
     }
 }

Copied: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/NamespaceMapper.java (from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/NamespaceMapper.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/NamespaceMapper.java?p2=incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/NamespaceMapper.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/NamespaceMapper.java&r1=631987&r2=633141&rev=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/NamespaceMapper.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/NamespaceMapper.java Mon Mar  3 07:50:13 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.api.internal;
+package org.apache.sling.jcr.base.internal;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;

Copied: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/PooledSession.java (from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/PooledSession.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/PooledSession.java?p2=incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/PooledSession.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/PooledSession.java&r1=631987&r2=633141&rev=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/PooledSession.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/PooledSession.java Mon Mar  3 07:50:13 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.api.internal;
+package org.apache.sling.jcr.base.internal;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPool.java (from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPool.java?p2=incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPool.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java&r1=631987&r2=633141&rev=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPool.java Mon Mar  3 07:50:13 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.api.internal;
+package org.apache.sling.jcr.base.internal;
 
 import java.util.IdentityHashMap;
 import java.util.Iterator;

Copied: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolFactory.java (from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolFactory.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolFactory.java?p2=incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolFactory.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolFactory.java&r1=631987&r2=633141&rev=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolFactory.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolFactory.java Mon Mar  3 07:50:13 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.api.internal;
+package org.apache.sling.jcr.base.internal;
 
 import javax.jcr.SimpleCredentials;
 

Copied: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolManager.java (from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolManager.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolManager.java?p2=incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolManager.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolManager.java&r1=631987&r2=633141&rev=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolManager.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/SessionPoolManager.java Mon Mar  3 07:50:13 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.api.internal;
+package org.apache.sling.jcr.base.internal;
 
 import java.util.HashMap;
 import java.util.Iterator;

Copied: incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java (from r631987, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/loader/Loader.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java?p2=incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/loader/Loader.java&r1=631987&r2=633141&rev=633141&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/loader/Loader.java (original)
+++ incubator/sling/trunk/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/loader/Loader.java Mon Mar  3 07:50:13 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.api.internal.loader;
+package org.apache.sling.jcr.base.internal.loader;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,9 +33,9 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.sling.jcr.api.AbstractSlingRepository;
-import org.apache.sling.jcr.api.NodeTypeLoader;
-import org.apache.sling.jcr.api.internal.NamespaceMapper;
+import org.apache.sling.jcr.base.AbstractSlingRepository;
+import org.apache.sling.jcr.base.NodeTypeLoader;
+import org.apache.sling.jcr.base.internal.NamespaceMapper;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;