You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/05/24 20:53:40 UTC
svn commit: rev 20365 - in avalon/trunk/tools/magic/engine/src: conf dist/bin dist/plugins/plugin java/org/apache/avalon/magic test/org/apache/merlin/magic
Author: niclas
Date: Mon May 24 11:53:39 2004
New Revision: 20365
Modified:
avalon/trunk/tools/magic/engine/src/conf/magic.MF
avalon/trunk/tools/magic/engine/src/dist/bin/magic
avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.properties
avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/ScriptFacade.java
avalon/trunk/tools/magic/engine/src/test/org/apache/merlin/magic/PluginContextTestCase.java
Log:
Changing package names...
Modified: avalon/trunk/tools/magic/engine/src/conf/magic.MF
==============================================================================
--- avalon/trunk/tools/magic/engine/src/conf/magic.MF (original)
+++ avalon/trunk/tools/magic/engine/src/conf/magic.MF Mon May 24 11:53:39 2004
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Main-Class: org.apache.merlin.magic.Main
+Main-Class: org.apache.avalon.magic.Main
Class-Path: avalon-framework-api-4.2.0.jar bsh-2.0b1.jar junit.jar
avalon-framework-impl-4.2.0.jar ant.jar ant-trax.jar tools.jar
Modified: avalon/trunk/tools/magic/engine/src/dist/bin/magic
==============================================================================
--- avalon/trunk/tools/magic/engine/src/dist/bin/magic (original)
+++ avalon/trunk/tools/magic/engine/src/dist/bin/magic Mon May 24 11:53:39 2004
@@ -10,4 +10,4 @@
done
CP=$CP:$ANT_HOME/lib/ant.jar:$ANT_HOME/lib/ant-trax.jar
-java $JVM_OPTS -Dmagic.system.dir=$SYSTEM_DIR -cp $CP org.apache.merlin.magic.Main $@
+java $JVM_OPTS -Dmagic.system.dir=$SYSTEM_DIR -cp $CP org.apache.avalon.magic.Main $@
Modified: avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.properties
==============================================================================
--- avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.properties (original)
+++ avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.properties Mon May 24 11:53:39 2004
@@ -1 +1 @@
-
+# No properties needed for the Plugin Plugin.
Modified: avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/ScriptFacade.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/ScriptFacade.java (original)
+++ avalon/trunk/tools/magic/engine/src/java/org/apache/avalon/magic/ScriptFacade.java Mon May 24 11:53:39 2004
@@ -85,7 +85,7 @@
{
bsh.eval( m_Script );
}
- String expr1 = "import org.apache.merlin.magic.Plugin; Plugin plugin = new " + m_Classname + "();";
+ String expr1 = "import org.apache.avalon.magic.Plugin; Plugin plugin = new " + m_Classname + "();";
bsh.eval( expr1 );
m_Plugin = (Plugin) bsh.get( "plugin" );
return m_Plugin;
Modified: avalon/trunk/tools/magic/engine/src/test/org/apache/merlin/magic/PluginContextTestCase.java
==============================================================================
--- avalon/trunk/tools/magic/engine/src/test/org/apache/merlin/magic/PluginContextTestCase.java (original)
+++ avalon/trunk/tools/magic/engine/src/test/org/apache/merlin/magic/PluginContextTestCase.java Mon May 24 11:53:39 2004
@@ -1,4 +1,4 @@
-package org.apache.merlin.magic;
+package org.apache.avalon.magic;
import java.io.File;
import java.io.InputStream;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org