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 2003/12/05 04:36:43 UTC
svn commit: rev 1355 - incubator/directory/ldap/trunk/snacc-provider
Author: akarasulu
Date: Thu Dec 4 19:36:42 2003
New Revision: 1355
Added:
incubator/directory/ldap/trunk/snacc-provider/gump.xml
Removed:
incubator/directory/ldap/trunk/snacc-provider/LICENSE.txt
Modified:
incubator/directory/ldap/trunk/snacc-provider/build.xml
incubator/directory/ldap/trunk/snacc-provider/project.properties
incubator/directory/ldap/trunk/snacc-provider/project.xml
Log:
package fixes
Modified: incubator/directory/ldap/trunk/snacc-provider/build.xml
==============================================================================
--- incubator/directory/ldap/trunk/snacc-provider/build.xml (original)
+++ incubator/directory/ldap/trunk/snacc-provider/build.xml Thu Dec 4 19:36:42 2003
@@ -1,203 +1,123 @@
-<?xml version="1.0"?>
-<project name="ldapd-snacc-provider" default="jars" basedir=".">
+<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ============================================================
-
-
- PROPERTY SETUP
-
-
- ================================================================ -->
-
-
- <!-- set up properties -->
- <property file="${user.home}/build.properties"/>
- <property file="${user.home}/.ant.properties"/>
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/../ant.properties"/>
- <property file="${basedir}/default.properties"/>
- <property file="${basedir}/../default.properties"/>
- <property file="${basedir}/../cocoon.properties"/>
-
- <!-- Set the properties for intermediate directory -->
- <property name="build.dir" value="build"/>
- <property name="build.snacc" value="build/snacc"/>
- <property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.src" value="${build.dir}/src"/>
- <property name="build.classes" value="${build.dir}/classes"/>
- <property name="build.javadocs" value="${build.dir}/javadocs"/>
- <property name="build.docs" value="${build.dir}/docs"/>
- <property name="build.context" value="${build.dir}/documentation"/>
- <property name="build.xdocs" value="${build.context}/content/xdocs"/>
-
- <!-- Set the properties for source directories -->
- <property name="src.dir" value="src"/>
- <property name="lib.dir" value="lib"/>
- <property name="java.dir" value="${src.dir}/java"/>
- <property name="manifest.dir" value="${src.dir}/manifest"/>
- <property name="context.dir" value="${avalon.home}/src/documentation"/>
- <property name="xdocs.dir" value="${src.dir}/xdocs"/>
- <property name="dist.base" value="dist"/>
-
- <!-- Dependent subproject paths -->
- <property name="common.dir" value="../ldapd-common" />
- <property name="common.jar.dir" value="${common.dir}/build/lib" />
- <property name="ldapd-common.jar"
- value="${common.jar.dir}/ldapd-common.jar"/>
- <property name="avalon-framework.jar"
- value="${common.dir}/lib/avalon-framework-20020713.jar"/>
-
-
- <!-- ======================================================
- C L A S S P A T H S
- ======================================================= -->
-
-
- <!-- Set some class paths -->
- <path id="project.class.path">
- <pathelement path="${java.class.path}"/>
- <pathelement path="${build.classes}"/>
- <pathelement path="${ldapd-common.jar}" />
- <pathelement path="${avalon-framework.jar}" />
-
- <fileset dir="lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
-
- <path id="tools.class.path">
- <path refid="project.class.path"/>
- <pathelement location="${tools.jar}"/>
- </path>
-
-
- <!-- ======================================================
-
-
- T A R G E T S
-
-
- ======================================================= -->
-
-
- <!-- ======================================================
- B E R L I B G E N E R A T I O N
-
- This target will seldom be used. It was used to initially
- generate the BER classes in the ldapd.common.ber packages.
- It is provided her in case new ASN definitions are defined
- for new versions to the protocol or on extentions to the
- protocol. This target genertes the BER classes using the
- snacc4j ASN1 compiler available from IBM's alphaworks site.
-
- The snacc4j generated classes are generated in the build
- src directory for snacc classes which is configured for the
- default to be ./build/snacc/src to prevent cvs complications
- the files are not copied to the src/java directory. This
- target does not overright the versions in the source tree.
- The classes must be moved manually in order to effect the
- source tree. For all practical purposes the generated
- classes are static and should never really change.
-
- In the future we may switch to using a2j as the ASN1 pkg
- of choice.
- ======================================================= -->
-
-
- <target name="berlib"
- description="Generates the BER library classes using snacc4j">
- <mkdir dir="${build.snacc}"/>
-
- <echo message="Generating BER library classes using snacc4j"/>
- <exec executable="snacc4j.exe">
- <arg line="-P 'ldapd.common.berlib.snacc'"/>
- <arg line="-d build/snacc"/>
- <arg line="-mak"/>
- <arg value="src/snacc/ldapv3.asn1"/>
- </exec>
-
- <echo message="Compiling BER library classes using snacc4j"/>
- <javac srcdir="${build.snacc}/src"
- destdir="${build.snacc}/classes"
- debug="${build.debug}"
- optimize="${build.optimize}"
- deprecation="${build.deprecation}">
- <classpath refid="project.class.path"/>
- </javac>
- </target>
-
-
- <!-- ======================================================
- C O M P I L A T I O N
- ======================================================= -->
-
-
- <target name="compile">
- <mkdir dir="${build.classes}"/>
-
- <javac srcdir="${java.dir}"
- destdir="${build.classes}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- deprecation="${build.deprecation}">
- <classpath refid="project.class.path"/>
- </javac>
-
- <copy todir="${build.classes}">
- <fileset dir="${java.dir}">
- <exclude name="**/test/**"/>
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
-
- <!-- ======================================================
- P R O J E C T J A R S
- ======================================================= -->
-
- <target name="jars" depends="compile"
- description="Jars up all the common classes">
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/${name}.jar" basedir="${build.classes}">
- <!-- Include entire package -->
- <include name="ldapd/**"/>
- </jar>
- </target>
-
-
- <!-- ======================================================
- C O R E T A R G E T S
- ======================================================= -->
-
- <target name="all"
- depends="jars"
- description="Generate build products including docs"/>
-
-
- <!-- ======================================================
- H O U S E - K E E P I N G T A R G E T S
- ======================================================= -->
-
-
- <target name="clean" description="Cleans up artifacts from build process">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- <delete dir="test"/>
- <delete>
- <fileset dir="." includes="**/*~" defaultexcludes="no"/>
- <fileset dir="." includes="**/*.log" defaultexcludes="no"/>
- </delete>
- </target>
-
-
- <target name="cleanall" depends="clean"
- description="Cleans up all generated files and directories">
- <delete dir="${bin.dist.dir}"/>
- <delete dir="${dist.base}"/>
- <delete dir="target"/>
- </target>
+<!--
+ build.xml generated by maven from project.xml version SNAPSHOT
+ on date December 4 2003, time 2229
+-->
+
+<project default="jar" name="ldap-snacc-provider" basedir=".">
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="ldap-snacc-provider-SNAPSHOT">
+ </property>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
+ </condition>
+ </target>
+ <target name="compile" description="o Compile the code" depends="get-deps">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="./src/java">
+ </pathelement>
+ </src>
+ <classpath>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ </classpath>
+ </javac>
+ </target>
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
+ </target>
+ <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
+ <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+ <fail message="There were test failures.">
+ </fail>
+ </target>
+ <target name="internal-test" depends="compile-tests">
+ </target>
+ <target name="compile-tests" depends="compile">
+ </target>
+ <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+ <format pattern="2002-yyyy" property="year">
+ </format>
+ </tstamp>
+ <property name="copyright" value="Copyright &copy; LDAPd Group. All Rights Reserved.">
+ </property>
+ <property name="title" value="ldap-snacc-provider SNAPSHOT API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="./src/java" packagenames="org.apache.ldap.common.berlib.snacc.*">
+ <classpath>
+ <fileset dir="${libdir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement location="target/${final.name}.jar">
+ </pathelement>
+ </classpath>
+ </javadoc>
+ </target>
+ <target name="get-deps" unless="noget" depends="init">
+ <get dest="${libdir}/ldap-common-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//directory/jars/ldap-common-SNAPSHOT.jar">
+ </get>
+ <get dest="${libdir}/snacc-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//snacc4j/jars/snacc-2.3.jar">
+ </get>
+ <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//commons-collections/jars/commons-collections-2.1.jar">
+ </get>
+ <get dest="${libdir}/avalon-framework-api-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//avalon-framework/jars/avalon-framework-api-SNAPSHOT.jar">
+ </get>
+ <get dest="${libdir}/avalon-framework-impl-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//avalon-framework/jars/avalon-framework-impl-SNAPSHOT.jar">
+ </get>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//junit/jars/junit-3.8.1.jar">
+ </get>
+ <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//ant/jars/ant-1.5.jar">
+ </get>
+ <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven//ant/jars/ant-optional-1.5.jar">
+ </get>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
</project>
Added: incubator/directory/ldap/trunk/snacc-provider/gump.xml
==============================================================================
--- (empty file)
+++ incubator/directory/ldap/trunk/snacc-provider/gump.xml Thu Dec 4 19:36:42 2003
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module name="ldap-snacc-provider">
+ <description>LDAPd will be a pure Java LDAP v3 protocol, RFC 2251 compliant server. It's architecture is based on Matt Welsh's Staged Event Driven Architecture (SEDA).</description>
+ <url href="http://ldapd.sourceforge.net/modules/ldap-snacc-provider">
+ </url>
+ <cvs module="ldap-snacc-provider" repository="">
+ </cvs>
+ <project name="ldap-snacc-provider">
+ <ant buildfile="build.xml" target="dist">
+ <property name="final.name" value="ldap-snacc-provider-@@DATE@@">
+ </property>
+ </ant>
+ <package>org.apache.ldap.common.berlib.snacc</package>
+ <depend project="commons-collections">
+ </depend>
+ <depend project="directory">
+ </depend>
+ <depend project="jakarta-ant">
+ </depend>
+ <depend project="jakarta-avalon">
+ </depend>
+ <depend project="snacc4j">
+ </depend>
+ <depend project="xml-xerces">
+ </depend>
+ <work nested="target/classes">
+ </work>
+ <home nested="target">
+ </home>
+ <jar name="ldap-snacc-provider-@@DATE@@.jar">
+ </jar>
+ <javadoc module="ldap-snacc-provider" nested="target/docs/apidocs">
+ </javadoc>
+ <nag to="ldapd-devel@sourceforge.net" from="ldap-snacc-provider development <ldapd-devel@sourceforge.net>">
+ </nag>
+ </project>
+</module>
\ No newline at end of file
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 Thu Dec 4 19:36:42 2003
@@ -11,5 +11,5 @@
#site.path=<directoryname>/ The default is blank. Override this property
#in the build.properties. Remember to include the final forward slash.
-module.name=ldapd-snacc-provider
+module.name=ldap-snacc-provider
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 Thu Dec 4 19:36:42 2003
@@ -3,9 +3,10 @@
xsi:noNamespaceSchemaLocation="maven-project.xsd">
<pomVersion>3</pomVersion>
- <id>ldapd-snacc-provider</id>
+ <groupId>directory</groupId>
+ <id>ldap-snacc-provider</id>
<name>${module.name}</name>
- <currentVersion>0.7.1</currentVersion>
+ <currentVersion>SNAPSHOT</currentVersion>
<organization>
<name>LDAPd Group</name>
@@ -14,7 +15,7 @@
</organization>
<inceptionYear>2002</inceptionYear>
- <package>ldapd.common.berlib.snacc</package>
+ <package>org.apache.ldap.common.berlib.snacc</package>
<logo>/../../images/ldapd-logo.gif</logo>
<description>
<![CDATA[LDAPd will be a pure Java embeddable fully compliant (RFC2251)
@@ -131,8 +132,8 @@
<dependencies>
<dependency>
- <groupId>ldapd-common</groupId>
- <artifactId>ldapd-common</artifactId>
+ <groupId>directory</groupId>
+ <artifactId>ldap-common</artifactId>
<version>SNAPSHOT</version>
<url>http://ldapd.sourceforge.net</url>
</dependency>
@@ -175,18 +176,6 @@
<integrationUnitTestSourceDirectory/>
<aspectSourceDirectory/>
<unitTest/>
-
- <resources>
- <directory>${basedir}/src/java/ldapd/common/name</directory>
- <targetPath>ldapd/common/name</targetPath>
- <includes>
- antlrNameParserTokenTypes.txt,
- antlrTypeTokenTypes.txt,
- antlrValueParserTokenTypes.txt,
- antlrValueTokenTypes.txt
- </includes>
-
- </resources>
</build>
<reports>