avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 21535 - in avalon/trunk: central/site/src/xdocs/central/tools/magic/tasks/management central/site/src/xdocs/central/tools/magic/tasks/production central/system/themes/modern/html/resources/styles planet planet/tutorials planet/tutorials/hello runtime/merlin/cli/etc/bin tools/magic/src/main/org/apache/avalon/tools/home tools/magic/src/main/org/apache/avalon/tools/project tools/magic/src/main/org/apache/avalon/tools/tasks
Date Mon, 21 Jun 2004 11:23:56 GMT
Author: mcconnell
Date: Mon Jun 21 04:23:55 2004
New Revision: 21535

Modified:
   avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/management/index.xml
   avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/production/bar.xml
   avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/production/jar.xml
   avalon/trunk/central/system/themes/modern/html/resources/styles/style.css
   avalon/trunk/planet/build.xml
   avalon/trunk/planet/tutorials/build.xml
   avalon/trunk/planet/tutorials/hello/build.xml
   avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Context.java
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Info.java
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/HomeTask.java
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JarTask.java
Log:
General updates.

Modified: avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/management/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/management/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/management/index.xml	Mon
Jun 21 04:23:55 2004
@@ -11,8 +11,9 @@
       <p>
       A set of tasks are provided that support plugin meta-data generation,
       initialization of dependendent plugin loading relative to a project
-      defintion, plugin classloader creation and plugin deployment, and 
-      tasks supporting repository-enabled factory meta-data creation. 
+      defintion, plugin classloader creation and plugin deployment, 
+      tasks supporting repository-enabled factory meta-data creation, and
+      a reactor task supporting muti-project builds.
       </p>
     </section>
   </body>

Modified: avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/production/bar.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/production/bar.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/production/bar.xml	Mon Jun
21 04:23:55 2004
@@ -9,10 +9,35 @@
   <body>
     <section name="Bar Task">
       <p>
+      The bar task generates a bar archive.  A bar achive is a jar file
+      the represents a group within a repository.  The manifest contains
+      the group identifier.  A bar archive is typically used to bundle 
+      application resources as an installable unit.
       </p>
+      <p>
+      The bar file content is created using ${basedir}/target/deliverables
+      as the input data.
+      </p>
 <source><![CDATA[
-    <x:bar/>
+<x:bar/>
 ]]></source>
+<pre>
+package:
+    [mkdir] Created dir: F:\dev\avalon\tools\magic\target\deliverables\bars
+      [jar] Building jar: F:\dev\avalon\tools\magic\target\deliverables\bars\avalon-tools.bar
+    [x:bar] Creating md5 checksum</pre>
+
+      <p><i>An example bar manifest is shown below:</i></p>
+
+<pre>Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.6.1
+Created-By: Apache Avalon
+Built-By: mcconnell
+
+Name: Block
+Block-Group: avalon/tools
+Block-Name: avalon-tools-magic</pre>
+
     </section>
   </body>
 

Modified: avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/production/jar.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/production/jar.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/tools/magic/tasks/production/jar.xml	Mon Jun
21 04:23:55 2004
@@ -9,10 +9,39 @@
   <body>
     <section name="Jar Task">
       <p>
+      The jar task creates a deliverable jar file based on the contents of 
+      the ${basedir}/target/classes directory, generates a md5 file, and 
+      optionally creates an asc signature file.
       </p>
 <source><![CDATA[
-    <x:jar/>
+<x:jar/>
 ]]></source>
+<pre>
+package:
+    [mkdir] Created dir: F:\dev\avalon\planet\tutorials\dynamics\target\deliverables\jars
+      [jar] Building jar: F:\dev\avalon\planet\tutorials\dynamics\target\deliverables\jars\dynamics.jar
+    [x:jar] Creating md5 checksum</pre>
+
+    <subsection name="Properties">
+      
+      <p>
+      The following optional properties can be used to customize manifest content.
+      </p>
+
+      <table>
+        <tr><th>Property</th><th>Description</th></tr>
+        <tr>
+          <td>${project.jar.main.class}</td>
+          <td>Optional declaration of a main class manifest attribute.</td>
+        </tr>
+        <tr>
+          <td>${project.jar.classpath}</td>
+          <td>Optional declaration of a classpath manifest attribute.</td>
+        </tr>
+      </table>
+
+    </subsection>
+
     </section>
   </body>
 

Modified: avalon/trunk/central/system/themes/modern/html/resources/styles/style.css
==============================================================================
--- avalon/trunk/central/system/themes/modern/html/resources/styles/style.css	(original)
+++ avalon/trunk/central/system/themes/modern/html/resources/styles/style.css	Mon Jun 21 04:23:55
2004
@@ -180,7 +180,7 @@
 {
     background-color: white;
     color: black;
-    margin-right: 200px;
+    margin-right: 210px;
     min-height: 400px;
 }
 
@@ -197,7 +197,7 @@
     text-align:left; 
     border-bottom:solid 1px #333333; 
     margin-left: -1em;
-    margin-right: 1em;
+    margin-right: 0em;
     padding-left: 10px; 
     padding-right: 10px; 
     padding-top: 30px;
