svn commit: rev 22405 - in avalon/trunk: . central/system planet planet/cornerstone planet/cornerstone/connection/impl/conf planet/cornerstone/connection/impl/src/java/org/apache/avalon/cornerstone/blocks/connection planet/facilities planet/facilities/db planet/facilities/db/api planet/facilities/db/hsql planet/facilities/dbcp planet/facilities/dbcp/api planet/facilities/dbcp/impl planet/facilities/finder planet/facilities/finder/api planet/facilities/finder/impl planet/facilities/finder/test planet/facilities/http planet/facilities/http/api planet/facilities/http/impl planet/facilities/http/spi planet/facilities/http/test planet/facilities/http/util planet/facilities/jms planet/facilities/jms/api planet/facilities/jms/impl planet/facilities/jms/test planet/facilities/jmx planet/facilities/jmx/api planet/facilities/jmx/handler planet/facilities/jmx/mx4j planet/facilities/jmx/spi
[email protected] 1 Jul 2004 06:50:39 -0000
Newsgroups
gmane.comp.jakarta.avalon.cvs
Message-ID
<[email protected] >
Author: mcconnell
Date: Wed Jun 30 23:50:38 2004
New Revision: 22405
Added:
avalon/trunk/planet/cornerstone/connection/impl/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.xprofile
avalon/trunk/planet/cornerstone/index.xml
avalon/trunk/planet/facilities/finder/test/build.properties (contents, props changed)
avalon/trunk/planet/facilities/index.xml
avalon/trunk/planet/tutorials/index.xml
Modified:
avalon/trunk/build.xml
avalon/trunk/central/system/index.xml
avalon/trunk/planet/cornerstone/connection/impl/conf/block.xml
avalon/trunk/planet/facilities/db/api/build.properties
avalon/trunk/planet/facilities/db/build.properties
avalon/trunk/planet/facilities/db/hsql/build.properties
avalon/trunk/planet/facilities/dbcp/api/build.properties
avalon/trunk/planet/facilities/dbcp/build.properties
avalon/trunk/planet/facilities/dbcp/impl/build.properties
avalon/trunk/planet/facilities/finder/api/build.properties
avalon/trunk/planet/facilities/finder/build.properties
avalon/trunk/planet/facilities/finder/impl/build.properties
avalon/trunk/planet/facilities/http/api/build.properties
avalon/trunk/planet/facilities/http/build.properties
avalon/trunk/planet/facilities/http/impl/build.properties
avalon/trunk/planet/facilities/http/spi/build.properties
avalon/trunk/planet/facilities/http/test/build.properties
avalon/trunk/planet/facilities/http/util/build.properties
avalon/trunk/planet/facilities/jms/api/build.properties
avalon/trunk/planet/facilities/jms/build.properties
avalon/trunk/planet/facilities/jms/impl/build.properties
avalon/trunk/planet/facilities/jms/test/build.properties
avalon/trunk/planet/facilities/jmx/api/build.properties
avalon/trunk/planet/facilities/jmx/build.properties
avalon/trunk/planet/facilities/jmx/handler/build.properties
avalon/trunk/planet/facilities/jmx/mx4j/build.properties
avalon/trunk/planet/facilities/jmx/spi/build.properties
avalon/trunk/planet/facilities/jmx/test/build.properties
avalon/trunk/planet/facilities/jmx/test/etc/main/BLOCK-INF/block.xml
avalon/trunk/planet/facilities/jmx/util/build.properties
avalon/trunk/planet/index.xml
avalon/trunk/planet/tutorials/dynamics/build.properties
avalon/trunk/planet/tutorials/hello/build.properties
avalon/trunk/runtime/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultAppliance.java
avalon/trunk/runtime/index.xml
avalon/trunk/tools/build.properties
avalon/trunk/tools/build.xml
avalon/trunk/tools/index.xml
Log:
Separate the index.xml file into groups (tools, runtime, facilities, cornerstone, tutorials). Add a default deployment scenario to connection manager in corenerstone, update the facilities and tutorial build.xml files to reference the respective index files.
Modified: avalon/trunk/build.xml
==============================================================================
--- avalon/trunk/build.xml (original)
+++ avalon/trunk/build.xml Wed Jun 30 23:50:38 2004
@@ -20,6 +20,10 @@
<ant dir="." antfile="${reactor.xml}" target="clean"/>
</target>
+ <target name="init" depends="verify">
+ <ant dir="." antfile="${reactor.xml}" target="init"/>
+ </target>
+
<target name="install" depends="default"/>
<target name="default" depends="verify">
Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml (original)
+++ avalon/trunk/central/system/index.xml Wed Jun 30 23:50:38 2004
@@ -2,6 +2,9 @@
<system>
+ <import index="../../runtime/index.xml"
+ href="http://svn.apache.org/repos/asf/avalon/trunk/runtime/index.xml"/>
+
<import index="../../planet/index.xml"
href="http://svn.apache.org/repos/asf/avalon/trunk/planet/index.xml"/>
Modified: avalon/trunk/planet/cornerstone/connection/impl/conf/block.xml
==============================================================================
--- avalon/trunk/planet/cornerstone/connection/impl/conf/block.xml (original)
+++ avalon/trunk/planet/cornerstone/connection/impl/conf/block.xml Wed Jun 30 23:50:38 2004
@@ -27,11 +27,6 @@
<component name="manager"
class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
- activation="startup">
- <configuration>
- <idle-timeout>300000</idle-timeout>
- <max-connections>30</max-connections>
- </configuration>
- </component>
+ profile="default"/>
</container>
Added: avalon/trunk/planet/cornerstone/connection/impl/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.xprofile
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/cornerstone/connection/impl/src/java/org/apache/avalon/cornerstone/blocks/connection/DefaultConnectionManager.xprofile Wed Jun 30 23:50:38 2004
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<profiles>
+
+ <profile name="default">
+ <configuration>
+ <idle-timeout>300000</idle-timeout>
+ <max-connections>30</max-connections>
+ </configuration>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: avalon/trunk/planet/cornerstone/index.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/cornerstone/index.xml Wed Jun 30 23:50:38 2004
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<system>
+
+ <import index="../../runtime/index.xml"
+ href="http://svn.apache.org/repos/asf/avalon/trunk/runtime/index.xml"/>
+
+ <!--
+ Avalon Components - Cornerstone Collection
+ -->
+
+</system>
Modified: avalon/trunk/planet/facilities/db/api/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/db/api/build.properties (original)
+++ avalon/trunk/planet/facilities/db/api/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/db/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/db/build.properties (original)
+++ avalon/trunk/planet/facilities/db/build.properties Wed Jun 30 23:50:38 2004
@@ -1,2 +1,2 @@
project.system = ../../../central/system
-project.home = ../..
+project.home = ..
Modified: avalon/trunk/planet/facilities/db/hsql/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/db/hsql/build.properties (original)
+++ avalon/trunk/planet/facilities/db/hsql/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/dbcp/api/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/dbcp/api/build.properties (original)
+++ avalon/trunk/planet/facilities/dbcp/api/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/dbcp/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/dbcp/build.properties (original)
+++ avalon/trunk/planet/facilities/dbcp/build.properties Wed Jun 30 23:50:38 2004
@@ -1,2 +1,2 @@
project.system = ../../../central/system
-project.home = ../..
+project.home = ..
Modified: avalon/trunk/planet/facilities/dbcp/impl/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/dbcp/impl/build.properties (original)
+++ avalon/trunk/planet/facilities/dbcp/impl/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/finder/api/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/finder/api/build.properties (original)
+++ avalon/trunk/planet/facilities/finder/api/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/finder/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/finder/build.properties (original)
+++ avalon/trunk/planet/facilities/finder/build.properties Wed Jun 30 23:50:38 2004
@@ -1,2 +1,2 @@
project.system = ../../../central/system
-project.home = ../..
+project.home = ..
Modified: avalon/trunk/planet/facilities/finder/impl/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/finder/impl/build.properties (original)
+++ avalon/trunk/planet/facilities/finder/impl/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Added: avalon/trunk/planet/facilities/finder/test/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/finder/test/build.properties Wed Jun 30 23:50:38 2004
@@ -0,0 +1,3 @@
+project.system = ../../../../central/system
+project.home = ../..
+project.src.main = java
Modified: avalon/trunk/planet/facilities/http/api/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/http/api/build.properties (original)
+++ avalon/trunk/planet/facilities/http/api/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/http/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/http/build.properties (original)
+++ avalon/trunk/planet/facilities/http/build.properties Wed Jun 30 23:50:38 2004
@@ -1,2 +1,2 @@
project.system = ../../../central/system
-project.home = ../..
+project.home = ..
Modified: avalon/trunk/planet/facilities/http/impl/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/build.properties (original)
+++ avalon/trunk/planet/facilities/http/impl/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/http/spi/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/http/spi/build.properties (original)
+++ avalon/trunk/planet/facilities/http/spi/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/http/test/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/http/test/build.properties (original)
+++ avalon/trunk/planet/facilities/http/test/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/http/util/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/http/util/build.properties (original)
+++ avalon/trunk/planet/facilities/http/util/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Added: avalon/trunk/planet/facilities/index.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/index.xml Wed Jun 30 23:50:38 2004
@@ -0,0 +1,424 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<system>
+
+ <import index="../../runtime/index.xml"
+ href="http://svn.apache.org/repos/asf/avalon/trunk/runtime/index.xml"/>
+
+ <!--
+ Avalon Facilities - Finder
+ -->
+
+ <project basedir="finder/api">
+ <info>
+ <group>avalon/finder</group>
+ <name>avalon-finder-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-framework-api" runtime="false"/>
+ </dependencies>
+ </project>
+
+ <project basedir="finder/impl">
+ <info>
+ <group>avalon/finder</group>
+ <name>avalon-finder-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-finder-api"/>
+ <include key="avalon-composition-api" runtime="false"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="finder/test">
+ <info>
+ <group>avalon/finder</group>
+ <name>avalon-finder-test</name>
+ </info>
+ <dependencies>
+ <include key="avalon-finder-impl"/>
+ <include key="avalon-framework-api" runtime="false"/>
+ <include key="avalon-merlin-unit" runtime="false"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <!--
+ Avalon Facilities - HTTP
+ -->
+
+ <resource>
+ <info>
+ <group>jetty</group>
+ <name>org.mortbay.jetty</name>
+ <version>4.2.15</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <project basedir="http/api">
+ <info>
+ <group>avalon/http</group>
+ <name>avalon-http-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="servletapi"/>
+ </dependencies>
+ </project>
+
+ <project basedir="http/spi">
+ <info>
+ <group>avalon/http</group>
+ <name>avalon-http-spi</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-http-api"/>
+ <include key="avalon-composition-api" runtime="false"/>
+ </dependencies>
+ </project>
+
+ <project basedir="http/util">
+ <info>
+ <group>avalon/http</group>
+ <name>avalon-http-util</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-http-api"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="http/impl">
+ <info>
+ <group>avalon/http</group>
+ <name>avalon-http-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-http-spi"/>
+ <include key="avalon-http-util"/>
+ <include key="avalon-composition-api" runtime="false"/>
+ <include key="avalon-util-configuration"/>
+ <include key="org.mortbay.jetty"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="http/test">
+ <info>
+ <group>avalon/http</group>
+ <name>avalon-http-test</name>
+ </info>
+ <dependencies>
+ <include key="avalon-http-impl"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <!--
+ Avalon Facilities - JMX
+ -->
+
+ <resource>
+ <info>
+ <group>mx4j</group>
+ <name>mx4j-jmx</name>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>mx4j</group>
+ <name>mx4j-tools</name>
+ <version>1.1.1</version>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="mx4j-jmx"/>
+ </dependencies>
+ </resource>
+
+ <project basedir="jmx/api">
+ <info>
+ <group>avalon/jmx</group>
+ <name>avalon-jmx-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-composition-api"/>
+ </dependencies>
+ </project>
+
+ <project basedir="jmx/util">
+ <info>
+ <group>avalon/jmx</group>
+ <name>avalon-jmx-util</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-framework-impl"/>
+ <include key="avalon-util-i18n"/>
+ <include key="mx4j-jmx"/>
+ </dependencies>
+ </project>
+
+ <project basedir="jmx/spi">
+ <info>
+ <group>avalon/jmx</group>
+ <name>avalon-jmx-spi</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-jmx-api"/>
+ <include key="avalon-jmx-util"/>
+ </dependencies>
+ </project>
+
+ <project basedir="jmx/mx4j">
+ <info>
+ <group>avalon/jmx</group>
+ <name>avalon-jmx-mx4j</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-jmx-spi"/>
+ <include key="mx4j-tools"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="jmx/handler">
+ <info>
+ <group>avalon/jmx</group>
+ <name>avalon-jmx-handler</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-jmx-api"/>
+ <include key="avalon-util-i18n"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="jmx/test">
+ <info>
+ <group>avalon/jmx</group>
+ <name>avalon-jmx-test</name>
+ </info>
+ <dependencies>
+ <include key="avalon-jmx-mx4j" build="false"/>
+ <include key="avalon-jmx-handler" build="false"/>
+ <include key="avalon-framework-api"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <!--
+ Avalon DB.
+ -->
+
+ <resource>
+ <info>
+ <group>hsqldb</group>
+ <name>hsqldb</name>
+ <version>1.7.2-rc5</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>concurrent</group>
+ <name>concurrent</name>
+ <version>1.3.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <project basedir="db/api">
+ <info>
+ <group>avalon/db</group>
+ <name>avalon-db-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <project basedir="db/hsql">
+ <info>
+ <group>avalon/db</group>
+ <name>avalon-db-hsql</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-db-api"/>
+ <include key="avalon-composition-api" runtime="false"/>
+ <include key="concurrent"/>
+ <include key="hsqldb"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <!--
+ Avalon DB.
+ -->
+
+ <resource>
+ <info>
+ <group>commons-dbcp</group>
+ <name>commons-dbcp</name>
+ <version>1.2</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>commons-pool</group>
+ <name>commons-pool</name>
+ <version>1.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <project basedir="dbcp/api">
+ <info>
+ <group>avalon/dbcp</group>
+ <name>avalon-dbcp-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ </project>
+
+ <project basedir="dbcp/impl">
+ <info>
+ <group>avalon/dbcp</group>
+ <name>avalon-dbcp-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-dbcp-api"/>
+ <include key="avalon-framework-impl"/>
+ <include key="commons-dbcp"/>
+ <include key="commons-pool"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <!--
+ Avalon JMS.
+ -->
+
+ <resource>
+ <info>
+ <group>geronimo-spec</group>
+ <name>geronimo-spec-jms</name>
+ <version>DEV</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>commons-messenger</group>
+ <name>commons-messenger</name>
+ <version>1.0-dev-8</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>commons-digester</group>
+ <name>commons-digester</name>
+ <version>1.5</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <project basedir="jms/api">
+ <info>
+ <group>avalon/jms</group>
+ <name>avalon-jms-api</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="geronimo-spec-jms"/>
+ <include key="commons-messenger"/>
+ </dependencies>
+ </project>
+
+ <project basedir="jms/impl">
+ <info>
+ <group>avalon/jms</group>
+ <name>avalon-jms-impl</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ <include key="avalon-jms-api"/>
+ <include key="avalon-composition-api"/>
+ <include key="commons-digester"/>
+ <include key="avalon-framework-impl"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="jms/test">
+ <info>
+ <group>avalon/jms</group>
+ <name>avalon-jms-test</name>
+ </info>
+ <dependencies>
+ <include key="avalon-jms-impl"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+</system>
Modified: avalon/trunk/planet/facilities/jms/api/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jms/api/build.properties (original)
+++ avalon/trunk/planet/facilities/jms/api/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/jms/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jms/build.properties (original)
+++ avalon/trunk/planet/facilities/jms/build.properties Wed Jun 30 23:50:38 2004
@@ -1,2 +1,2 @@
project.system = ../../../central/system
-project.home = ../..
+project.home = ..
Modified: avalon/trunk/planet/facilities/jms/impl/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jms/impl/build.properties (original)
+++ avalon/trunk/planet/facilities/jms/impl/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/jms/test/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jms/test/build.properties (original)
+++ avalon/trunk/planet/facilities/jms/test/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/jmx/api/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jmx/api/build.properties (original)
+++ avalon/trunk/planet/facilities/jmx/api/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/jmx/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jmx/build.properties (original)
+++ avalon/trunk/planet/facilities/jmx/build.properties Wed Jun 30 23:50:38 2004
@@ -1,2 +1,2 @@
project.system = ../../../central/system
-project.home = ../..
+project.home = ..
Modified: avalon/trunk/planet/facilities/jmx/handler/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jmx/handler/build.properties (original)
+++ avalon/trunk/planet/facilities/jmx/handler/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/jmx/mx4j/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jmx/mx4j/build.properties (original)
+++ avalon/trunk/planet/facilities/jmx/mx4j/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/jmx/spi/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jmx/spi/build.properties (original)
+++ avalon/trunk/planet/facilities/jmx/spi/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/jmx/test/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jmx/test/build.properties (original)
+++ avalon/trunk/planet/facilities/jmx/test/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/facilities/jmx/test/etc/main/BLOCK-INF/block.xml
==============================================================================
--- avalon/trunk/planet/facilities/jmx/test/etc/main/BLOCK-INF/block.xml (original)
+++ avalon/trunk/planet/facilities/jmx/test/etc/main/BLOCK-INF/block.xml Wed Jun 30 23:50:38 2004
@@ -11,7 +11,7 @@
</classpath>
</classloader>
- <include name="mx4j" id="avalon-jmx:avalon-jmx-mx4j" version="1.0.dev-0">
+ <include name="mx4j" id="avalon-jmx:avalon-jmx-mx4j" version="1.0-0.DEV">
<target path="registry">
<configuration>
<enable-rmi-adaptor>
Modified: avalon/trunk/planet/facilities/jmx/util/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/jmx/util/build.properties (original)
+++ avalon/trunk/planet/facilities/jmx/util/build.properties Wed Jun 30 23:50:38 2004
@@ -1,3 +1,3 @@
project.system = ../../../../central/system
-project.home = ../../..
+project.home = ../..
project.src.main = java
Modified: avalon/trunk/planet/index.xml
==============================================================================
--- avalon/trunk/planet/index.xml (original)
+++ avalon/trunk/planet/index.xml Wed Jun 30 23:50:38 2004
@@ -2,454 +2,13 @@
<system>
- <import index="../runtime/index.xml"
- href="http://svn.apache.org/repos/asf/avalon/trunk/runtime/index.xml"/>
+ <import index="cornerstone/index.xml"
+ href="http://svn.apache.org/repos/asf/avalon/trunk/planet/cornerstone/index.xml"/>
- <!--
- Avalon Facilities - Finder
- -->
+ <import index="facilities/index.xml"
+ href="http://svn.apache.org/repos/asf/avalon/trunk/planet/facilities/index.xml"/>
- <project basedir="facilities/finder/api">
- <info>
- <group>avalon/finder</group>
- <name>avalon-finder-api</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-framework-api" runtime="false"/>
- </dependencies>
- </project>
-
- <project basedir="facilities/finder/impl">
- <info>
- <group>avalon/finder</group>
- <name>avalon-finder-impl</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-finder-api"/>
- <include key="avalon-composition-api" runtime="false"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <project basedir="facilities/finder/test">
- <info>
- <group>avalon/finder</group>
- <name>avalon-finder-test</name>
- </info>
- <dependencies>
- <include key="avalon-finder-impl"/>
- <include key="avalon-framework-api" runtime="false"/>
- <include key="avalon-merlin-unit" runtime="false"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <!--
- Avalon Facilities - HTTP
- -->
-
- <resource>
- <info>
- <group>jetty</group>
- <name>org.mortbay.jetty</name>
- <version>4.2.15</version>
- <type>jar</type>
- </info>
- </resource>
-
- <project basedir="facilities/http/api">
- <info>
- <group>avalon/http</group>
- <name>avalon-http-api</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="servletapi"/>
- </dependencies>
- </project>
-
- <project basedir="facilities/http/spi">
- <info>
- <group>avalon/http</group>
- <name>avalon-http-spi</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-http-api"/>
- <include key="avalon-composition-api" runtime="false"/>
- </dependencies>
- </project>
-
- <project basedir="facilities/http/util">
- <info>
- <group>avalon/http</group>
- <name>avalon-http-util</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-http-api"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <project basedir="facilities/http/impl">
- <info>
- <group>avalon/http</group>
- <name>avalon-http-impl</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-http-spi"/>
- <include key="avalon-http-util"/>
- <include key="avalon-composition-api" runtime="false"/>
- <include key="avalon-util-configuration"/>
- <include key="org.mortbay.jetty"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <project basedir="facilities/http/test">
- <info>
- <group>avalon/http</group>
- <name>avalon-http-test</name>
- </info>
- <dependencies>
- <include key="avalon-http-impl"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <!--
- Avalon Facilities - JMX
- -->
-
- <resource>
- <info>
- <group>mx4j</group>
- <name>mx4j-jmx</name>
- <version>1.1.1</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>mx4j</group>
- <name>mx4j-tools</name>
- <version>1.1.1</version>
- <type>jar</type>
- </info>
- <dependencies>
- <include key="mx4j-jmx"/>
- </dependencies>
- </resource>
-
- <project basedir="facilities/jmx/api">
- <info>
- <group>avalon/jmx</group>
- <name>avalon-jmx-api</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-composition-api"/>
- </dependencies>
- </project>
-
- <project basedir="facilities/jmx/util">
- <info>
- <group>avalon/jmx</group>
- <name>avalon-jmx-util</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-framework-impl"/>
- <include key="avalon-util-i18n"/>
- <include key="mx4j-jmx"/>
- </dependencies>
- </project>
-
- <project basedir="facilities/jmx/spi">
- <info>
- <group>avalon/jmx</group>
- <name>avalon-jmx-spi</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-jmx-api"/>
- <include key="avalon-jmx-util"/>
- </dependencies>
- </project>
-
- <project basedir="facilities/jmx/mx4j">
- <info>
- <group>avalon/jmx</group>
- <name>avalon-jmx-mx4j</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-jmx-spi"/>
- <include key="mx4j-tools"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <project basedir="facilities/jmx/handler">
- <info>
- <group>avalon/jmx</group>
- <name>avalon-jmx-handler</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-jmx-api"/>
- <include key="avalon-util-i18n"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <project basedir="facilities/jmx/test">
- <info>
- <group>avalon/jmx</group>
- <name>avalon-jmx-test</name>
- </info>
- <dependencies>
- <include key="avalon-jmx-mx4j" build="false"/>
- <include key="avalon-jmx-handler" build="false"/>
- <include key="avalon-framework-api"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <!--
- Avalon DB.
- -->
-
- <resource>
- <info>
- <group>hsqldb</group>
- <name>hsqldb</name>
- <version>1.7.2-rc5</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>concurrent</group>
- <name>concurrent</name>
- <version>1.3.1</version>
- <type>jar</type>
- </info>
- </resource>
-
- <project basedir="facilities/db/api">
- <info>
- <group>avalon/db</group>
- <name>avalon-db-api</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- </project>
-
- <project basedir="facilities/db/hsql">
- <info>
- <group>avalon/db</group>
- <name>avalon-db-hsql</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-db-api"/>
- <include key="avalon-composition-api" runtime="false"/>
- <include key="concurrent"/>
- <include key="hsqldb"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <!--
- Avalon DB.
- -->
-
- <resource>
- <info>
- <group>commons-dbcp</group>
- <name>commons-dbcp</name>
- <version>1.2</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>commons-pool</group>
- <name>commons-pool</name>
- <version>1.1</version>
- <type>jar</type>
- </info>
- </resource>
-
- <project basedir="facilities/dbcp/api">
- <info>
- <group>avalon/dbcp</group>
- <name>avalon-dbcp-api</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- </project>
-
- <project basedir="facilities/dbcp/impl">
- <info>
- <group>avalon/dbcp</group>
- <name>avalon-dbcp-impl</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-dbcp-api"/>
- <include key="avalon-framework-impl"/>
- <include key="commons-dbcp"/>
- <include key="commons-pool"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <!--
- Avalon JMS.
- -->
-
- <resource>
- <info>
- <group>geronimo-spec</group>
- <name>geronimo-spec-jms</name>
- <version>DEV</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>commons-messenger</group>
- <name>commons-messenger</name>
- <version>1.0-dev-8</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>commons-digester</group>
- <name>commons-digester</name>
- <version>1.5</version>
- <type>jar</type>
- </info>
- </resource>
-
- <project basedir="facilities/jms/api">
- <info>
- <group>avalon/jms</group>
- <name>avalon-jms-api</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="geronimo-spec-jms"/>
- <include key="commons-messenger"/>
- </dependencies>
- </project>
-
- <project basedir="facilities/jms/impl">
- <info>
- <group>avalon/jms</group>
- <name>avalon-jms-impl</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- </info>
- <dependencies>
- <include key="avalon-jms-api"/>
- <include key="avalon-composition-api"/>
- <include key="commons-digester"/>
- <include key="avalon-framework-impl"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <project basedir="facilities/jms/test">
- <info>
- <group>avalon/jms</group>
- <name>avalon-jms-test</name>
- </info>
- <dependencies>
- <include key="avalon-jms-impl"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <!--
- Avalon Tutorials.
- -->
-
- <project basedir="tutorials/hello" key="avalon-tutorial-hello">
- <info>
- <group>avalon/tutorial</group>
- <name>hello</name>
- </info>
- <dependencies>
- <include key="avalon-framework-api" runtime="false"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
-
- <project basedir="tutorials/dynamics" key="avalon-tutorial-dynamics">
- <info>
- <group>avalon/tutorial</group>
- <name>dynamics</name>
- </info>
- <dependencies>
- <include key="avalon-composition-api" runtime="false"/>
- <include key="avalon-framework-impl"/>
- </dependencies>
- <plugins>
- <include key="avalon-meta-tools"/>
- </plugins>
- </project>
+ <import index="tutorials/index.xml"
+ href="http://svn.apache.org/repos/asf/avalon/trunk/planet/tutorials/index.xml"/>
</system>
Modified: avalon/trunk/planet/tutorials/dynamics/build.properties
==============================================================================
--- avalon/trunk/planet/tutorials/dynamics/build.properties (original)
+++ avalon/trunk/planet/tutorials/dynamics/build.properties Wed Jun 30 23:50:38 2004
@@ -1,6 +1,6 @@
project.system = ../../../central/system
-project.home = ../..
+project.home = ..
project.name = avalon-tutorial-dynamics
project.src.main = java
Modified: avalon/trunk/planet/tutorials/hello/build.properties
==============================================================================
--- avalon/trunk/planet/tutorials/hello/build.properties (original)
+++ avalon/trunk/planet/tutorials/hello/build.properties Wed Jun 30 23:50:38 2004
@@ -1,4 +1,4 @@
project.system = ../../../central/system
-project.home = ../..
+project.home = ..
project.name = avalon-tutorial-hello
project.src.main = java
Added: avalon/trunk/planet/tutorials/index.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/index.xml Wed Jun 30 23:50:38 2004
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<system>
+
+ <import index="../../runtime/index.xml"
+ href="http://svn.apache.org/repos/asf/avalon/trunk/runtime/index.xml"/>
+
+ <!--
+ Avalon Tutorials.
+ -->
+
+ <project basedir="hello" key="avalon-tutorial-hello">
+ <info>
+ <group>avalon/tutorial</group>
+ <name>hello</name>
+ </info>
+ <dependencies>
+ <include key="avalon-framework-api" runtime="false"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="dynamics" key="avalon-tutorial-dynamics">
+ <info>
+ <group>avalon/tutorial</group>
+ <name>dynamics</name>
+ </info>
+ <dependencies>
+ <include key="avalon-composition-api" runtime="false"/>
+ <include key="avalon-framework-impl"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+</system>
Modified: avalon/trunk/runtime/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultAppliance.java
==============================================================================
--- avalon/trunk/runtime/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultAppliance.java (original)
+++ avalon/trunk/runtime/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultAppliance.java Wed Jun 30 23:50:38 2004
@@ -171,7 +171,7 @@
ComponentModel model = getComponentModel();
Logger logger = model.getLogger().getChildLogger( "proxy" );
ApplianceInvocationHandler handler =
- new ApplianceInvocationHandler( this, logger, m_secure );
+ new ApplianceInvocationHandler( this, logger, m_secure );
try
{
@@ -183,7 +183,7 @@
catch( Throwable e )
{
final String error =
- "Proxy establishment failure in block: " + this;
+ "Proxy establishment failure in appliance: " + this;
throw new ApplianceException( error, e );
}
}
Modified: avalon/trunk/runtime/index.xml
==============================================================================
--- avalon/trunk/runtime/index.xml (original)
+++ avalon/trunk/runtime/index.xml Wed Jun 30 23:50:38 2004
@@ -30,33 +30,6 @@
<resource>
<info>
- <group>ant</group>
- <name>ant</name>
- <version>1.6.1</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>ant</group>
- <name>ant-nodeps</name>
- <version>1.6.1</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>ant</group>
- <name>ant-junit</name>
- <version>1.6.1</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
<group>qdox</group>
<name>qdox</name>
<version>1.3</version>
@@ -69,15 +42,6 @@
<group>commons-cli</group>
<name>commons-cli</name>
<version>1.0</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>junit</group>
- <name>junit</name>
- <version>3.8.1</version>
<type>jar</type>
</info>
</resource>
Modified: avalon/trunk/tools/build.properties
==============================================================================
--- avalon/trunk/tools/build.properties (original)
+++ avalon/trunk/tools/build.properties Wed Jun 30 23:50:38 2004
@@ -1 +1,2 @@
-project.home = ../central/system
+project.home = .
+project.system = ../central/system
Modified: avalon/trunk/tools/build.xml
==============================================================================
--- avalon/trunk/tools/build.xml (original)
+++ avalon/trunk/tools/build.xml Wed Jun 30 23:50:38 2004
@@ -3,6 +3,6 @@
<project name="tools" default="default" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
- <import file="${project.home}/build/reactor.xml"/>
+ <import file="${project.system}/build/reactor.xml"/>
</project>
Modified: avalon/trunk/tools/index.xml
==============================================================================
--- avalon/trunk/tools/index.xml (original)
+++ avalon/trunk/tools/index.xml Wed Jun 30 23:50:38 2004
@@ -2,6 +2,42 @@
<index>
+ <resource>
+ <info>
+ <group>ant</group>
+ <name>ant</name>
+ <version>1.6.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>ant</group>
+ <name>ant-nodeps</name>
+ <version>1.6.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>ant</group>
+ <name>ant-junit</name>
+ <version>1.6.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>junit</group>
+ <name>junit</name>
+ <version>3.8.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
<!--
Avalon Tools.
-->