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 2005/11/04 07:50:20 UTC
svn commit: r330728 - in /directory/apacheds/trunk:
main/src/main/java/org/apache/ldap/server/configuration/
main/src/main/java/org/apache/ldap/server/jndi/
main/src/test/java/org/apache/ldap/server/ server-unit/ server-unit/src/
server-unit/src/main/ ...
Author: akarasulu
Date: Thu Nov 3 22:50:02 2005
New Revision: 330728
URL: http://svn.apache.org/viewcvs?rev=330728&view=rev
Log:
changes ...
o created two new projects
o one for holding all the server configuration beans and the server ctx factory
o anther server-unit for the unit testing of the server with protocols and moved
all test cases using it into here
o tidy'd up
Added:
directory/apacheds/trunk/server/ (with props)
directory/apacheds/trunk/server-unit/ (with props)
directory/apacheds/trunk/server-unit/project.properties
directory/apacheds/trunk/server-unit/project.xml
directory/apacheds/trunk/server-unit/src/
directory/apacheds/trunk/server-unit/src/main/
directory/apacheds/trunk/server-unit/src/main/java/
directory/apacheds/trunk/server-unit/src/main/java/org/
directory/apacheds/trunk/server-unit/src/main/java/org/apache/
directory/apacheds/trunk/server-unit/src/main/java/org/apache/ldap/
directory/apacheds/trunk/server-unit/src/main/java/org/apache/ldap/server/
directory/apacheds/trunk/server-unit/src/main/java/org/apache/ldap/server/AbstractServerTest.java
- copied unchanged from r330715, directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/AbstractServerTest.java
directory/apacheds/trunk/server-unit/src/test/
directory/apacheds/trunk/server-unit/src/test/java/
directory/apacheds/trunk/server-unit/src/test/java/org/
directory/apacheds/trunk/server-unit/src/test/java/org/apache/
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/server/
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/server/AddObjectClassesToEntryTest.java
- copied unchanged from r330715, directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/AddObjectClassesToEntryTest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/server/MatchingRuleCompareTest.java
- copied unchanged from r330715, directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/MatchingRuleCompareTest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/server/MiscTest.java
- copied unchanged from r330715, directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/MiscTest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/server/ModifyAddTest.java
- copied unchanged from r330715, directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/ModifyAddTest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/server/ModifyRdnTest.java
- copied unchanged from r330715, directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/ModifyRdnTest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/server/ModifyRemoveTest.java
- copied unchanged from r330715, directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/ModifyRemoveTest.java
directory/apacheds/trunk/server-unit/src/test/java/org/apache/ldap/server/UnknownExtendedOperationTest.java
- copied unchanged from r330715, directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/UnknownExtendedOperationTest.java
directory/apacheds/trunk/server-unit/src/test/resources/
- copied from r330715, directory/apacheds/trunk/main/src/test/resources/
directory/apacheds/trunk/server-unit/src/test/resources/log4j.properties
- copied, changed from r330727, directory/apacheds/trunk/main/src/test/resources/log4j.properties
directory/apacheds/trunk/server/project.properties
directory/apacheds/trunk/server/project.xml
directory/apacheds/trunk/server/src/
directory/apacheds/trunk/server/src/main/
directory/apacheds/trunk/server/src/main/java/
directory/apacheds/trunk/server/src/main/java/org/
directory/apacheds/trunk/server/src/main/java/org/apache/
directory/apacheds/trunk/server/src/main/java/org/apache/ldap/
directory/apacheds/trunk/server/src/main/java/org/apache/ldap/server/
directory/apacheds/trunk/server/src/main/java/org/apache/ldap/server/configuration/
- copied from r330715, directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/configuration/
directory/apacheds/trunk/server/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java
- copied unchanged from r330727, directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java
directory/apacheds/trunk/server/src/main/java/org/apache/ldap/server/configuration/ServerStartupConfiguration.java
- copied unchanged from r330727, directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/configuration/ServerStartupConfiguration.java
directory/apacheds/trunk/server/src/main/java/org/apache/ldap/server/jndi/
- copied from r330715, directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/jndi/
directory/apacheds/trunk/server/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
- copied unchanged from r330727, directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
directory/apacheds/trunk/server/src/test/
directory/apacheds/trunk/server/src/test/java/
Removed:
directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/configuration/
directory/apacheds/trunk/main/src/main/java/org/apache/ldap/server/jndi/
directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/AbstractServerTest.java
directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/AddObjectClassesToEntryTest.java
directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/MatchingRuleCompareTest.java
directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/MiscTest.java
directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/ModifyAddTest.java
directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/ModifyRdnTest.java
directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/ModifyRemoveTest.java
directory/apacheds/trunk/main/src/test/java/org/apache/ldap/server/UnknownExtendedOperationTest.java
Propchange: directory/apacheds/trunk/server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 3 22:50:02 2005
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+*.iml
+*.log
Propchange: directory/apacheds/trunk/server-unit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 3 22:50:02 2005
@@ -0,0 +1,5 @@
+target
+*.iml
+*.log
+.classpath
+.project
Added: directory/apacheds/trunk/server-unit/project.properties
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/server-unit/project.properties?rev=330728&view=auto
==============================================================================
--- directory/apacheds/trunk/server-unit/project.properties (added)
+++ directory/apacheds/trunk/server-unit/project.properties Thu Nov 3 22:50:02 2005
@@ -0,0 +1,2 @@
+maven.xdoc.includeProjectDocumentation=yes
+maven.license.licenseFile=${basedir}/../LICENSE.txt
Added: directory/apacheds/trunk/server-unit/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/server-unit/project.xml?rev=330728&view=auto
==============================================================================
--- directory/apacheds/trunk/server-unit/project.xml (added)
+++ directory/apacheds/trunk/server-unit/project.xml Thu Nov 3 22:50:02 2005
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <extend>${basedir}/../project.xml</extend>
+ <artifactId>apacheds-server-unit</artifactId>
+ <name>ApacheDS Server Unit</name>
+ <inceptionYear>2005</inceptionYear>
+ <shortDescription>Unit testing framework for ApaceheDS Server</shortDescription>
+
+ <description>
+ A unit testing framework used to integration test ApacheDS with all it's
+ wire level services enabled.
+ </description>
+
+ <!-- Need to have all dependencies here so appjar bundles them -->
+
+ <dependencies>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/regexp/index.html</url>
+ <properties>
+ <gump.project>jakarta-regexp</gump.project>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.7</version>
+ <url>http://jakarta.apache.org/oro</url>
+ <properties>
+ <gump.project>jakarta-oro</gump.project>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ <url>http://jakarta.apache.org/commons/lang/api</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.0</version>
+ <url>http://jakarta.apache.org/commons/collections</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/io</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>20041207.202534</version>
+ <url>http://jakarta.apache.org/commons/primitives</url>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.2</version>
+ <url>http://antlr.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>jdbm</groupId>
+ <artifactId>jdbm</artifactId>
+ <version>1.0</version>
+ <url>http://jdbm.sourceforge.net</url>
+ </dependency>
+ <dependency>
+ <groupId>directory-shared</groupId>
+ <artifactId>kerberos-common</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>apacheds-shared</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>ldap-protocol</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>kerberos-protocol</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>ldap-protocol</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>kerberos-protocol</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>changepw-protocol</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>ntp-protocol</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-codec</artifactId>
+ <version>0.3.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-shared</groupId>
+ <artifactId>apache-ldapber-provider</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-shared</groupId>
+ <artifactId>protocol-common</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-ber</artifactId>
+ <version>0.3.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-der</artifactId>
+ <version>0.3.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-network</groupId>
+ <artifactId>mina</artifactId>
+ <version>0.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>apacheds-server</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>apacheds-core-unit</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>124</version>
+ <properties>
+ <gump.project>bcprov</gump.project>
+ </properties>
+ </dependency>
+ </dependencies>
+
+ <reports>
+ <report>maven-changes-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-simian-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-multiproject-plugin</report>
+ </reports>
+</project>
+
+
Copied: directory/apacheds/trunk/server-unit/src/test/resources/log4j.properties (from r330727, directory/apacheds/trunk/main/src/test/resources/log4j.properties)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/server-unit/src/test/resources/log4j.properties?p2=directory/apacheds/trunk/server-unit/src/test/resources/log4j.properties&p1=directory/apacheds/trunk/main/src/test/resources/log4j.properties&r1=330727&r2=330728&rev=330728&view=diff
==============================================================================
--- directory/apacheds/trunk/main/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/server-unit/src/test/resources/log4j.properties Thu Nov 3 22:50:02 2005
@@ -1,10 +1,5 @@
-log4j.rootCategory=ERROR, stdout, record
+log4j.rootCategory=ERROR, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
-
-log4j.appender.record=org.apache.log4j.FileAppender
-log4j.appender.record.File=logs/apacheds.log
-log4j.appender.record.layout=org.apache.log4j.PatternLayout
-log4j.appender.record.layout.ConversionPattern=[%d{HH:mm:ss}] %p - [%l] - %m%n
Added: directory/apacheds/trunk/server/project.properties
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/server/project.properties?rev=330728&view=auto
==============================================================================
--- directory/apacheds/trunk/server/project.properties (added)
+++ directory/apacheds/trunk/server/project.properties Thu Nov 3 22:50:02 2005
@@ -0,0 +1,2 @@
+maven.xdoc.includeProjectDocumentation=yes
+maven.license.licenseFile=${basedir}/../LICENSE.txt
Added: directory/apacheds/trunk/server/project.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/server/project.xml?rev=330728&view=auto
==============================================================================
--- directory/apacheds/trunk/server/project.xml (added)
+++ directory/apacheds/trunk/server/project.xml Thu Nov 3 22:50:02 2005
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <extend>${basedir}/../project.xml</extend>
+ <artifactId>apacheds-server</artifactId>
+ <name>ApacheDS Server</name>
+ <inceptionYear>2005</inceptionYear>
+ <shortDescription>Configuration and JNDI provider for Server embedding.</shortDescription>
+
+ <description>
+ Contains JNDI ContextFactory implementation for Server equipted with all services
+ for wire level protocols and Server specific configuration beans.
+ </description>
+
+ <!-- Need to have all dependencies here so appjar bundles them -->
+
+ <dependencies>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/regexp/index.html</url>
+ <properties>
+ <gump.project>jakarta-regexp</gump.project>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.7</version>
+ <url>http://jakarta.apache.org/oro</url>
+ <properties>
+ <gump.project>jakarta-oro</gump.project>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ <url>http://jakarta.apache.org/commons/lang/api</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.0</version>
+ <url>http://jakarta.apache.org/commons/collections</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/io</url>
+ </dependency>
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>20041207.202534</version>
+ <url>http://jakarta.apache.org/commons/primitives</url>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.2</version>
+ <url>http://antlr.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>jdbm</groupId>
+ <artifactId>jdbm</artifactId>
+ <version>1.0</version>
+ <url>http://jdbm.sourceforge.net</url>
+ </dependency>
+ <dependency>
+ <groupId>directory-shared</groupId>
+ <artifactId>kerberos-common</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>apacheds-shared</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>ldap-protocol</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>kerberos-protocol</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>ldap-protocol</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>kerberos-protocol</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>changepw-protocol</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>ntp-protocol</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-codec</artifactId>
+ <version>0.3.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-shared</groupId>
+ <artifactId>apache-ldapber-provider</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-shared</groupId>
+ <artifactId>protocol-common</artifactId>
+ <version>0.7-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-ber</artifactId>
+ <version>0.3.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-der</artifactId>
+ <version>0.3.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>directory-network</groupId>
+ <artifactId>mina</artifactId>
+ <version>0.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>124</version>
+ <properties>
+ <gump.project>bcprov</gump.project>
+ </properties>
+ </dependency>
+ </dependencies>
+
+ <reports>
+ <report>maven-changes-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-simian-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-multiproject-plugin</report>
+ </reports>
+</project>
+
+