Author: niclas
Date: Sun Sep 19 03:36:57 2004
New Revision: 46328
Modified:
avalon/trunk/central/laboratory/studio/build.xml
avalon/trunk/central/laboratory/studio/core/java/build.xml
avalon/trunk/central/laboratory/studio/docs/build.xml
avalon/trunk/central/laboratory/studio/event/api/build.xml
avalon/trunk/central/laboratory/studio/event/impl/build.xml
avalon/trunk/central/laboratory/studio/features/build.xml
avalon/trunk/central/laboratory/studio/index.xml
avalon/trunk/central/laboratory/studio/launch/build.xml
avalon/trunk/central/laboratory/studio/magic/build.xml
avalon/trunk/central/laboratory/studio/magic/src/main/org/apache/metro/studio/magic/EclipseBuildListener.java
avalon/trunk/central/laboratory/studio/test/build.xml
avalon/trunk/central/laboratory/studio/ui/build.xml
Log:
To let Steve have a look.
Modified: avalon/trunk/central/laboratory/studio/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/build.xml Sun Sep 19 03:36:57 2004
@@ -4,6 +4,6 @@
xmlns:x="antlib:org.apache.avalon.tools">
<x:home index="index.xml"/>
- <import file="${magic.templates}/default/reactor.xml"/>
+ <import file="${magic.templates}/reactor.xml"/>
</project>
Modified: avalon/trunk/central/laboratory/studio/core/java/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/core/java/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/core/java/build.xml Sun Sep 19 03:36:57
2004
@@ -3,9 +3,6 @@
<project name="metro-studio-core" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools"
>
-
- <property file="project.properties" />
-
<x:home index="../index.xml"/>
<import file="${magic.templates}/standard.xml"/>
Modified: avalon/trunk/central/laboratory/studio/docs/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/docs/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/docs/build.xml Sun Sep 19 03:36:57
2004
@@ -3,8 +3,6 @@
<project name="metro-studio-docs" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
- <property file="project.properties" />
-
<x:home index="../index.xml"/>
<import file="${magic.templates}/standard.xml"/>
Modified: avalon/trunk/central/laboratory/studio/event/api/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/event/api/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/event/api/build.xml Sun Sep 19 03:36:57
2004
@@ -3,8 +3,6 @@
<project name="metro-studio-event-api" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
- <property file="project.properties" />
-
<x:home index="${project.home}/index.xml"/>
<import file="${magic.templates}/standard.xml"/>
Modified: avalon/trunk/central/laboratory/studio/event/impl/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/event/impl/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/event/impl/build.xml Sun Sep 19 03:36:57
2004
@@ -3,8 +3,6 @@
<project name="metro-studio-event-impl" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
- <property file="project.properties" />
-
<x:home index="${project.home}/index.xml"/>
<import file="${magic.templates}/standard.xml"/>
Modified: avalon/trunk/central/laboratory/studio/features/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/features/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/features/build.xml Sun Sep 19 03:36:57
2004
@@ -3,8 +3,6 @@
<project name="metro-studio-features" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
- <property file="project.properties" />
-
<x:home index="../index.xml"/>
<import file="${magic.templates}/standard.xml"/>
Modified: avalon/trunk/central/laboratory/studio/index.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/index.xml (original)
+++ avalon/trunk/central/laboratory/studio/index.xml Sun Sep 19 03:36:57 2004
@@ -188,7 +188,7 @@
</info>
</project>
- <project basedir="core">
+ <project basedir="core/java">
<info>
<group>metro/studio/core</group>
<name>metro-studio-core</name>
@@ -212,6 +212,17 @@
</plugins>
</project>
+ <project basedir="core/plugin">
+ <info>
+ <group>metro/studio/core</group>
+ <name>org.apache.metro.studio.core</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ </info>
+ <dependencies>
+ </dependencies>
+ </project>
+
<project basedir="docs">
<info>
<group>metro/studio/docs</group>
Modified: avalon/trunk/central/laboratory/studio/launch/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/launch/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/launch/build.xml Sun Sep 19 03:36:57
2004
@@ -2,8 +2,6 @@
<project name="metro-studio-launch" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
-
- <property file="project.properties" />
<x:home index="../index.xml"/>
<import file="${magic.templates}/standard.xml"/>
Modified: avalon/trunk/central/laboratory/studio/magic/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/magic/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/magic/build.xml Sun Sep 19 03:36:57
2004
@@ -4,8 +4,6 @@
xmlns:x="antlib:org.apache.avalon.tools"
>
- <property file="project.properties" />
-
<x:home index="../index.xml"/>
<import file="${magic.templates}/standard.xml"/>
Modified:
avalon/trunk/central/laboratory/studio/magic/src/main/org/apache/metro/studio/magic/EclipseBuildListener.java
==============================================================================
---
avalon/trunk/central/laboratory/studio/magic/src/main/org/apache/metro/studio/magic/EclipseBuildListener.java
(original)
+++
avalon/trunk/central/laboratory/studio/magic/src/main/org/apache/metro/studio/magic/EclipseBuildListener.java
Sun Sep 19 03:36:57 2004
@@ -40,8 +40,8 @@
private static final String PREPARE_TASK_KEY =
"antlib:org.apache.avalon.tools:prepare";
- private static final String META_TASK_KEY =
- "plugin:metro/studio/metro-studio-magic:studio";
+ private static final String INSTALL_TASK_KEY =
+ "antlib:org.apache.avalon.tools:install";
private final String m_uri;
@@ -136,7 +136,7 @@
Project project = event.getProject();
generatePluginXML( project );
- m_executed = true;
+ m_PluginXmlExecuted = true;
}
if( INSTALL_TASK_KEY.equals( type ) )
{
@@ -144,7 +144,7 @@
return;
Project project = event.getProject();
generatePluginJar( project );
- m_executed = true;
+ m_PluginJarExecuted = true;
}
}
@@ -159,6 +159,7 @@
MagicPath path = new MagicPath( project );
path.setMode( "RUNTIME" );
+// TODO!!!!
ReplicateTask repl = new ReplicateTask();
repl.setProject( project );
@@ -167,7 +168,10 @@
File f = new File( basedir, "target/deliverables/lib" );
f.mkdirs();
repl.setTodir( f );
- repl.setRefid( path );
+
+ repl.setRefid( "deps.path" );
+// path ---------^
+
repl.execute();
EclipseTask task = new EclipseTask();
Modified: avalon/trunk/central/laboratory/studio/test/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/test/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/test/build.xml Sun Sep 19 03:36:57
2004
@@ -2,8 +2,6 @@
<project name="metro-studio-test" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
-
- <property file="project.properties" />
<x:home index="../index.xml"/>
<import file="${magic.templates}/standard.xml"/>
Modified: avalon/trunk/central/laboratory/studio/ui/build.xml
==============================================================================
--- avalon/trunk/central/laboratory/studio/ui/build.xml (original)
+++ avalon/trunk/central/laboratory/studio/ui/build.xml Sun Sep 19 03:36:57 2004
@@ -2,8 +2,6 @@
<project name="metro-studio-ui" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
-
- <property file="project.properties" />
<x:home index="../index.xml"/>
<import file="${magic.templates}/standard.xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
