oberhack 2004/02/13 02:42:44
Modified: ide/org.apache.avalon.ide.eclipse.launch .classpath
plugin.xml
ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container
MerlinExternalContainer.java
Log:
merlin 3.2.5 update
Revision Changes Path
1.2 +1 -1
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/.classpath
Index: .classpath
===================================================================
RCS file:
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/.classpath,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .classpath 26 Jan 2004 11:27:12 -0000 1.1
+++ .classpath 13 Feb 2004 10:42:44 -0000 1.2
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="lib/merlin-bootstrap-1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/merlin-cli-3.2.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.3 +1 -1
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/plugin.xml
Index: plugin.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.xml 2 Feb 2004 20:16:30 -0000 1.2
+++ plugin.xml 13 Feb 2004 10:42:44 -0000 1.3
@@ -10,7 +10,7 @@
<library name="MerlinDeveloperLaunch.jar">
<export name="*"/>
</library>
- <library name="lib/merlin-bootstrap-1.0.jar"/>
+ <library name="lib/merlin-cli-3.2.4.jar"/>
</runtime>
<requires>
<import plugin="org.eclipse.core.resources"/>
1.3 +1 -1
avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container/MerlinExternalContainer.java
Index: MerlinExternalContainer.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container/MerlinExternalContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MerlinExternalContainer.java 2 Feb 2004 20:16:30 -0000 1.2
+++ MerlinExternalContainer.java 13 Feb 2004 10:42:44 -0000 1.3
@@ -119,7 +119,7 @@
protected String getMainClass()
{
- return "Merlin";
+ return "org.apache.avalon.merlin.cli.Main";
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
