DPML Notify

[niclas AT hedhman.org]

Author: niclas AT hedhman.org
Date: Sat Mar 19 15:46:51 2005
New Revision: 2087

Modified:
   development/main/README.TXT
   development/main/build.bat
   development/main/build.sh
   development/main/build.xml
   development/main/magic/core/etc/deliverables/templates/reactor.template
   development/main/magic/core/etc/deliverables/templates/standard.template
   
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Repository.java
Log:
Cleanup of remaining \'central\' references.

Modified: development/main/README.TXT
==============================================================================
--- development/main/README.TXT (original)
+++ development/main/README.TXT Sat Mar 19 15:46:51 2005
@@ -5,7 +5,6 @@
 $ ant transit           ... builds the transit diustribution and updates the 
local installation
 $ ant magic             ... builds the magic build system (requires transit)
 $ ant metro             ... builds Metro (requires Magic)
-$ ant central           ... builds site documentation (requires Metro)
 
 Please note that the Transit build will install the junit jar file
 under the .ant/lib directory if not available.  In such a case the

Modified: development/main/build.bat
==============================================================================
--- development/main/build.bat  (original)
+++ development/main/build.bat  Sat Mar 19 15:46:51 2005
@@ -11,8 +11,7 @@
 REM where the first argument is product group and the second (optional) 
argument is the
 REM build revision identifier. Allowable product group names include:
 REM
-REM  all      builds transit, util, magic, metro and central
-REM  main     builds transit, util, magic and metro
+REM  all      builds transit, util, magic, metro
 REM  transit  build transit and util
 REM  magic    build magic
 REM  metro    build metro
@@ -23,25 +22,13 @@
 
 IF "%TARGET%" == "help" goto help
 
-IF "%TARGET%" == "" set TARGET=main
-IF "%TARGET%" == "main" CALL :main
+IF "%TARGET%" == "" set TARGET=all
 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
 
-:main
-CALL :transit
-IF ERRORLEVEL 1 goto fail
-CALL :magic
-IF ERRORLEVEL 1 goto fail
-CALL :metro
-if ERRORLEVEL 1 goto fail
-GOTO :EOF
-
 :all
 CALL :transit
 IF ERRORLEVEL 1 goto fail
@@ -49,8 +36,6 @@
 IF ERRORLEVEL 1 goto fail
 CALL :metro
 if ERRORLEVEL 1 goto fail
-CALL :central
-if ERRORLEVEL 1 goto fail
 GOTO :EOF
 
 :fail
@@ -79,18 +64,6 @@
 POPD
 GOTO :EOF
 
-:central
-PUSHD central
-CALL :build clean install
-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%]
@@ -105,9 +78,7 @@
 echo       transit   -- build the transit distribution
 echo       magic     -- build the magic distribution
 echo       metro     -- build the metro distribution
-echo       main      -- build transit, magic and metro distributions
-echo       all       -- builds transit, magic, metro, central distributions
+echo       all       -- builds transit, magic, metro distributions
 echo     [revision] optional build revision identified used when
 echo                building number releases.
 goto :EOF
-

Modified: development/main/build.sh
==============================================================================
--- development/main/build.sh   (original)
+++ development/main/build.sh   Sat Mar 19 15:46:51 2005
@@ -8,8 +8,7 @@
 # where the first argument is product group and the second (optional) 
argument is the
 # build revision identifier. Allowable product group names include:
 #
-#  all      builds transit, util, magic, metro and central
-#  main     builds transit, util, magic and metro
+#  all      builds transit, util, magic, metro
 #  transit  build transit and util
 #  magic    build magic
 #  metro    build metro
@@ -52,13 +51,6 @@
     cd -
 }
 
