svn commit: rev 22293 - in avalon/trunk/planet: . facilities/dbcp facilities/dbcp/api facilities/dbcp/impl facilities/dbcp/impl/conf facilities/dbcp/impl/etc facilities/dbcp/impl/etc/main facilities/dbcp/impl/etc/main/BLOCK-INF

Author: mcconnell
Date: Tue Jun 29 20:16:57 2004
New Revision: 22293

Added:
   avalon/trunk/planet/facilities/dbcp/api/build.properties   (contents, props changed)
   avalon/trunk/planet/facilities/dbcp/api/build.xml
   avalon/trunk/planet/facilities/dbcp/build.properties   (contents, props changed)
   avalon/trunk/planet/facilities/dbcp/build.xml
   avalon/trunk/planet/facilities/dbcp/impl/build.properties   (contents, props changed)
   avalon/trunk/planet/facilities/dbcp/impl/build.xml
   avalon/trunk/planet/facilities/dbcp/impl/etc/
   avalon/trunk/planet/facilities/dbcp/impl/etc/main/
   avalon/trunk/planet/facilities/dbcp/impl/etc/main/BLOCK-INF/
   avalon/trunk/planet/facilities/dbcp/impl/etc/main/BLOCK-INF/block.xml
Removed:
   avalon/trunk/planet/facilities/dbcp/api/LICENSE.txt
   avalon/trunk/planet/facilities/dbcp/api/index.ent
   avalon/trunk/planet/facilities/dbcp/api/maven.xml
   avalon/trunk/planet/facilities/dbcp/api/project.xml
   avalon/trunk/planet/facilities/dbcp/common-project.xml
   avalon/trunk/planet/facilities/dbcp/impl/LICENSE.txt
   avalon/trunk/planet/facilities/dbcp/impl/conf/
   avalon/trunk/planet/facilities/dbcp/impl/index.ent
   avalon/trunk/planet/facilities/dbcp/impl/maven.xml
   avalon/trunk/planet/facilities/dbcp/impl/project.xml
   avalon/trunk/planet/facilities/dbcp/maven.xml
Modified:
   avalon/trunk/planet/facilities/dbcp/api/   (props changed)
   avalon/trunk/planet/facilities/dbcp/impl/   (props changed)
   avalon/trunk/planet/index.xml
Log:
migrate dbcp to magic

Added: avalon/trunk/planet/facilities/dbcp/api/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/dbcp/api/build.properties	Tue Jun 29 20:16:57 2004
@@ -0,0 +1,3 @@
+project.system = ../../../../central/system
+project.home = ../../..
+project.src.main = java

Added: avalon/trunk/planet/facilities/dbcp/api/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/dbcp/api/build.xml	Tue Jun 29 20:16:57 2004
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-dbcp-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/dbcp/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/dbcp/build.properties	Tue Jun 29 20:16:57 2004
@@ -0,0 +1,2 @@
+project.system = ../../../central/system
+project.home = ../..

Added: avalon/trunk/planet/facilities/dbcp/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/dbcp/build.xml	Tue Jun 29 20:16:57 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dbcp" default="default" basedir=".">
+
+  <property file="build.properties"/>
+  <import file="${project.system}/build/reactor.xml"/>
+
+</project>

Added: avalon/trunk/planet/facilities/dbcp/impl/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/dbcp/impl/build.properties	Tue Jun 29 20:16:57 2004
@@ -0,0 +1,3 @@
+project.system = ../../../../central/system
+project.home = ../../..
+project.src.main = java

Added: avalon/trunk/planet/facilities/dbcp/impl/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/dbcp/impl/build.xml	Tue Jun 29 20:16:57 2004
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-dbcp-impl" 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/dbcp/impl/etc/main/BLOCK-INF/block.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/dbcp/impl/etc/main/BLOCK-INF/block.xml	Tue Jun 29 20:16:57 2004
@@ -0,0 +1,47 @@
+<container name="avalon-dbcp">
+
+    <services>
+		<service type="org.apache.avalon.dbcp.ConnectionManager">
+			<source>dbcp-manager</source>
+		</service>
+    </services>
+    
+    <classloader>
+        <classpath>
+            <repository>
+                <!-- Avalon Framework stuff -->
+                <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
+                <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+                
+                <!-- For avalon-dbcp stuff -->
+				<resource id="avalon-dbcp:avalon-dbcp-api" version="1.0.dev-0"/>
+				<resource id="commons-pool:commons-pool" version="1.1"/>
+				<resource id="commons-dbcp:commons-dbcp" version="1.2-dev"/>
+				<resource id="commons-collections:commons-collections" version="2.1"/>
+				
+				<!-- For avalon-db stuff -->
+				<resource id="avalon-db:avalon-db-api" version="1.0.dev-0"/>
+                <resource id="hsqldb:hsqldb" version="1.7.2-rc5"/>
+				
+            </repository>
+        </classpath>
+    </classloader>
+    
+	<include name="hsql-server" id="avalon-db:avalon-db-hsql" version="1.0.dev-0"/>
+	
+	<component name="dbcp-manager" class="org.apache.avalon.dbcp.DbcpConnectionManager" activation="startup">
+		<configuration>
+			<datasources>
+				<datasource name="hsql" default="true">
+					<driver>org.hsqldb.jdbcDriver</driver>
+					<db-url>jdbc:hsqldb:hsql://localhost</db-url>
+					<username>sa</username>
+					<password></password>
+					<read-only>false</read-only>
+					<auto-commit>true</auto-commit>
+				</datasource>
+			</datasources>
+		</configuration>
+	</component>
+    
+</container>

Modified: avalon/trunk/planet/index.xml
==============================================================================
--- avalon/trunk/planet/index.xml	(original)
+++ avalon/trunk/planet/index.xml	Tue Jun 29 20:16:57 2004
@@ -159,6 +159,55 @@
   </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 Tutorials.
   -->