directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r267211 - in /directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap: project.xml src/main/java/org/apache/ldap/Activator.java src/main/java/org/apache/ldap/LdapConfiguration.java
Date Fri, 02 Sep 2005 14:30:47 GMT
Author: erodriguez
Date: Fri Sep  2 07:30:41 2005
New Revision: 267211

URL: http://svn.apache.org/viewcvs?rev=267211&view=rev
Log:
Updates to LDAP protocol OSGi wrapper:
o  bumped up ldap deps to 0.9.3-SNAPSHOT and asn1 to 0.3.2-SNAPSHOT
o  removed osgi exports, none are required
o  removed erroneous osgi imports
o  added new osgi imports to satisfy bad encapsulation or dependency mgmt issues
   - ContextFactoryService in org.apache.ldap.server.jndi
   - ExprNode in org.apache.ldap.common.filter
   - Configuration and Startup Configuration in org.apache.ldap.server.configuration
o  initial use of apacheds-core configuration mechanism
o  initial use of SLF4J logging, library dependency to POM
o  addition of MINA ServiceRegistry tracking using ServiceTracker

Added:
    directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/LdapConfiguration.java
  (with props)
Modified:
    directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/project.xml
    directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/Activator.java

Modified: directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/project.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/project.xml?rev=267211&r1=267210&r2=267211&view=diff
==============================================================================
--- directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/project.xml (original)
+++ directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/project.xml Fri Sep  2 07:30:41
2005
@@ -8,8 +8,7 @@
   <currentVersion>0.1.1</currentVersion>
   <properties>
     <osgi.bundle.category>Network Service</osgi.bundle.category>
-    <osgi.export.package>org.apache.ldap.common.berlib.asn1,org.apache.asn1.codec,org.apache.asn1.codec.stateful</osgi.export.package>
-    <osgi.import.package>org.apache.ldap.common.util,org.apache.ldap.common.message.spi,org.apache.ldap.common,org.apache.ldap.common.message,org.apache.ldap.common.exception,org.apache.ldap.common.filter,org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.protocol.codec,org.apache.mina.common,org.osgi.service.cm</osgi.import.package>
+    <osgi.import.package>org.apache.ldap.common.filter,org.apache.ldap.server.configuration,org.osgi.framework,org.apache.mina.registry,org.apache.mina.protocol,org.apache.mina.protocol.handler,org.apache.mina.protocol.codec,org.apache.mina.common,org.osgi.service.cm,org.osgi.util.tracker</osgi.import.package>
   </properties>
   <inceptionYear>2005</inceptionYear>
   <package>org.apache.ldap</package>
@@ -19,7 +18,7 @@
     <dependency>
       <groupId>directory-protocols</groupId>
       <artifactId>ldap-protocol</artifactId>
-      <version>0.9-SNAPSHOT</version>
+      <version>0.9.3-SNAPSHOT</version>
       <properties>
         <osgi.jar.bundle>true</osgi.jar.bundle>
       </properties>
@@ -27,7 +26,15 @@
     <dependency>
       <groupId>directory-shared</groupId>
       <artifactId>apache-ldapber-provider</artifactId>
-      <version>0.9-SNAPSHOT</version>
+      <version>0.9.3-SNAPSHOT</version>
+      <properties>
+        <osgi.jar.bundle>true</osgi.jar.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>directory-shared</groupId>
+      <artifactId>ldap-common</artifactId>
+      <version>0.9.3-SNAPSHOT</version>
       <properties>
         <osgi.jar.bundle>true</osgi.jar.bundle>
       </properties>
@@ -35,7 +42,7 @@
     <dependency>
       <groupId>directory-asn1</groupId>
       <artifactId>asn1-codec</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.3.2-SNAPSHOT</version>
       <properties>
         <osgi.jar.bundle>true</osgi.jar.bundle>
       </properties>
@@ -43,17 +50,12 @@
     <dependency>
       <groupId>directory-asn1</groupId>
       <artifactId>asn1-ber</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.3.2-SNAPSHOT</version>
       <properties>
         <osgi.jar.bundle>true</osgi.jar.bundle>
       </properties>
     </dependency>
     <dependency>
-      <groupId>directory-shared</groupId>
-      <artifactId>ldap-common</artifactId>
-      <version>0.9-SNAPSHOT</version>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.0</version>
@@ -76,6 +78,21 @@
       <properties>
         <osgi.jar.bundle>true</osgi.jar.bundle>
       </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+      <version>1.2.14</version>
+      <url>http://slf4j.org/nlog4j</url>
+      <properties>
+        <osgi.jar.bundle>true</osgi.jar.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <!-- required to load Configuration base class -->
+      <groupId>directory</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>0.9.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/Activator.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/Activator.java?rev=267211&r1=267210&r2=267211&view=diff
==============================================================================
--- directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/Activator.java
(original)
+++ directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/Activator.java
Fri Sep  2 07:30:41 2005
@@ -22,6 +22,7 @@
 
 import javax.naming.spi.InitialContextFactory;
 
+import org.apache.ldap.server.configuration.StartupConfiguration;
 import org.apache.mina.registry.ServiceRegistry;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -65,7 +66,7 @@
 
         InitialContextFactory factory = (InitialContextFactory) context.getService( storeReference
);
 
-        Hashtable env = new Hashtable();
+        Hashtable env = new Hashtable( new StartupConfiguration().toJndiEnvironment() );
         loadEnvironment( env );
 
         env.put( "server.use.factory.instance", factory );

Added: directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/LdapConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/LdapConfiguration.java?rev=267211&view=auto
==============================================================================
--- directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/LdapConfiguration.java
(added)
+++ directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/LdapConfiguration.java
Fri Sep  2 07:30:41 2005
@@ -0,0 +1,39 @@
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.ldap;
+
+import org.apache.ldap.server.configuration.Configuration;
+
+public class LdapConfiguration extends Configuration
+{
+    /**
+     * Creates a new instance with default settings.
+     */
+    public LdapConfiguration()
+    {
+    }
+
+    /**
+     * Creates a new instance with default settings that operates
+     * with the specified ID.
+     */
+    public LdapConfiguration( String instanceId )
+    {
+        setInstanceId( instanceId );
+    }
+}

Propchange: directory/sandbox/trunk/osgi-protocol-providers/trunk/ldap/src/main/java/org/apache/ldap/LdapConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message