incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r885721 - in /sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server: ./ src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/ src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/ src/main/resources/M...
Date Tue, 01 Dec 2009 10:24:40 GMT
Author: fmeschbe
Date: Tue Dec  1 10:24:39 2009
New Revision: 885721

URL: http://svn.apache.org/viewvc?rev=885721&view=rev
Log:
SLING-1212 Upgrade embedded Jackrabbit Repository to Jackrabbit 2.0-beta3 and JCR 2.0. Don't
embed Tika (and its dependencies) and remove derby to be provided as a bundle.

Modified:
    sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/pom.xml
    sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
    sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
    sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
    sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
    sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties

Modified: sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/pom.xml?rev=885721&r1=885720&r2=885721&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/pom.xml (original)
+++ sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/pom.xml Tue
Dec  1 10:24:39 2009
@@ -96,7 +96,7 @@
                         </goals>
                         <configuration>
                             <includeArtifactIds>
-                                jackrabbit-jcr-rmi,jackrabbit-core,jackrabbit-jcr-commons,jackrabbit-spi-commons,jackrabbit-spi,lucene-core,derby,concurrent,jackrabbit-text-extractors,pdfbox,jempbox,fontbox,poi,poi-scratchpad,nekohtml,xercesImpl
+                                jackrabbit-core,jackrabbit-jcr-commons,jackrabbit-spi-commons,jackrabbit-spi,lucene-core,concurrent,xercesImpl,jackrabbit-jcr-rmi
                             </includeArtifactIds>
                             <excludeTransitive>false</excludeTransitive>
                             <outputDirectory>
@@ -167,40 +167,63 @@
                                             org.apache.sling.jcr.jackrabbit.server.impl.Activator
                                         </Bundle-Activator>
                                         <Export-Package>
-                                        	org.apache.sling.jcr.jackrabbit.server.security.*;version=2.0.4-incubator,
-                                            org.apache.jackrabbit.core.security.principal;version=1.6.0
+                                            org.apache.sling.jcr.jackrabbit.server.security.*;version=2.0.4-incubator,
+                                            org.apache.jackrabbit.core.security.principal;version=2.0
                                         </Export-Package>
                                         <Private-Package>
                                             org.apache.sling.jcr.jackrabbit.server.impl.*
                                         </Private-Package>
                                         <Import-Package>
-                                            org.apache.sling.*, javax.jcr.*,
-                                            javax.naming.*, javax.xml.*,
+                                            <!-- 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.*,
-                                            org.apache.jackrabbit.api.*,
-                                            org.osgi.*,
-                                            org.slf4j, org.xml.sax, org.xml.sax.helpers
+                                            <!-- 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,
+                                            
+                                            <!-- 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>
-                                            <!-- core repository implementation -->
-                                            jackrabbit-jcr-rmi; jackrabbit-core;
-                                            jackrabbit-jcr-commons;
-                                            jackrabbit-spi-commons; jackrabbit-spi;
-                                            lucene-core; derby; concurrent,
-                                            
-                                            <!-- jackrabbit text extraction -->
-                                            jackrabbit-text-extractors,
-                                            pdfbox, jempbox, fontbox,
-                                            poi, poi-scratchpad,
-                                            nekohtml, xercesImpl
+                                            jackrabbit-core,
+                                            jackrabbit-jcr-commons,
+                                            jackrabbit-spi-commons, jackrabbit-spi,
+                                            lucene-core,
+                                            concurrent,
+                                            jackrabbit-jcr-rmi
                                         </Embed-Dependency>
                                         <_removeheaders>
-                                            Embed-Dependency,Private-Package,Include-Resource
+                                            Embed-Dependency,
+                                            Embed-Transitive,
+                                            Private-Package,
+                                            Include-Resource
                                         </_removeheaders>
                                     </instructions>
                                 </configuration>
@@ -236,25 +259,24 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.base</artifactId>
-            <version>2.0.2-incubator</version>
+            <version>2.0.5-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         
         <!-- The core repository implementation -->
         <dependency>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-core</artifactId>
-            <version>1.6.0</version>
+            <version>2.0-beta3</version>
             <scope>compile</scope>
         </dependency>
 
