incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r662747 - in /incubator/sling/trunk: engine/ engine/src/main/java/org/apache/sling/engine/impl/log/ engine/src/main/resources/OSGI-INF/ engine/src/main/resources/OSGI-INF/metatype/ engine/src/main/resources/OSGI-INF/scr-plugin/ jcr/jackrabb...
Date Tue, 03 Jun 2008 11:36:22 GMT
Author: fmeschbe
Date: Tue Jun  3 04:36:22 2008
New Revision: 662747

URL: http://svn.apache.org/viewvc?rev=662747&view=rev
Log:
SLING-502 Create manual Declarative Service descriptors for component factories
to make them usable both in Felix SCR 1.0.0 and and later implementations as
well as in Equinox DS. See issue for details.

Added:
    incubator/sling/trunk/engine/src/main/resources/OSGI-INF/manual_serviceComponents.xml
    incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.xml
    incubator/sling/trunk/engine/src/main/resources/OSGI-INF/scr-plugin/
    incubator/sling/trunk/engine/src/main/resources/OSGI-INF/scr-plugin/scrinfo.xml
    incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/manual_serviceComponents.xml
    incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.xml
    incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/manual_serviceComponents.xml
    incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.xml
Modified:
    incubator/sling/trunk/engine/pom.xml
    incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java
    incubator/sling/trunk/jcr/jackrabbit-client/pom.xml
    incubator/sling/trunk/jcr/jackrabbit-server/pom.xml

Modified: incubator/sling/trunk/engine/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/pom.xml?rev=662747&r1=662746&r2=662747&view=diff
==============================================================================
--- incubator/sling/trunk/engine/pom.xml (original)
+++ incubator/sling/trunk/engine/pom.xml Tue Jun  3 04:36:22 2008
@@ -79,6 +79,11 @@
                         <Embed-Dependency>
                             commons-fileupload
                         </Embed-Dependency>
+                                                
+                        <Service-Component>
+                            OSGI-INF/manual_serviceComponents.xml,
+                            OSGI-INF/serviceComponents.xml
+                        </Service-Component>
                     </instructions>
                 </configuration>
             </plugin>

