Author: mcconnell
Date: Sat Jul 24 01:22:12 2004
New Revision: 23209
Modified:
incubator/directory/eve/trunk/frontend/merlin/project.xml
Log:
Applying NIclas's patch to project dependencies list.
Modified: incubator/directory/eve/trunk/frontend/merlin/project.xml
==============================================================================
--- incubator/directory/eve/trunk/frontend/merlin/project.xml (original)
+++ incubator/directory/eve/trunk/frontend/merlin/project.xml Sat Jul 24
01:22:12 2004
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
- <extend>${basedir}/../../project.xml</extend>
- <groupId>incubator-directory</groupId>
- <id>eve-frontend-merlin</id>
-
- <name>Eve Frontend Merlin Implementation</name>
- <package>org.apache.eve</package>
- <currentVersion>SNAPSHOT</currentVersion>
- <inceptionYear>2003</inceptionYear>
-
- <shortDescription>Eve Frontend Merlin Implementation</shortDescription>
-
- <description>
- Contains the Avalon merlin service implementations and other
- associated helper classes and interfaces.
- </description>
-
- <dependencies>
-
- <!-- =============================================================== -->
- <!-- A V A L O N D E N D E N C I E S -->
- <!-- =============================================================== -->
-
- <!-- for some reason this is needed for merlin-unit tests -->
- <!-- but it is not needed when when using command line merlin -->
- <!-- within the block.xml's classloader directive -->
-
- <dependency>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- <version>2.0.0</version>
- </dependency>
-
- <!-- cornerstone dependencies -->
-
- <dependency>
- <groupId>cornerstone-threads</groupId>
- <artifactId>cornerstone-threads-api</artifactId>
- <version>2.0.0</version>
- <url>http://avalon.apache.org/components/components/threads.html</url>
- </dependency>
-
- <dependency>
- <groupId>cornerstone-threads</groupId>
- <artifactId>cornerstone-threads-impl</artifactId>
- <version>2.0.0</version>
- <url>http://avalon.apache.org/components/components/threads.html</url>
- </dependency>
-
- <!-- excalibur dependencies from cornerstone -->
-
- <dependency>
- <groupId>excalibur-thread</groupId>
- <artifactId>excalibur-thread-api</artifactId>
- <version>2.0.0</version>
- <url>http://avalon.apache.org/excalibur/index.html</url>
- </dependency>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+ <extend>${basedir}/../../project.xml</extend>
+ <groupId>incubator-directory</groupId>
+ <id>eve-frontend-merlin</id>
+
+ <name>Eve Frontend Merlin Implementation</name>
+ <package>org.apache.eve</package>
+ <currentVersion>SNAPSHOT</currentVersion>
+ <inceptionYear>2003</inceptionYear>
+
+ <shortDescription>Eve Frontend Merlin Implementation</shortDescription>
+
+ <description>
+ Contains the Avalon merlin service implementations and other
+ associated helper classes and interfaces.
+ </description>
+
+ <dependencies>
+
+ <!-- =============================================================== -->
+ <!-- A V A L O N D E N D E N C I E S -->
+ <!-- =============================================================== -->
+
+ <!-- for some reason this is needed for merlin-unit tests -->
+ <!-- but it is not needed when when using command line merlin -->
+ <!-- within the block.xml's classloader directive -->
+
+ <dependency>
+ <groupId>avalon-logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+
+ <!-- cornerstone dependencies -->
+
+ <dependency>
+ <groupId>cornerstone-threads</groupId>
+ <artifactId>cornerstone-threads-api</artifactId>
+ <version>2.0.0</version>
+ <url>http://avalon.apache.org/components/components/threads.html</url>
+ </dependency>
+
+ <dependency>
+ <groupId>cornerstone-threads</groupId>
+ <artifactId>cornerstone-threads-impl</artifactId>
+ <version>2.0.0</version>
+ <url>http://avalon.apache.org/components/components/threads.html</url>
+ </dependency>
+
+ <!-- excalibur dependencies from cornerstone -->
+
+ <dependency>
+ <groupId>excalibur-thread</groupId>
+ <artifactId>excalibur-thread-api</artifactId>
+ <version>2.0.0</version>
+ <url>http://avalon.apache.org/excalibur/index.html</url>
+ </dependency>
+
<dependency>
<groupId>excalibur-thread</groupId>
<artifactId>excalibur-thread-impl</artifactId>
@@ -64,164 +64,166 @@
<url>http://avalon.apache.org/excalibur/index.html</url>
</dependency>
- <dependency>
- <groupId>excalibur-pool</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- <version>2.0.0</version>
- <url>http://avalon.apache.org/excalibur/index.html</url>
- </dependency>
-
+ <dependency>
+ <groupId>excalibur-pool</groupId>
+ <artifactId>excalibur-pool-api</artifactId>
+ <version>2.0.0</version>
+ <url>http://avalon.apache.org/excalibur/index.html</url>
+ </dependency>
+
+ <!--
<dependency>
<groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-impl</artifactId>
<version>2.0.0</version>
<url>http://avalon.apache.org/excalibur/index.html</url>
</dependency>
+ -->
<!--
- <dependency>
- <groupId>excalibur-event</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>1.0.3</version>
- <url>http://avalon.apache.org/excalibur/index.html</url>
- </dependency>
+ <dependency>
+ <groupId>excalibur-event</groupId>
+ <artifactId>excalibur-event</artifactId>
+ <version>1.0.3</version>
+ <url>http://avalon.apache.org/excalibur/index.html</url>
+ </dependency>
-->
-
- <!-- framework dependencies -->
-
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.2.0</version>
- <url>http://avalon.apache.org/framework</url>
- </dependency>
-
- <dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.2.0</version>
- <url>http://avalon.apache.org/framework</url>
- </dependency>
-
- <!-- =============================================================== -->
- <!-- C O M M O N S D E N D E N C I E S -->
- <!-- =============================================================== -->
-
- <!-- We need to get rid of this dependency on commons-codec -->
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>SNAPSHOT</version>
- <url>http://jakarta.apache.org/commons/codec</url>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- <url>http://jakarta.apache.org/commons/lang</url>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- <url>http://jakarta.apache.org/commons/logging</url>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- <url>http://jakarta.apache.org/commons/collections</url>
- </dependency>
-
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <version>1.1-dev</version>
- <url>http://jakarta.apache.org/commons/primitives</url>
- </dependency>
-
- <!-- =============================================================== -->
- <!-- O T H E R D E N D E N C I E S -->
- <!-- =============================================================== -->
-
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.1</version>
- <url>
-http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
- </url>
- </dependency>
-
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.2</version>
- <url>http://jakarta.apache.org/regexp</url>
- </dependency>
-
- <!--
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <url>http://junit.org</url>
- </dependency>
+
+ <!-- framework dependencies -->
+
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.2.0</version>
+ <url>http://avalon.apache.org/framework</url>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.2.0</version>
+ <url>http://avalon.apache.org/framework</url>
+ </dependency>
+
+ <!-- =============================================================== -->
+ <!-- C O M M O N S D E N D E N C I E S -->
+ <!-- =============================================================== -->
+
+ <!-- We need to get rid of this dependency on commons-codec -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://jakarta.apache.org/commons/codec</url>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ <url>http://jakarta.apache.org/commons/lang</url>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <url>http://jakarta.apache.org/commons/logging</url>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ <url>http://jakarta.apache.org/commons/collections</url>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>1.1-dev</version>
+ <url>http://jakarta.apache.org/commons/primitives</url>
+ </dependency>
+
+ <!-- =============================================================== -->
+ <!-- O T H E R D E N D E N C I E S -->
+ <!-- =============================================================== -->
+
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.1</version>
+ <url>
+http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+ </url>
+ </dependency>
+
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/regexp</url>
+ </dependency>
+
+ <!--
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <url>http://junit.org</url>
+ </dependency>
-->
-
- <!-- THE DEPENDENCY KEEPING USE IN INCUBATOR -->
- <dependency>
- <groupId>snacc4j</groupId>
- <artifactId>snacc</artifactId>
- <version>2.3</version>
- </dependency>
- <!-- THE DEPENDENCY KEEPING USE IN INCUBATOR -->
-
- <!-- =============================================================== -->
- <!-- D I R E C T O R Y D E N D E N C I E S -->
- <!-- =============================================================== -->
-
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>ldap-common</artifactId>
- <version>SNAPSHOT</version>
- <url>http://incubator.apache.org/directory/subprojects/ldap/common</url>
- </dependency>
-
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>eve-frontend-api</artifactId>
- <version>SNAPSHOT</version>
- <url>http://incubator.apache.org/directory/subprojects/eve/frontend</url>
- </dependency>
-
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>eve-frontend-impl</artifactId>
- <version>SNAPSHOT</version>
- <url>http://incubator.apache.org/directory/subprojects/eve/frontend</url>
- </dependency>
-
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>codec-stateful</artifactId>
- <version>SNAPSHOT</version>
- <url>http://incubator.apache.org/directory/subprojects/ldap/common</url>
- </dependency>
-
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>snickers-ber-api</artifactId>
- <version>SNAPSHOT</version>
- <url>
- http://incubator.apache.org/directory/subprojects/snickers/ber/api
- </url>
- </dependency>
-
- </dependencies>
-
-</project>
-
+
+ <!-- THE DEPENDENCY KEEPING USE IN INCUBATOR -->
+ <dependency>
+ <groupId>snacc4j</groupId>
+ <artifactId>snacc</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <!-- THE DEPENDENCY KEEPING USE IN INCUBATOR -->
+
+ <!-- =============================================================== -->
+ <!-- D I R E C T O R Y D E N D E N C I E S -->
+ <!-- =============================================================== -->
+
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>ldap-common</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://incubator.apache.org/directory/subprojects/ldap/common</url>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>eve-frontend-api</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://incubator.apache.org/directory/subprojects/eve/frontend</url>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>eve-frontend-impl</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://incubator.apache.org/directory/subprojects/eve/frontend</url>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>codec-stateful</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://incubator.apache.org/directory/subprojects/ldap/common</url>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>snickers-ber-api</artifactId>
+ <version>SNAPSHOT</version>
+ <url>
+ http://incubator.apache.org/directory/subprojects/snickers/ber/api
+ </url>
+ </dependency>
+
+ </dependencies>
+
+</project>
+
