directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r406172 - in /directory/trunks/apacheds/osgi: ./ apacheds/ changepw/ dns/ jmx/ kerberos/ ldap/ loader/ main/ main/src/main/resources/ mina-filter-codec-asn1-osgi/ network/ ntp/ shared-asn1-osgi/ shared-ldap-osgi/
Date Sun, 14 May 2006 00:21:23 GMT
Author: erodriguez
Date: Sat May 13 17:21:21 2006
New Revision: 406172

URL: http://svn.apache.org/viewcvs?rev=406172&view=rev
Log:
Updates to the ApacheDS OSGi build to complete the assembly of the server:
o  Addition of a MINA ASN1 Codec bundle.
o  Addition of remainder of modules to OSGi build parent POM.
o  POM updates to dependency scopes to exclude embedded library jars.
o  POM updates to import and export statements based on mangen analysis.
o  POM updates to normalize artifact IDs.
o  Updates to bundle assembly to include all the bundles.
o  Logger configuration update to tune logging levels now that all the bundles are loading.
o  Normalization of svn ignores.

Added:
    directory/trunks/apacheds/osgi/main/server.xml   (with props)
    directory/trunks/apacheds/osgi/mina-filter-codec-asn1-osgi/   (with props)
    directory/trunks/apacheds/osgi/mina-filter-codec-asn1-osgi/pom.xml   (with props)
Modified:
    directory/trunks/apacheds/osgi/apacheds/   (props changed)
    directory/trunks/apacheds/osgi/apacheds/pom.xml
    directory/trunks/apacheds/osgi/changepw/   (props changed)
    directory/trunks/apacheds/osgi/changepw/pom.xml
    directory/trunks/apacheds/osgi/dns/   (props changed)
    directory/trunks/apacheds/osgi/dns/pom.xml
    directory/trunks/apacheds/osgi/jmx/   (props changed)
    directory/trunks/apacheds/osgi/jmx/pom.xml
    directory/trunks/apacheds/osgi/kerberos/   (props changed)
    directory/trunks/apacheds/osgi/kerberos/pom.xml
    directory/trunks/apacheds/osgi/ldap/   (props changed)
    directory/trunks/apacheds/osgi/ldap/pom.xml
    directory/trunks/apacheds/osgi/loader/   (props changed)
    directory/trunks/apacheds/osgi/loader/pom.xml
    directory/trunks/apacheds/osgi/main/apacheds.sh
    directory/trunks/apacheds/osgi/main/pom.xml
    directory/trunks/apacheds/osgi/main/src/main/resources/config.properties
    directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties
    directory/trunks/apacheds/osgi/network/   (props changed)
    directory/trunks/apacheds/osgi/network/pom.xml
    directory/trunks/apacheds/osgi/ntp/   (props changed)
    directory/trunks/apacheds/osgi/ntp/pom.xml
    directory/trunks/apacheds/osgi/pom.xml
    directory/trunks/apacheds/osgi/shared-asn1-osgi/pom.xml
    directory/trunks/apacheds/osgi/shared-ldap-osgi/pom.xml

Propchange: directory/trunks/apacheds/osgi/apacheds/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -1 +1,16 @@
 target
