You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by jh...@apache.org on 2005/11/22 00:40:00 UTC
svn commit: r348023 - in /excalibur/trunk/fortress: bean/pom.xml
container-api/pom.xml container-impl/pom.xml examples/pom.xml meta/pom.xml
Author: jheymans
Date: Mon Nov 21 15:39:53 2005
New Revision: 348023
URL: http://svn.apache.org/viewcvs?rev=348023&view=rev
Log:
- All poms now inherit from the root excalibur pom
- Tests compile and run
Added:
excalibur/trunk/fortress/bean/pom.xml (with props)
Modified:
excalibur/trunk/fortress/container-api/pom.xml
excalibur/trunk/fortress/container-impl/pom.xml
excalibur/trunk/fortress/examples/pom.xml
excalibur/trunk/fortress/meta/pom.xml
Added: excalibur/trunk/fortress/bean/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/bean/pom.xml?rev=348023&view=auto
==============================================================================
--- excalibur/trunk/fortress/bean/pom.xml (added)
+++ excalibur/trunk/fortress/bean/pom.xml Mon Nov 21 15:39:53 2005
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2003-2004 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project>
+ <parent>
+ <groupId>excalibur</groupId>
+ <artifactId>excalibur</artifactId>
+ <version>1.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <name>Excalibur Fortress Bean</name>
+ <artifactId>excalibur-fortress-bean</artifactId>
+ <groupId>excalibur-fortress-bean</groupId>
+ <version>2.1</version>
+ <description>Excalibur Fortress Bean component</description>
+ <dependencies>
+ <dependency>
+ <groupId>excalibur-fortress</groupId>
+ <artifactId>excalibur-fortress-container-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-fortress</groupId>
+ <artifactId>excalibur-fortress-container-impl</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.3</version>
+ </dependency>
+ <dependency>
+ <id>excalibur-logger</id>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-lifecycle</groupId>
+ <artifactId>excalibur-lifecycle-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-instrument</groupId>
+ <artifactId>excalibur-instrument-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-instrument</groupId>
+ <artifactId>excalibur-instrument-mgr-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-instrument</groupId>
+ <artifactId>excalibur-instrument-mgr-impl</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <id>excalibur-sourceresolve</id>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <id>excalibur-xmlutil</id>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-pool</groupId>
+ <artifactId>excalibur-pool-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>d-haven-event</groupId>
+ <artifactId>d-haven-event</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>d-haven-managed-pool</groupId>
+ <artifactId>d-haven-managed-pool</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <id>commons-collections</id>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <id>concurrent</id>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <id>qdox</id>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <id>ant</id>
+ <version>1.6.2</version>
+ </dependency>
+ <dependency>
+ <id>xml-apis</id>
+ <version>2.0.2</version>
+ </dependency>
+ <!-- Neeme: commented commons-logging out for now, as it seems to cause a
+ mysterious NPE in logging conf while running FortressBean test case.
+ Maybe only my machine issue?
+ <dependency>
+ <id>commons-logging</id>
+ <version>1.0.4</version>
+ </dependency>
+ -->
+ <dependency>
+ <id>junit</id>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>excalibur-lifecycle</groupId>
+ <artifactId>excalibur-lifecycle-impl</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+</project>
Propchange: excalibur/trunk/fortress/bean/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: excalibur/trunk/fortress/container-api/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/container-api/pom.xml?rev=348023&r1=348022&r2=348023&view=diff
==============================================================================
--- excalibur/trunk/fortress/container-api/pom.xml (original)
+++ excalibur/trunk/fortress/container-api/pom.xml Mon Nov 21 15:39:53 2005
@@ -19,7 +19,7 @@
<parent>
<groupId>excalibur</groupId>
<artifactId>excalibur</artifactId>
- <version>2.1</version>
+ <version>1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>Excalibur Fortress Container API</name>
@@ -55,5 +55,16 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: excalibur/trunk/fortress/container-impl/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/container-impl/pom.xml?rev=348023&r1=348022&r2=348023&view=diff
==============================================================================
--- excalibur/trunk/fortress/container-impl/pom.xml (original)
+++ excalibur/trunk/fortress/container-impl/pom.xml Mon Nov 21 15:39:53 2005
@@ -16,6 +16,11 @@
limitations under the License.
-->
<project>
+ <parent>
+ <groupId>excalibur</groupId>
+ <artifactId>excalibur</artifactId>
+ <version>1.0</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<name>Excalibur Fortress Container Implementation</name>
<groupId>excalibur-fortress</groupId>
@@ -130,5 +135,16 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: excalibur/trunk/fortress/examples/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/examples/pom.xml?rev=348023&r1=348022&r2=348023&view=diff
==============================================================================
--- excalibur/trunk/fortress/examples/pom.xml (original)
+++ excalibur/trunk/fortress/examples/pom.xml Mon Nov 21 15:39:53 2005
@@ -16,6 +16,11 @@
limitations under the License.
-->
<project>
+ <parent>
+ <groupId>excalibur</groupId>
+ <artifactId>excalibur</artifactId>
+ <version>1.0</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<name>Excalibur Fortress Examples</name>
<artifactId>excalibur-fortress-examples</artifactId>
@@ -25,16 +30,13 @@
The Avalon project is an effort to create, design, develop and maintain a common framework and set of
components for applications written using the Java language.
</description>
-
<dependencies>
<dependency>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
<version>2.3</version>
<scope>provided</scope>
</dependency>
-
- <!-- dependencies for container -->
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
@@ -60,8 +62,6 @@
<groupId>concurrent</groupId>
<version>1.3.4</version>
</dependency>
-
- <!-- fortress dependencies -->
<dependency>
<groupId>excalibur-fortress</groupId>
<artifactId>excalibur-fortress-container-api</artifactId>
@@ -77,13 +77,11 @@
<artifactId>excalibur-fortress-meta</artifactId>
<version>1.2</version>
</dependency>
-
<dependency>
<groupId>excalibur-instrument</groupId>
<artifactId>excalibur-instrument-api</artifactId>
<version>2.1</version>
</dependency>
-
<dependency>
<groupId>excalibur-lifecycle</groupId>
<artifactId>excalibur-lifecycle-api</artifactId>
@@ -94,7 +92,6 @@
<artifactId>excalibur-lifecycle-impl</artifactId>
<version>2.1</version>
</dependency>
-
<!-- dependencies for tools -->
<dependency>
<artifactId>qdox</artifactId>
@@ -107,5 +104,18 @@
<version>1.6.2</version>
</dependency>
</dependencies>
-
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: excalibur/trunk/fortress/meta/pom.xml
URL: http://svn.apache.org/viewcvs/excalibur/trunk/fortress/meta/pom.xml?rev=348023&r1=348022&r2=348023&view=diff
==============================================================================
--- excalibur/trunk/fortress/meta/pom.xml (original)
+++ excalibur/trunk/fortress/meta/pom.xml Mon Nov 21 15:39:53 2005
@@ -16,6 +16,11 @@
limitations under the License.
-->
<project>
+ <parent>
+ <groupId>excalibur</groupId>
+ <artifactId>excalibur</artifactId>
+ <version>1.0</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<name>Excalibur Fortress Meta Generator</name>
<groupId>excalibur-fortress</groupId>
@@ -51,5 +56,16 @@
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org