Author: niclas Date: Sun May 23 23:39:58 2004 New Revision: 20286 Removed: avalon/trunk/tools/magic/artifact/src/xdocs/ avalon/trunk/tools/magic/clean/src/xdocs/ avalon/trunk/tools/magic/prepare/src/xdocs/ avalon/trunk/tools/magic/xdoc/src/xdocs/index.xml avalon/trunk/tools/magic/xdoc/src/xdocs/methods.xml avalon/trunk/tools/magic/xdoc/src/xdocs/navigation.xml avalon/trunk/tools/magic/xdoc/src/xdocs/properties.xml Modified: avalon/trunk/tools/magic/artifact/src/dist/build.bsh avalon/trunk/tools/magic/clean/src/dist/build.bsh avalon/trunk/tools/magic/clean/src/dist/build.properties avalon/trunk/tools/magic/engine/src/dist/plugins/plugin/build.properties avalon/trunk/tools/magic/jar/src/dist/build.properties avalon/trunk/tools/magic/java/src/dist/build.bsh Log: Adjustments only.
Modified: avalon/trunk/tools/magic/artifact/src/dist/build.bsh ============================================================================== --- avalon/trunk/tools/magic/artifact/src/dist/build.bsh (original) +++ avalon/trunk/tools/magic/artifact/src/dist/build.bsh Sun May 23 23:39:58 2004 @@ -27,7 +27,7 @@ public class ArtifactPlugin extends AbstractPlugin { - public Artifact locate( String artifactId ) + public Artifact resolve( String artifactId ) throws IOException { File definitionsDir = new File( m_Context.getProjectSystemDir(), "definitions" ); @@ -164,7 +164,7 @@ return result; } - public void upload( Artifact artifact ) + public void upload( Artifact artifact, File content ) { } Modified: avalon/trunk/tools/magic/clean/src/dist/build.bsh ============================================================================== --- avalon/trunk/tools/magic/clean/src/dist/build.bsh (original) +++ avalon/trunk/tools/magic/clean/src/dist/build.bsh Sun May 23 23:39:58 2004 @@ -33,7 +33,7 @@ throws IOException { File basedir = m_Context.getProjectDir(); - String targets = m_Context.getProperty( "clean.build.dest.dirs" ); + String targets = m_Context.getProperty( "clean.dirs" ); StringTokenizer st = new StringTokenizer( targets, " ,", false ); while( st.hasMoreTokens() ) { Modified: avalon/trunk/tools/magic/clean/src/dist/build.properties ============================================================================== --- avalon/trunk/tools/magic/clean/src/dist/build.properties (original) +++ avalon/trunk/tools/magic/clean/src/dist/build.properties Sun May 23 23:39:58 2004 @@ -1,2 +1,2 @@ -clean.build.dest.dirs = ${prepare.dest.dir} +clean.dirs = ${prepare.dest.dir} 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 Sun May 23 23:39:58 2004 @@ -1,3 +1 @@ -project.name = plugin - 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 Sun May 23 23:39:58 2004 @@ -1,5 +1,5 @@ -jar.build.src.dir = ${prepare.dest.dir}/classes +jar.build.src.dir = ${java.build.dest.dir} jar.build.dest.dir = ${prepare.dest.dir} 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 Sun May 23 23:39:58 2004 @@ -77,7 +77,7 @@ Path.PathElement pe = cp.createPathElement(); pe.setPath( classpath ); - ArtifactPlugin ap = ((ArtifactPlugin) m_ArtifactPlugin); + ArtifactPlugin ap = (ArtifactPlugin) m_ArtifactPlugin; String projectname = m_Context.getProjectName(); Artifact thisArtifact = ap.locate( projectname ); Artifact[] deps = ap.getDependencies( thisArtifact ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]