svn commit: r612084 - in /incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client: Activator.java SlingClientRepository.java

[cziegeler]

Author: cziegeler
Date: Tue Jan 15 03:24:01 2008
New Revision: 612084

URL: http://svn.apache.org/viewvc?rev=612084&view=rev
Log:
Move default config for client into separate method; use jackrabbit default 
config.

Modified:
    
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/Activator.java
    
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java

Modified: 
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/Activator.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/Activator.java?rev=612084&r1=612083&r2=612084&view=diff
==============================================================================
--- 
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/Activator.java
 (original)
+++ 
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/Activator.java
 Tue Jan 15 03:24:01 2008
@@ -71,6 +71,16 @@
         return SlingClientRepository.class.getName();
     }
 
+    protected Hashtable<String, Object>getDefaultConfiguration() {
+        Hashtable<String, Object> props = new Hashtable<String, Object>();
+        props.put(SLING_CONTEXT, slingContext);
+        props.put(SlingClientRepository.REPOSITORY_NAME, "jackrabbit");
+        props.put(Context.PROVIDER_URL, "http://incubator.apache.org/sling";);
+        props.put(Context.INITIAL_CONTEXT_FACTORY,
+            
"org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory");
+        return props;
+    }
+
     public void start(BundleContext context) {
 
         this.bundleContext = context;
@@ -142,12 +152,7 @@
             }
 
             // we have no configuration, create from default settings
-            Hashtable<String, Object> props = new Hashtable<String, Object>();
-            props.put(SLING_CONTEXT, slingContext);
-            props.put(SlingClientRepository.REPOSITORY_NAME, "crx");
-            props.put(Context.PROVIDER_URL, "http://jcr.day.com";);
-            props.put(Context.INITIAL_CONTEXT_FACTORY,
-                "com.day.util.jndi.provider.MemoryInitialContextFactory");
+            final Hashtable<String, Object> props = 
this.getDefaultConfiguration();
 
             // create the factory and set the properties
             Configuration config = 
ca.createFactoryConfiguration(this.getClientRepositoryFactoryPID());

Modified: 
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java?rev=612084&r1=612083&r2=612084&view=diff
==============================================================================
--- 
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
 (original)
+++ 
incubator/sling/trunk/jcr/jackrabbit-client/src/main/java/org/apache/sling/jcr/jackrabbit/client/SlingClientRepository.java
 Tue Jan 15 03:24:01 2008
@@ -63,7 +63,7 @@
         implements Repository, SlingRepository {
 
     /**
-     * @scr.property value="crx"
+     * @scr.property value="jackrabbit"
      */
     public static final String REPOSITORY_NAME = "name";