DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Tue Feb 22 21:02:58 2005
New Revision: 1875

Modified:
   development/main/build.bat
   development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
   
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
   development/main/magic/core/src/main/net/dpml/magic/tasks/JavacTask.java
   development/main/metro/index.xml
   development/main/module.properties
Log:
Update the javac task to exclude the ant path from the main comile and update 
the index to deal with the missing deps this raises.

Modified: development/main/build.bat
==============================================================================
--- development/main/build.bat  (original)
+++ development/main/build.bat  Tue Feb 22 21:02:58 2005
@@ -23,12 +23,13 @@
 
 IF "%TARGET%" == "help" goto help
 
-IF "%TARGET%" == "" set TARGET=core
+IF "%TARGET%" == "" set TARGET=main
 IF "%TARGET%" == "main" CALL :main
 IF "%TARGET%" == "transit" CALL :transit
 IF "%TARGET%" == "magic" CALL :magic
 IF "%TARGET%" == "metro" CALL :metro
 IF "%TARGET%" == "central" CALL :central
+IF "%TARGET%" == "site" CALL :site
 IF "%TARGET%" == "all" CALL :all
 goto end
 
@@ -84,6 +85,12 @@
 POPD
 GOTO :EOF
 
+:site
+PUSHD central\site
+CALL :build clean install
+POPD
+GOTO :EOF
+
 :build
 IF not "%ID%" == "" set BUILD_ID=-Ddpml.release.signature=%ID%
 ECHO building project with release ID [%ID%]

Modified: 
development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Resource.java   
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Resource.java   
  Tue Feb 22 21:02:58 2005
@@ -248,6 +248,7 @@
 
         final Path path = new Path( project );
         final ArrayList visited = new ArrayList();
+
         final ResourceRef[] refs = getResourceRefs( project, mode, 
ResourceRef.ANY, true );
         for( int i=0; i<refs.length; i++ )
         {

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
==============================================================================
--- 
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java  
      (original)
+++ 
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java  
      Tue Feb 22 21:02:58 2005
@@ -261,6 +261,7 @@
     {
         final Javac javac = (Javac) getProject().createTask( "javac" );
         javac.setTaskName( getTaskName() );
+        //javac.setIncludeantruntime( false );
         final Path src = javac.createSrc();
         final Path.PathElement element = src.createPathElement();
         element.setLocation( sources );

Modified: 
development/main/magic/core/src/main/net/dpml/magic/tasks/JavacTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/JavacTask.java  
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/JavacTask.java  
  Tue Feb 22 21:02:58 2005
@@ -130,6 +130,7 @@
     {
         final Javac javac = (Javac) getProject().createTask( "javac" );
         javac.setTaskName( getTaskName() );
+        javac.setIncludeantruntime( false );
         final Path src = javac.createSrc();
         final Path.PathElement element = src.createPathElement();
         element.setLocation( sources );

Modified: development/main/metro/index.xml
==============================================================================
--- development/main/metro/index.xml    (original)
+++ development/main/metro/index.xml    Tue Feb 22 21:02:58 2005
@@ -95,6 +95,7 @@
     <dependencies>
       <include key="dpml-parameters-api"/>
       <include key="dpml-configuration-api"/>
+      <include key="dpml-transit-main"/>
     </dependencies>
   </project>
 
@@ -276,6 +277,7 @@
       <include key="dpml-util-exception"/>
       <include key="dpml-composition-impl" build="false"/>
       <include key="dpml-system-impl" build="false"/>
+      <include key="junit"/>
     </dependencies>
   </project>
 
@@ -293,6 +295,9 @@
         <type>jar</type>
       </types>
     </info>
+    <dependencies>
+      <include key="dpml-transit-main"/>
+    </dependencies>
   </project>
 
   <project basedir="extension/impl">
@@ -419,6 +424,7 @@
       <include key="dpml-system-impl" build="false"/>
       <include key="dpml-logging-logkit-impl" build="false"/>
       <include key="dpml-test-testschema"/>
+      <include key="ant-junit"/>
     </dependencies>
   </project>
 
@@ -432,6 +438,9 @@
       <status>SNAPSHOT</status>
       <type>jar</type>
     </info>
+    <dependencies>
+      <include key="dpml-transit-main"/>
+    </dependencies>
   </project>
 
   <!-- Extension -->
@@ -864,6 +873,7 @@
       <include key="dpml-logging-api"/>
       <include key="dpml-context-api"/>
       <include key="dpml-configuration-api"/>
+      <include key="dpml-transit-main"/>
     </dependencies>
     <plugins>
       <include key="dpml-meta-tools"/>

Modified: development/main/module.properties
==============================================================================
--- development/main/module.properties  (original)
+++ development/main/module.properties  Tue Feb 22 21:02:58 2005
@@ -16,3 +16,4 @@
 
 dpml.metro.version = ${dpml.build.signature}
 dpml.metro.uri = artifact:module:dpml/metro/dpml-metro#${dpml.metro.version}
+