incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r592404 - in /incubator/sling/trunk/jcr/jackrabbit.server: ./ src/main/java/org/apache/sling/jcr/jackrabbit/ src/main/java/org/apache/sling/jcr/jackrabbit/server/ src/main/java/org/apache/sling/jcr/server/
Date Tue, 06 Nov 2007 12:20:14 GMT
Author: fmeschbe
Date: Tue Nov  6 04:20:13 2007
New Revision: 592404

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

Added:
    incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/
    incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/
      - copied from r592370, incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/server/
Removed:
    incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/server/
Modified:
    incubator/sling/trunk/jcr/jackrabbit.server/pom.xml
    incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/AbstractRegistrationSupport.java
    incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java
    incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/JndiRegistrationSupport.java
    incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/RmiRegistrationSupport.java
    incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java

Modified: incubator/sling/trunk/jcr/jackrabbit.server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit.server/pom.xml?rev=592404&r1=592403&r2=592404&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit.server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit.server/pom.xml Tue Nov  6 04:20:13 2007
@@ -28,7 +28,7 @@
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>sling-jackrabbit-server</artifactId>
+    <artifactId>jcr.jackrabbit.server</artifactId>
     <packaging>bundle</packaging>
     <version>2.0.0-incubator-SNAPSHOT</version>
 
@@ -40,13 +40,13 @@
 
     <scm>
         <connection>
-            scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jackrabbit-server
+            scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/jackrabbit.server
         </connection>
         <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jackrabbit-server
+            scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/jackrabbit.server
         </developerConnection>
         <url>
-            http://svn.apache.org/viewvc/incubator/sling/trunk/jackrabbit-server
+            http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit.server
         </url>
     </scm>
 
@@ -66,7 +66,7 @@
                             sling,jcr,jackrabbit
                         </Bundle-Category>
                         <Bundle-Activator>
-                            org.apache.sling.jcr.server.Activator
+                            org.apache.sling.jcr.jackrabbit.server.Activator
                         </Bundle-Activator>
                         <!-- 
                             Export the crx-core package for CRXModule
@@ -126,8 +126,8 @@
                                 and day-commons-misc. Hence, include com.day.util
                                 here and forget about the rest ....
                             -->
-                            org.apache.sling.jcr.server.*,
-                            META-INF.services.*,
+                            org.apache.sling.jcr.jackrabbit.server.*,
+                            META-INF.services.*;-split-package:=merge-first,
 
                             <!-- Jackrabbit Text Extractors -->
                             org.apache.jackrabbit.extractor,
@@ -139,7 +139,7 @@
                             org.apache.lucene.*, org.apache.derby.*
                         </Private-Package>
                         <Import-Package>
-                            org.apache.sling.jcr,
+                            org.apache.sling.jcr.api,
 
                             org.apache.jackrabbit,
                             org.apache.jackrabbit.name,
@@ -178,7 +178,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>sling-jackrabbit-api</artifactId>
+            <artifactId>jcr.api</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
         </dependency>
         <dependency>

Modified: incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/AbstractRegistrationSupport.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/AbstractRegistrationSupport.java?rev=592404&r1=592370&r2=592404&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/AbstractRegistrationSupport.java
(original)
+++ incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/AbstractRegistrationSupport.java
Tue Nov  6 04:20:13 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.server;
+package org.apache.sling.jcr.jackrabbit.server;
 
 import java.util.HashMap;
 import java.util.Iterator;

Modified: incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java?rev=592404&r1=592370&r2=592404&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java
(original)
+++ incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/Activator.java
Tue Nov  6 04:20:13 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.server;
+package org.apache.sling.jcr.jackrabbit.server;
 
 import java.io.File;
 import java.util.Hashtable;

Modified: incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/JndiRegistrationSupport.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/JndiRegistrationSupport.java?rev=592404&r1=592370&r2=592404&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/JndiRegistrationSupport.java
(original)
+++ incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/JndiRegistrationSupport.java
Tue Nov  6 04:20:13 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.server;
+package org.apache.sling.jcr.jackrabbit.server;
 
 import java.security.AccessController;
 import java.security.PrivilegedActionException;

Modified: incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/RmiRegistrationSupport.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/RmiRegistrationSupport.java?rev=592404&r1=592370&r2=592404&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/RmiRegistrationSupport.java
(original)
+++ incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/RmiRegistrationSupport.java
Tue Nov  6 04:20:13 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.server;
+package org.apache.sling.jcr.jackrabbit.server;
 
 import java.io.IOException;
 import java.net.InetAddress;

Modified: incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java?rev=592404&r1=592370&r2=592404&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java
(original)
+++ incubator/sling/trunk/jcr/jackrabbit.server/src/main/java/org/apache/sling/jcr/jackrabbit/server/SlingServerRepository.java
Tue Nov  6 04:20:13 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.jcr.server;
+package org.apache.sling.jcr.jackrabbit.server;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,8 +31,8 @@
 
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.apache.sling.jcr.AbstractSlingRepository;
-import org.apache.sling.jcr.SlingRepository;
+import org.apache.sling.jcr.api.AbstractSlingRepository;
+import org.apache.sling.jcr.api.SlingRepository;
 import org.osgi.framework.Bundle;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.log.LogService;
@@ -41,7 +41,7 @@
  * The <code>RepositorySPIImpl</code> TODO
  *
  * @scr.component label="%repository.name" description="%repository.description"
- *          factory="org.apache.sling.jcr.server.SlingServerRepositoryFactory"
+ *          factory="org.apache.sling.jcr.jackrabbit.server.SlingServerRepositoryFactory"
  *
  * @scr.property name="service.vendor" value="The Apache Software Foundation"
  * @scr.property name="service.description"



Mime
View raw message