-central()
-{
-    cd central
-    build clean install
-    cd -
-}
-
 site()
 {
     cd central/site
@@ -76,8 +68,7 @@
     echo "      transit   -- build the transit distribution"
     echo "      magic     -- build the magic distribution"
     echo "      metro     -- build the metro distribution"
-    echo "      main      -- build transit, magic and metro distributions"
-    echo "      all       -- builds transit, magic, metro, central 
distributions"
+    echo "      all       -- builds transit, magic, metro distributions"
     echo "    [revision] optional build revision identified used when"
     echo "               building number releases."
     exit 1
@@ -87,12 +78,6 @@
     TARGET=main
 fi
 
-if [ "$TARGET" == "main"  ] ; then
-    transit
-    magic
-    metro
-fi
-
 if [ "$TARGET" == "transit" ] ; then
     transit
 fi
@@ -117,5 +102,4 @@
     transit
     magic
     metro
-    central
 fi

Modified: development/main/build.xml
==============================================================================
--- development/main/build.xml  (original)
+++ development/main/build.xml  Sat Mar 19 15:46:51 2005
@@ -37,10 +37,6 @@
     <ant dir="metro"/>
   </target>
 
-  <target name="central" description="Build Central (requires Metro).">
-    <ant dir="central"/>
-  </target>
-
   <target name="clean" description="Clean all subprojects.">
     <delete includeemptydirs="true">
       <fileset dir=".">

Modified: 
development/main/magic/core/etc/deliverables/templates/reactor.template
==============================================================================
--- development/main/magic/core/etc/deliverables/templates/reactor.template   
  (original)
+++ development/main/magic/core/etc/deliverables/templates/reactor.template   
  Sat Mar 19 15:46:51 2005
@@ -3,25 +3,25 @@
   Copyright 2004 Apache Software Foundation
   Licensed  under the  Apache License,  Version 2.0  (the "License");
   you may not use  this file  except in  compliance with the License.
-  You may obtain a copy of the License at 
-  
-    http://www.dpml.net/central/about/legal/
-  
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed  under the  License is distributed on an "AS IS" BASIS,
   WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
   implied.
-  
+
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
 
 <project name="reactor"
-    xmlns:transit="antlib:net.dpml.transit" 
+    xmlns:transit="antlib:net.dpml.transit"
     xmlns:x="plugin:dpml/magic/dpml-magic-core">
 
   <transit:init>
-    <map urn="@PROJECT-PLUGIN-URN@" 
+    <map urn="@PROJECT-PLUGIN-URN@"
        uri="@PROJECT-PLUGIN-URI@"/>
   </transit:init>
 

Modified: 
development/main/magic/core/etc/deliverables/templates/standard.template
==============================================================================
--- development/main/magic/core/etc/deliverables/templates/standard.template  
  (original)
+++ development/main/magic/core/etc/deliverables/templates/standard.template  
  Sat Mar 19 15:46:51 2005
@@ -3,25 +3,25 @@
   Copyright 2004 Apache Software Foundation
   Licensed  under the  Apache License,  Version 2.0  (the "License");
   you may not use  this file  except in  compliance with the License.
-  You may obtain a copy of the License at 
-  
-    http://www.dpml.net/central/about/legal/
-  
+  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
   Unless required by applicable law or agreed to in writing, software
   distributed  under the  License is distributed on an "AS IS" BASIS,
   WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
   implied.
-  
+
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
 
-<project name="standard" 
-    xmlns:transit="antlib:net.dpml.transit" 
+<project name="standard"
+    xmlns:transit="antlib:net.dpml.transit"
     xmlns:x="plugin:dpml/magic/dpml-magic-core">
 
   <transit:init>
-    <map urn="@PROJECT-PLUGIN-URN@" 
+    <map urn="@PROJECT-PLUGIN-URN@"
        uri="@PROJECT-PLUGIN-URI@"/>
   </transit:init>
 
@@ -64,7 +64,7 @@
     </x:javadoc>
   </target>
 
-  <target name="checkstyle" depends="prepare" 
unless="project.checkstyle.disable" 
+  <target name="checkstyle" depends="prepare" 
unless="project.checkstyle.disable"
       description="Create a checkstyle report.">
     <property name="project.checkstyle.dest" value="target/checkstyle"/>
     <property name="project.checkstyle.format" 
value="artifact:format:dpml/magic/dpml"/>
@@ -75,7 +75,7 @@
     </x:checkstyle>
     <mkdir dir="${project.checkstyle.reports}"/>
     <x:style style="artifact:xsl:dpml/magic/checkstyle-frames"
-        in="${project.checkstyle.dest}/checkstyle_errors.xml" 
+        in="${project.checkstyle.dest}/checkstyle_errors.xml"
         out="${project.checkstyle.reports}/checkstyle_report.html" />
   </target>
 

Modified: 
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Repository.java
==============================================================================
--- 
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Repository.java
  (original)
+++ 
development/main/transit/core/handler/src/main/net/dpml/transit/repository/Repository.java
  Sat Mar 19 15:46:51 2005
@@ -46,7 +46,7 @@
     * @param parent the parent classloader
     * @param uri the plugin uri
     * @return the plugin classloader
-    * @exception IOException sitoryException if plugin loading exception 
occurs
+    * @exception IOException if plugin loading exception occurs
     */
     ClassLoader getPluginClassLoader( ClassLoader parent, URI uri )
         throws IOException;