-        <!-- Text Extractor support -->
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-text-extractors</artifactId>
-            <version>1.6.0</version>
-        </dependency>
-        
         <!-- OSGi Libraries -->
         <dependency>
             <groupId>org.osgi</groupId>

Modified: sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java?rev=885721&r1=885720&r2=885721&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
(original)
+++ sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/Activator.java
Tue Dec  1 10:24:39 2009
@@ -20,7 +20,6 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.sql.DriverManager;
 import java.util.Hashtable;
 
 import org.apache.sling.jcr.base.util.RepositoryAccessor;
@@ -69,13 +68,13 @@
     // the service tracker used by the PluggableDefaultLoginModule
     // this field is only set on the first call to getLoginModules()
     private static ServiceTracker loginModuleTracker;
-    
+
     // the tracking count when the moduleCache has been filled
     private static int lastTrackingCount = -1;
-    
+
     // the cache of login module services
     private static LoginModulePlugin[] moduleCache;
-    
+
     // empty list of login modules if there are none registered
     private static LoginModulePlugin[] EMPTY = new LoginModulePlugin[0];
 
@@ -98,7 +97,7 @@
         // ensure the module cache is not set right now, this may
         // (theoretically) be non-null after the last bundle stop
         moduleCache = null;
-        
+
         // check the name of the default context, nothing to do if none
         slingContext = context.getProperty(SLING_CONTEXT_DEFAULT);
         if (slingContext == null) {
@@ -131,22 +130,7 @@
     }
 
     public void stop(BundleContext arg0) {
-        
-        /*
-         * when stopping Derby (which is used by Jackrabbit by default) a
-         * derby.antiGC thread keeps running which prevents this bundle from
-         * being garbage collected ... we try to really stop derby here and
-         * ignore the exception since according to
-         * http://db.apache.org/derby/docs/10.4/devguide/tdevdvlp20349.html this
-         * exception will always be thrown.
-         */
 
-        try {
-            DriverManager.getConnection("jdbc:derby:;shutdown=true");
-        } catch (Throwable t) {
-            // exception is always thrown
-        }
-        
         // drop module cache
         moduleCache = null;
 
@@ -160,7 +144,7 @@
             accessManagerFactoryTracker.close();
             accessManagerFactoryTracker = null;
         }
-        
+
         // clear the bundle context field
         bundleContext = null;
     }
@@ -179,7 +163,7 @@
     }
 
     // ---------- LoginModule tracker for PluggableDefaultLoginModule
-    
+
     private static BundleContext getBundleContext() {
         return bundleContext;
     }
@@ -197,7 +181,7 @@
             return moduleCache;
         }
         // invariant: moduleCache is null or modules have changed
-        
+
         // tracker may be null if moduleCache is null
         if (loginModuleTracker == null) {
             loginModuleTracker = new ServiceTracker(getBundleContext(),
@@ -250,15 +234,15 @@
             Hashtable<String, String> defaultConfig = new Hashtable<String, String>();
             final String overrideUrl = bundleContext.getProperty(RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY);
             if(overrideUrl != null && overrideUrl.length() > 0) {
-                // Ignore other parameters if override URL (SLING-254) is set 
+                // Ignore other parameters if override URL (SLING-254) is set
                 defaultConfig.put(RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY, overrideUrl);
-                log.info(RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY + "=" + overrideUrl
+ 
+                log.info(RepositoryAccessor.REPOSITORY_URL_OVERRIDE_PROPERTY + "=" + overrideUrl
+
                     ", using it to create the default configuration");
-                
+
             } else {
-               initDefaultConfig(defaultConfig, bundleContext); 
+               initDefaultConfig(defaultConfig, bundleContext);
             }
-            
+
             // create the factory and set the properties
             Configuration config = ca.createFactoryConfiguration(SERVER_REPOSITORY_FACTORY_PID);
             config.update(defaultConfig);
@@ -273,12 +257,12 @@
             bundleContext.ungetService(ref);
         }
     }
-    
+
     private void initDefaultConfig(Hashtable<String, String> props, BundleContext bundleContext)
throws IOException {
         File homeDir = getHomeDir(bundleContext);
         if (homeDir == null)
         	return;
-       
+
         File configFile = getConfigFile(bundleContext, homeDir);
 
         // default config values
@@ -290,21 +274,21 @@
         props.put(SlingServerRepository.REPOSITORY_REGISTRATION_NAME,
             this.getRepositoryName());
     }
-    
+
     private File getHomeDir(BundleContext bundleContext) throws IOException {
     	File homeDir;
-    	
+
     	String repoHomePath = bundleContext.getProperty("sling.repository.home");
     	String slingHomePath = bundleContext.getProperty("sling.home");
-    	
-    	if (repoHomePath != null) {     		
+
+    	if (repoHomePath != null) {
          	homeDir = new File(repoHomePath, getRepositoryName());
         } else if (slingHomePath != null) {
     		homeDir = new File(slingHomePath, getRepositoryName());
     	} else {
     		homeDir = new File(getRepositoryName());
-    	} 
-    	
+    	}
+
     	// make sure jackrabbit home exists
         log.info("Creating default config for Jackrabbit in " + homeDir);
         if (!homeDir.isDirectory()) {
@@ -313,14 +297,14 @@
                     + homeDir + ", failed creating default configuration");
                 return null;
             }
-        }	
-    	
+        }
+
     	return homeDir;
     }
