Author: niclas
Date: Sat May 22 09:35:32 2004
New Revision: 20216
Modified:
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/FacadeFactory.java
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginServiceManager.java
avalon/trunk/tools/magic/jar/src/dist/build.bsh
avalon/trunk/tools/magic/jar/src/dist/build.properties
avalon/trunk/tools/magic/java/src/dist/build.bsh
avalon/trunk/tools/magic/java/src/dist/build.properties
avalon/trunk/tools/magic/test-project/build.properties
Log:
Manages to create a Jar.
Modified:
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/FacadeFactory.java
==============================================================================
---
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/FacadeFactory.java
(original)
+++
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/FacadeFactory.java
Sat May 22 09:35:32 2004
@@ -22,7 +22,7 @@
try
{
if( getLogger().isDebugEnabled() )
- getLogger().debug( "Creating Script Facade: " +
context.getProjectName() );
+ getLogger().debug( "Creating Script Facade: " + bshFile );
ScriptFacade facade = new ScriptFacade( context );
if( facade instanceof LogEnabled )
{
Modified:
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginServiceManager.java
==============================================================================
---
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginServiceManager.java
(original)
+++
avalon/trunk/tools/magic/engine/src/java/org/apache/merlin/magic/PluginServiceManager.java
Sat May 22 09:35:32 2004
@@ -44,6 +44,7 @@
DUMMY = new Object();
m_FacadeFactory = factory;
+ m_GlobalProperties = globalProps;
m_PluginsByKey = new HashMap();
m_PluginsByValue = new HashMap();
@@ -158,15 +159,19 @@
{
File pluginDir;
if( service.equals( "" ) || service.equals( "." ) )
+ {
pluginDir = m_ProjectDir;
+ }
else
+ {
pluginDir = new File( m_LocalPlugins, service );
+ appendProperties( m_GlobalProperties, pluginDir );
+ }
if( pluginDir == null )
throw new ServiceException( "Plugin '" + service + "' is not
present in " + m_LocalPlugins + "." );
PluginProperties props = new PluginProperties( m_GlobalProperties );
- appendProperties( props, pluginDir );
appendProperties( props, m_ProjectDir );
String projectName = props.getProperty( "project.name" );
Modified: avalon/trunk/tools/magic/jar/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/jar/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/jar/src/dist/build.bsh Sat May 22 09:35:32 2004
@@ -52,21 +52,25 @@
{
String manifestName = m_Context.getProperty( "jar.manifest" );
File srcManifest = new File( manifestName );
+ if( srcManifest.exists() )
+ {
+ String destDirName = m_Context.getProperty(
"jar.manifest.build.dir" );
+ File toDir = new File( destDirName );
+ toDir.mkdirs();
- String destDirName = m_Context.getProperty( "jar.manifest.build.dir" );
- File toDir = new File( destDirName );
- toDir.mkdirs();
-
- getLogger().info( "Copying " + srcManifest + " to " + toDir );
-
- Copy copy = (Copy) m_Project.createTask( "copy" );
- copy.setTodir( toDir );
- copy.setFile( srcManifest );
- copy.init();
- copy.execute();
-
- File manifest = new File( toDir, srcManifest.getName() );
- return manifest;
+ getLogger().info( "Copying " + srcManifest + " to " + toDir );
+
+ Copy copy = (Copy) m_Project.createTask( "copy" );
+ copy.setTodir( toDir );
+ copy.setFile( srcManifest );
+ copy.init();
+ copy.execute();
+
+ File manifest = new File( toDir, srcManifest.getName() );
+ return manifest;
+ }
+ else
+ return null;
}
private void createJar( File manifest )
@@ -81,7 +85,7 @@
/* Set the destination */
jar.setDestFile( jarFile );
jar.setBasedir( fromDir );
-
+
jar.init();
jar.execute();
}
Modified: avalon/trunk/tools/magic/jar/src/dist/build.properties
==============================================================================
--- avalon/trunk/tools/magic/jar/src/dist/build.properties (original)
+++ avalon/trunk/tools/magic/jar/src/dist/build.properties Sat May 22
09:35:32 2004
@@ -1,8 +1,8 @@
-jar.build.src.dir = ${prepare.build.src.dir}/classes
+jar.build.src.dir = ${prepare.dest.dir}/classes
jar.filename = ${jar.build.src.dir}/../${project.name}-${project.version}.jar
jar.manifest = ${prepare.src.dir}/etc/manifest.MF
-jar.manifest.build.dir = ${prepare.build.src.dir}/etc
\ No newline at end of file
+jar.manifest.build.dir = ${prepare.build.src.dir}/etc
Modified: avalon/trunk/tools/magic/java/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/java/src/dist/build.bsh (original)
+++ avalon/trunk/tools/magic/java/src/dist/build.bsh Sat May 22 09:35:32 2004
@@ -8,7 +8,7 @@
import org.apache.merlin.magic.Plugin;
import org.apache.merlin.magic.PluginContext;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.service.ServiceException;
@@ -38,35 +38,19 @@
return;
PreparePlugin prepare = (PreparePlugin) m_PreparePlugin;
prepare.init();
+
notifyPreMethod( "compile" );
- copySources();
- notifyStep( "compile", "sources-copied" );
executeCompile();
notifyPostMethod( "compile" );
m_Compiled = true;
}
- private void copySources()
- {
- String destdirname = m_Context.getProperty( "java.build.src.dir" );
- File toDir = new File( destdirname );
- String srcdirname = m_Context.getProperty( "java.src.dir" );
- File fromDir = new File( srcdirname );
-
- FileSet from = new FileSet();
- from.setDir( fromDir );
- from.setIncludes( "**/*" );
- toDir.mkdirs(); /* ensure that the directory exists. */
-
- Copy copy = (Copy) m_Project.createTask( "copy" );
- copy.setTodir( toDir );
- copy.addFileset( from );
- copy.init();
- copy.execute();
- }
-
private void executeCompile()
{
+ Logger logger = getLogger();
+ if( logger.isDebugEnabled() )
+ logger.debug( "Starting Compile." );
+
String destdirname = m_Context.getProperty( "java.build.dest.dir" );
File toDir = new File( destdirname );
toDir.mkdirs();
Modified: avalon/trunk/tools/magic/java/src/dist/build.properties
==============================================================================
--- avalon/trunk/tools/magic/java/src/dist/build.properties (original)
+++ avalon/trunk/tools/magic/java/src/dist/build.properties Sat May 22
09:35:32 2004
@@ -1,6 +1,6 @@
-java.src.dir = src/java
+java.src.dir = ${prepare.src.dir}/java
-java.build.src.dir = target/src/java
+java.build.src.dir = ${prepare.build.src.dir}/java
-java.build.dest.dir = target/classes
+java.build.dest.dir = ${prepare.dest.dir}/classes
Modified: avalon/trunk/tools/magic/test-project/build.properties
==============================================================================
--- avalon/trunk/tools/magic/test-project/build.properties (original)
+++ avalon/trunk/tools/magic/test-project/build.properties Sat May 22
09:35:32 2004
@@ -1,4 +1,6 @@
project.name = test-project
-java.class.path = ../engine/target/dist/bin/avalon-framework-api-4.1.5.jar
\ No newline at end of file
+project.version = 1.0
+
+java.class.path = ../engine/target/dist/bin/avalon-framework-api-4.1.5.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
