directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r442783 - in /directory/branches/apacheds/1.0: ./ kerberos-shared/ protocol-dhcp/ protocol-dns/ protocol-ldap/ protocol-ntp/ schema-archetype/ schema-archetype/src/main/resources/archetype-resources/ server-installers/ server-jndi/src/main/...
Date Wed, 13 Sep 2006 01:15:50 GMT
Author: akarasulu
Date: Tue Sep 12 18:15:49 2006
New Revision: 442783

URL: http://svn.apache.org/viewvc?view=rev&rev=442783
Log:
bumping up deps to latest MINA, daemon and shared code

Modified:
    directory/branches/apacheds/1.0/kerberos-shared/pom.xml
    directory/branches/apacheds/1.0/pom.xml
    directory/branches/apacheds/1.0/protocol-dhcp/pom.xml
    directory/branches/apacheds/1.0/protocol-dns/pom.xml
    directory/branches/apacheds/1.0/protocol-ldap/pom.xml
    directory/branches/apacheds/1.0/protocol-ntp/pom.xml
    directory/branches/apacheds/1.0/schema-archetype/   (props changed)
    directory/branches/apacheds/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml
    directory/branches/apacheds/1.0/server-installers/pom.xml
    directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
    directory/branches/apacheds/1.0/server-main/pom.xml
    directory/branches/apacheds/1.0/server-sar/pom.xml
    directory/branches/apacheds/1.0/server-ssl/pom.xml
    directory/branches/apacheds/1.0/server-tools/pom.xml
    directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF
    directory/branches/apacheds/1.0/testcase-archetype/   (props changed)

Modified: directory/branches/apacheds/1.0/kerberos-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/kerberos-shared/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/kerberos-shared/pom.xml (original)
+++ directory/branches/apacheds/1.0/kerberos-shared/pom.xml Tue Sep 12 18:15:49 2006
@@ -19,9 +19,9 @@
       <version>131</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.5</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/branches/apacheds/1.0/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/pom.xml (original)
+++ directory/branches/apacheds/1.0/pom.xml Tue Sep 12 18:15:49 2006
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
-      <version>0.9.5.2</version>
+      <version>0.9.5.3-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
@@ -86,6 +86,8 @@
         <module>server-unit</module>
         <module>server-main</module>
         <module>server-jndi</module>
+        <module>schema-archetype</module>
+        <module>testcase-archetype</module>
         <module>kerberos-shared</module>
 
         <!-- extra for jdk 1.5 -->
@@ -152,6 +154,8 @@
         <module>server-main</module>
         <module>server-jndi</module>
         <module>kerberos-shared</module>
+        <module>schema-archetype</module>
+        <module>testcase-archetype</module>
       </modules>
       <build>
         <plugins>

Modified: directory/branches/apacheds/1.0/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-dhcp/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/protocol-dhcp/pom.xml (original)
+++ directory/branches/apacheds/1.0/protocol-dhcp/pom.xml Tue Sep 12 18:15:49 2006
@@ -26,9 +26,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.5</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/branches/apacheds/1.0/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-dns/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/protocol-dns/pom.xml (original)
+++ directory/branches/apacheds/1.0/protocol-dns/pom.xml Tue Sep 12 18:15:49 2006
@@ -20,9 +20,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.5</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/branches/apacheds/1.0/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-ldap/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/protocol-ldap/pom.xml (original)
+++ directory/branches/apacheds/1.0/protocol-ldap/pom.xml Tue Sep 12 18:15:49 2006
@@ -20,14 +20,14 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
-      <artifactId>mina-filter-codec-asn1</artifactId>
-      <version>0.9.5</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1-codec</artifactId>
+      <version>0.9.5.3-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-filter-ssl</artifactId>
-      <version>0.9.5</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/branches/apacheds/1.0/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/protocol-ntp/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/protocol-ntp/pom.xml (original)
+++ directory/branches/apacheds/1.0/protocol-ntp/pom.xml Tue Sep 12 18:15:49 2006
@@ -20,9 +20,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.5</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Propchange: directory/branches/apacheds/1.0/schema-archetype/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Sep 12 18:15:49 2006
@@ -2,3 +2,4 @@
 .classpath
 .project
 *.log
+.settings

Modified: directory/branches/apacheds/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ directory/branches/apacheds/1.0/schema-archetype/src/main/resources/archetype-resources/pom.xml
Tue Sep 12 18:15:49 2006
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.apache.directory.server</groupId>
         <artifactId>apacheds-core-plugin</artifactId>
-        <version>1.0-RC4</version>
+        <version>1.0-SNAPSHOT</version>
         <configuration>
           <schemaSourcesDir>src/main/schema</schemaSourcesDir>
           <schemas>

Modified: directory/branches/apacheds/1.0/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-installers/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/server-installers/pom.xml (original)
+++ directory/branches/apacheds/1.0/server-installers/pom.xml Tue Sep 12 18:15:49 2006
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
-      <version>1.0-RC3</version>
+      <version>1.0-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>  
     <dependency>
@@ -75,7 +75,7 @@
       <plugin>
         <groupId>org.apache.directory.daemon</groupId>
         <artifactId>daemon-plugin</artifactId>
-        <version>1.0-RC3</version>
+        <version>1.0-SNAPSHOT</version>
         <configuration>
           <excludes>
 