-    
-    private File getConfigFile(BundleContext bundleContext, File homeDir) throws IOException
{
+
+    private static File getConfigFile(BundleContext bundleContext, File homeDir) throws IOException
{
     	File configFile;
-    	
+
     	String repoConfigFileUrl = bundleContext.getProperty("sling.repository.config.file.url");
     	if (repoConfigFileUrl != null) {
     		// the repository config file is set
@@ -331,16 +315,16 @@
 				// this not an url, trying with "file:"
 				configFileUrl = new URL("file:///" + repoConfigFileUrl);
 			}
-    		
+
     		// local support only
     		configFile = new File(configFileUrl.getFile());
     		if (configFile.canRead())
     			return configFile;
     	}
-    	
+
         // ensure the configuration file (inside the home Dir !)
         configFile = new File(homeDir, "repository.xml");
-        SlingServerRepository.copyFile(bundleContext.getBundle(), "repository.xml", configFile);
+        SlingServerRepository.copyFile(bundleContext.getBundle(), configFile);
     	return configFile;
     }
 

Modified: sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java?rev=885721&r1=885720&r2=885721&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
(original)
+++ sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/SlingServerRepository.java
Tue Dec  1 10:24:39 2009
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Dictionary;
 
@@ -40,8 +41,8 @@
  * The <code>SlingServerRepository</code> TODO
  *
  * @scr.component label="%repository.name" description="%repository.description"
- *          factory="org.apache.sling.jcr.jackrabbit.server.SlingServerRepositoryFactory"
  *          name="org.apache.sling.jcr.jackrabbit.server.SlingServerRepository"
+ *          configurationFactory="true" configuration-policy="require"
  *
  * @scr.property name="service.vendor" value="The Apache Software Foundation"
  * @scr.property name="service.description"
@@ -81,14 +82,14 @@
     public static final String REPOSITORY_REGISTRATION_NAME = "name";
 
     //---------- Repository Management ----------------------------------------
-    
+
     @Override
     protected Repository acquireRepository() {
         Repository repository = super.acquireRepository();
         if (repository != null) {
             return repository;
         }
-        
+
         @SuppressWarnings("unchecked")
         Dictionary<String, Object> environment = this.getComponentContext().getProperties();
         String configURLObj = (String) environment.get(REPOSITORY_CONFIG_URL);
@@ -100,7 +101,7 @@
             String derbyLog = home + "/derby.log";
             System.setProperty("derby.stream.error.file", derbyLog);
         }
