svn commit: rev 21149 - in avalon/trunk: central/system runtime/activation runtime/composition runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl runtime/framework runtime/merlin/cli runtime/merlin/cli/conf runtime/merlin/cli/etc/bin runtime/merlin/cli/etc/bin/nt runtime/merlin/cli/etc/main/bin runtime/merlin/cli/etc/test runtime/merlin/unit/etc/test runtime/repository runtime/test runtime/util

Author: mcconnell
Date: Sat Jun 12 09:35:51 2004
New Revision: 21149

Added:
   avalon/trunk/runtime/merlin/cli/etc/bin/
      - copied from rev 21114, avalon/trunk/runtime/merlin/cli/etc/main/bin/
   avalon/trunk/runtime/merlin/cli/etc/bin/README.TXT
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/README.TXT
   avalon/trunk/runtime/merlin/cli/etc/bin/internal-cygwin.sh
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/internal-cygwin.sh
   avalon/trunk/runtime/merlin/cli/etc/bin/internal-unix.sh
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/internal-unix.sh
   avalon/trunk/runtime/merlin/cli/etc/bin/merlin
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/merlin
   avalon/trunk/runtime/merlin/cli/etc/bin/merlin-server.sh
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/merlin-server.sh
   avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/merlin.bat
   avalon/trunk/runtime/merlin/cli/etc/bin/merlin.sh
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/merlin.sh
   avalon/trunk/runtime/merlin/cli/etc/bin/merlinx
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/merlinx
   avalon/trunk/runtime/merlin/cli/etc/bin/merlinx.bat
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/merlinx.bat
   avalon/trunk/runtime/merlin/cli/etc/bin/merlinx.sh
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/merlinx.sh
   avalon/trunk/runtime/merlin/cli/etc/bin/nt/
      - copied from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/nt/
   avalon/trunk/runtime/merlin/cli/etc/bin/repository.bat
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/repository.bat
   avalon/trunk/runtime/merlin/cli/etc/bin/security.policy
      - copied unchanged from rev 21146, avalon/trunk/runtime/merlin/cli/etc/main/bin/security.policy
   avalon/trunk/runtime/merlin/cli/etc/test/hello.block
      - copied unchanged from rev 21109, avalon/trunk/runtime/merlin/cli/conf/hello.block
   avalon/trunk/runtime/merlin/cli/etc/test/merlin.properties
      - copied unchanged from rev 21109, avalon/trunk/runtime/merlin/cli/conf/merlin.properties
   avalon/trunk/runtime/merlin/cli/etc/test/override.xml
      - copied unchanged from rev 21109, avalon/trunk/runtime/merlin/cli/conf/override.xml
Removed:
   avalon/trunk/runtime/merlin/cli/conf/hello.block
   avalon/trunk/runtime/merlin/cli/conf/merlin.properties
   avalon/trunk/runtime/merlin/cli/conf/override.xml
   avalon/trunk/runtime/merlin/cli/conf/test-2.block
   avalon/trunk/runtime/merlin/cli/conf/test.block
   avalon/trunk/runtime/merlin/cli/etc/main/bin/
Modified:
   avalon/trunk/central/system/index.xml
   avalon/trunk/runtime/activation/build.xml
   avalon/trunk/runtime/composition/build.xml
   avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/CommissionRequest.java
   avalon/trunk/runtime/framework/build.xml
   avalon/trunk/runtime/merlin/cli/build.properties
   avalon/trunk/runtime/merlin/unit/etc/test/merlin.properties
   avalon/trunk/runtime/repository/build.xml
   avalon/trunk/runtime/test/build.xml
   avalon/trunk/runtime/util/build.xml
Log:
housekeeping

Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml	(original)
+++ avalon/trunk/central/system/index.xml	Sat Jun 12 09:35:51 2004
@@ -754,6 +754,19 @@
       </dependencies>
     </project>
 
+    <project basedir="../../runtime/merlin/cli">
+      <info>
+        <group>avalon/merlin</group>
+        <name>avalon-merlin-cli</name>
+        <version>3.3.0</version>
+      </info>
+      <dependencies>
+        <include key="avalon-merlin-impl" build="false" test="false" runtime="false"/>
+        <include key="avalon-repository-main"/>
+        <include key="commons-cli"/>
+      </dependencies>
+    </project>
+
     <project basedir="../../runtime/merlin/unit">
       <info>
         <group>avalon/merlin</group>
@@ -764,6 +777,25 @@
         <include key="avalon-repository-main"/>
         <include key="avalon-merlin-impl" build="false" test="false" runtime="false"/>
       </dependencies>