+bin
+build
+classes
+.classpath
+.project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/apacheds/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/apacheds/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/apacheds/pom.xml (original)
+++ directory/trunks/apacheds/osgi/apacheds/pom.xml Sat May 13 17:21:21 2006
@@ -17,7 +17,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
-      <!--<scope>provided</scope>-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -25,6 +25,23 @@
       <version>${pom.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-shared</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.5.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>0.8.0-SNAPSHOT</version>
@@ -50,10 +67,10 @@
               org.apache.ldap.server.Activator
             </bundleActivator>
             <importPackage>
-              org.osgi.framework,javax.naming,javax.naming.directory,javax.naming.ldap,javax.naming.spi
+              org.osgi.framework,com.sun.jndi.ldap,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,org.apache.commons.collections,org.apache.directory.shared.asn1.primitives,org.apache.directory.shared.ldap,org.apache.directory.shared.ldap.aci,org.apache.directory.shared.ldap.codec.util,org.apache.directory.shared.ldap.exception,org.apache.directory.shared.ldap.filter,org.apache.directory.shared.ldap.ldif,org.apache.directory.shared.ldap.message,org.apache.directory.shared.ldap.name,org.apache.directory.shared.ldap.schema,org.apache.directory.shared.ldap.subtree,org.apache.directory.shared.ldap.util,org.slf4j,org.apache.directory.shared.ldap.trigger
             </importPackage>
             <exportPackage>
-              org.apache.directory.shared.ldap.exception,org.apache.ldap.common.filter,org.apache.ldap.server.jndi,org.apache.directory.server.core.configuration
+              org.apache.directory.server.core,org.apache.directory.server.core.authn,org.apache.directory.server.core.configuration,org.apache.directory.server.core.jndi,org.apache.directory.server.core.partition,org.apache.directory.server.core.partition.impl.btree,org.apache.directory.server.core.partition.impl.btree.gui,org.apache.directory.server.core.schema.bootstrap
             </exportPackage>
           </osgiManifest>
         </configuration>
@@ -61,4 +78,3 @@
     </plugins>
   </build>
 </project>
-

Propchange: directory/trunks/apacheds/osgi/changepw/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -3,4 +3,14 @@
 target
 classes
 .classpath
-.profile
+.project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/changepw/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/changepw/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/changepw/pom.xml (original)
+++ directory/trunks/apacheds/osgi/changepw/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-protocol-osgi-changepw</artifactId>
+  <artifactId>apacheds-protocol-changepw-osgi</artifactId>
   <name>ApacheDS Change Password Protocol Bundle</name>
   <description>
     The Change Password Protocol Provider for ApacheDS packaged as an OSGi bundle.
@@ -17,12 +17,13 @@
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
-      <!--<scope>provided</scope>-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.2</version>
+      <version>0.9.4-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -57,6 +58,24 @@
       <version>0.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -78,7 +97,7 @@
               org.apache.changepw.Activator
             </bundleActivator>
             <importPackage>
-              javax.security.auth.kerberos,org.apache.directory.shared.ldap.exception,javax.naming.directory,org.apache.directory.server.core.configuration,javax.naming,javax.naming.spi,org.apache.felix.servicebinder,org.osgi.framework,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common,org.osgi.service.cm
+              javax.naming,javax.naming.directory,javax.naming.spi,javax.security.auth.callback,javax.security.auth.kerberos,javax.security.auth.login,org.apache.directory.server.core.configuration,org.apache.directory.shared.asn1.der,org.apache.directory.shared.ldap.name,org.apache.mina.handler.chain,org.apache.mina.common,org.apache.mina.filter.codec,org.apache.mina.handler.chain,org.slf4j,org.osgi.service.cm,org.apache.felix.servicebinder,org.apache.mina.transport.socket.nio
             </importPackage>
           </osgiManifest>
         </configuration>

Propchange: directory/trunks/apacheds/osgi/dns/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -4,3 +4,13 @@
 classes
 .classpath
 .project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/dns/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/dns/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/dns/pom.xml (original)
+++ directory/trunks/apacheds/osgi/dns/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-protocol-osgi-dns</artifactId>
+  <artifactId>apacheds-protocol-dns-osgi</artifactId>
   <name>ApacheDS DNS Protocol Bundle</name>
   <description>
     The DNS Protocol Provider for ApacheDS packaged as an OSGi bundle.
@@ -17,12 +17,13 @@
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
-      <!--<scope>provided</scope>-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.2</version>
+      <version>0.9.4-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -52,6 +53,24 @@
       <version>0.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -73,7 +92,7 @@
               org.apache.dns.Activator
             </bundleActivator>
             <importPackage>
-              org.apache.directory.shared.ldap.exception,javax.naming.directory,org.apache.directory.server.core.configuration,javax.naming,javax.naming.spi,org.apache.felix.servicebinder,org.osgi.framework,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common,org.osgi.service.cm
+              org.apache.mina.transport.socket.nio,com.sun.jndi.ldap,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.security.auth.kerberos,org.apache.directory.server.core.configuration,org.apache.directory.shared.ldap.exception,org.apache.mina.common,org.apache.mina.filter.codec,org.apache.mina.handler.chain,org.apache.felix.servicebinder,org.apache.log4j,org.osgi.service.cm,org.slf4j
             </importPackage>
           </osgiManifest>
         </configuration>

Propchange: directory/trunks/apacheds/osgi/jmx/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -1 +1,16 @@
 target
+bin
+build
+classes
+.classpath
+.project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/jmx/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/jmx/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/jmx/pom.xml (original)
+++ directory/trunks/apacheds/osgi/jmx/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-jmx-osgi</artifactId>
+  <artifactId>apacheds-server-jmx-osgi</artifactId>
   <name>ApacheDS JMX Logger Bundle</name>
   <description>
     An example showing how to use a JMX subsystem with OSGi bundles.
@@ -17,7 +17,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
-      <!--<scope>provided</scope>-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>
@@ -51,7 +51,7 @@
               org.apache.jmx.JmxLogger
             </bundleActivator>
             <importPackage>
-              org.osgi.framework
+              org.slf4j,org.apache.log4j,org.osgi.framework
             </importPackage>
           </osgiManifest>
         </configuration>

Propchange: directory/trunks/apacheds/osgi/kerberos/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -4,3 +4,13 @@
 classes
 .classpath
 .project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/kerberos/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/kerberos/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/kerberos/pom.xml (original)
+++ directory/trunks/apacheds/osgi/kerberos/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-protocol-osgi-kerberos</artifactId>
+  <artifactId>apacheds-protocol-kerberos-osgi</artifactId>
   <name>ApacheDS Kerberos Protocol Bundle</name>
   <description>
     The Kerberos Protocol Provider for ApacheDS packaged as an OSGi bundle.
@@ -17,12 +17,13 @@
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
-      <!--<scope>provided</scope>-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.2</version>
+      <version>0.9.4-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -57,6 +58,24 @@
       <version>0.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -78,7 +97,7 @@
               org.apache.kerberos.Activator
             </bundleActivator>
             <importPackage>
-              javax.security.auth.kerberos,org.apache.directory.shared.ldap.exception,javax.naming.directory,org.apache.directory.server.core.configuration,javax.naming,javax.naming.spi,org.apache.felix.servicebinder,org.osgi.framework,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common,org.osgi.service.cm
+              javax.naming,javax.naming.directory,javax.naming.spi,javax.security.auth.callback,javax.security.auth.kerberos,javax.security.auth.login,org.apache.directory.server.core.configuration,org.apache.directory.shared.asn1.der,org.apache.directory.shared.ldap.name,org.apache.mina.handler.chain,org.apache.mina.common,org.apache.mina.filter.codec,org.apache.mina.handler.chain,org.slf4j,org.osgi.service.cm,org.apache.felix.servicebinder,org.apache.mina.transport.socket.nio
             </importPackage>
           </osgiManifest>
         </configuration>

Propchange: directory/trunks/apacheds/osgi/ldap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -4,3 +4,13 @@
 classes
 .classpath
 .project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/ldap/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/ldap/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/ldap/pom.xml (original)
+++ directory/trunks/apacheds/osgi/ldap/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-protocol-osgi-ldap</artifactId>
+  <artifactId>apacheds-protocol-ldap-osgi</artifactId>
   <name>ApacheDS LDAP Protocol Bundle</name>
   <description>
     The ApacheDS LDAP Network Service packaged as an OSGi bundle.
@@ -17,12 +17,25 @@
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
-      <!--<scope>provided</scope>-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.mina</groupId>
+      <artifactId>mina-filter-ssl</artifactId>
       <version>0.9.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.mina</groupId>
+      <artifactId>mina-filter-codec-asn1</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -33,6 +46,7 @@
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -40,6 +54,18 @@
       <version>${pom.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>0.8.0-SNAPSHOT</version>
@@ -67,6 +93,7 @@
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>
+            <metadataLocation>metadata.xml</metadataLocation>
             <bundleName>ApacheDS LDAP Protocol Bundle</bundleName>
             <bundleVendor>Apache Software Foundation</bundleVendor>
             <bundleCategory>Network Service</bundleCategory>
@@ -77,11 +104,8 @@
               org.apache.ldap.Activator
             </bundleActivator>
             <importPackage>
-              org.osgi.framework,javax.naming,javax.naming.directory,javax.naming.ldap,javax.naming.spi,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.apache.directory.shared.asn1.codec.stateful,com.sun.jndi.ldap,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net.ssl,javax.security.auth.kerberos,org.apache.directory.server.core,org.apache.directory.server.core.authn,org.apache.directory.server.core.configuration,org.apache.directory.server.core.jndi,org.apache.directory.server.core.partition,org.apache.directory.server.core.partition.impl.btree,org.apache.directory.server.core.partition.impl.btree.gui,org.apache.directory.shared.asn1.ber,org.apache.directory.shared.asn1.codec,org.apache.directory.shared.ldap.codec.extended.operations,org.apache.directory.shared.ldap.codec.search.controls,org.apache.directory.shared.ldap.codec.util,org.apache.directory.shared.ldap.exception,org.apache.directory.shared.ldap.filter,org.apache.directory.shared.ldap.message,org.apache.directory.shared.ldap.message.extended,org.apache.directory.shared.ldap.name,org.apache.directo
 ry.shared.ldap.util,org.apache.mina.common,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.filter.codec.asn1,org.apache.mina.handler.demux,org.apache.mina.transport.socket.nio,org.apache.mina.util,org.apache.felix.servicebinder,org.osgi.service.cm,org.apache.log4j,org.slf4j
             </importPackage>
-            <exportPackage>
-              org.apache.directory.shared.ldap.exception,org.apache.ldap.common.filter,org.apache.ldap.server.jndi,org.apache.directory.server.core.configuration
-            </exportPackage>
           </osgiManifest>
         </configuration>
       </plugin>

Propchange: directory/trunks/apacheds/osgi/loader/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -1 +1,16 @@
 target
+bin
+build
+classes
+.classpath
+.project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/loader/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/loader/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/loader/pom.xml (original)
+++ directory/trunks/apacheds/osgi/loader/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-command-osgi-loader</artifactId>
+  <artifactId>apacheds-server-loader-osgi</artifactId>
   <name>ApacheDS LDIF Loader Console Command</name>
   <description>
     The ApacheDS LDIF Loader Console Command packaged as an OSGi bundle.
@@ -17,7 +17,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
-      <!--<scope>provided</scope>-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -28,6 +28,7 @@
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -57,6 +58,7 @@
         <extensions>true</extensions>
         <configuration>
           <osgiManifest>
+            <metadataLocation>metadata.xml</metadataLocation>
             <bundleName>ApacheDS LDIF Loader Console Command</bundleName>
             <bundleVendor>Apache Software Foundation</bundleVendor>
             <bundleCategory>Network Service</bundleCategory>
@@ -67,11 +69,8 @@
               org.apache.ldap.server.loader.Activator
             </bundleActivator>
             <importPackage>
-              org.osgi.framework,javax.naming,javax.naming.directory,javax.naming.ldap,javax.naming.spi
+              org.slf4j,org.apache.log4j,org.apache.directory.server.core.configuration,org.ungoverned.osgi.service.shell,org.apache.felix.servicebinder,org.osgi.framework,javax.naming,javax.naming.directory,javax.naming.ldap,javax.naming.spi,org.apache.directory.server.core.jndi,javax.security.auth.kerberos
             </importPackage>
-            <exportPackage>
-              org.apache.directory.shared.ldap.exception,org.apache.ldap.common.filter,org.apache.ldap.server.jndi,org.apache.directory.server.core.configuration
-            </exportPackage>
           </osgiManifest>
         </configuration>
       </plugin>

Modified: directory/trunks/apacheds/osgi/main/apacheds.sh
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/main/apacheds.sh?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/main/apacheds.sh (original)
+++ directory/trunks/apacheds/osgi/main/apacheds.sh Sat May 13 17:21:21 2006
@@ -6,4 +6,4 @@
   mvn clean install
 fi
 
-java -Dlog4j.configuration=file://$(pwd)/conf/log4j.properties -jar bin/felix.jar
+java -Dlog4j.configuration=file://$(pwd)/conf/log4j.properties -jar bin/felix.jar server.xml

Modified: directory/trunks/apacheds/osgi/main/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/main/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/main/pom.xml (original)
+++ directory/trunks/apacheds/osgi/main/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-osgi-main</artifactId>
+  <artifactId>apacheds-server-main-osgi</artifactId>
   <name>ApacheDS OSGi Server Main</name>
   <packaging>pom</packaging>
   <build>
@@ -27,6 +27,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.1</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -35,6 +36,7 @@
             </goals>
             <configuration>
               <tasks>
+                <delete dir="${user.home}/.felix/apacheds"/>
                 <delete dir="${basedir}/bin"/>
                 <mkdir dir="${basedir}/bin"/>
                 <delete dir="${basedir}/lib"/>
@@ -85,6 +87,13 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.felix</groupId>
+                  <artifactId>org.osgi.compendium</artifactId>
+                  <version>0.8.0-SNAPSHOT</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
                   <artifactId>org.apache.felix.shell</artifactId>
                   <version>0.8.0-SNAPSHOT</version>
                   <type>jar</type>
@@ -106,15 +115,113 @@
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.server</groupId>
-                  <artifactId>apacheds-osgi-mina</artifactId>
+                  <artifactId>mina-core-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>mina-filter-codec-asn1-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-ntp-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-ldap-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-dns-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-kerberos-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-protocol-changepw-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-server-logger-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>apacheds-server-loader-osgi</artifactId>
                   <version>${pom.version}</version>
                   <type>jar</type>
                   <outputDirectory>${basedir}/bundle</outputDirectory>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.server</groupId>
-                  <artifactId>apacheds-osgi-logger</artifactId>
+                  <artifactId>apacheds-core-osgi</artifactId>
                   <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>shared-ldap-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>shared-asn1-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>antlr-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>commons-lang-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.directory.server</groupId>
+                  <artifactId>commons-collections-osgi</artifactId>
+                  <version>${pom.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${basedir}/bundle</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.felix</groupId>
+                  <artifactId>org.apache.felix.servicebinder</artifactId>
+                  <version>0.8.0-SNAPSHOT</version>
                   <type>jar</type>
                   <outputDirectory>${basedir}/bundle</outputDirectory>
                 </artifactItem>

Added: directory/trunks/apacheds/osgi/main/server.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/main/server.xml?rev=406172&view=auto
==============================================================================
--- directory/trunks/apacheds/osgi/main/server.xml (added)
+++ directory/trunks/apacheds/osgi/main/server.xml Sat May 13 17:21:21 2006
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
+  "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+  <bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+    <property name="properties">
+      <props>
+        <prop key="java.naming.security.authentication">simple</prop>
+        <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
+        <prop key="java.naming.security.credentials">secret</prop>
+        <!--<prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+        <!--<prop key="kdc.java.naming.security.credentials">secret</prop>-->
+        <!--<prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+        <!--<prop key="changepw.java.naming.security.credentials">secret</prop>-->
+        <!-- Set this key to a space delimited set of attributeType descriptions
+             and their OID's if you want an attributeType to be handled as 
+             binary content.
+ 
+             The server will use the schema to derive the set of attributeTypes
+             to treat as binary.  The union if the values you provide here 
+             will be taken as the set of binaries. Note to be consistent you 
+             must add both the OID and all the names an attributeType can have.
+        -->
+        <!-- 
+        <prop key="java.naming.ldap.attributes.binary"></prop>
+        -->
+      </props>
+    </property>
+  </bean>
+  
+  <bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
+    <property name="workingDirectory"><value>example.com</value></property>
+
+    <!-- Uncomment below to have the server load entries on startup!        -->
+    <!-- ldifDirectory property can point to a relative file, directory or  -->
+    <!-- can point to an absolute path to either using the URL path         -->
+    <!-- notation: i.e. file:///Users/jack/apacheds/ldifs                   -->
+
+    <!-- Entries will optionally be filtered using LdifLoadFilters in the   -->
+    <!-- order specified.  The included Krb5KdcEntryFilter will filter      -->
+    <!-- kerberos principals creating keys for them using their             -->
+    <!-- userPassword attribute if present.                                 -->
+
+    <!--<property name="ldifDirectory">
+      <value>example.ldif</value>
+    </property>
+    <property name="ldifFilters">
+      <list>
+        <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
+      </list>
+    </property>-->
+
+    <property name="allowAnonymousAccess"><value>false</value></property>
+    <property name="accessControlEnabled"><value>false</value></property>
+    <property name="enableNtp"><value>false</value></property>
+    <property name="enableKerberos"><value>false</value></property>
+    <property name="enableChangePassword"><value>false</value></property>
+    <property name="ldapPort"><value>10389</value></property>
+    <property name="contextPartitionConfigurations">
+      <set>
+        <ref bean="examplePartitionConfiguration"/>
+      </set>
+    </property>
+    <property name="bootstrapSchemas">
+      <set>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.AutofsSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.CorbaSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.CoreSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.CosineSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.ApacheSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.CollectiveSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.InetorgpersonSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.JavaSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.Krb5kdcSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.NisSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.SystemSchema"/>
+        <bean class="org.apache.directory.server.core.schema.bootstrap.ApachednsSchema"/>
+      </set>
+    </property>
+    
+    <property name="extendedOperationHandlers">
+      <list>
+        <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
+        <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
+      </list>
+    </property>
+
+    <property name="interceptorConfigurations">
+      <list>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>normalizationService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.normalization.NormalizationService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>authenticationService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.authn.AuthenticationService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>referralService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.referral.ReferralService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>authorizationService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.authz.AuthorizationService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>oldAuthorizationService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.authz.OldAuthorizationService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>exceptionService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.exception.ExceptionService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>schemaService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.schema.SchemaService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>subentryService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.subtree.SubentryService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>operationalAttributeService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>collectiveAttributeService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.collective.CollectiveAttributeService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name"><value>eventService</value></property>
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.event.EventService" />
+          </property>
+        </bean>
+      </list>
+    </property>
+  </bean>
+  
+  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration">
+    <property name="name"><value>example</value></property>
+    <property name="suffix"><value>dc=example,dc=com</value></property>
+    <property name="indexedAttributes">
+      <set>
+        <value>dc</value>
+        <value>ou</value>
+        <value>objectClass</value>
+        <value>krb5PrincipalName</value>
+        <value>uid</value>
+      </set>
+    </property>
+    <property name="contextEntry">
+      <value>
+        objectClass: top
+        objectClass: domain
+        objectClass: extensibleObject
+        dc: example
+      </value>
+    </property>
+  </bean>
+
+  <bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+    <property name="customEditors">
+      <map>
+        <entry key="javax.naming.directory.Attributes">
+          <bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
+        </entry>
+      </map>
+   </property>
+  </bean>
+</beans>

Propchange: directory/trunks/apacheds/osgi/main/server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/trunks/apacheds/osgi/main/src/main/resources/config.properties
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/main/src/main/resources/config.properties?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/main/src/main/resources/config.properties (original)
+++ directory/trunks/apacheds/osgi/main/src/main/resources/config.properties Sat May 13 17:21:21 2006
@@ -24,13 +24,31 @@
  javax.naming.directory, \
  javax.naming.ldap, \
  javax.security.auth.kerberos, \
- javax.net.ssl
+ javax.security.auth.login, \
+ javax.security.auth.callback, \
+ javax.net.ssl, \
+ com.sun.jndi.ldap
 
 felix.auto.start.1= \
  file:bundle/org.apache.felix.shell-0.8.0-SNAPSHOT.jar \
  file:bundle/org.apache.felix.shell.tui-0.8.0-SNAPSHOT.jar \
- file:bundle/apacheds-osgi-mina-${pom.version}.jar \
- file:bundle/apacheds-osgi-logger-${pom.version}.jar
+ file:bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar \
+ file:bundle/org.osgi.compendium-0.8.0-SNAPSHOT.jar \
+ file:bundle/mina-core-osgi-${pom.version}.jar \
+ file:bundle/mina-filter-codec-asn1-osgi-${pom.version}.jar \
+ file:bundle/apacheds-core-osgi-${pom.version}.jar \
+ file:bundle/apacheds-server-logger-osgi-${pom.version}.jar \
+ file:bundle/apacheds-server-loader-osgi-${pom.version}.jar \
+ file:bundle/shared-ldap-osgi-${pom.version}.jar \
+ file:bundle/shared-asn1-osgi-${pom.version}.jar \
+ file:bundle/antlr-osgi-${pom.version}.jar \
+ file:bundle/commons-lang-osgi-${pom.version}.jar \
+ file:bundle/commons-collections-osgi-${pom.version}.jar \
+ file:bundle/apacheds-protocol-ntp-osgi-${pom.version}.jar \
+ file:bundle/apacheds-protocol-ldap-osgi-${pom.version}.jar \
+ file:bundle/apacheds-protocol-dns-osgi-${pom.version}.jar \
+ file:bundle/apacheds-protocol-kerberos-osgi-${pom.version}.jar \
+ file:bundle/apacheds-protocol-changepw-osgi-${pom.version}.jar
 #http:...
 
 felix.startlevel.framework=1

Modified: directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties (original)
+++ directory/trunks/apacheds/osgi/main/src/main/resources/log4j.properties Sat May 13 17:21:21 2006
@@ -5,8 +5,18 @@
 log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
 
 # with these we'll not get innundated when switching to DEBUG
-log4j.logger.org.apache.directory.shared.ldap.name=WARN
 log4j.logger.org.springframework=WARN
+log4j.logger.org.apache.directory=WARN
+log4j.logger.org.apache.directory.server.core=WARN
+log4j.logger.org.apache.directory.shared.ldap.name=WARN
 log4j.logger.org.apache.directory.shared.codec=WARN
 log4j.logger.org.apache.directory.shared.asn1=WARN
 
+log4j.logger.org.apache.dns=DEBUG
+log4j.logger.org.apache.kerberos=DEBUG
+log4j.logger.org.apache.changepw=DEBUG
+
+log4j.logger.org.apache.directory.server.changepw=DEBUG
+log4j.logger.org.apache.directory.server.dns=DEBUG
+log4j.logger.org.apache.directory.server.kerberos=DEBUG
+log4j.logger.org.apache.directory.server.logger=DEBUG

Propchange: directory/trunks/apacheds/osgi/mina-filter-codec-asn1-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -0,0 +1,16 @@
+bin
+build
+target
+classes
+.classpath
+.project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Added: directory/trunks/apacheds/osgi/mina-filter-codec-asn1-osgi/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/mina-filter-codec-asn1-osgi/pom.xml?rev=406172&view=auto
==============================================================================
--- directory/trunks/apacheds/osgi/mina-filter-codec-asn1-osgi/pom.xml (added)
+++ directory/trunks/apacheds/osgi/mina-filter-codec-asn1-osgi/pom.xml Sat May 13 17:21:21 2006
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.server</groupId>
+    <artifactId>build</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>mina-filter-codec-asn1-osgi</artifactId>
+  <name>ApacheDS MINA ASN1 Codec Bundle</name>
+  <description>
+    The ApacheDS MINA ASN1 Codec packaged as an OSGi bundle.
+  </description>
+  <packaging>osgi-bundle</packaging>  
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>nlog4j</artifactId>
+      <version>1.2.19</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.mina</groupId>
+      <artifactId>mina-core</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.mina</groupId>
+      <artifactId>mina-filter-codec-asn1</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest>
+            <bundleName>ApacheDS MINA ASN1 Codec Bundle</bundleName>
+            <bundleVendor>Apache Software Foundation</bundleVendor>
+            <bundleCategory>Network Service</bundleCategory>
+            <bundleDescription>
+              A bundle that registers the MINA library.
+            </bundleDescription>
+            <importPackage>
+              org.apache.directory.shared.asn1.codec,org.apache.directory.shared.asn1.codec.stateful,org.apache.mina.common,org.apache.mina.filter.codec
+            </importPackage>
+            <exportPackage>
+              org.apache.mina.filter.codec.asn1
+            </exportPackage>
+          </osgiManifest>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: directory/trunks/apacheds/osgi/mina-filter-codec-asn1-osgi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/osgi/network/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -1 +1,16 @@
 target
+bin
+build
+classes
+.classpath
+.project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/network/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/network/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/network/pom.xml (original)
+++ directory/trunks/apacheds/osgi/network/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-osgi-mina</artifactId>
+  <artifactId>mina-core-osgi</artifactId>
   <name>ApacheDS MINA Library Bundle</name>
   <description>
     The ApacheDS MINA library packaged as an OSGi bundle.
@@ -22,7 +22,12 @@
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.2</version>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.mina</groupId>
+      <artifactId>mina-filter-ssl</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
@@ -40,8 +45,11 @@
             <bundleDescription>
               A bundle that registers the MINA library.
             </bundleDescription>
+            <importPackage>
+              org.slf4j,org.apache.log4j,javax.net.ssl
+            </importPackage>
             <exportPackage>
-              org.apache.mina.protocol.handler,org.apache.mina,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common
+              org.apache.mina.common,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.handler.chain,org.apache.mina.handler.demux,org.apache.mina.transport.socket.nio,org.apache.mina.util
             </exportPackage>
           </osgiManifest>
         </configuration>

Propchange: directory/trunks/apacheds/osgi/ntp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat May 13 17:21:21 2006
@@ -4,3 +4,13 @@
 classes
 .classpath
 .project
+.settings
+.wtpmodules
+.deployables
+*.iml
+*.ipr
+*.iws
+*.log
+lib
+bundle
+dist

Modified: directory/trunks/apacheds/osgi/ntp/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/ntp/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/ntp/pom.xml (original)
+++ directory/trunks/apacheds/osgi/ntp/pom.xml Sat May 13 17:21:21 2006
@@ -6,7 +6,7 @@
     <artifactId>build</artifactId>
     <version>1.1.0-SNAPSHOT</version>
   </parent>
-  <artifactId>apacheds-protocol-osgi-ntp</artifactId>
+  <artifactId>apacheds-protocol-ntp-osgi</artifactId>
   <name>ApacheDS NTP Protocol Bundle</name>
   <description>
     The NTP Protocol Provider for ApacheDS packaged as an OSGi bundle.
@@ -17,17 +17,19 @@
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.19</version>
-      <!--<scope>provided</scope>-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.2</version>
+      <version>0.9.4-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
       <version>${pom.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -57,6 +59,18 @@
       <version>0.8.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -78,7 +92,7 @@
               org.apache.ntp.Activator
             </bundleActivator>
             <importPackage>
-              <!--org.apache.directory.server.core.configuration,-->org.apache.felix.servicebinder,org.osgi.framework,org.apache.mina.registry,org.apache.mina.filter,org.apache.mina.filter.codec,org.apache.mina.common,org.osgi.service.cm
+              org.apache.directory.server.core.configuration,org.apache.mina.common,org.apache.mina.filter.codec,org.slf4j,org.apache.felix.servicebinder,org.osgi.service.cm,org.apache.mina.transport.socket.nio
             </importPackage>
           </osgiManifest>
         </configuration>

Modified: directory/trunks/apacheds/osgi/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/pom.xml (original)
+++ directory/trunks/apacheds/osgi/pom.xml Sat May 13 17:21:21 2006
@@ -10,15 +10,21 @@
   <packaging>pom</packaging>
   <name>ApacheDS OSGi Bundle Build</name>
   <modules>
+    <module>antlr-osgi</module>
     <module>apacheds</module>
     <module>changepw</module>
     <module>dns</module>
+    <module>commons-collections-osgi</module>
+    <module>commons-lang-osgi</module>
     <module>jmx</module>
     <module>kerberos</module>
     <module>ldap</module>
     <module>loader</module>
+    <module>logger</module>
+    <module>mina-filter-codec-asn1-osgi</module>
     <module>network</module>
     <module>ntp</module>
-    <module>logger</module>
+    <module>shared-asn1-osgi</module>
+    <module>shared-ldap-osgi</module>
   </modules>
 </project>

Modified: directory/trunks/apacheds/osgi/shared-asn1-osgi/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/shared-asn1-osgi/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/shared-asn1-osgi/pom.xml (original)
+++ directory/trunks/apacheds/osgi/shared-asn1-osgi/pom.xml Sat May 13 17:21:21 2006
@@ -21,8 +21,32 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-asn1</artifactId>
+      <artifactId>shared-ldap</artifactId>
       <version>0.9.6-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.5.1-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-asn1</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>antlr</groupId>
+          <artifactId>antlr</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <build>

Modified: directory/trunks/apacheds/osgi/shared-ldap-osgi/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/osgi/shared-ldap-osgi/pom.xml?rev=406172&r1=406171&r2=406172&view=diff
==============================================================================
--- directory/trunks/apacheds/osgi/shared-ldap-osgi/pom.xml (original)
+++ directory/trunks/apacheds/osgi/shared-ldap-osgi/pom.xml Sat May 13 17:21:21 2006
@@ -17,6 +17,24 @@
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
       <version>0.9.6-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-asn1</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>antlr</groupId>
+          <artifactId>antlr</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <build>
@@ -38,7 +56,7 @@
               antlr,antlr.collections.impl,javax.naming,javax.naming.directory,javax.naming.ldap,org.apache.commons.collections,org.apache.commons.lang,org.apache.directory.shared.asn1,org.apache.directory.shared.asn1.ber,org.apache.directory.shared.asn1.ber.grammar,org.apache.directory.shared.asn1.ber.tlv,org.apache.directory.shared.asn1.codec,org.apache.directory.shared.asn1.codec.stateful,org.apache.directory.shared.asn1.primitives,org.apache.directory.shared.asn1.util,org.apache.log4j,org.slf4j
             </importPackage>
             <exportPackage>
-              org.apache.directory.shared.ldap,org.apache.directory.shared.ldap.aci,org.apache.directory.shared.ldap.codec.util,org.apache.directory.shared.ldap.exception,org.apache.directory.shared.ldap.filter,org.apache.directory.shared.ldap.ldif,org.apache.directory.shared.ldap.message,org.apache.directory.shared.ldap.name,org.apache.directory.shared.ldap.schema,org.apache.directory.shared.ldap.subtree,org.apache.directory.shared.ldap.util
+              org.apache.directory.shared.ldap,org.apache.directory.shared.ldap.aci,org.apache.directory.shared.ldap.codec.extended.operations,org.apache.directory.shared.ldap.codec.search.controls,org.apache.directory.shared.ldap.codec.util,org.apache.directory.shared.ldap.exception,org.apache.directory.shared.ldap.filter,org.apache.directory.shared.ldap.ldif,org.apache.directory.shared.ldap.message,org.apache.directory.shared.ldap.message.extended,org.apache.directory.shared.ldap.name,org.apache.directory.shared.ldap.schema,org.apache.directory.shared.ldap.subtree,org.apache.directory.shared.ldap.util,org.apache.directory.shared.ldap.trigger
             </exportPackage>
           </osgiManifest>
         </configuration>



Mime
View raw message