@@ -221,7 +221,7 @@
     border-top: 1px solid;
     margin-top: 30px;
     margin-bottom: 20px;
-    margin-right: 220px;
+    margin-right: 210px;
     margin-left: 1em;
     padding-top: 2px;
     padding-bottom: 30px; 
@@ -482,7 +482,9 @@
     color: black;
     outline: none;
 }
-
+
+/* comment out doclink until problems are fixed */
+/*
 a.doclink {
 	text-decoration: none;
 	color: #000;
@@ -513,7 +515,7 @@
 	padding: 1px 2px 1px 2px;
 	margin: 0px;
 }
-
+*/
 
 img
 {

Modified: avalon/trunk/planet/build.xml
==============================================================================
--- avalon/trunk/planet/build.xml	(original)
+++ avalon/trunk/planet/build.xml	Mon Jun 21 04:23:55 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="runtime" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="runtime" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
   <import file="${project.system}/build/reactor.xml"/>

Modified: avalon/trunk/planet/tutorials/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/build.xml	(original)
+++ avalon/trunk/planet/tutorials/build.xml	Mon Jun 21 04:23:55 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="runtime" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="runtime" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
 
   <property file="build.properties"/>
   <import file="${project.system}/build/reactor.xml"/>

Modified: avalon/trunk/planet/tutorials/hello/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/hello/build.xml	(original)
+++ avalon/trunk/planet/tutorials/hello/build.xml	Mon Jun 21 04:23:55 2004
@@ -9,8 +9,14 @@
   <target name="javadoc" depends="prepare">
     <x:javadoc>
       <x:link href="http://java.sun.com/j2se/1.4/docs/api" />
+      <!--
       <x:link key="avalon-runtime"
         href="http://www.apache.org/~mcconnell/docs/avalon/runtime/3.3.0/api"/>
+      <x:link key="avalon-runtime"
+        href="./../../../../../avalon/runtime/3.3.0/api"/>
+      -->
+      <x:link key="avalon-runtime"
+        href="http://@DOC-ROOT@/avalon/runtime/3.3.0/api"/>
     </x:javadoc>
   </target>
 

Modified: avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat
==============================================================================
--- avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat	(original)
+++ avalon/trunk/runtime/merlin/cli/etc/bin/merlin.bat	Mon Jun 21 04:23:55 2004
@@ -13,7 +13,7 @@
 :SET_MERLIN
 if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
 set MERLIN_CMD_LINE_ARGS=%*
-set SYSTEM_CACHE_DIRECTORY=%MERLIN_HOME%\system
+set MAGIC_SCD=%MERLIN_HOME%\system
 set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
 set MERLIN_BOOTSTRAP_CLASSPATH=@WINDOWS-CLI-CLASSPATH@
 

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Context.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Context.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Context.java	Mon Jun 21
04:23:55 2004
@@ -57,8 +57,8 @@
     public static final String SRC_MAIN = "main";
     public static final String SRC_MAIN_KEY = "project.src.main";
 
-    public static final String SRC_CONFIG_KEY = "project.src.config";
-    public static final String SRC_CONFIG = "config";
+    public static final String SRC_CONFIG_KEY = "project.src.conf";
+    public static final String SRC_CONFIG = "conf";
 
     public static final String SRC_TEST_KEY = "project.src.test";
     public static final String SRC_TEST = "test";

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/home/Home.java	Mon Jun 21 04:23:55
2004
@@ -98,7 +98,6 @@
     {
         setProject( project );
         m_index = index;
-        log( "Building system definition." );
 
         m_system = system;
 

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Info.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Info.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Info.java	Mon Jun 21
04:23:55 2004
@@ -43,7 +43,6 @@
         return Info.create( protocol, spec);
     }
 
-
     public static Info create( String type, String id )
     {
         int n = getGroupIndex( id );

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/HomeTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/HomeTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/HomeTask.java	Mon Jun
21 04:23:55 2004
@@ -69,6 +69,7 @@
             setupProperties( project, system );
             if( null == HOME )
             {
+                log( "Building system definition." );
                 setupSystemProperties( project, system );
                 HOME = new Home( project, system, index );
             }

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JarTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JarTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JarTask.java	Mon Jun 21
04:23:55 2004
@@ -127,13 +127,16 @@
 
             if( null != def.getInfo().getVersion() )
             {
+
+                // TODO: validate that the version is a dewy version
+
                 addAttribute( 
                   main, "Specification-Version", 
                   def.getInfo().getVersion() );
             }
             else
             {
-                addAttribute( main, "Specification-Version", "1.0" );
+                addAttribute( main, "Specification-Version", "0" ); 
             }
             addAttribute( 
               main, "Implementation-Vendor", 
@@ -141,8 +144,11 @@
             addAttribute( 
               main, "Implementation-Vendor-Id", 
               "org.apache.avalon" );
+
+            // TODO: get a real implementation version id
+            
             addAttribute( 
-              main, "Implementation-Version", "123" );
+              main, "Implementation-Version", "UNKNOWN" ); 
 
             String classpath = getProject().getProperty( JAR_CLASSPATH_KEY );
             if( null != classpath )

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


Mime
View raw message