Author: akarasulu
Date: Wed Aug 25 21:19:31 2004
New Revision: 37054
Modified:
incubator/directory/eve/branches/eve-0.1-phoenix/build.xml
incubator/directory/eve/branches/eve-0.1-phoenix/project.xml
Log:
Commit changes ...
o Modified build to include all jars for both snickers and snacc4j runtimes
and providers for the time being so we can switch between the two using
the berlib.properties file. This is temporary until we find and work out
kinks in the snickers runtime and the ldap provider while comparing PDU's
captured by ethereal.
o cleaned up file formatting
Results of Integration Tests:
It looks like the snickers provider is working and holding up well with a
simple bind, search, unbind sequence of operations from the initial tests
we have run. But at this point we can continue with assurances that the
new snickers encoder redesign will work. We will implement the rest of the
PDU's now and test them using this branch of the Eve server.
Modified: incubator/directory/eve/branches/eve-0.1-phoenix/build.xml
==============================================================================
--- incubator/directory/eve/branches/eve-0.1-phoenix/build.xml (original)
+++ incubator/directory/eve/branches/eve-0.1-phoenix/build.xml Wed Aug 25
21:19:31 2004
@@ -64,6 +64,14 @@
name="ldap-ber-provider.jar"
value="ldap-ber-provider-SNAPSHOT.jar"/>
+ <property
+ name="snacc.jar"
+ value="snacc-2.3.jar"/>
+
+ <property
+ name="ldap-snacc-provider.jar"
+ value="ldap-snacc-provider-SNAPSHOT.jar"/>
+
<!-- ============================================================
DEPENDENCY JARS: Jakarta Commons Collections Jars
============================================================= -->
@@ -185,6 +193,9 @@
<pathelement path="${build.lib}/${codec-stateful.jar}"/>
<pathelement path="${build.lib}/${snickers-ber-codec.jar}"/>
<pathelement path="${build.lib}/${ldap-ber-provider.jar}"/>
+
+ <pathelement path="${build.lib}/${snacc.jar}"/>
+
</path>
<path id="tools.class.path">
@@ -274,6 +285,16 @@
/>
<get verbose="true" usetimestamp="true"
+ src="${remote.repo}/incubator-directory/jars/${ldap-snacc-provider.jar}"
+ dest="${build.lib}/${ldap-snacc-provider.jar}"
+ />
+
+ <get verbose="true" usetimestamp="true"
+
src="http://ldapd.sourceforge.net/maven/repository/snacc4j/jars/${snacc.jar}";
+ dest="${build.lib}/${snacc.jar}"
+ />
+
+ <get verbose="true" usetimestamp="true"
src="${remote.repo}/commons-logging/jars/${commons-logging.jar}"
dest="${build.lib}/${commons-logging.jar}"
/>
@@ -690,35 +711,43 @@
<include name="${commons-collections.jar}"/>
<include name="${commons-lang.jar}"/>
<include name="${commons-logging.jar}"/>
+ <include name="${commons-codec.jar}"/>
+ <include name="${commons-primitives.jar}"/>
<include name="core.jar"/>
<include name="${cornerstone-threads-api.jar}"/>
<include name="${cornerstone-threads-impl.jar}"/>
<include name="decoder.jar"/>
<include name="encoder.jar"/>
- <include name="event.jar"/>
+ <include name="event.jar"/>
<include name="${excalibur-thread.jar}"/>
<include name="input.jar"/>
<include name="${jdbm.jar}"/>
- <include name="jndi.jar"/>
+ <include name="jndi.jar"/>
<include name="${ldap-common.jar}"/>
+ <include name="listener.jar"/>
<include name="${logkit.jar}"/>
<include name="${oro.jar}"/>
<include name="output.jar"/>
<include name="protocol.jar"/>
<include name="${regexp.jar}"/>
<include name="schema.jar"/>
- </lib>
+ <include name="${codec-stateful.jar}"/>
+ <include name="${snickers-ber-codec.jar}"/>
+ <include name="${ldap-ber-provider.jar}"/>
+ <include name="${ldap-snacc-provider.jar}"/>
+ <include name="${snacc.jar}"/>
+ </lib>
</sar>
- <mkdir dir="dist"/>
- <copy todir="dist">
- <fileset dir="${build.lib}">
- <include name="*.sar"/>
- </fileset>
- </copy>
+ <mkdir dir="dist"/>
+ <copy todir="dist">
+ <fileset dir="${build.lib}">
+ <include name="*.sar"/>
+ </fileset>
+ </copy>
- <echo message="done with sars"/>
- </target>
+ <echo message="done with sars"/>
+ </target>
<!-- ======================================================
Modified: incubator/directory/eve/branches/eve-0.1-phoenix/project.xml
==============================================================================
--- incubator/directory/eve/branches/eve-0.1-phoenix/project.xml
(original)
+++ incubator/directory/eve/branches/eve-0.1-phoenix/project.xml Wed Aug
25 21:19:31 2004
@@ -98,11 +98,25 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
</dependency>
<dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://jakarta.apache.org/commons/primitives.html</url>
+ </dependency>
+
+ <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>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.0</version>
@@ -150,54 +164,47 @@
<url>http://avalon.apache.org/phoenix/</url>
</dependency>
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>ldap-common</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>ldap-snacc-provider</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
- <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>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.2</version>
- <url>http://antlr.org/</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>incubator-directory</groupId>
+ <artifactId>ldap-common</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
- </dependencies>
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>ldap-snacc-provider</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/regexp/index.html</url>
+ </dependency>
+
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.2</version>
+ <url>http://antlr.org/</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>
+
+ </dependencies>
<build>
@@ -215,13 +222,13 @@
<report>maven-developer-activity-plugin</report>
<report>maven-file-activity-plugin</report>
<report>maven-javadoc-plugin</report>
- <report>maven-changes-plugin</report>
- <report>maven-checkstyle-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jdepend-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-license-plugin</report>
- <report>maven-tasklist-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-tasklist-plugin</report>
</reports>
</project>
