avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 21421 - avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks
Date Fri, 18 Jun 2004 13:24:53 GMT
Author: mcconnell
Date: Fri Jun 18 06:24:52 2004
New Revision: 21421

Modified:
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java
Log:
update the install task to include registration of docs

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java	Fri Jun
18 06:24:52 2004
@@ -43,27 +43,48 @@
 {
     public void execute() throws BuildException 
     {
+        installDeliverables();
+        installDocs();
+    }
+
+    private void installDeliverables()
+    {
         File deliverables = getContext().getDeliverablesDirectory();
         if( deliverables.exists() )
         {
-            install( deliverables );
+            File cache = getHome().getRepository().getCacheDirectory();
+            FileSet fileset = new FileSet();
+            fileset.setDir( deliverables );
+            fileset.createInclude().setName( "**/*" );
+            String group = getHome().getDefinition( getKey() ).getInfo().getGroup();
+            File target = new File( cache, group );
+            copy( target, fileset );
         }
     }
 
-    private void install( File deliverables )
+    private void installDocs()
     {
-        FileSet fileset = new FileSet();
-        fileset.setDir( deliverables );
-        fileset.createInclude().setName( "**/*" );
-
-        File cache = getHome().getRepository().getCacheDirectory();
-        String group = getHome().getDefinition( getKey() ).getInfo().getGroup();
-        File target = new File( cache, group );
-        mkDir( target );
+        File cache = getHome().getDocsRepository().getCacheDirectory();
+        File source = getContext().getDocsDirectory();
+        if( source.exists() )
+        {
+            FileSet fileset = new FileSet();
+            fileset.setDir( source );
+            fileset.createInclude().setName( "**/*" );
+            String group = getHome().getDefinition( getKey() ).getInfo().getGroup();
+            String name = getHome().getDefinition( getKey() ).getInfo().getName();
+            File parent = new File( cache, group );
+            File target = new File( parent, name );
+            copy( target, fileset );
+        }
+    }
 
+    private void copy( File destination, FileSet fileset )
+    {
+        mkDir( destination );
         Copy copy = (Copy) getProject().createTask( "copy" );
         copy.setPreserveLastModified( true );
-        copy.setTodir( target );
+        copy.setTodir( destination );
         copy.addFileset( fileset );
         copy.init();
         copy.execute();

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


Mime
View raw message