You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/30 04:06:40 UTC
svn commit: rev 22285 - in avalon/trunk/planet: . facilities/finder facilities/http facilities/http/api facilities/http/impl facilities/http/impl/src/java/org/apache/avalon/http/impl facilities/http/spi facilities/http/util
Author: mcconnell
Date: Tue Jun 29 19:06:39 2004
New Revision: 22285
Added:
avalon/trunk/planet/facilities/http/api/build.properties (contents, props changed)
avalon/trunk/planet/facilities/http/api/build.xml
avalon/trunk/planet/facilities/http/build.properties (contents, props changed)
avalon/trunk/planet/facilities/http/build.xml
avalon/trunk/planet/facilities/http/impl/build.properties (contents, props changed)
avalon/trunk/planet/facilities/http/impl/build.xml
avalon/trunk/planet/facilities/http/spi/build.properties (contents, props changed)
avalon/trunk/planet/facilities/http/spi/build.xml
avalon/trunk/planet/facilities/http/util/build.properties (contents, props changed)
avalon/trunk/planet/facilities/http/util/build.xml
Removed:
avalon/trunk/planet/facilities/http/api/index.ent
avalon/trunk/planet/facilities/http/api/maven.xml
avalon/trunk/planet/facilities/http/api/project.xml
avalon/trunk/planet/facilities/http/impl/index.ent
avalon/trunk/planet/facilities/http/impl/maven.xml
avalon/trunk/planet/facilities/http/impl/merlin.properties
avalon/trunk/planet/facilities/http/impl/project.xml
avalon/trunk/planet/facilities/http/spi/index.ent
avalon/trunk/planet/facilities/http/spi/maven.xml
avalon/trunk/planet/facilities/http/spi/project.xml
avalon/trunk/planet/facilities/http/util/index.ent
avalon/trunk/planet/facilities/http/util/maven.xml
avalon/trunk/planet/facilities/http/util/project.xml
Modified:
avalon/trunk/planet/facilities/finder/build.properties
avalon/trunk/planet/facilities/finder/build.xml
avalon/trunk/planet/facilities/http/api/ (props changed)
avalon/trunk/planet/facilities/http/impl/ (props changed)
avalon/trunk/planet/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServer.java
avalon/trunk/planet/facilities/http/spi/ (props changed)
avalon/trunk/planet/facilities/http/util/ (props changed)
avalon/trunk/planet/index.xml
Log:
migrate http facility to magic
Modified: avalon/trunk/planet/facilities/finder/build.properties
==============================================================================
--- avalon/trunk/planet/facilities/finder/build.properties (original)
+++ avalon/trunk/planet/facilities/finder/build.properties Tue Jun 29 19:06:39 2004
@@ -1 +1,2 @@
-project.home = ../../../central/system
+project.system = ../../../central/system
+project.home = ../..
Modified: avalon/trunk/planet/facilities/finder/build.xml
==============================================================================
--- avalon/trunk/planet/facilities/finder/build.xml (original)
+++ avalon/trunk/planet/facilities/finder/build.xml Tue Jun 29 19:06:39 2004
@@ -3,6 +3,6 @@
<project name="finder" default="default" basedir=".">
<property file="build.properties"/>
- <import file="${project.home}/build/reactor.xml"/>
+ <import file="${project.system}/build/reactor.xml"/>
</project>
Added: avalon/trunk/planet/facilities/http/api/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/api/build.properties Tue Jun 29 19:06:39 2004
@@ -0,0 +1,3 @@
+project.system = ../../../../central/system
+project.home = ../../..
+project.src.main = java
Added: avalon/trunk/planet/facilities/http/api/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/api/build.xml Tue Jun 29 19:06:39 2004
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-http-api" default="install" basedir="."
+ xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/standard.xml"/>
+
+</project>
+
Added: avalon/trunk/planet/facilities/http/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/build.properties Tue Jun 29 19:06:39 2004
@@ -0,0 +1,2 @@
+project.system = ../../../central/system
+project.home = ../..
Added: avalon/trunk/planet/facilities/http/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/build.xml Tue Jun 29 19:06:39 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="http" default="default" basedir=".">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/reactor.xml"/>
+
+</project>
Added: avalon/trunk/planet/facilities/http/impl/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/impl/build.properties Tue Jun 29 19:06:39 2004
@@ -0,0 +1,3 @@
+project.system = ../../../../central/system
+project.home = ../../..
+project.src.main = java
Added: avalon/trunk/planet/facilities/http/impl/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/impl/build.xml Tue Jun 29 19:06:39 2004
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-http-impl" default="install" basedir="."
+ xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/standard.xml"/>
+
+</project>
+
Modified: avalon/trunk/planet/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServer.java
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServer.java (original)
+++ avalon/trunk/planet/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServer.java Tue Jun 29 19:06:39 2004
@@ -31,7 +31,7 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Startable;
-import org.apache.excalibur.configuration.ConfigurationUtil;
+import org.apache.avalon.util.configuration.ConfigurationUtil;
import org.apache.avalon.composition.model.ComponentModel;
Added: avalon/trunk/planet/facilities/http/spi/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/spi/build.properties Tue Jun 29 19:06:39 2004
@@ -0,0 +1,3 @@
+project.system = ../../../../central/system
+project.home = ../../..
+project.src.main = java
Added: avalon/trunk/planet/facilities/http/spi/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/spi/build.xml Tue Jun 29 19:06:39 2004
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-http-spi" default="install" basedir="."
+ xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/standard.xml"/>
+
+</project>
+
Added: avalon/trunk/planet/facilities/http/util/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/util/build.properties Tue Jun 29 19:06:39 2004
@@ -0,0 +1,3 @@
+project.system = ../../../../central/system
+project.home = ../../..
+project.src.main = java
Added: avalon/trunk/planet/facilities/http/util/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/util/build.xml Tue Jun 29 19:06:39 2004
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-http-util" default="install" basedir="."
+ xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/standard.xml"/>
+
+</project>
+
Modified: avalon/trunk/planet/index.xml
==============================================================================
--- avalon/trunk/planet/index.xml (original)
+++ avalon/trunk/planet/index.xml Tue Jun 29 19:06:39 2004
@@ -6,13 +6,15 @@
href="http://svn.apache.org/repos/asf/avalon/trunk/runtime/index.xml"/>
<!--
- Avalon Facilities
+ Avalon Facilities - Finder
-->
<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"/>
@@ -23,10 +25,84 @@
<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"/>
+ </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"/>
+ </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"/>
+ <include key="org.mortbay.jetty"/>
+ <include key="avalon-util-configuration"/>
</dependencies>
<plugins>
<include key="avalon-meta-tools"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org