Author: justin
Date: Thu Feb 18 18:35:29 2010
New Revision: 911512
URL: http://svn.apache.org/viewvc?rev=911512&view=rev
Log:
SLING-1212 - fixing manifest to include correct list of JR2 imports
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=911512&r1=911511&r2=911512&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Thu Feb 18 18:35:29 2010
@@ -187,6 +187,8 @@
org.apache.commons.collections.*,
<!-- JCR and Jackrabbit API -->
javax.jcr.*,
org.apache.jackrabbit.api.*,
+ org.apache.jackrabbit.spi.*,
+
<!-- Logging -->
org.slf4j,
<!-- XML stuff -->
@@ -200,6 +202,13 @@
<!-- playground imports -->
org.apache.tika.*,
+ <!-- Jackrabbit internals -->
+ org.apache.jackrabbit.rmi.*,
+ org.apache.jackrabbit.util,
+ org.apache.jackrabbit.value,
+ org.apache.jackrabbit.commons.*,
+
org.apache.jackrabbit.spi.commons.*,
+
<!-- Our default configuration
uses derby, so import the driver -->
org.apache.derby.jdbc;resolution:=optional,
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF?rev=911512&r1=911511&r2=911512&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
Thu Feb 18 18:35:29 2010
@@ -1,4 +1,5 @@
Manifest-Version: 1.0
+Service-Component: OSGI-INF/serviceComponents.xml
Export-Package: org.apache.sling.jcr.jackrabbit.server.security;uses:=
"javax.jcr,javax.security.auth.callback,javax.security.auth.login";ve
rsion="2.0.4.incubator",org.apache.sling.jcr.jackrabbit.server.securi
@@ -6,28 +7,27 @@
.incubator",org.apache.jackrabbit.core.security.principal;uses:="org.
apache.jackrabbit.api.security.principal,org.slf4j,org.apache.commons
.collections.map,javax.jcr,org.apache.jackrabbit.api.security.user,ja
- vax.security.auth,org.apache.commons.collections.iterators,javax.jcr.
- observation";version="2.0.0"
-Service-Component: OSGI-INF/serviceComponents.xml
+ vax.security.auth,org.apache.commons.collections.iterators,org.apache
+ .jackrabbit.spi,org.apache.jackrabbit.spi.commons.conversion,javax.jc
+ r.observation,org.apache.jackrabbit.util,org.apache.jackrabbit.common
+ s.iterator";version="2.0.0"
Ignore-Package: org.apache.jackrabbit.test
Bundle-ClassPath: .,jackrabbit-core-2.0.0.jar,lucene-core-2.4.1.jar,co
ncurrent-1.3.4.jar,commons-dbcp-1.2.2.jar,commons-pool-1.3.jar
-Tool: Bnd-0.0.357
-Bundle-Activator: org.apache.sling.jcr.jackrabbit.server.impl.Activato
- r
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-SymbolicName: org.apache.sling.jcr.jackrabbit.server
-Note: Built by bundle profile
Bundle-Category: sling,jcr,jackrabbit
+Tool: Bnd-0.0.357
Bundle-Name: Apache Sling Jackrabbit Embedded Repository
Created-By: 1.6.0_17 (Apple Inc.)
-DynamicImport-Package: *
Bundle-Vendor: The Apache Software Foundation
Bundle-Version: 2.0.7.SNAPSHOT
-Bnd-LastModified: 1266504700690
+Bnd-LastModified: 1266511924745
+Bundle-Activator: org.apache.sling.jcr.jackrabbit.server.impl.Activato
+ r
Bundle-ManifestVersion: 2
Bundle-Description: Bundle providing support to embed Jackrabbit Repos
itory instances and publish via RMI and/or JNDI
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-DocURL: http://sling.apache.org
Import-Package: javax.imageio.spi,javax.jcr;version="2.0.0",javax.jcr.
lock;version="2.0.0",javax.jcr.nodetype;version="2.0.0",javax.jcr.obs
ervation;version="2.0.0",javax.jcr.query;version="2.0.0",javax.jcr.qu
@@ -48,19 +48,34 @@
org.apache.jackrabbit.api.observation;version="2.0.0",org.apache.jack
rabbit.api.security;version="2.0.0",org.apache.jackrabbit.api.securit
y.principal;version="2.0.0",org.apache.jackrabbit.api.security.user;v
- ersion="2.0.0",org.apache.sling.jcr.api;version="2.0.2",org.apache.sl
- ing.jcr.base;version="2.0.4",org.apache.sling.jcr.jackrabbit.server.s
- ecurity;version="2.0.4",org.apache.sling.jcr.jackrabbit.server.securi
- ty.accessmanager;version="2.0.4",org.apache.tika.config,org.apache.ti
- ka.exception,org.apache.tika.metadata,org.apache.tika.parser,org.apac
- he.tika.parser.html,org.apache.tika.parser.image,org.apache.tika.pars
- er.microsoft,org.apache.tika.parser.odf,org.apache.tika.parser.pdf,or
- g.apache.tika.parser.rtf,org.apache.tika.parser.txt,org.apache.tika.p
- arser.xml,org.apache.tika.sax,org.osgi.framework;version="1.4.0",org.
- osgi.service.cm;version="1.2.0",org.osgi.service.component;version="1
- .0.0",org.osgi.service.log;version="1.3.0",org.osgi.util.tracker;vers
- ion="1.3.3",org.slf4j;version="1.5.2",org.w3c.dom,org.xml.sax,org.xml
- .sax.helpers
-Bundle-DocURL: http://sling.apache.org
-Originally-Created-By: 1.6.0_10 (Sun Microsystems Inc.)
+ ersion="2.0.0",org.apache.jackrabbit.commons;version="2.0.0",org.apac
+ he.jackrabbit.commons.cnd;version="2.0.0",org.apache.jackrabbit.commo
+ ns.iterator;version="2.0.0",org.apache.jackrabbit.commons.query;versi
+ on="2.0.0",org.apache.jackrabbit.commons.query.qom;version="2.0.0",or
+ g.apache.jackrabbit.rmi.remote;version="2.0.0",org.apache.jackrabbit.
+ rmi.server;version="2.0.0",org.apache.jackrabbit.spi;version="2.0.0",
+ org.apache.jackrabbit.spi.commons;version="2.0.0",org.apache.jackrabb
+ it.spi.commons.conversion;version="2.0.0",org.apache.jackrabbit.spi.c
+ ommons.name;version="2.0.0",org.apache.jackrabbit.spi.commons.namespa
+ ce;version="2.0.0",org.apache.jackrabbit.spi.commons.nodetype;version
+ ="2.0.0",org.apache.jackrabbit.spi.commons.nodetype.compact;version="
+ 2.0.0",org.apache.jackrabbit.spi.commons.nodetype.constraint;version=
+ "2.0.0",org.apache.jackrabbit.spi.commons.query;version="2.0.0",org.a
+ pache.jackrabbit.spi.commons.query.qom;version="2.0.0",org.apache.jac
+ krabbit.spi.commons.value;version="2.0.0",org.apache.jackrabbit.util;
+ version="2.0.0",org.apache.jackrabbit.value;version="2.0.0",org.apach
+ e.sling.jcr.api;version="2.0.2",org.apache.sling.jcr.base;version="2.
+ 0.4",org.apache.sling.jcr.jackrabbit.server.security;version="2.0.4",
+ org.apache.sling.jcr.jackrabbit.server.security.accessmanager;version
+ ="2.0.4",org.apache.tika.config,org.apache.tika.exception,org.apache.
+ tika.metadata,org.apache.tika.parser,org.apache.tika.parser.html,org.
+ apache.tika.parser.image,org.apache.tika.parser.microsoft,org.apache.
+ tika.parser.odf,org.apache.tika.parser.pdf,org.apache.tika.parser.rtf
+ ,org.apache.tika.parser.txt,org.apache.tika.parser.xml,org.apache.tik
+ a.sax,org.osgi.framework;version="1.4.0",org.osgi.service.cm;version=
+ "1.2.0",org.osgi.service.component;version="1.0.0",org.osgi.service.l
+ og;version="1.3.0",org.osgi.util.tracker;version="1.3.3",org.slf4j;ve
+ rsion="1.5.2",org.w3c.dom,org.xml.sax,org.xml.sax.helpers
+Bundle-SymbolicName: org.apache.sling.jcr.jackrabbit.server
+Note: Built by bundle profile