+    </project>
+
+    <project basedir="../../runtime/merlin/tools">
+      <info>
+        <group>avalon/merlin</group>
+        <name>avalon-merlin-tools</name>
+        <version>3.3.0</version>
+      </info>
+      <dependencies>
+        <include key="avalon-repository-main"/>
+        <include key="avalon-merlin-impl" build="false" test="false" runtime="false"/>
+      </dependencies>
+    </project>
+
+    <project basedir="../../tools/bootstrap">
+      <info>
+        <group>avalon/tools</group>
+        <name>avalon-tools-bootstrap</name>
+      </info>
     </project>
 
   </projects>

Modified: avalon/trunk/runtime/activation/build.xml
==============================================================================
--- avalon/trunk/runtime/activation/build.xml	(original)
+++ avalon/trunk/runtime/activation/build.xml	Sat Jun 12 09:35:51 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="activation" default="build" basedir=".">
+<project name="activation" default="dist" basedir=".">
 
   <property file="build.properties"/>
   <import file="${project.home}/build/reactor.xml"/>

Modified: avalon/trunk/runtime/composition/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/build.xml	(original)
+++ avalon/trunk/runtime/composition/build.xml	Sat Jun 12 09:35:51 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="composition" default="build" basedir=".">
+<project name="composition" default="dist" basedir=".">
 
   <property file="build.properties"/>
   <import file="${project.home}/build/reactor.xml"/>

Modified: avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/CommissionRequest.java
==============================================================================
--- avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/CommissionRequest.java	(original)
+++ avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/CommissionRequest.java	Sat Jun 12 09:35:51 2004
@@ -125,7 +125,7 @@
             wait( timeout );
         }
         else
-        {
+        {
             while( !m_completed )
             {
                 wait( 60 );
@@ -159,7 +159,7 @@
     {
         synchronized( this )
         {
-            m_completed = true;
+            m_completed = true;
             notifyAll();
         }
     }
@@ -178,7 +178,7 @@
         m_exception = e;
         synchronized( this )
         {
-            m_completed = true;
+            m_completed = true;
             notify();
         }
     }

Modified: avalon/trunk/runtime/framework/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/build.xml	(original)
+++ avalon/trunk/runtime/framework/build.xml	Sat Jun 12 09:35:51 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="test" default="build" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="test" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
   <import file="${project.home}/build/reactor.xml"/>

Modified: avalon/trunk/runtime/merlin/cli/build.properties
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.properties	(original)
+++ avalon/trunk/runtime/merlin/cli/build.properties	Sat Jun 12 09:35:51 2004
@@ -2,3 +2,6 @@
 project.name = avalon-merlin-cli
 project.src.main = java
 project.home = ../../../central/system
+
+project.jar.main.class = org.apache.avalon.merlin.cli.Main
+project.jar.classpath = commons-cli/jars/commons-cli-1.0.jar
\ No newline at end of file

Modified: avalon/trunk/runtime/merlin/unit/etc/test/merlin.properties
==============================================================================
--- avalon/trunk/runtime/merlin/unit/etc/test/merlin.properties	(original)
+++ avalon/trunk/runtime/merlin/unit/etc/test/merlin.properties	Sat Jun 12 09:35:51 2004
@@ -30,10 +30,10 @@
 
 avalon.repository.cache = @CACHE-DIRECTORY@
 
-merlin.info = false
-merlin.debug = false
+merlin.info = true
+merlin.debug = true
 merlin.audit = true
 merlin.deployment = hello.block
 merlin.override = override.xml
-
+merlin.deployment.timeout = 0
 

Modified: avalon/trunk/runtime/repository/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/build.xml	(original)
+++ avalon/trunk/runtime/repository/build.xml	Sat Jun 12 09:35:51 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="repository" default="build" basedir="." 
+<project name="repository" default="dist" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>

Modified: avalon/trunk/runtime/test/build.xml
==============================================================================
--- avalon/trunk/runtime/test/build.xml	(original)
+++ avalon/trunk/runtime/test/build.xml	Sat Jun 12 09:35:51 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="test" default="build" basedir="." 
+<project name="test" default="dist" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>

Modified: avalon/trunk/runtime/util/build.xml
==============================================================================
--- avalon/trunk/runtime/util/build.xml	(original)
+++ avalon/trunk/runtime/util/build.xml	Sat Jun 12 09:35:51 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="test" default="build" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="test" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
   <import file="${project.home}/build/reactor.xml"/>