incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r592398 - in /incubator/sling/trunk/jcr/api: ./ src/main/java/org/apache/sling/jcr/ src/main/java/org/apache/sling/jcr/api/ src/main/java/org/apache/sling/jcr/api/internal/ src/main/java/org/apache/sling/jcr/api/internal/loader/ src/main/ja...
Date Tue, 06 Nov 2007 12:10:49 GMT
Author: fmeschbe
Date: Tue Nov  6 04:10:47 2007
New Revision: 592398

URL: http://svn.apache.org/viewvc?rev=592398&view=rev
Log:
SLING-83 Fix SVN location, project name and java packages

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

Modified: incubator/sling/trunk/jcr/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/pom.xml?rev=592398&r1=592397&r2=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/pom.xml (original)
+++ incubator/sling/trunk/jcr/api/pom.xml Tue Nov  6 04:10:47 2007
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28,7 +28,7 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>sling-jackrabbit-api</artifactId>
+    <artifactId>jcr.api</artifactId>
     <packaging>bundle</packaging>
     <version>2.0.0-incubator-SNAPSHOT</version>
 
@@ -41,23 +41,19 @@
 
     <scm>
         <connection>
-            scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jackrabbit-api
+            scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/api
         </connection>
         <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jackrabbit-api
+            scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/api
         </developerConnection>
         <url>
-            http://svn.apache.org/viewvc/incubator/sling/trunk/jackrabbit-api
+            http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api
         </url>
     </scm>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.sling</groupId>
-                <artifactId>maven-sling-plugin</artifactId>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
@@ -68,16 +64,19 @@
                         </Bundle-Category>
                         <Export-Package>
                             <!-- Export provider API selectively -->
-                            org.apache.sling.jcr,
+                            org.apache.sling.jcr.api,
 
                             <!-- Re-export JCR API, Jackrabbit API and Jackrabbit JCR
Commons -->
                             javax.jcr.*;version=1.0,
-                            org.apache.jackrabbit.*;version=1.3.1
+                            org.apache.jackrabbit.*;version=1.3.1;-split-package:=merge-first
                         </Export-Package>
                         <Private-Package>
-                            org.apache.sling.jcr.internal,
-                            org.apache.sling.jcr.internal.loader
+                            org.apache.sling.jcr.api.internal,
+                            org.apache.sling.jcr.api.internal.loader
                         </Private-Package>
+                        <Import-Package>
+                            javax.xml.*;org.xml.sax*;resolution:=optional,*
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Copied: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java
(from r592370, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/AbstractSlingRepository.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java?p2=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/AbstractSlingRepository.java&r1=592370&r2=592398&rev=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/AbstractSlingRepository.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/AbstractSlingRepository.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr;
+package org.apache.sling.jcr.api;
 
 import java.util.Dictionary;
 
@@ -30,8 +30,8 @@
 import javax.jcr.Workspace;
 
 import org.apache.jackrabbit.api.JackrabbitWorkspace;
-import org.apache.sling.jcr.internal.SessionPoolManager;
-import org.apache.sling.jcr.internal.loader.Loader;
+import org.apache.sling.jcr.api.internal.SessionPoolManager;
+import org.apache.sling.jcr.api.internal.loader.Loader;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.SynchronousBundleListener;

Copied: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java
(from r592370, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/NodeTypeLoader.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java?p2=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/NodeTypeLoader.java&r1=592370&r2=592398&rev=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/NodeTypeLoader.java (original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/NodeTypeLoader.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr;
+package org.apache.sling.jcr.api;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
(from r592370, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/SlingRepository.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java?p2=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/SlingRepository.java&r1=592370&r2=592398&rev=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/SlingRepository.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/SlingRepository.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr;
+package org.apache.sling.jcr.api;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;

Copied: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/TooManySessionsException.java
(from r592370, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/TooManySessionsException.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/TooManySessionsException.java?p2=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/TooManySessionsException.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/TooManySessionsException.java&r1=592370&r2=592398&rev=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/TooManySessionsException.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/TooManySessionsException.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr;
+package org.apache.sling.jcr.api;
 
 import javax.jcr.LoginException;
 

Copied: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/NamespaceMapper.java
(from r592370, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/NamespaceMapper.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/NamespaceMapper.java?p2=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/NamespaceMapper.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/NamespaceMapper.java&r1=592370&r2=592398&rev=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/NamespaceMapper.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/NamespaceMapper.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.internal;
+package org.apache.sling.jcr.api.internal;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;

Copied: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/PooledSession.java
(from r592370, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/PooledSession.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/PooledSession.java?p2=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/PooledSession.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/PooledSession.java&r1=592370&r2=592398&rev=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/PooledSession.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/PooledSession.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.internal;
+package org.apache.sling.jcr.api.internal;
 
 import java.io.IOException;
 import java.io.InputStream;

Copied: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java
(from r592370, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/SessionPool.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java?p2=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/SessionPool.java&r1=592370&r2=592398&rev=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/SessionPool.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPool.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.internal;
+package org.apache.sling.jcr.api.internal;
 
 import java.util.IdentityHashMap;
 import java.util.Iterator;
@@ -37,7 +37,7 @@
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 
-import org.apache.sling.jcr.TooManySessionsException;
+import org.apache.sling.jcr.api.TooManySessionsException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolManager.java
(from r592370, incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/SessionPoolManager.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolManager.java?p2=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolManager.java&p1=incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/SessionPoolManager.java&r1=592370&r2=592398&rev=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/internal/SessionPoolManager.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/SessionPoolManager.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.internal;
+package org.apache.sling.jcr.api.internal;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30,7 +30,7 @@
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 
-import org.apache.sling.jcr.SlingRepository;
+import org.apache.sling.jcr.api.SlingRepository;
 
 /**
  * The <code>SessionPoolManager</code> is an abstract implementation of the

Modified: 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/api/src/main/java/org/apache/sling/jcr/api/internal/loader/Loader.java?rev=592398&r1=592370&r2=592398&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/loader/Loader.java
(original)
+++ incubator/sling/trunk/jcr/api/src/main/java/org/apache/sling/jcr/api/internal/loader/Loader.java
Tue Nov  6 04:10:47 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.internal.loader;
+package org.apache.sling.jcr.api.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.AbstractSlingRepository;
-import org.apache.sling.jcr.NodeTypeLoader;
-import org.apache.sling.jcr.internal.NamespaceMapper;
+import org.apache.sling.jcr.api.AbstractSlingRepository;
+import org.apache.sling.jcr.api.NodeTypeLoader;
+import org.apache.sling.jcr.api.internal.NamespaceMapper;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;



Mime
View raw message