Modified: directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
(original)
+++ directory/branches/apacheds/1.0/server-jndi/src/main/java/org/apache/directory/server/jndi/ServerContextFactory.java
Tue Sep 12 18:15:49 2006
@@ -61,7 +61,7 @@
 import org.apache.mina.common.IoFilterChainBuilder;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.common.WriteFuture;
-import org.apache.mina.filter.thread.ThreadPoolFilter;
+import org.apache.mina.filter.executor.ExecutorFilter;
 import org.apache.mina.transport.socket.nio.DatagramAcceptor;
 import org.apache.mina.transport.socket.nio.SocketAcceptor;
 import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
@@ -86,11 +86,11 @@
 
     protected static final IoAcceptor tcpAcceptor = new SocketAcceptor();
     protected static final IoAcceptor udpAcceptor = new DatagramAcceptor();
-    protected static final ThreadPoolFilter threadPool;
+    protected static final ExecutorFilter threadPool;
     
     static
     {
-        threadPool = new ThreadPoolFilter();
+        threadPool = new ExecutorFilter();
         tcpAcceptor.getFilterChain().addFirst( "threadPool", threadPool );
         udpAcceptor.getFilterChain().addFirst( "threadPool", threadPool );
     }
@@ -108,7 +108,9 @@
 
     public void beforeStartup( DirectoryService service )
     {
-        threadPool.getThreadPool().setMaximumPoolSize( service.getConfiguration().getStartupConfiguration().getMaxThreads()
);
+        // TODO Find out how now with executor we are to set the max pool size
+        
+//        threadPool.setMaximumPoolSize( service.getConfiguration().getStartupConfiguration().getMaxThreads()
);
         this.directoryService = service;
     }
 

Modified: directory/branches/apacheds/1.0/server-main/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-main/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/server-main/pom.xml (original)
+++ directory/branches/apacheds/1.0/server-main/pom.xml Tue Sep 12 18:15:49 2006
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
-      <version>1.0-RC3</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>  
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: directory/branches/apacheds/1.0/server-sar/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-sar/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/server-sar/pom.xml (original)
+++ directory/branches/apacheds/1.0/server-sar/pom.xml Tue Sep 12 18:15:49 2006
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
-      <version>1.0-RC3</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>jboss</groupId>
@@ -54,20 +54,13 @@
       <version>1.2.1</version>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>mojo.snapshots</id>
-      <name>Codehaus Snapshot Repository</name>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </repository>
-  </repositories>
   <build>
     <plugins>
       <plugin>
         <extensions>true</extensions>
         <groupId>org.apache.directory.server</groupId>
       	<artifactId>apacheds-sar-plugin</artifactId>
-        <version>1.0-RC4</version>
+        <version>1.0-SNAPSHOT</version>
         <configuration>
           <excludes>
             <exclude>

Modified: directory/branches/apacheds/1.0/server-ssl/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-ssl/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/server-ssl/pom.xml (original)
+++ directory/branches/apacheds/1.0/server-ssl/pom.xml Tue Sep 12 18:15:49 2006
@@ -31,9 +31,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-filter-ssl</artifactId>
-      <version>0.9.5</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

Modified: directory/branches/apacheds/1.0/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-tools/pom.xml?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/server-tools/pom.xml (original)
+++ directory/branches/apacheds/1.0/server-tools/pom.xml Tue Sep 12 18:15:49 2006
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
-      <version>1.0-RC3</version>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>

Modified: directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF?view=diff&rev=442783&r1=442782&r2=442783
==============================================================================
--- directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF (original)
+++ directory/branches/apacheds/1.0/server-tools/src/main/manifest/MANIFEST.MF Tue Sep 12
18:15:49 2006
@@ -12,18 +12,18 @@
  ../lib/apacheds-core-shared-1.0-SNAPSHOT.jar 
  ../lib/apacheds-server-jndi-1.0-SNAPSHOT.jar 
  ../lib/apacheds-server-main-1.0-SNAPSHOT.jar 
+ ../lib/shared-asn1-codec-0.9.5.3-SNAPSHOT.jar 
+ ../lib/shared-asn1-0.9.5.3-SNAPSHOT.jar 
+ ../lib/shared-ldap-0.9.5.3-SNAPSHOT.jar 
+ ../lib/mina-core-1.0-SNAPSHOT.jar 
+ ../lib/mina-filter-ssl-1.0-SNAPSHOT.jar 
  ../lib/commons-collections-3.0.jar 
  ../lib/commons-lang-2.0.jar 
  ../lib/commons-logging-1.0.4.jar 
  ../lib/commons-cli-1.0.jar 
  ../lib/jdbm-1.0.jar 
  ../lib/lcrypto-jdk14-131.jar 
- ../lib/mina-core-0.9.5.jar 
- ../lib/mina-filter-codec-asn1-0.9.5.jar 
- ../lib/mina-filter-ssl-0.9.5.jar 
  ../lib/oro-2.0.8.jar 
- ../lib/shared-asn1-0.9.5.2.jar 
- ../lib/shared-ldap-0.9.5.2.jar 
  ../lib/spring-beans-1.2.1.jar 
  ../lib/spring-context-1.2.1.jar 
  ../lib/spring-core-1.2.1.jar 

Propchange: directory/branches/apacheds/1.0/testcase-archetype/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 12 18:15:49 2006
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target



Mime
View raw message