DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Sun Jan 30 20:00:29 2005
New Revision: 1640

Added:
   development/main/transit/core/README.TXT
      - copied unchanged from r1639, development/main/transit/README.TXT
   development/main/transit/core/build.properties
      - copied unchanged from r1639, development/main/transit/build.properties
   development/main/transit/core/build.xml
      - copied unchanged from r1639, development/main/transit/build.xml
   development/main/transit/core/handler/
      - copied from r1639, development/main/transit/handler/
   development/main/transit/core/index.xml
      - copied unchanged from r1639, development/main/transit/index.xml
   development/main/transit/core/installer/
      - copied from r1639, development/main/transit/installer/
   development/main/transit/core/module.xml
      - copied unchanged from r1639, development/main/transit/module.xml
   development/main/transit/core/overview.html
      - copied unchanged from r1639, development/main/transit/overview.html
   development/main/transit/core/plugin/
      - copied from r1639, development/main/transit/plugin/
   development/main/transit/util/
      - copied from r1636, development/main/util/
Removed:
   development/main/transit/README.TXT
   development/main/transit/build.properties
   development/main/transit/build.xml
   development/main/transit/handler/
   development/main/transit/index.xml
   development/main/transit/installer/
   development/main/transit/module.xml
   development/main/transit/overview.html
   development/main/transit/plugin/
   development/main/util/
Modified:
   development/main/index.xml
   development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java
   development/main/magic/index.xml
Log:
shuffle the transit module under trasnit/core and move util under the transit 
directory

   transit ------------ application root directory
   transit/core ------- transit module and children
   transit/util ------- the utility packages
   transit/tutorials -- the tutorials



Modified: development/main/index.xml
==============================================================================
--- development/main/index.xml  (original)
+++ development/main/index.xml  Sun Jan 30 20:00:29 2005
@@ -21,11 +21,19 @@
 
 <index>
 
+  <!--
   <import index="util/index.xml"/>
   <import index="transit/index.xml"/>
+  -->
+
+  <!--<import uri="artifact:module:dpml/transit/dpml-transit#1638"/>-->
+
   <import index="magic/index.xml"/>
   <import index="metro/index.xml"/>
   <import index="central/index.xml"/>
   <import index="planet/facilities/index.xml"/>
 
+  <!--
+  -->
+
 </index>

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java   
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/DistTask.java   
  Sun Jan 30 20:00:29 2005
@@ -52,6 +52,8 @@
 
     private TarTask m_tar;
 
+    private String m_compression;
+
     /**
      * Set compression method.
      * Allowable values are
@@ -69,6 +71,15 @@
             m_tar = createNewTarTask();
         }
         m_tar.setCompression( mode );
+        String policy = mode.getValue();
+        if( policy == "gzip" )
+        {
+            m_compression = "gz";
+        }
+        else if( policy == "bzip2" )
+        {
+            m_compression = "gz2";
+        }
     }
 
     public void addFileset( FileSet set )
@@ -112,12 +123,25 @@
         
         if( isTarContentDeclared() )
         {
-            final String tarfilename = getDefinition().getFilename( TAR_EXT 
);
+            final String tarfilename = getTarFilename();
             final File tarfile = new File( dist, tarfilename );
             tarIt( tarfile );
         }
     }
 
+    private String getTarFilename()
+    {
+        final String tarfilename = getDefinition().getFilename( TAR_EXT );
+        if( m_compression != null )
+        {
+            return tarfilename + "." + m_compression;
+        }
+        else
+        {
+            return tarfilename;
+        }
+    }
+
     private void zipIt( File distribution )
     {
         final Zip zip = (Zip) getProject().createTask( "zip" );

Modified: development/main/magic/index.xml
==============================================================================
--- development/main/magic/index.xml    (original)
+++ development/main/magic/index.xml    Sun Jan 30 20:00:29 2005
@@ -21,8 +21,12 @@
 
 <index key="dpml-magic">
 
+  <import uri="artifact:module:dpml/transit/dpml-transit#1638"/>
+
+  <!--
   <import index="../transit/index.xml"/>
- 
+  -->
+
   <!--
   Magic Module
   -->