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/10 18:42:57 UTC
svn commit: rev 21021 - in avalon/trunk/runtime/merlin/impl: . src/java/org/apache/avalon/merlin/impl
Author: mcconnell
Date: Thu Jun 10 09:42:56 2004
New Revision: 21021
Added:
avalon/trunk/runtime/merlin/impl/build.properties (contents, props changed)
avalon/trunk/runtime/merlin/impl/build.xml (contents, props changed)
Modified:
avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
Log:
add project build support and switch fro excalibur to util-configuration
Added: avalon/trunk/runtime/merlin/impl/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/impl/build.properties Thu Jun 10 09:42:56 2004
@@ -0,0 +1,3 @@
+project.name = avalon-merlin-impl
+project.src.main = java
+project.home = ../../../central/system
Added: avalon/trunk/runtime/merlin/impl/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/merlin/impl/build.xml Thu Jun 10 09:42:56 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-merlin-impl" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Modified: avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
==============================================================================
--- avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java (original)
+++ avalon/trunk/runtime/merlin/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java Thu Jun 10 09:42:56 2004
@@ -65,7 +65,7 @@
import org.apache.avalon.util.i18n.ResourceManager;
import org.apache.avalon.util.i18n.Resources;
-import org.apache.excalibur.configuration.ConfigurationUtil;
+import org.apache.avalon.util.configuration.ConfigurationUtil;
import org.xml.sax.InputSource;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org