mcconnell 2003/02/07 15:08:56
Modified: assembly .cvsignore build.xml default.properties
info default.properties
lifecycle default.properties
lifecycle/src/xdocs merlin.xml
merlin .cvsignore build.xml default.properties
merlin/config demo.xml
merlin/src/java Merlin.java
merlin/src/test/org/apache/avalon/merlin/kernel
KernelTestCase.java
meta .cvsignore default.properties
site default.properties
Log:
Migration form jakarta-avalon-xxxx to avalon-xxx
Revision Changes Path
1.3 +2 -1 avalon-sandbox/assembly/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon-sandbox/assembly/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Feb 2003 05:42:32 -0000 1.2
+++ .cvsignore 7 Feb 2003 23:08:55 -0000 1.3
@@ -8,4 +8,5 @@
maven.log
project.xml
project.properties
-
+target
+xdocs
1.16 +5 -2 avalon-sandbox/assembly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/assembly/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 4 Feb 2003 05:42:32 -0000 1.15
+++ build.xml 7 Feb 2003 23:08:55 -0000 1.16
@@ -25,7 +25,7 @@
<pathelement location="${excalibur-i18n.jar}"/>
<pathelement location="${avalon-meta.jar}"/>
<pathelement location="${avalon-lifecycle.jar}"/>
- <pathelement location="${excalibur-logger.jar}"/>
+ <!--<pathelement location="${excalibur-logger.jar}"/>-->
<pathelement location="${excalibur-extension.jar}"/>
<pathelement location="${excalibur-configuration.jar}"/>
<pathelement location="${excalibur-event.jar}"/>
@@ -378,6 +378,8 @@
<copy todir="${common.dir}" file="${avalon-meta.jar}"/>
<copy todir="${common.dir}" file="${excalibur-configuration.jar}"/>
<copy todir="${common.dir}" file="${excalibur-i18n.jar}"/>
+
+ <!--
<copy todir="${common.dir}" preservelastmodified="true">
<fileset dir="${tools.dir}/lib">
<include name="xerces-2.0.1.jar"/>
@@ -385,11 +387,12 @@
<include name="xalan-2.3.1.jar"/>
</fileset>
</copy>
+ -->
<mkdir dir="${lib.dir}"/>
<copy todir="${lib.dir}" file="${logkit.jar}"/>
<copy todir="${lib.dir}" file="${excalibur-extension.jar}"/>
- <copy todir="${lib.dir}" file="${excalibur-logger.jar}"/>
+ <!--<copy todir="${lib.dir}" file="${excalibur-logger.jar}"/>-->
<copy todir="${lib.dir}" file="${excalibur-event.jar}"/>
<copy todir="${lib.dir}" file="${commons-collections.jar}"/>
<copy todir="${lib.dir}" file="${util.concurrent.jar}"/>
1.14 +4 -9 avalon-sandbox/assembly/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/assembly/default.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- default.properties 29 Jan 2003 13:50:39 -0000 1.13
+++ default.properties 7 Feb 2003 23:08:55 -0000 1.14
@@ -18,7 +18,7 @@
# --------------------------------------------------
# ----- Avalon Framework -----
-avalon-framework.home=${basedir}/../../jakarta-avalon
+avalon-framework.home=${basedir}/../../avalon
avalon-framework.lib=${avalon-framework.home}/target/lib
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
@@ -36,12 +36,12 @@
avalon-lifecycle.jar=${avalon-lifecycle.lib}/avalon-lifecycle-1.0.jar
# ----- Excalibur -----
-excalibur.home=${basedir}/../../jakarta-avalon-excalibur
+excalibur.home=${basedir}/../../avalon-excalibur
# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${excalibur.home}/i18n
excalibur-i18n.lib=${excalibur-i18n.home}/build/lib
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
# ----- Excalibur Extension -----
excalibur-extension.home=${excalibur.home}/extension
@@ -53,11 +53,6 @@
excalibur-configuration.lib=${excalibur-configuration.home}/build/lib
excalibur-configuration.jar=${excalibur-configuration.lib}/excalibur-configuration-1.0.jar
-# ----- Excalibur logger, version 1.0 or later -----
-excalibur-logger.home=${excalibur.home}/logger
-excalibur-logger.lib=${excalibur-logger.home}/build/lib
-excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
-
# ----- Excalibur event, version 1.0 or later -----
excalibur-event.home=${excalibur.home}/event
excalibur-event.lib=${excalibur-event.home}/build/lib
@@ -73,7 +68,7 @@
#excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.1.jar
# ----- Logkit -----
-logkit.home=${basedir}/../../jakarta-avalon-logkit
+logkit.home=${basedir}/../../avalon-logkit
logkit.lib=${logkit.home}/build/lib
logkit.jar=${logkit.lib}/logkit.jar
1.7 +1 -1 avalon-sandbox/info/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/info/default.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- default.properties 29 Jan 2003 13:50:39 -0000 1.6
+++ default.properties 7 Feb 2003 23:08:55 -0000 1.7
@@ -24,7 +24,7 @@
# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${basedir}/../../jakarta-avalon-excalibur/i18n/dist
excalibur-i18n.lib=${excalibur-i18n.home}
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
# ----- jakarta-site CVS module, latest version (Anakia) -----
jakarta-site.dir=${basedir}/../../jakarta-site
1.3 +2 -2 avalon-sandbox/lifecycle/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/lifecycle/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 24 Jan 2003 18:38:58 -0000 1.2
+++ default.properties 7 Feb 2003 23:08:55 -0000 1.3
@@ -17,7 +17,7 @@
# --------------------------------------------------
# ----- Avalon Framework, version 4.1 or later -----
-avalon-framework.home=${basedir}/../../jakarta-avalon
+avalon-framework.home=${basedir}/../../avalon
avalon-framework.lib=${avalon-framework.home}/target/lib
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
@@ -25,7 +25,7 @@
avalon-sandbox.home=${basedir}/..
# ----- Excalibur -----
-excalibur.home=${basedir}/../../jakarta-avalon-excalibur
+excalibur.home=${basedir}/../../avalon-excalibur
# --------------------------------------------------
1.3 +4 -4 avalon-sandbox/lifecycle/src/xdocs/merlin.xml
Index: merlin.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/lifecycle/src/xdocs/merlin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin.xml 7 Feb 2003 15:39:28 -0000 1.2
+++ merlin.xml 7 Feb 2003 23:08:55 -0000 1.3
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<document>
- <header>
- <title>Merlin Lifecycle Extensions</title>
+ <properties>
+ <title>Lifecycle Extensions</title>
<authors>
<person name="Avalon Development Team" email="[EMAIL PROTECTED]"/>
</authors>
- </header>
+ </properties>
<body>
<s1 title="Example">
1.4 +6 -1 avalon-sandbox/merlin/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 15 Jan 2003 09:14:50 -0000 1.3
+++ .cvsignore 7 Feb 2003 23:08:55 -0000 1.4
@@ -7,4 +7,9 @@
extensions
distributions
common
-working
\ No newline at end of file
+working
+velocity.log
+project.xml
+project.properties
+maven.log
+target
\ No newline at end of file
1.15 +6 -4 avalon-sandbox/merlin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 27 Jan 2003 23:52:32 -0000 1.14
+++ build.xml 7 Feb 2003 23:08:55 -0000 1.15
@@ -32,7 +32,7 @@
<pathelement location="${avalon-meta.jar}"/>
<pathelement location="${avalon-lifecycle.jar}"/>
<pathelement location="${avalon-assembly.jar}"/>
- <pathelement location="${excalibur-logger.jar}"/>
+ <!--<pathelement location="${excalibur-logger.jar}"/>-->
<pathelement location="${excalibur-configuration.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
<!-- <pathelement location="${excalibur-thread.jar}"/> -->
@@ -42,7 +42,7 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${checkstyle.jar}"/>
- <pathelement location="${xml-apis.jar}"/>
+ <!--<pathelement location="${xml-apis.jar}"/>-->
<pathelement path="${java.class.path}"/>
</path>
@@ -254,7 +254,7 @@
<copy todir="${lib.dir}" file="${build.lib}/${jar.name}"/>
<copy todir="${lib.dir}" file="${excalibur-collections.jar}"/>
<copy todir="${lib.dir}" file="${excalibur-extension.jar}"/>
- <copy todir="${lib.dir}" file="${excalibur-logger.jar}"/>
+ <!--<copy todir="${lib.dir}" file="${excalibur-logger.jar}"/>-->
<copy todir="${lib.dir}" file="${excalibur-event.jar}"/>
<copy todir="${lib.dir}" file="${commons-collections.jar}"/>
<copy todir="${lib.dir}" file="${util.concurrent.jar}"/>
@@ -264,6 +264,7 @@
<!-- <copy todir="${lib.dir}" file="${excalibur-thread.jar}"/> -->
<copy todir="${lib.dir}" file="${avalon-lifecycle.jar}"/>
<copy todir="${lib.dir}" file="${avalon-assembly.jar}"/>
+ <!--
<copy todir="${lib.dir}" preservelastmodified="true">
<fileset dir="${tools.dir}/lib">
<include name="xerces-2.0.1.jar"/>
@@ -271,7 +272,7 @@
<include name="xalan-2.3.1.jar"/>
</fileset>
</copy>
-
+ -->
</target>
@@ -330,6 +331,7 @@
</checkstyle>
</target>
+ <!-- the following task is broken folling checkes to the tool dir in the avalon
package -->
<target name="checkstyle-report" depends="checkstyle" if="do.checkstyle"
description="Generate Checkstyle Report">
<mkdir dir="${build.reports}"/>
1.15 +8 -8 avalon-sandbox/merlin/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- default.properties 29 Jan 2003 13:50:39 -0000 1.14
+++ default.properties 7 Feb 2003 23:08:55 -0000 1.15
@@ -24,7 +24,7 @@
commons-cli.jar=${external.lib}/commons-cli-1.0.jar
# ----- Avalon Framework -----
-avalon-framework.home=${basedir}/../../jakarta-avalon
+avalon-framework.home=${basedir}/../../avalon
avalon-framework.lib=${avalon-framework.home}/target/lib
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
@@ -47,12 +47,12 @@
avalon-assembly.jar=${avalon-assembly.lib}/avalon-assembly-1.0.jar
# ----- Excalibur -----
-excalibur.home=${basedir}/../../jakarta-avalon-excalibur
+excalibur.home=${basedir}/../../avalon-excalibur
# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${excalibur.home}/i18n
excalibur-i18n.lib=${excalibur-i18n.home}/build/lib
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
# ----- Excalibur Extension, version 1.0 or later -----
excalibur-extension.home=${excalibur.home}/extension
@@ -65,9 +65,9 @@
excalibur-configuration.jar=${excalibur-configuration.lib}/excalibur-configuration-1.0.jar
# ----- Excalibur logger, version 1.0 or later -----
-excalibur-logger.home=${excalibur.home}/logger
-excalibur-logger.lib=${excalibur-logger.home}/build/lib
-excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
+#excalibur-logger.home=${excalibur.home}/logger
+#excalibur-logger.lib=${excalibur-logger.home}/build/lib
+#excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
# ----- Excalibur event, version 1.0 or later -----
excalibur-event.home=${excalibur.home}/event
@@ -102,7 +102,7 @@
excalibur-sourceresolve.jar=${excalibur-sourceresolve.lib}/excalibur-sourceresolve-1.0.jar
# ----- Logkit -----
-logkit.home=${basedir}/../../jakarta-avalon-logkit
+logkit.home=${basedir}/../../avalon-logkit
logkit.lib=${logkit.home}/build/lib
logkit.jar=${logkit.lib}/logkit.jar
@@ -139,7 +139,7 @@
lib.dir = lib
common.dir = common
-tools.dir=${basedir}/../../jakarta-avalon/tools
+#tools.dir=${basedir}/../../avalon/tools
# Set the properties for distribution directories
dist.dir = dist
1.2 +4 -0 avalon-sandbox/merlin/config/demo.xml
Index: demo.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/config/demo.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demo.xml 27 Jan 2003 03:27:45 -0000 1.1
+++ demo.xml 7 Feb 2003 23:08:55 -0000 1.2
@@ -28,7 +28,11 @@
<blocks>
+ <!-- demo of a block descriptor embedded in a jar file -->
+
<block name="playground"
path="../assembly/build/lib/avalon-assembly-demo-1.0.jar" enabled="true" />
+
+ <!-- demo of a external block descriptor -->
<block name="demo" src="src/test/config/demo.xml" enabled="true">
<configuration target="standard">
1.5 +2 -1 avalon-sandbox/merlin/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/java/Merlin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Merlin.java 27 Jan 2003 07:47:59 -0000 1.4
+++ Merlin.java 7 Feb 2003 23:08:55 -0000 1.5
@@ -133,7 +133,8 @@
ResourceManager.clearResourceCache();
String language = line.getOptionValue( "lang" );
Locale locale = new Locale( language );
- I18N = ResourceManager.getPackageResources( Merlin.class, locale );
+ Locale.setDefault( locale );
+ I18N = ResourceManager.getPackageResources( Merlin.class );
CL_OPTIONS = buildCommandLineOptions();
}
1.7 +3 -2
avalon-sandbox/merlin/src/test/org/apache/avalon/merlin/kernel/KernelTestCase.java
Index: KernelTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/src/test/org/apache/avalon/merlin/kernel/KernelTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KernelTestCase.java 18 Jan 2003 16:23:55 -0000 1.6
+++ KernelTestCase.java 7 Feb 2003 23:08:56 -0000 1.7
@@ -31,9 +31,10 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.merlin.block.Block;
-import org.apache.avalon.merlin.kernel.DefaultKernel;
+import org.apache.avalon.merlin.kernel.impl.DefaultKernel;
import org.apache.avalon.merlin.kernel.KernelException;
import org.apache.avalon.assembly.util.ExceptionHelper;
+import org.apache.avalon.assembly.locator.DefaultLocator;
import junit.framework.TestCase;
public class KernelTestCase extends TestCase
@@ -58,7 +59,7 @@
m_kernel = new DefaultKernel();
File base = getWorkingDirectory();
- DefaultContext context = new DefaultContext();
+ DefaultLocator context = new DefaultLocator();
context.put( "urn:assembly:home", base );
context.makeReadOnly();
1.2 +3 -0 avalon-sandbox/meta/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Nov 2002 12:58:25 -0000 1.1
+++ .cvsignore 7 Feb 2003 23:08:56 -0000 1.2
@@ -6,3 +6,6 @@
excalibur-*
*.el
*.ipr
+velocity.log
+project.xml
+maven.log
1.6 +3 -3 avalon-sandbox/meta/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/default.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default.properties 29 Jan 2003 13:50:39 -0000 1.5
+++ default.properties 7 Feb 2003 23:08:56 -0000 1.6
@@ -19,7 +19,7 @@
# --------------------------------------------------
# ----- Avalon Framework, version 4.1 or later -----
-avalon-framework.home=${basedir}/../../jakarta-avalon
+avalon-framework.home=${basedir}/../../avalon
avalon-framework.lib=${avalon-framework.home}/target/lib
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
@@ -27,12 +27,12 @@
avalon-sandbox.home=${basedir}/..
# ----- Excalibur -----
-excalibur.home=${basedir}/../../jakarta-avalon-excalibur
+excalibur.home=${basedir}/../../avalon-excalibur
# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${excalibur.home}/i18n
excalibur-i18n.lib=${excalibur-i18n.home}/build/lib
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
# ----- Excalibur Configuration -----
excalibur-configuration.home=${excalibur.home}/configuration
1.4 +3 -3 avalon-sandbox/site/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/site/default.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.properties 29 Jan 2003 13:50:40 -0000 1.3
+++ default.properties 7 Feb 2003 23:08:56 -0000 1.4
@@ -37,10 +37,10 @@
avalon-assembly.lib=${avalon-assembly.home}/build/lib
avalon-assembly.jar=${avalon-assembly.lib}/avalon-assembly-1.0.jar
-# ----- Avalon Assembly -----
+# ----- Avalon Merlin -----
avalon-merlin.home=${avalon-sandbox.home}/merlin
avalon-merlin.lib=${avalon-merlin.home}/build/lib
-avalon-merlin.jar=${avalon-merlin.lib}/avalon-merlin-2.0.jar
+avalon-merlin.jar=${avalon-merlin.lib}/avalon-merlin-2.1.jar
# ----- Excalibur -----
excalibur.home=${basedir}/../../jakarta-avalon-excalibur
@@ -48,7 +48,7 @@
# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${excalibur.home}/i18n
excalibur-i18n.lib=${excalibur-i18n.home}/build/lib
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
# ----- Excalibur Configuration -----
excalibur-configuration.home=${excalibur.home}/configuration
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