-        
+
         InputStream ins = null;
         try {
 
@@ -110,22 +111,34 @@
                 ins = new FileInputStream(configFile);
                 log(LogService.LOG_INFO, "Using configuration file " + configFile.getAbsolutePath());
             } else {
-                URL configURL = new URL(configURLObj);
-                ins = configURL.openStream();
-                log(LogService.LOG_INFO, "Using configuration URL " + configURL);
+                try {
+                    URL configURL = new URL(configURLObj);
+                    ins = configURL.openStream();
+                    log(LogService.LOG_INFO, "Using configuration URL "
+                        + configURL);
+                } catch (MalformedURLException mue) {
+                    // last ressort: URL is a file, which we have to prepare yet
+                    copyFile(
+                        getComponentContext().getBundleContext().getBundle(),
+                        configFile);
+                    ins = new FileInputStream(configFile);
+                    log(LogService.LOG_INFO,
+                        "Using new default configuration file "
+                            + configFile.getAbsolutePath());
+                }
             }
 
             RepositoryConfig crc = RepositoryConfig.create(ins, home);
             return RepositoryImpl.create(crc);
-            
+
         } catch (IOException ioe) {
-            
+
             log(LogService.LOG_ERROR,
                 "acquireRepository: IO problem starting repository from "
                     + configURLObj + " in " + home, ioe);
-            
+
         } catch (RepositoryException re) {
-            
+
             log(LogService.LOG_ERROR,
                 "acquireRepository: Repository problem starting repository from "
                     + configURLObj + " in " + home, re);
@@ -138,17 +151,17 @@
                 }
             }
         }
-        
+
         // got no repository ....
         return null;
     }
-    
+
     @Override
     protected void disposeRepository(Repository repository) {
         super.disposeRepository(repository);
 
         if (repository instanceof RepositoryImpl) {
-            
+
             try {
                 ((RepositoryImpl) repository).shutdown();
             } catch (Throwable t) {
@@ -156,22 +169,23 @@
                     "deactivate: Unexpected problem shutting down repository",
                     t);
             }
-            
+
         } else {
             log(LogService.LOG_INFO,
                 "Repository is not a RepositoryImpl, nothing to do");
         }
     }
-    
+
     //---------- Helper -------------------------------------------------------
 
