proyal 2002/07/13 11:55:50
Modified: merlin build.xml default.properties
merlin/src/java/org/apache/excalibur/merlin
ServiceFactory.java UnitInfo.java
Log:
Updated to reflect revival of configuration
Revision Changes Path
1.10 +2 -13 jakarta-avalon-excalibur/merlin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/merlin/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 12 Jul 2002 07:13:47 -0000 1.9
+++ build.xml 13 Jul 2002 18:55:49 -0000 1.10
@@ -14,6 +14,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${logkit.jar}"/>
+ <pathelement location="${excalibur-configuration.jar}"/>
<pathelement path="${java.class.path}"/>
</path>
@@ -39,6 +40,7 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkConfiguration"/>
</target>
<target name="dependencies-test" depends="dist-jar, dependencies"
@@ -141,19 +143,6 @@
<!-- add Merlin specific properties file -->
<zipfileset dir="${conf.dir}">
<include name="merlin.properties"/>
- </zipfileset>
- </jar>
- </target>
-
- <!-- Creates all the .jar file -->
- <target name="configuration.jar" depends="compile, prepare-conf"
description="Generates the independent configuration jar files">
- <mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/excalibur-configuration-1.0.jar"
- basedir="${build.classes}"
- compress="${build.compress}">
- <include name="**/configuration/**"/>
- <zipfileset dir="${build.conf}" prefix="META-INF/">
- <include name="LICENSE.txt"/>
</zipfileset>
</jar>
</target>
1.5 +5 -0 jakarta-avalon-excalibur/merlin/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/merlin/default.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.properties 13 Jun 2002 05:27:50 -0000 1.4
+++ default.properties 13 Jul 2002 18:55:49 -0000 1.5
@@ -28,6 +28,11 @@
logkit.lib=${logkit.home}/build/lib
logkit.jar=${logkit.lib}/logkit.jar
+# ----- Excalibur Configuration -----
+excalibur-configuration.home=${basedir}/../configuration
+excalibur-configuration.lib=${excalibur-configuration.home}/build/lib
+excalibur-configuration.jar=${excalibur-configuration.lib}/excalibur-configuration-1.0.jar
+
# --------------------------------------------------
# Settings used to configure compile environment
1.9 +1 -1
jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ServiceFactory.java
Index: ServiceFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/ServiceFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServiceFactory.java 12 Jul 2002 20:12:26 -0000 1.8
+++ ServiceFactory.java 13 Jul 2002 18:55:49 -0000 1.9
@@ -32,7 +32,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.excalibur.configuration.CascadingConfiguration;
-import org.apache.avalon.framework.configuration.ConfigurationUtil;
+import org.apache.excalibur.configuration.ConfigurationUtil;
/**
* The <code>ServiceFactory</code> class provides support for the
1.11 +1 -1
jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/UnitInfo.java
Index: UnitInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/merlin/src/java/org/apache/excalibur/merlin/UnitInfo.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UnitInfo.java 12 Jul 2002 20:12:27 -0000 1.10
+++ UnitInfo.java 13 Jul 2002 18:55:49 -0000 1.11
@@ -19,7 +19,7 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.context.Context;
import org.apache.excalibur.configuration.CascadingConfiguration;
-import org.apache.avalon.framework.configuration.ConfigurationUtil;
+import org.apache.excalibur.configuration.ConfigurationUtil;
import org.apache.excalibur.configuration.ContextFactory;
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