Modified: incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java?rev=662747&r1=662746&r2=662747&view=diff
==============================================================================
--- incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java
(original)
+++ incubator/sling/trunk/engine/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerService.java
Tue Jun  3 04:36:22 2008
@@ -25,13 +25,14 @@
 import org.apache.sling.engine.RequestLog;
 import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.ComponentContext;
 
 /**
  * The <code>RequestLoggerService</code> is a factory component which gets
  * configuration to register loggers for the {@link RequestLogger}.
  *
- * @scr.component label="%request.log.service.name"
+ * @ scr.component label="%request.log.service.name"
  *                description="%request.log.service.description"
  *                factory="org.apache.sling.engine.impl.log.RequestLoggerService"
  * @scr.property name="service.vendor" value="The Apache Software Foundation"
@@ -123,12 +124,26 @@
 
     // ---------- SCR integration ----------------------------------------------
 
+    // manual service registration due to component factory bug in Felix SCR 1.0.0
+    private ServiceRegistration serviceRegistration;
+    
     @SuppressWarnings("unchecked")
     protected void activate(ComponentContext context) {
         this.setup(context.getBundleContext(), context.getProperties());
+        
+        // SLING-502: do manually due to component factory bug in Felix SCR 1.0.0
+        serviceRegistration = context.getBundleContext().registerService(
+            "org.apache.sling.engine.impl.log.RequestLoggerService", this,
+            context.getProperties());
     }
 
     protected void deactivate(ComponentContext context) {
+        // SLING-502: do manually due to component factory bug in Felix SCR 1.0.0
+        if (serviceRegistration != null) {
+            serviceRegistration.unregister();
+            serviceRegistration = null;
+        }
+        
         this.shutdown();
     }
 

Added: incubator/sling/trunk/engine/src/main/resources/OSGI-INF/manual_serviceComponents.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/resources/OSGI-INF/manual_serviceComponents.xml?rev=662747&view=auto
==============================================================================
--- incubator/sling/trunk/engine/src/main/resources/OSGI-INF/manual_serviceComponents.xml
(added)
+++ incubator/sling/trunk/engine/src/main/resources/OSGI-INF/manual_serviceComponents.xml
Tue Jun  3 04:36:22 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <scr:component enabled="true"
+        name="org.apache.sling.engine.impl.log.RequestLoggerService"
+        factory="org.apache.sling.engine.impl.log.RequestLoggerService">
+        <scr:implementation
+            class="org.apache.sling.engine.impl.log.RequestLoggerService" />
+        <scr:property name="service.description"
+            value="Factory for configuration" />
+        <scr:property name="request.log.service.output"
+            value="request.log" />
+        <scr:property name="request.log.service.format" />
+        <scr:property name="service.vendor"
+            value="The Apache Software Foundation" />
+        <scr:property name="request.log.service.onentry" type="Boolean"
+            value="false" />
+        <scr:property name="request.log.service.outputtype"
+            type="Integer" value="0" />
+        <scr:property name="service.pid"
+            value="org.apache.sling.engine.impl.log.RequestLoggerService" />
+    </scr:component>
+</components>

Added: incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=662747&view=auto
==============================================================================
--- incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ incubator/sling/trunk/engine/src/main/resources/OSGI-INF/metatype/metatype.xml Tue Jun
 3 04:36:22 2008
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData
+    xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
+    localization="metatype">
+    <metatype:OCD
+        id="org.apache.sling.engine.impl.auth.SlingAuthenticator"
+        name="%auth.name" description="%auth.description">
+        <metatype:AD id="auth.sudo.cookie" type="String"
+            default="sling.sudo" name="%auth.sudo.cookie.name"
+            description="%auth.sudo.cookie.description" />
+        <metatype:AD id="auth.sudo.parameter" type="String"
+            default="sudo" name="%auth.sudo.parameter.name"
+            description="%auth.sudo.parameter.description" />
+        <metatype:AD id="auth.annonymous" type="Boolean" default="true"
+            name="%auth.annonymous.name"
+            description="%auth.annonymous.description" />
+    </metatype:OCD>
+    <metatype:Designate
+        pid="org.apache.sling.engine.impl.auth.SlingAuthenticator">
+        <metatype:Object
+            ocdref="org.apache.sling.engine.impl.auth.SlingAuthenticator" />
+    </metatype:Designate>
+    <metatype:OCD id="org.apache.sling.engine.impl.log.RequestLogger"
+        name="%request.log.name"
+        description="%request.log.description">
+        <metatype:AD id="request.log.enabled" type="Boolean"
+            default="true" name="%request.log.enabled.name"
+            description="%request.log.enabled.description" />
+        <metatype:AD id="request.log.output" type="String"
+            default="logs/request.log" name="%request.log.output.name"
+            description="%request.log.output.description" />
+        <metatype:AD id="request.log.outputtype" type="Integer"
+            default="0" name="%request.log.outputtype.name"
+            description="%request.log.outputtype.description">
+            <metatype:Option value="0" label="Logger Name" />
+            <metatype:Option value="1" label="File" />
+            <metatype:Option value="Name" label="RequestLog" />
+        </metatype:AD>
+        <metatype:AD id="access.log.enabled" type="Boolean"
+            default="true" name="%access.log.enabled.name"
+            description="%access.log.enabled.description" />
+        <metatype:AD id="access.log.output" type="String"
+            default="logs/access.log" name="%access.log.output.name"
+            description="%access.log.output.description" />
+        <metatype:AD id="access.log.outputtype" type="Integer"
+            default="0" name="%access.log.outputtype.name"
+            description="%access.log.outputtype.description">
+            <metatype:Option value="0" label="Logger Name" />
+            <metatype:Option value="1" label="File" />
+            <metatype:Option value="Name" label="RequestLog" />
+        </metatype:AD>
+    </metatype:OCD>
+    <metatype:Designate
+        pid="org.apache.sling.engine.impl.log.RequestLogger">
+        <metatype:Object
+            ocdref="org.apache.sling.engine.impl.log.RequestLogger" />
+    </metatype:Designate>
+    <metatype:OCD
+        id="org.apache.sling.engine.impl.log.RequestLoggerService"
+        name="%request.log.service.name"
+        description="%request.log.service.description">
+        <metatype:AD id="request.log.service.output" type="String"
+            default="request.log"
+            name="%request.log.service.output.name"
+            description="%request.log.service.output.description" />
+        <metatype:AD id="request.log.service.format" type="String"
+            name="%request.log.service.format.name"
+            description="%request.log.service.format.description" />
+        <metatype:AD id="request.log.service.onentry" type="Boolean"
+            default="false" name="%request.log.service.onentry.name"
+            description="%request.log.service.onentry.description" />
+        <metatype:AD id="request.log.service.outputtype" type="Integer"
+            default="0" name="%request.log.service.outputtype.name"
+            description="%request.log.service.outputtype.description">
+            <metatype:Option value="0" label="Logger Name" />
+            <metatype:Option value="1" label="File" />
+            <metatype:Option value="Name" label="RequestLog" />
+        </metatype:AD>
+    </metatype:OCD>
+    <metatype:Designate
+        pid="org.apache.sling.engine.impl.log.RequestLoggerService">
+        <metatype:Object
+            ocdref="org.apache.sling.engine.impl.log.RequestLoggerService" />
+    </metatype:Designate>
+</metatype:MetaData>

Added: incubator/sling/trunk/engine/src/main/resources/OSGI-INF/scr-plugin/scrinfo.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/engine/src/main/resources/OSGI-INF/scr-plugin/scrinfo.xml?rev=662747&view=auto
==============================================================================
--- incubator/sling/trunk/engine/src/main/resources/OSGI-INF/scr-plugin/scrinfo.xml (added)
+++ incubator/sling/trunk/engine/src/main/resources/OSGI-INF/scr-plugin/scrinfo.xml Tue Jun
 3 04:36:22 2008
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <scr:component enabled="true"
+        name="org.apache.sling.engine.impl.log.RequestLoggerService"
+        factory="org.apache.sling.engine.impl.log.RequestLoggerService">
+        <scr:implementation
+            class="org.apache.sling.engine.impl.log.RequestLoggerService" />
+        <scr:service>
+            <scr:provide
+                interface="org.apache.sling.engine.impl.log.RequestLoggerService" />
+        </scr:service>
+        <scr:property name="service.description"
+            value="Factory for configuration" private="false" />
+        <scr:property name="request.log.service.output"
+            value="request.log" private="false" />
+        <scr:property name="request.log.service.format" private="false" />
+        <scr:property name="service.vendor"
+            value="The Apache Software Foundation" private="false" />
+        <scr:property name="request.log.service.onentry" type="Boolean"
+            value="false" private="false" />
+        <scr:property name="request.log.service.outputtype"
+            type="Integer" value="0" private="false" />
+        <scr:property name="service.pid"
+            value="org.apache.sling.engine.impl.log.RequestLoggerService"
+            private="false" />
+    </scr:component>
+</components>

Modified: incubator/sling/trunk/jcr/jackrabbit-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/pom.xml?rev=662747&r1=662746&r2=662747&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-client/pom.xml Tue Jun  3 04:36:22 2008
@@ -51,10 +51,12 @@
 
     <build>
         <plugins>
+            <!--
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
             </plugin>
+            -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -75,6 +77,10 @@
                              org.osgi.service.log,
                              *
                         </Import-Package>
+                        
+                        <Service-Component>
+                            OSGI-INF/manual_serviceComponents.xml
+                        </Service-Component>
                     </instructions>
                 </configuration>
             </plugin>

Added: incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/manual_serviceComponents.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/manual_serviceComponents.xml?rev=662747&view=auto
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/manual_serviceComponents.xml
(added)
+++ incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/manual_serviceComponents.xml
Tue Jun  3 04:36:22 2008
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <scr:component enabled="true"
+        name="org.apache.sling.jcr.jackrabbit.client.SlingClientRepository"
+        factory="org.apache.sling.jcr.client.SlingClientRepositoryFactory">
+        <scr:implementation
+            class="org.apache.sling.jcr.jackrabbit.client.SlingClientRepository" />
+        <scr:property name="service.description"
+            value="Factory for non-embedded JCR Repository Instances" />
+        <scr:property name="pool.maxActiveWait" type="Integer"
+            value="1" />
+        <scr:property name="admin.name" type="String" value="admin" />
+        <scr:property name="defaultWorkspace" value="" />
+        <scr:property name="poll.inactive" type="Integer" value="10" />
+        <scr:property name="admin.password" type="String" value="admin" />
+        <scr:property name="service.pid"
+            value="org.apache.sling.jcr.base.AbstractSlingRepository" />
+        <scr:property name="java.naming.factory.initial"
+            value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory" />
+        <scr:property name="anonymous.password" type="String"
+            value="anonymous" />
+        <scr:property name="poll.active" type="Integer" value="10" />
+        <scr:property name="pool.maxActive" type="Integer" value="-1" />
+        <scr:property name="java.naming.provider.url"
+            value="http://incubator.apache.org/sling" />
+        <scr:property name="anonymous.name" type="String"
+            value="anonymous" />
+        <scr:property name="name" value="jackrabbit" />
+        <scr:property name="pool.maxIdle" type="Integer" value="10" />
+        <scr:property name="service.vendor"
+            value="The Apache Software Foundation" />
+        <scr:reference name="log"
+            interface="org.osgi.service.log.LogService"
+            cardinality="1..1" policy="static" bind="bindLog"
+            unbind="unbindLog" />
+    </scr:component>
+</components>

Added: incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=662747&view=auto
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.xml
(added)
+++ incubator/sling/trunk/jcr/jackrabbit-client/src/main/resources/OSGI-INF/metatype/metatype.xml
Tue Jun  3 04:36:22 2008
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData
+    xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
+    localization="metatype">
+    <metatype:OCD
+        id="org.apache.sling.jcr.jackrabbit.client.SlingClientRepository"
+        name="%repository.name" description="%repository.description">
+        <metatype:AD id="pool.maxActiveWait" type="Integer" default="1"
+            name="%pool.maxActiveWait.name"
+            description="%pool.maxActiveWait.description" />
+        <metatype:AD id="admin.name" type="String" default="admin"
+            name="%admin.name.name"
+            description="%admin.name.description" />
+        <metatype:AD id="defaultWorkspace" type="String" default=""
+            name="%defaultWorkspace.name"
+            description="%defaultWorkspace.description" />
+        <metatype:AD id="poll.inactive" type="Integer" default="10"
+            name="%poll.inactive.name"
+            description="%poll.inactive.description" />
+        <metatype:AD id="admin.password" type="String" default="admin"
+            name="%admin.password.name"
+            description="%admin.password.description" />
+        <metatype:AD id="java.naming.factory.initial" type="String"
+            default="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory"
+            name="%java.naming.factory.initial.name"
+            description="%java.naming.factory.initial.description" />
+        <metatype:AD id="anonymous.password" type="String"
+            default="anonymous" name="%anonymous.password.name"
+            description="%anonymous.password.description" />
+        <metatype:AD id="poll.active" type="Integer" default="10"
+            name="%poll.active.name"
+            description="%poll.active.description" />
+        <metatype:AD id="pool.maxActive" type="Integer" default="-1"
+            name="%pool.maxActive.name"
+            description="%pool.maxActive.description" />
+        <metatype:AD id="java.naming.provider.url" type="String"
+            default="http://incubator.apache.org/sling"
+            name="%java.naming.provider.url.name"
+            description="%java.naming.provider.url.description" />
+        <metatype:AD id="anonymous.name" type="String"
+            default="anonymous" name="%anonymous.name.name"
+            description="%anonymous.name.description" />
+        <metatype:AD id="name" type="String" default="jackrabbit"
+            name="%name.name" description="%name.description" />
+        <metatype:AD id="pool.maxIdle" type="Integer" default="10"
+            name="%pool.maxIdle.name"
+            description="%pool.maxIdle.description" />
+    </metatype:OCD>
+    <metatype:Designate
+        pid="org.apache.sling.jcr.jackrabbit.client.SlingClientRepository">
+        <metatype:Object
+            ocdref="org.apache.sling.jcr.jackrabbit.client.SlingClientRepository" />
+    </metatype:Designate>
+</metatype:MetaData>

Modified: incubator/sling/trunk/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/pom.xml?rev=662747&r1=662746&r2=662747&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/pom.xml (original)
+++ incubator/sling/trunk/jcr/jackrabbit-server/pom.xml Tue Jun  3 04:36:22 2008
@@ -50,10 +50,12 @@
 
     <build>
         <plugins>
+            <!--
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
             </plugin>
+            -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -98,6 +100,10 @@
                             nekohtml,
                             xercesImpl
                         </Embed-Dependency>
+                        
+                        <Service-Component>
+                            OSGI-INF/manual_serviceComponents.xml
+                        </Service-Component>
                     </instructions>
                 </configuration>
             </plugin>

Added: incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/manual_serviceComponents.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/manual_serviceComponents.xml?rev=662747&view=auto
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/manual_serviceComponents.xml
(added)
+++ incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/manual_serviceComponents.xml
Tue Jun  3 04:36:22 2008
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+    <scr:component enabled="true" immediate="true"
+        name="org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport">
+        <scr:implementation
+            class="org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport" />
+        <scr:property name="service.description"
+            value="JNDI Repository Registration" />
+        <scr:property name="java.naming.factory.initial"
+            value="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory" />
+        <scr:property name="java.naming.provider.url"
+            value="http://incubator.apache.org/sling" />
+        <scr:property name="service.vendor"
+            value="The Apache Software Foundation" />
+        <scr:property name="service.pid"
+            value="org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport" />
+        <scr:reference name="Log"
+            interface="org.osgi.service.log.LogService"
+            cardinality="0..1" policy="dynamic" bind="bindLog"
+            unbind="unbindLog" />
+        <scr:reference name="Repository"
+            interface="javax.jcr.Repository" cardinality="0..n"
+            policy="dynamic" bind="bindRepository"
+            unbind="unbindRepository" />
+    </scr:component>
+    <scr:component enabled="true" immediate="true"
+        name="org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport">
+        <scr:implementation
+            class="org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport" />
+        <scr:property name="port" type="Integer" value="1099" />
+        <scr:property name="service.description"
+            value="RMI based Repository Registration" />
+        <scr:property name="service.vendor"
+            value="The Apache Software Foundation" />
+        <scr:property name="service.pid"
+            value="org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport" />
+        <scr:reference name="Log"
+            interface="org.osgi.service.log.LogService"
+            cardinality="0..1" policy="dynamic" bind="bindLog"
+            unbind="unbindLog" />
+        <scr:reference name="Repository"
+            interface="javax.jcr.Repository" cardinality="0..n"
+            policy="dynamic" bind="bindRepository"
+            unbind="unbindRepository" />
+    </scr:component>
+    <scr:component enabled="true"
+        name="org.apache.sling.jcr.jackrabbit.server.SlingServerRepository"
+        factory="org.apache.sling.jcr.jackrabbit.server.SlingServerRepositoryFactory">
+        <scr:implementation
+            class="org.apache.sling.jcr.jackrabbit.server.SlingServerRepository" />
+        <scr:property name="service.description"
+            value="Factory for embedded Jackrabbit Repository Instances" />
+        <scr:property name="home" value="" />
+        <scr:property name="pool.maxActiveWait" type="Integer"
+            value="1" />
+        <scr:property name="admin.name" type="String" value="admin" />
+        <scr:property name="defaultWorkspace" value="" />
+        <scr:property name="poll.inactive" type="Integer" value="10" />
+        <scr:property name="admin.password" type="String" value="admin" />
+        <scr:property name="service.pid"
+            value="org.apache.sling.jcr.base.AbstractSlingRepository" />
+        <scr:property name="anonymous.password" type="String"
+            value="anonymous" />
+        <scr:property name="poll.active" type="Integer" value="10" />
+        <scr:property name="pool.maxActive" type="Integer" value="-1" />
+        <scr:property name="anonymous.name" type="String"
+            value="anonymous" />
+        <scr:property name="name" value="" />
+        <scr:property name="config" value="" />
+        <scr:property name="pool.maxIdle" type="Integer" value="10" />
+        <scr:property name="service.vendor"
+            value="The Apache Software Foundation" />
+        <scr:reference name="log"
+            interface="org.osgi.service.log.LogService"
+            cardinality="1..1" policy="static" bind="bindLog"
+            unbind="unbindLog" />
+    </scr:component>
+</components>

Added: incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=662747&view=auto
==============================================================================
--- incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.xml
(added)
+++ incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/OSGI-INF/metatype/metatype.xml
Tue Jun  3 04:36:22 2008
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData
+    xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
+    localization="metatype">
+    <metatype:OCD
+        id="org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport"
+        name="%jndi.name" description="%jndi.description">
+        <metatype:AD id="java.naming.factory.initial" type="String"
+            default="org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory"
+            name="%jndi.factory.name"
+            description="%jndi.factory.description" />
+        <metatype:AD id="java.naming.provider.url" type="String"
+            default="http://incubator.apache.org/sling"
+            name="%jndi.providerurl.name"
+            description="%jndi.providerurl.description" />
+    </metatype:OCD>
+    <metatype:Designate
+        pid="org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport">
+        <metatype:Object
+            ocdref="org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport" />
+    </metatype:Designate>
+    <metatype:OCD
+        id="org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport"
+        name="%rmi.name" description="%rmi.description">
+        <metatype:AD id="port" type="Integer" default="1099"
+            name="%rmi.port.name" description="%rmi.port.description" />
+    </metatype:OCD>
+    <metatype:Designate
+        pid="org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport">
+        <metatype:Object
+            ocdref="org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport" />
+    </metatype:Designate>
+    <metatype:OCD
+        id="org.apache.sling.jcr.jackrabbit.server.SlingServerRepository"
+        name="%repository.name" description="%repository.description">
+        <metatype:AD id="home" type="String" default=""
+            name="%home.name" description="%home.description" />
+        <metatype:AD id="pool.maxActiveWait" type="Integer" default="1"
+            name="%pool.maxActiveWait.name"
+            description="%pool.maxActiveWait.description" />
+        <metatype:AD id="admin.name" type="String" default="admin"
+            name="%admin.name.name"
+            description="%admin.name.description" />
+        <metatype:AD id="defaultWorkspace" type="String" default=""
+            name="%defaultWorkspace.name"
+            description="%defaultWorkspace.description" />
+        <metatype:AD id="poll.inactive" type="Integer" default="10"
+            name="%poll.inactive.name"
+            description="%poll.inactive.description" />
+        <metatype:AD id="admin.password" type="String" default="admin"
+            name="%admin.password.name"
+            description="%admin.password.description" />
+        <metatype:AD id="anonymous.password" type="String"
+            default="anonymous" name="%anonymous.password.name"
+            description="%anonymous.password.description" />
+        <metatype:AD id="poll.active" type="Integer" default="10"
+            name="%poll.active.name"
+            description="%poll.active.description" />
+        <metatype:AD id="pool.maxActive" type="Integer" default="-1"
+            name="%pool.maxActive.name"
+            description="%pool.maxActive.description" />
+        <metatype:AD id="anonymous.name" type="String"
+            default="anonymous" name="%anonymous.name.name"
+            description="%anonymous.name.description" />
+        <metatype:AD id="name" type="String" default=""
+            name="%name.name" description="%name.description" />
+        <metatype:AD id="config" type="String" default=""
+            name="%config.name" description="%config.description" />
+        <metatype:AD id="pool.maxIdle" type="Integer" default="10"
+            name="%pool.maxIdle.name"
+            description="%pool.maxIdle.description" />
+    </metatype:OCD>
+    <metatype:Designate
+        pid="org.apache.sling.jcr.jackrabbit.server.SlingServerRepository">
+        <metatype:Object
+            ocdref="org.apache.sling.jcr.jackrabbit.server.SlingServerRepository" />
+    </metatype:Designate>
+</metatype:MetaData>



Mime
View raw message