-    public static void copyFile(Bundle bundle, String entryPath, File destFile) throws FileNotFoundException,
IOException {
+    public static void copyFile(Bundle bundle, File destFile) throws FileNotFoundException,
IOException {
         if (destFile.canRead()) {
             // nothing to do, file exists
             return;
         }
 
         // copy from property
+        final String entryPath = "repository.xml";
         URL entryURL = bundle.getEntry(entryPath);
         if (entryURL == null) {
             throw new FileNotFoundException(entryPath);

Modified: sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java?rev=885721&r1=885720&r2=885721&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
(original)
+++ sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/security/PluggableDefaultAccessManager.java
Tue Dec  1 10:24:39 2009
@@ -18,7 +18,7 @@
 package org.apache.sling.jcr.jackrabbit.server.impl.security;
 
 import org.apache.jackrabbit.core.HierarchyManager;
-import org.apache.jackrabbit.core.ItemId;
+import org.apache.jackrabbit.core.id.ItemId;
 import org.apache.jackrabbit.core.security.AMContext;
 import org.apache.jackrabbit.core.security.DefaultAccessManager;
 import org.apache.jackrabbit.core.security.authorization.AccessControlProvider;

Modified: sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF?rev=885721&r1=885720&r2=885721&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
(original)
+++ sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/META-INF/MANIFEST.MF
Tue Dec  1 10:24:39 2009
@@ -1,22 +1,20 @@
 Manifest-Version: 1.0
-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
- ty.accessmanager;uses:="javax.jcr,javax.security.auth";version="2.0.4
+Export-Package: org.apache.sling.jcr.jackrabbit.server.security.access
+ manager;uses:="javax.jcr,javax.security.auth";version="2.0.4.incubato
+ r",org.apache.sling.jcr.jackrabbit.server.security;uses:="javax.jcr,j
+ avax.security.auth.callback,javax.security.auth.login";version="2.0.4
  .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,or
- g.apache.commons.collections.iterators,javax.jcr.observation,org.apac
- he.commons.collections.set";version="1.6.0"
+ .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"
 Service-Component: OSGI-INF/serviceComponents.xml
-Bundle-ClassPath: .,jackrabbit-jcr-rmi-1.4.1.jar,jackrabbit-core-1.6.0
- .jar,jackrabbit-jcr-commons-1.6.0.jar,jackrabbit-spi-commons-1.6.0.ja
- r,jackrabbit-spi-1.6.0.jar,lucene-core-2.4.1.jar,derby-10.2.1.6.jar,c
- oncurrent-1.3.4.jar,jackrabbit-text-extractors-1.6.0.jar,pdfbox-0.7.3
- .jar,jempbox-0.2.0.jar,fontbox-0.1.0.jar,poi-3.2-FINAL.jar,poi-scratc
- hpad-3.2-FINAL.jar,nekohtml-1.9.7.jar,xercesImpl-2.8.1.jar
+Ignore-Package: org.apache.jackrabbit.test
+Bundle-ClassPath: .,jackrabbit-core-2.0-beta3.jar,jackrabbit-jcr-commo
+ ns-2.0-beta3.jar,jackrabbit-spi-commons-2.0-beta3.jar,jackrabbit-spi-
+ 2.0-beta3.jar,lucene-core-2.4.1.jar,concurrent-1.3.4.jar,jackrabbit-j
+ cr-rmi-1.4.1.jar
 Tool: Bnd-0.0.357
-Embed-Transitive: true
 Bundle-Activator: org.apache.sling.jcr.jackrabbit.server.impl.Activato
  r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -28,39 +26,45 @@
 DynamicImport-Package: *
 Bundle-Vendor: The Apache Software Foundation
 Bundle-Version: 2.0.5.SNAPSHOT
-Bnd-LastModified: 1259353659272
+Bnd-LastModified: 1259662551376
 Bundle-ManifestVersion: 2
 Bundle-Description: Bundle providing support to embed Jackrabbit Repos
  itory        instances and publish via RMI and/or JNDI
-Import-Package: javax.jcr;version="1.0.0",javax.jcr.lock;version="1.0.
- 0",javax.jcr.nodetype;version="1.0.0",javax.jcr.observation;version="
- 1.0.0",javax.jcr.query;version="1.0.0",javax.jcr.util;version="1.0.0"
- ,javax.jcr.version;version="1.0.0",javax.naming,javax.naming.director
- y,javax.naming.spi,javax.security.auth,javax.security.auth.callback,j
- avax.security.auth.login,javax.security.auth.spi,javax.xml.datatype,j
- avax.xml.namespace,javax.xml.parsers,javax.xml.transform,javax.xml.tr
- ansform.dom,javax.xml.transform.sax,javax.xml.transform.stream,javax.
- xml.validation,org.apache.commons.collections,org.apache.commons.coll
- ections.bidimap,org.apache.commons.collections.buffer,org.apache.comm
- ons.collections.collection,org.apache.commons.collections.iterators,o
- rg.apache.commons.collections.list,org.apache.commons.collections.map
- ,org.apache.commons.collections.set,org.apache.jackrabbit.api;version
- ="1.6.0",org.apache.jackrabbit.api.jsr283;version="1.6.0",org.apache.
- jackrabbit.api.jsr283.lock;version="1.6.0",org.apache.jackrabbit.api.
- jsr283.nodetype;version="1.6.0",org.apache.jackrabbit.api.jsr283.obse
- rvation;version="1.6.0",org.apache.jackrabbit.api.jsr283.query;versio
- n="1.6.0",org.apache.jackrabbit.api.jsr283.retention;version="1.6.0",
- org.apache.jackrabbit.api.jsr283.security;version="1.6.0",org.apache.
- jackrabbit.api.jsr283.version;version="1.6.0",org.apache.jackrabbit.a
- pi.observation;version="1.6.0",org.apache.jackrabbit.api.security.pri
- ncipal;version="1.6.0",org.apache.jackrabbit.api.security.user;versio
- n="1.6.0",org.apache.sling.jcr.api;version="2.0.2",org.apache.sling.j
- cr.base;version="2.0.2",org.apache.sling.jcr.jackrabbit.server.securi
- ty;version="2.0.4",org.apache.sling.jcr.jackrabbit.server.security.ac
- cessmanager;version="2.0.4",org.osgi.framework;version="1.4.0",org.os
- gi.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;versio
- n="1.3.3",org.slf4j;version="1.5.2",org.xml.sax,org.xml.sax.helpers
+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
+ ery.qom;version="2.0.0",javax.jcr.retention;version="2.0.0",javax.jcr
+ .security;version="2.0.0",javax.jcr.util;version="2.0.0",javax.jcr.ve
+ rsion;version="2.0.0",javax.naming,javax.naming.spi,javax.security.au
+ th,javax.security.auth.callback,javax.security.auth.login,javax.secur
+ ity.auth.spi,javax.sql,javax.swing;resolution:=optional,javax.swing.b
+ order;resolution:=optional,javax.transaction.xa,javax.xml.parsers,jav
+ ax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,java
+ x.xml.transform.stream,org.apache.commons.collections,org.apache.comm
+ ons.collections.bidimap,org.apache.commons.collections.buffer,org.apa
+ che.commons.collections.iterators,org.apache.commons.collections.map,
+ org.apache.commons.io;version="1.4.0",org.apache.commons.io.input;ver
+ sion="1.4.0",org.apache.derby.jdbc;resolution:=optional,org.apache.ja
+ ckrabbit.api;version="2.0.0",org.apache.jackrabbit.api.management;ver
+ sion="2.0.0",org.apache.jackrabbit.api.observation;version="2.0.0",or
+ g.apache.jackrabbit.api.security;version="2.0.0",org.apache.jackrabbi
+ t.api.security.principal;version="2.0.0",org.apache.jackrabbit.api.se
+ curity.user;version="2.0.0",org.apache.sling.jcr.api;version="2.0.2",
+ org.apache.sling.jcr.base;version="2.0.2",org.apache.sling.jcr.jackra
+ bbit.server.security;version="2.0.4",org.apache.sling.jcr.jackrabbit.
+ server.security.accessmanager;version="2.0.4",org.apache.tika.config;
+ version="0.4.0",org.apache.tika.exception;version="0.4.0",org.apache.
+ tika.metadata;version="0.4.0",org.apache.tika.parser;version="0.4.0",
+ org.apache.tika.parser.html;version="0.4.0",org.apache.tika.parser.im
+ age;version="0.4.0",org.apache.tika.parser.microsoft;version="0.4.0",
+ org.apache.tika.parser.opendocument;version="0.4.0",org.apache.tika.p
+ arser.pdf;version="0.4.0",org.apache.tika.parser.rtf;version="0.4.0",
+ org.apache.tika.parser.txt;version="0.4.0",org.apache.tika.parser.xml
+ ;version="0.4.0",org.apache.tika.sax;version="0.4.0",org.osgi.framewo
+ rk;version="1.4.0",org.osgi.service.cm;version="1.2.0",org.osgi.servi
+ ce.component;version="1.0.0",org.osgi.service.log;version="1.3.0",org
+ .osgi.util.tracker;version="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.)
 

Modified: sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=885721&r1=885720&r2=885721&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++ sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.properties
Tue Dec  1 10:24:39 2009
@@ -80,26 +80,6 @@
  The default value is 10 seconds, the minimum allowed value is 2 seconds, \
  smaller values are corected to the minimum.
  
-pool.maxActive.name = Maximum Sessions	
-pool.maxActive.description = The maximum number of sessions which may be logged \
- in through the Sling Repository. This number limits the number of sessions \
- provided by the session pool at any one time. If more sessions are requested \
- the respective threads have to wait for sessions to be logged out by other \
- threads. Default if negative or not set is virtually unlimited. \
- See Session Wait Time.
- 
-pool.maxActiveWait.name	= Session Wait Time
-pool.maxActiveWait.description = The number of seconds to wait for a session \
- to become available if the maximum number of sessions has been provided. If \
- no session becomes available within time frame, access to the repository fails. \
- Default if negative or not set is 10 seconds.
- 
-pool.maxIdle.name = Maximum Idle Sessions
-pool.maxIdle.description = The maximum number of sessions to keep in the pool. \
- The bigger this number, the more sessions are kept in the pool, the more login \
- round trips may be saved. On the other hand, each session requires a certain \
- amount of memory. Default if negative or not set is 10 idle sessions.
- 
 name.name = Embedded JCR Repository Name
 name.description = The name under which the embedded repository will be \
  registered JNDI and RMI registries. The respective registry services listen \



Mime
View raw message