You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/03/13 03:53:16 UTC
svn commit: rev 9395 - in incubator/directory/ldap/trunk: clients clients/src/java/org/apache/ldap/clients/embedded clients/src/java/org/apache/ldap/clients/standalone snacc-provider
Author: akarasulu
Date: Fri Mar 12 18:53:15 2004
New Revision: 9395
Modified:
incubator/directory/ldap/trunk/clients/ (props changed)
incubator/directory/ldap/trunk/clients/project.properties
incubator/directory/ldap/trunk/clients/project.xml
incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java
incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapClientResponse.java
incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapInputParser.java
incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapAdd.java
incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapBind.java
incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapDelete.java
incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapModify.java
incubator/directory/ldap/trunk/snacc-provider/ (props changed)
incubator/directory/ldap/trunk/snacc-provider/project.properties
incubator/directory/ldap/trunk/snacc-provider/project.xml
Log:
Started cleaning up some of the clients so they would build in their
current state. For some reason they did not compile.
Modified: incubator/directory/ldap/trunk/clients/project.properties
==============================================================================
--- incubator/directory/ldap/trunk/clients/project.properties (original)
+++ incubator/directory/ldap/trunk/clients/project.properties Fri Mar 12 18:53:15 2004
@@ -11,10 +11,10 @@
#site.path=<directoryname>/ The default is blank. Override this property
#in the build.properties. Remember to include the final forward slash.
-module.name=ldapd-client
+module.name=ldap-client
# eclipse configuration
-maven.eclipse.workspace=c:/cygwin/home/Administrator/projects/ldapd/HEAD
+#maven.eclipse.workspace=c:/cygwin/home/Administrator/projects/ldapd/HEAD
maven.repo.remote=http://www.ibiblio.org/maven/,http://ldapd.sourceforge.net/maven/repository/
Modified: incubator/directory/ldap/trunk/clients/project.xml
==============================================================================
--- incubator/directory/ldap/trunk/clients/project.xml (original)
+++ incubator/directory/ldap/trunk/clients/project.xml Fri Mar 12 18:53:15 2004
@@ -1,218 +1,108 @@
<?xml version="1.0"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="maven-project.xsd">
-
- <pomVersion>3</pomVersion>
- <id>ldapd-clients</id>
- <name>${module.name}</name>
- <currentVersion>0.7.1</currentVersion>
-
- <organization>
- <name>LDAPd Group</name>
- <url>http://sourceforge.net</url>
- <logo>http://sourceforge.net/sflogo.php?group_id=64972&type=2</logo>
- </organization>
-
- <inceptionYear>2002</inceptionYear>
- <package>ldapd.clients</package>
- <logo>/../../images/ldapd-logo.gif</logo>
- <description>
- <![CDATA[LDAPd will be a pure Java embeddable fully compliant (RFC2251)
- LDAP v3 protocol daemon. It has a Staged Event Driven Architecture
- (SEDA) with several hot pluggable components: backends, and replication
- modules. LDAPd may be run in one of three modes, as an imbeddable agent,
- a standalone statefull server, or as a Phoenix application. The server
- library provides a set of core server modules. These modules include the
- nexus, protocol engine, listener, and schema manager.]]>
- </description>
-
- <shortDescription>
- Pure java LDAP clients. These clients are designed to bundle with
- the LDAPd server, but will work with any RFC 2251 compliant LDAP
- server.
- </shortDescription>
-
- <url>http://ldapd.sourceforge.net/${module.path}modules/${module.name}</url>
- <issueTrackingUrl>http://sourceforge.net/tracker?group_id=64792</issueTrackingUrl>
- <siteAddress>shell.sourceforge.net</siteAddress>
- <siteDirectory>
- /home/groups/l/ld/ldapd/htdocs/${module.path}modules/${module.name}
- </siteDirectory>
- <distributionDirectory>/home/groups/l/ld/ldapd/htdocs/dist</distributionDirectory>
-
- <repository>
- <connection>
- scm:cvs:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ldapd:${module.name}
- </connection>
- <developerConnection>
- scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/ldapd:${module.name}
- </developerConnection>
- <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ldapd/${module.name}/</url>
- </repository>
-
- <mailingLists>
- <mailingList>
- <name>ldapd-devel</name>
- <subscribe>http://lists.sourceforge.net/lists/listinfo/ldapd-devel</subscribe>
- <unsubscribe>http://lists.sourceforge.net/lists/listinfo/ldapd-devel</unsubscribe>
- <archive>http://sourceforge.net/mailarchive/forum.php?forum=ldapd-devel</archive>
- </mailingList>
- </mailingLists>
-
- <developers>
- <developer>
- <name>Alex Karasulu</name>
- <id>akarasulu</id>
- <email>akarasulu at users.sourceforge.net</email>
- <roles>
- <role>Founder</role>
- <role>Developer</role>
- <role>Architect</role>
- <role>Lead Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Robb Penoyer</name>
- <id>rpenoyer</id>
- <email>rpenoyer at users.sourceforge.net</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jim Bearce</name>
- <id>bearcej</id>
- <email>bearcej at users.sourceforge.net</email>
- <roles>
- <role>Project Manager</role>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Jeff Machols</name>
- <id>jmachols</id>
- <email>jmachols at users.sourceforget.net</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Wes McKean</name>
- <id>wesmckean</id>
- <email>wesmckean at users.sourceforget.net</email>
- <roles>
- <role>Developer</role>
- </roles>
- </developer>
- <developer>
- <name>Peter Donald</name>
- <id>donaldp</id>
- <email>donaldp at users.sourceforge.net</email>
- <roles>
- <role>Advisor</role>
- <role>Mentor</role>
- <role>Consultant</role>
- </roles>
- </developer>
- <developer>
- <name>Noel Bergman</name>
- <id>noeljb</id>
- <email>noeljb at users.sourceforge.net</email>
- <roles>
- <role>Advisor</role>
- <role>Mentor</role>
- <role>Consultant</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- <url>http://jakarta.apache.org/commons/collections.html</url>
- </dependency>
-
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.2</version>
- <url>http://jakarta.apache.org/regexp/index.html</url>
- </dependency>
-
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
- <url>http://avalon.apache.org/framework/</url>
- </dependency>
-
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
- <url>http://avalon.apache.org/framework/</url>
- </dependency>
-
- <dependency>
- <groupId>excalibur-cli</groupId>
- <artifactId>excalibur-cli</artifactId>
- <version>1.0</version>
- <url>http://avalon.apache.org/excalibur/</url>
- </dependency>
-
- <dependency>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- <version>1.2</version>
- <url>http://avalon.apache.org/logkit/</url>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
- <url>http://www.ibiblio.org/maven</url>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.2.1</version>
- <url>http://www.ibiblio.org/maven</url>
- </dependency>
-
- <dependency>
- <groupId>ldapd-common</groupId>
- <artifactId>ldapd-common</artifactId>
- <version>SNAPSHOT</version>
- <url>http://ldapd.sourceforge.net</url>
- </dependency>
-
- </dependencies>
-
- <build>
- <nagEmailAddress>ldapd-devel@sourceforge.net</nagEmailAddress>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <sourceModifications/>
- <unitTestSourceDirectory/>
- <integrationUnitTestSourceDirectory/>
- <aspectSourceDirectory/>
- <unitTest/>
-
- <resources>
- <directory>${basedir}/src/java/ldapd/clients/name</directory>
- <targetPath>ldapd/clients/name</targetPath>
- </resources>
- </build>
-
- <reports>
- <report>maven-changelog-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- </reports>
-
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="maven-project.xsd">
+ <pomVersion>3</pomVersion>
+ <artifactId>ldap-clients</artifactId>
+ <groupId>directory</groupId>
+ <name>ldap-clients</name>
+ <currentVersion>SNAPSHOT</currentVersion>
+
+ <organization>
+ <name>The Apache Incubator</name>
+ <url>http://incubator.apache.org</url>
+ <logo>/images/apache-incubator-logo.png</logo>
+ </organization>
+
+ <inceptionYear>2003</inceptionYear>
+ <package>org.apache.directory.sitedocs</package>
+ <logo>/images/apache-directory-logo.png</logo>
+ <url>http://incubator.apache.org/directory</url>
+
+ <description>
+ An LDAP Client libarary used for testing and building LDAP JNDI
+ providers.
+ </description>
+
+ <shortDescription>
+ Pure java LDAP clients. These clients are designed to bundle with the Eve
+ LDAP server, but will work with any RFC 2251 compliant LDAP server.
+ </shortDescription>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ <url>http://jakarta.apache.org/commons/collections.html</url>
+ </dependency>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/regexp/index.html</url>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5</version>
+ <url>http://avalon.apache.org/framework/</url>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5</version>
+ <url>http://avalon.apache.org/framework/</url>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-cli</groupId>
+ <artifactId>excalibur-cli</artifactId>
+ <version>1.0</version>
+ <url>http://avalon.apache.org/excalibur/</url>
+ </dependency>
+ <dependency>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ <version>1.2</version>
+ <url>http://avalon.apache.org/logkit/</url>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ <version>2.4.0</version>
+ <url>http://www.ibiblio.org/maven</url>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.2.1</version>
+ <url>http://www.ibiblio.org/maven</url>
+ </dependency>
+ <dependency>
+ <groupId>directory</groupId>
+ <artifactId>ldap-common</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <nagEmailAddress>directory-dev@incubator.apache.org</nagEmailAddress>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <sourceModifications/>
+ <unitTestSourceDirectory/>
+ <integrationUnitTestSourceDirectory/>
+ <aspectSourceDirectory/>
+ <unitTest/>
+
+ <resources>
+ <directory>${basedir}/src/java/org/apache/ldap/clients</directory>
+ <targetPath>org/apache/ldap/clients</targetPath>
+ </resources>
+ </build>
+
+ <reports>
+ <report>maven-changelog-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ </reports>
</project>
Modified: incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java
==============================================================================
--- incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java (original)
+++ incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapClientImpl.java Fri Mar 12 18:53:15 2004
@@ -220,7 +220,6 @@
import javax.naming.directory.BasicAttributes;
import javax.naming.directory.ModificationItem;
-import org.apache.ldap.clients.standalone.SearchOpts;
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.filter.FilterParser;
import org.apache.ldap.common.filter.FilterParserImpl;
Modified: incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapClientResponse.java
==============================================================================
--- incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapClientResponse.java (original)
+++ incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapClientResponse.java Fri Mar 12 18:53:15 2004
@@ -206,7 +206,6 @@
package org.apache.ldap.clients.embedded;
import org.apache.ldap.common.message.ResultCodeEnum ;
-import java.util.LinkedList ;
public class LdapClientResponse
{
Modified: incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapInputParser.java
==============================================================================
--- incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapInputParser.java (original)
+++ incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/embedded/LdapInputParser.java Fri Mar 12 18:53:15 2004
@@ -209,7 +209,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.math.BigInteger;
import java.util.LinkedList;
/**
Modified: incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapAdd.java
==============================================================================
--- incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapAdd.java (original)
+++ incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapAdd.java Fri Mar 12 18:53:15 2004
@@ -273,7 +273,7 @@
// Report the results from the response.
// ----------------------------------------------------------------
- if ( l_response.getResultCode() == l_response.SUCCESS )
+ if ( l_response.getResultCode() == LdapClientResponse.SUCCESS )
{
System.out.println(
"Authentication for "
@@ -329,7 +329,7 @@
try
{
l_response = l_client.ldapAdd( l_ldifEntry ) ;
- if ( l_response.getResultCode() != l_response.SUCCESS )
+ if ( l_response.getResultCode() != LdapClientResponse.SUCCESS )
{
System.out.println( "Add failed for entry "
+ l_response.getDn() + "\n"
Modified: incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapBind.java
==============================================================================
--- incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapBind.java (original)
+++ incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapBind.java Fri Mar 12 18:53:15 2004
@@ -272,7 +272,7 @@
// Report the results from the response.
// ----------------------------------------------------------------
- if ( l_response.getResultCode() == l_response.SUCCESS )
+ if ( l_response.getResultCode() == LdapClientResponse.SUCCESS )
{
System.out.println(
"Authentication for "
Modified: incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapDelete.java
==============================================================================
--- incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapDelete.java (original)
+++ incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapDelete.java Fri Mar 12 18:53:15 2004
@@ -269,7 +269,7 @@
// Report the results from the response.
// ----------------------------------------------------------------
- if ( l_response.getResultCode() == l_response.SUCCESS )
+ if ( l_response.getResultCode() == LdapClientResponse.SUCCESS )
{
System.out.println(
"Authentication for "
Modified: incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapModify.java
==============================================================================
--- incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapModify.java (original)
+++ incubator/directory/ldap/trunk/clients/src/java/org/apache/ldap/clients/standalone/LdapModify.java Fri Mar 12 18:53:15 2004
@@ -273,7 +273,7 @@
// Report the results from the response.
// ----------------------------------------------------------------
- if ( l_response.getResultCode() == l_response.SUCCESS )
+ if ( l_response.getResultCode() == LdapClientResponse.SUCCESS )
{
System.out.println(
"Authentication for "
@@ -329,7 +329,7 @@
try
{
l_response = l_client.ldapModify( l_ldifEntry ) ;
- if ( l_response.getResultCode() != l_response.SUCCESS )
+ if ( l_response.getResultCode() != LdapClientResponse.SUCCESS )
{
System.out.println( "Modify failed for entry "
+ l_response.getDn() + "\n"
Modified: incubator/directory/ldap/trunk/snacc-provider/project.properties
==============================================================================
--- incubator/directory/ldap/trunk/snacc-provider/project.properties (original)
+++ incubator/directory/ldap/trunk/snacc-provider/project.properties Fri Mar 12 18:53:15 2004
@@ -12,4 +12,4 @@
#site.path=<directoryname>/ The default is blank. Override this property
#in the build.properties. Remember to include the final forward slash.
module.name=ldap-snacc-provider
-maven.repo.remote=http://www.ibiblio.org/maven/,http://ldapd.sourceforge.net/maven/repository/
+maven.repo.remote=http://www.ibiblio.org/maven/, http://ldapd.sourceforge.net/maven/repository/
Modified: incubator/directory/ldap/trunk/snacc-provider/project.xml
==============================================================================
--- incubator/directory/ldap/trunk/snacc-provider/project.xml (original)
+++ incubator/directory/ldap/trunk/snacc-provider/project.xml Fri Mar 12 18:53:15 2004
@@ -153,14 +153,14 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5</version>
<url>http://avalon.apache.org/framework/</url>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5</version>
<url>http://avalon.apache.org/framework/</url>
</dependency>