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 05:04:23 UTC

svn commit: rev 22291 - in avalon/trunk/planet: . facilities/db facilities/db/api facilities/db/hsql facilities/db/hsql/conf facilities/db/hsql/etc facilities/db/hsql/etc/main facilities/db/hsql/etc/main/BLOCK-INF facilities/http

Author: mcconnell
Date: Tue Jun 29 20:04:22 2004
New Revision: 22291

Added:
   avalon/trunk/planet/facilities/db/api/build.properties   (contents, props changed)
   avalon/trunk/planet/facilities/db/api/build.xml
   avalon/trunk/planet/facilities/db/build.properties   (contents, props changed)
   avalon/trunk/planet/facilities/db/build.xml
   avalon/trunk/planet/facilities/db/hsql/build.properties   (contents, props changed)
   avalon/trunk/planet/facilities/db/hsql/build.xml
   avalon/trunk/planet/facilities/db/hsql/etc/
   avalon/trunk/planet/facilities/db/hsql/etc/main/
   avalon/trunk/planet/facilities/db/hsql/etc/main/BLOCK-INF/
   avalon/trunk/planet/facilities/db/hsql/etc/main/BLOCK-INF/block.xml
Removed:
   avalon/trunk/planet/facilities/db/api/LICENSE.txt
   avalon/trunk/planet/facilities/db/api/index.ent
   avalon/trunk/planet/facilities/db/api/maven.xml
   avalon/trunk/planet/facilities/db/api/project.xml
   avalon/trunk/planet/facilities/db/common-project.xml
   avalon/trunk/planet/facilities/db/hsql/LICENSE.txt
   avalon/trunk/planet/facilities/db/hsql/conf/
   avalon/trunk/planet/facilities/db/hsql/index.ent
   avalon/trunk/planet/facilities/db/hsql/maven.xml
   avalon/trunk/planet/facilities/db/hsql/merlin.properties
   avalon/trunk/planet/facilities/db/hsql/project.xml
   avalon/trunk/planet/facilities/db/maven.xml
   avalon/trunk/planet/facilities/http/common-project.xml
   avalon/trunk/planet/facilities/http/index.ent
   avalon/trunk/planet/facilities/http/maven.xml
Modified:
   avalon/trunk/planet/facilities/db/api/   (props changed)
   avalon/trunk/planet/facilities/db/hsql/   (props changed)
   avalon/trunk/planet/index.xml
Log:
migrate avalon db to magic and some related facilities housekeeping

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

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

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

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

Added: avalon/trunk/planet/facilities/db/hsql/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/db/hsql/build.xml	Tue Jun 29 20:04:22 2004
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-db-hsql" 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/db/hsql/etc/main/BLOCK-INF/block.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/db/hsql/etc/main/BLOCK-INF/block.xml	Tue Jun 29 20:04:22 2004
@@ -0,0 +1,25 @@
+<container name="avalon-hsql">
+    <classloader>
+        <classpath>
+            <repository>
+                <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
+                <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+                <resource id="avalon-db:avalon-db-api" version="1.0.dev-0"/>
+                <resource id="hsqldb:hsqldb" version="1.7.2-rc5"/>
+                <resource id="concurrent:concurrent" version="1.3.1"/>
+            </repository>
+        </classpath>
+    </classloader>
+
+    <!-- HypersonicSQL database server component -->
+    <component name="hsql-server" class="org.apache.avalon.db.hsql.HsqlServiceProvider" activation="startup">
+        <configuration>
+            <host>127.0.0.1</host>
+            <port>9001</port>
+            <db-name>avalon-hsql</db-name>
+            <debug>true</debug>
+            <silent>false</silent>
+        </configuration>
+    </component>
+    
+</container>

Modified: avalon/trunk/planet/index.xml
==============================================================================
--- avalon/trunk/planet/index.xml	(original)
+++ avalon/trunk/planet/index.xml	Tue Jun 29 20:04:22 2004
@@ -110,6 +110,55 @@
   </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"/>
+      <include key="concurrent"/>
+      <include key="hsqldb"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <!--
   Avalon Tutorials.
   -->
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org