You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by br...@apache.org on 2003/11/14 21:39:22 UTC
cvs commit: jakarta-commons-sandbox/naming/xdocs building.xml navigation.xml
brett 2003/11/14 12:39:22
Modified: naming project.xml
naming/core project.xml
naming/factory project.xml
naming/xdocs building.xml navigation.xml
Removed: naming maven.xml
Log:
updated maven build.
Should work with beta-10 and up with latest multiproject plugin, tested with RC1
Revision Changes Path
1.5 +23 -3 jakarta-commons-sandbox/naming/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/naming/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 2 Sep 2003 03:25:10 -0000 1.4
+++ project.xml 14 Nov 2003 20:39:21 -0000 1.5
@@ -4,6 +4,7 @@
<version>3</version>
<name>commons-naming</name>
<id>commons-naming</id>
+ <groupId>commons-naming</groupId>
<currentVersion>SNAPSHOT</currentVersion>
<organization>
@@ -66,6 +67,16 @@
<role>Java Developer</role>
</roles>
</developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>brett</id>
+ <email>brett@apache.org</email>
+ <organization>f2 network</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+10</timezone>
+ </developer>
</developers>
@@ -118,9 +129,18 @@
<!-- J A R R E S O U R C E S -->
<!-- Resources that are packaged up inside the JAR file -->
<resources>
- <includes>
- <include>**/*.properties</include>
- </includes>
+ <resource>
+ <directory>${basedir}/src/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/conf</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
</resources>
</build>
1.2 +1 -4 jakarta-commons-sandbox/naming/core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/naming/core/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 2 Sep 2003 03:43:56 -0000 1.1
+++ project.xml 14 Nov 2003 20:39:21 -0000 1.2
@@ -2,9 +2,6 @@
<project>
<extend>${basedir}/../project.xml</extend>
<id>commons-naming-core</id>
- <name>commons-naming-core</name>
- <currentVersion>SNAPSHOT</currentVersion>
- <dependencies>
- </dependencies>
+ <name>Core</name>
</project>
1.2 +49 -4 jakarta-commons-sandbox/naming/factory/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/naming/factory/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 2 Sep 2003 04:18:08 -0000 1.1
+++ project.xml 14 Nov 2003 20:39:21 -0000 1.2
@@ -2,14 +2,15 @@
<project>
<extend>${basedir}/../project.xml</extend>
<id>commons-naming-factory</id>
- <name>commons-naming-factory</name>
- <currentVersion>SNAPSHOT</currentVersion>
+ <name>Naming Factories</name>
<dependencies>
+ <!-- Compile time dependencies -->
<dependency>
- <id>commons-naming-core</id>
- <version>SNAPSHOT</version>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>commons-naming-core</artifactId>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
@@ -27,6 +28,50 @@
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+
+ <!-- Runtime dependencies - Digester -->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
+ <!-- Runtime dependencies - DBCP factories -->
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+ <!-- Test dependencies - used to test database connection factories -->
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.7.1</version>
+ </dependency>
</dependencies>
</project>
1.2 +11 -6 jakarta-commons-sandbox/naming/xdocs/building.xml
Index: building.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/naming/xdocs/building.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- building.xml 2 Sep 2003 03:03:23 -0000 1.1
+++ building.xml 14 Nov 2003 20:39:21 -0000 1.2
@@ -9,13 +9,12 @@
<section name="Maven targets">
<p>
Commons Naming consists of two subprojects: core and factory. These can be built separately
- by executing maven build targets from the /core or /factory directories. Both subprojects can be
+ by executing maven build targets from the /core or /factory directories. All subprojects can be
built using the following targets, executed from the top level sandbox/naming directory:
<ul>
- <li>clean-all -- cleans both subprojects</li>
- <li>build-all -- cleans, builds, tests and jars both subprojects</li>
- <li>site-all -- generates separate maven sites in /target directories for subprojects</li>
- <li>multiproject:site -- generates an integrated site including both subprojects </li>
+ <li>multiproject:clean -- cleans all subprojects</li>
+ <li>multiproject:install -- builds, tests and jars all subprojects</li>
+ <li>multiproject:site -- generates an integrated site including all subprojects</li>
<li>clean -- cleans top level project</li>
</ul>
</p>
@@ -31,12 +30,18 @@
<li>junit 3.7</li>
</ul>
The core subproject has no dependencies beyond these. The factory subproject depends on
- core and has the following additional dependencies, specified in factory/project.xml:
+ core and has the following additional dependencies, specified in factory/project.xml (see <a href="multiproject/commons-naming-factory/dependencies.html">dependencies</a>):
<ul>
<li>jta-spec 1.0.1 (runtime only, must be added to local repo,
since not available on ibiblio)</li>
<li>javamail 1.2 (must be added to local repo, since not available on ibiblio)</li>
<li>tyrex 1.0 </li>
+ <li>commons-dbcp 1.0 and commons-pool 1.0.1 (only required if using the default resource factory to obtain database connections)</li>
+ <li>commons-digester 1.4.1 (for reading XML configuration files)</li>
+ <li>commons-logging 1.0.3</li>
+ <li>commons-beanutils 1.6.1 (runtime only for digester)</li>
+ <li>commons-lang 1.0.1</li>
+ <li>hsqldb 1.7.1 (testing only - used to setup a simple database to perform resource factory testing)</li>
</ul>
</p>
</section>
1.2 +6 -4 jakarta-commons-sandbox/naming/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/naming/xdocs/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 2 Sep 2003 03:03:23 -0000 1.1
+++ navigation.xml 14 Nov 2003 20:39:21 -0000 1.2
@@ -5,15 +5,17 @@
<body>
+ <link name="Index" href="/" />
+
<menu name="Commons Naming">
<item name="Overview" href="/index.html"/>
<item name="Building" href="/building.html"/>
</menu>
- <menu name="Components">
- <item name="Core" href="/multiproject/commons-naming-core/index.html"/>
- <item name="Factories" href="/multiproject/commons-naming-factory/index.html"/>
+ <menu name="Projects">
+ #foreach ($reactorProject in $reactorProjects)
+ <item name="$reactorProject.name" href="/${aggregateDir}${reactorProject.artifactId}/index.html"/>
+ #end
</menu>
-
</body>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org