You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sz...@apache.org on 2009/11/23 16:34:39 UTC
svn commit: r883370 - in /directory/sandbox/szoerner/helloWorldPartition:
pom.xml
src/main/java/org/apache/directory/samples/partition/hello/HelloWorldPartition.java
src/main/java/org/apache/directory/samples/partition/hello/Main.java
Author: szoerner
Date: Mon Nov 23 15:34:38 2009
New Revision: 883370
URL: http://svn.apache.org/viewvc?rev=883370&view=rev
Log:
Updated for ApacheDS 1.5.5
Modified:
directory/sandbox/szoerner/helloWorldPartition/pom.xml
directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/HelloWorldPartition.java
directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/Main.java
Modified: directory/sandbox/szoerner/helloWorldPartition/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/szoerner/helloWorldPartition/pom.xml?rev=883370&r1=883369&r2=883370&view=diff
==============================================================================
--- directory/sandbox/szoerner/helloWorldPartition/pom.xml (original)
+++ directory/sandbox/szoerner/helloWorldPartition/pom.xml Mon Nov 23 15:34:38 2009
@@ -24,7 +24,7 @@
<groupId>org.apache.directory.samples</groupId>
<artifactId>helloWorldPartition</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.5.6-SNAPSHOT</version>
<name>The most simple partition implementation</name>
<url>http://maven.apache.org</url>
@@ -43,91 +43,88 @@
</build>
<dependencies>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-bootstrap-extract</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-bootstrap-partition</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-avl</artifactId>
- <version>1.5.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-core-cursor</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-entry</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-jndi</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-shared</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-store</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-protocol-shared</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-bootstrap</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-schema-registries</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-utils</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xdbm-base</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xdbm-search</artifactId>
- <version>1.5.4</version>
+ <version>1.5.5</version>
</dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -153,40 +150,37 @@
<artifactId>mina-filter-ssl</artifactId>
<version>1.1.7</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1</artifactId>
- <version>0.9.12</version>
+ <version>0.9.15</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-asn1-codec</artifactId>
- <version>0.9.12</version>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-bouncycastle-reduced</artifactId>
- <version>0.9.12</version>
+ <version>0.9.15</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap</artifactId>
- <version>0.9.12</version>
+ <version>0.9.15</version>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-constants</artifactId>
- <version>0.9.12</version>
+ <version>0.9.15</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.2</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
Modified: directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/HelloWorldPartition.java
URL: http://svn.apache.org/viewvc/directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/HelloWorldPartition.java?rev=883370&r1=883369&r2=883370&view=diff
==============================================================================
--- directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/HelloWorldPartition.java (original)
+++ directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/HelloWorldPartition.java Mon Nov 23 15:34:38 2009
@@ -22,8 +22,6 @@
import static org.apache.directory.shared.ldap.message.ResultCodeEnum.UNWILLING_TO_PERFORM;
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.cursor.EmptyCursor;
-import org.apache.directory.server.core.cursor.SingletonCursor;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.DefaultServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
@@ -43,6 +41,8 @@
import org.apache.directory.server.core.interceptor.context.UnbindOperationContext;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.EmptyCursor;
+import org.apache.directory.shared.ldap.cursor.SingletonCursor;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
Modified: directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/Main.java
URL: http://svn.apache.org/viewvc/directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/Main.java?rev=883370&r1=883369&r2=883370&view=diff
==============================================================================
--- directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/Main.java (original)
+++ directory/sandbox/szoerner/helloWorldPartition/src/main/java/org/apache/directory/samples/partition/hello/Main.java Mon Nov 23 15:34:38 2009
@@ -21,36 +21,33 @@
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.ldap.LdapService;
-import org.apache.directory.server.protocol.shared.SocketAcceptor;
+import org.apache.directory.server.ldap.LdapServer;
+import org.apache.directory.server.protocol.shared.transport.TcpTransport;
-/**
+/**
* Starts the server with the HelloWorld partition.
*/
public class Main {
public static void main(String[] args) throws Exception {
- DirectoryService directoryService;
- SocketAcceptor socketAcceptor;
- LdapService ldapService;
-
- directoryService = new DefaultDirectoryService();
+ DirectoryService directoryService = new DefaultDirectoryService();
directoryService.setShutdownHookEnabled(true);
- socketAcceptor = new SocketAcceptor(null);
- ldapService = new LdapService();
- ldapService.setSocketAcceptor(socketAcceptor);
- ldapService.setDirectoryService(directoryService);
- ldapService.setIpPort(10389);
+ LdapServer ldapServer = new LdapServer();
+ ldapServer.setDirectoryService(directoryService);
+ ldapServer.setAllowAnonymousAccess(true);
+
+ TcpTransport ldapTransport = new TcpTransport(10389);
+ ldapServer.setTransports(ldapTransport);
HelloWorldPartition helloPartition = new HelloWorldPartition();
helloPartition.setSuffix("ou=helloWorld");
helloPartition.init(directoryService);
-
- directoryService.addPartition(helloPartition);
-
+
+ directoryService.addPartition(helloPartition);
+
directoryService.startup();
- ldapService.start();
+ ldapServer.start();
}
}