jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r904418 - /jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml
Date Fri, 29 Jan 2010 08:39:57 GMT
Author: fmeschbe
Date: Fri Jan 29 08:39:56 2010
New Revision: 904418

URL: http://svn.apache.org/viewvc?rev=904418&view=rev
Log:
* Depend on release Jackrabbit API 2.0.0 (no extensions needed/provided)
* Drop SCR plugin setup, not needed
* Fix Exported and Private Package lists

Modified:
    jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml

Modified: jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml?rev=904418&r1=904417&r2=904418&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml (original)
+++ jackrabbit/sandbox/jackrabbit2-bundle/jackrabbit-core/pom.xml Fri Jan 29 08:39:56 2010
@@ -184,7 +184,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-api</artifactId>
-      <version>2.0.1.bundle-SNAPSHOT</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
@@ -517,23 +517,6 @@
       <id>bundle</id>
       <build>
         <plugins>
-          <!-- generate the SCR descriptors -->
-          <!--
-          <plugin>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>maven-scr-plugin</artifactId>
-            <version>1.4.0</version>
-            <executions>
-              <execution>
-                <id>generate-scr-scrdescriptor</id>
-                <goals>
-                  <goal>scr</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          -->
-
           <!--
           copy the SCR descriptors into the correct location
           because the maven-scr-plugin cannot be configured
@@ -607,56 +590,52 @@
                                   sling,jcr,jackrabbit
                               </Bundle-Category>
                               <Bundle-Activator>
-                                  org.apache.sling.jcr.jackrabbit.server.impl.Activator
+                                  org.apache.jackrabbit.core.osgi.Activator
                               </Bundle-Activator>
                               <Export-Package>
-                                  org.apache.sling.jcr.jackrabbit.server.security.*;version=2.0.4-incubator,
-                                  !org.apache.jackrabbit.core.embedded.impl.*;
-                                  org.apache.jackrabbit.core.embedded.*;
-                                  org.apache.jackrabbit.core.security.principal;version=2.0
+                                  org.apache.jackrabbit.core.api.*;version=2.0
                               </Export-Package>
                               <Private-Package>
-                                  org.apache.jackrabbit.core.embedded.impl.*,
-                                  org.apache.sling.jcr.jackrabbit.server.impl.*
+                                  org.apache.jackrabbit.core.*,
                               </Private-Package>
                               <Import-Package>
                                   <!-- Sling and OSGi -->
-          org.apache.sling.*, org.osgi.*, 
-          <!-- JNDI, Security, Transactions -->
-          javax.naming.*, 
-          javax.security.*,
-          javax.sql.*,
-          javax.transaction.xa,
-          <!--  Helpers -->
-          org.apache.commons.io.*,
-          org.apache.commons.collections.*,
-          <!-- JCR and Jackrabbit API -->
-          javax.jcr.*, org.apache.jackrabbit.api.*,
-          <!-- Logging -->
-          org.slf4j,
-          <!-- XML stuff -->
-          javax.xml.*, org.xml.sax.*, org.w3c.dom.*,
-          <!-- JAR Service Registry for Query -->
-          javax.imageio.spi,
-          
-          <!-- Exclude package, see JCR-2412 -->
-          !org.apache.jackrabbit.test,
-          org.apache.jackrabbit.*,
-          
-          <!-- playground imports -->
-          org.apache.tika.*,
-          
-          <!-- Our default configuration uses derby, so import the driver -->
-          org.apache.derby.jdbc;resolution:=optional,
-          
-          <!-- Required by concurrent lib SynchronizationTimer class -->
-              javax.swing.*;resolution:=optional
-          </Import-Package>
-          <!--
-          <DynamicImport-Package>*</DynamicImport-Package>
-          -->
-          
-          <!-- Embedd some libraries -->
+                                  org.apache.sling.*, org.osgi.*, 
+                                  <!-- JNDI, Security, Transactions -->
+                                  javax.naming.*, 
+                                  javax.security.*,
+                                  javax.sql.*,
+                                  javax.transaction.xa,
+                                  <!--  Helpers -->
+                                  org.apache.commons.io.*,
+                                  org.apache.commons.collections.*,
+                                  <!-- JCR and Jackrabbit API -->
+                                  javax.jcr.*, org.apache.jackrabbit.api.*,
+                                  <!-- Logging -->
+                                  org.slf4j,
+                                  <!-- XML stuff -->
+                                  javax.xml.*, org.xml.sax.*, org.w3c.dom.*,
+                                  <!-- JAR Service Registry for Query -->
+                                  javax.imageio.spi,
+                                  
+                                  <!-- Exclude package, see JCR-2412 -->
+                                  !org.apache.jackrabbit.test,
+                                  org.apache.jackrabbit.*,
+                                  
+                                  <!-- playground imports -->
+                                  org.apache.tika.*,
+                                  
+                                  <!-- Our default configuration uses derby, so import
the driver -->
+                                  org.apache.derby.jdbc;resolution:=optional,
+                                  
+                                  <!-- Required by concurrent lib SynchronizationTimer
class -->
+                                  javax.swing.*;resolution:=optional
+                              </Import-Package>
+                              <!--
+                              <DynamicImport-Package>*</DynamicImport-Package>
+                              -->
+                              
+                              <!-- Embedd some libraries -->
                               <Embed-Transitive>true</Embed-Transitive>
                               <Embed-Dependency>
                                   commons-dbcp,



Mime
View raw message