svn commit: rev 20470 - in avalon/trunk/tools/magic: . artifact clean jar java prepare test-project xdoc xdoc/src/dist

[ni...@apache.org]

Author: niclas
Date: Wed May 26 04:59:56 2004
New Revision: 20470

Modified:
   avalon/trunk/tools/magic/artifact/build.properties
   avalon/trunk/tools/magic/build.properties
   avalon/trunk/tools/magic/clean/build.properties
   avalon/trunk/tools/magic/jar/build.properties
   avalon/trunk/tools/magic/java/build.properties
   avalon/trunk/tools/magic/prepare/build.properties
   avalon/trunk/tools/magic/test-project/build.properties
   avalon/trunk/tools/magic/xdoc/build.properties
   avalon/trunk/tools/magic/xdoc/src/dist/build.bsh
Log:
Now requires the project.system property...

Modified: avalon/trunk/tools/magic/artifact/build.properties
==============================================================================
--- avalon/trunk/tools/magic/artifact/build.properties	(original)
+++ avalon/trunk/tools/magic/artifact/build.properties	Wed May 26 04:59:56 2004
@@ -1,2 +1,4 @@
  
 project.name = artifact
+
+project.system = ../../../central/system

Modified: avalon/trunk/tools/magic/build.properties
==============================================================================
--- avalon/trunk/tools/magic/build.properties	(original)
+++ avalon/trunk/tools/magic/build.properties	Wed May 26 04:59:56 2004
@@ -1,2 +1,4 @@
 
-project.name = magic
\ No newline at end of file
+project.name = magic
+
+project.system = ../../central/system

Modified: avalon/trunk/tools/magic/clean/build.properties
==============================================================================
--- avalon/trunk/tools/magic/clean/build.properties	(original)
+++ avalon/trunk/tools/magic/clean/build.properties	Wed May 26 04:59:56 2004
@@ -1,2 +1,4 @@
  
 project.name = clean
+
+project.system = ../../../central/system

Modified: avalon/trunk/tools/magic/jar/build.properties
==============================================================================
--- avalon/trunk/tools/magic/jar/build.properties	(original)
+++ avalon/trunk/tools/magic/jar/build.properties	Wed May 26 04:59:56 2004
@@ -1,2 +1,4 @@
  
 project.name = jar
+
+project.system = ../../../central/system

Modified: avalon/trunk/tools/magic/java/build.properties
==============================================================================
--- avalon/trunk/tools/magic/java/build.properties	(original)
+++ avalon/trunk/tools/magic/java/build.properties	Wed May 26 04:59:56 2004
@@ -1,2 +1,4 @@
  
 project.name = java
+
+project.system = ../../../central/system

Modified: avalon/trunk/tools/magic/prepare/build.properties
==============================================================================
--- avalon/trunk/tools/magic/prepare/build.properties	(original)
+++ avalon/trunk/tools/magic/prepare/build.properties	Wed May 26 04:59:56 2004
@@ -1,2 +1,4 @@
  
 project.name = prepare
+
+project.system = ../../../central/system

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	Wed May 26 04:59:56 2004
@@ -3,4 +3,6 @@
 
 project.version = 1.0
 
+project.system = ../../../central/system
+
 java.class.path = ../engine/target/dist/bin/avalon-framework-api-4.1.5.jar

Modified: avalon/trunk/tools/magic/xdoc/build.properties
==============================================================================
--- avalon/trunk/tools/magic/xdoc/build.properties	(original)
+++ avalon/trunk/tools/magic/xdoc/build.properties	Wed May 26 04:59:56 2004
@@ -1,3 +1,4 @@
 
 project.name = xdoc
 
+project.system = ../../../central/system

Modified: avalon/trunk/tools/magic/xdoc/src/dist/build.bsh
==============================================================================
--- avalon/trunk/tools/magic/xdoc/src/dist/build.bsh	(original)
+++ avalon/trunk/tools/magic/xdoc/src/dist/build.bsh	Wed May 26 04:59:56 2004
@@ -20,6 +20,21 @@
 import java.io.File;
 import java.io.FileFilter;
 
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+
 import org.apache.avalon.magic.AbstractPlugin;
 import org.apache.avalon.magic.RegexpFilter;
 import org.apache.avalon.magic.Plugin;
@@ -32,21 +47,17 @@
 
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
 public class XDocPlugin extends AbstractPlugin
+    implements Serviceable
 {
     private File m_BaseDir;    
     
+    public void service( ServiceManager man )
+        throws ServiceException
+    {
+        Object preparePlugin = man.lookup( "prepare" );
+    }
+    
     public void generate()
         throws TransformerException
     {
@@ -95,6 +106,7 @@
     private void copySources()
     {
         File toDir = new File( m_Context.getProperty( "xdoc.build.src.dir" ) );
+        toDir.mkdirs();
         String srcDir = m_Context.getProperty( "xdoc.src.dir" );
         File fromDir = new File( srcDir );
         copy( fromDir, toDir, "**/*", "**/navigation.xml" );

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org