avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/xdocs/stylesheets changes.vsl docs.vsl project.xml templates.vm velocity.properties
Date Sun, 15 Sep 2002 02:07:33 GMT
donaldp     2002/09/14 19:07:33

  Modified:    .        README.txt build.xml gump.xml project.properties
               src/java/org/apache/avalon/phoenix/components/deployer
                        DefaultDeployer.java
               src/java/org/apache/avalon/phoenix/frontends CLIMain.java
               src/java/org/apache/avalon/phoenix/launcher
                        DaemonLauncher.java Main.java
               src/java/org/apache/avalon/phoenix/tools/configuration
                        ConfigurationBuilder.java
               src/java/org/apache/avalon/phoenix/tools/verifier
                        SarVerifier.java
               src/java/org/apache/avalon/phoenix/tools/xdoclet
                        ManifestSubTask.java blockinfo.xdt mxinfo.xdt
               src/pdk  build.xml
               src/schema assembly.dtd blockinfo.dtd mxinfo.dtd
               src/xdocs announcement.xml changes.xml getting-started.xml
                        guide-administrator.xml guide-deployers.xml
                        guide-example-configuration.xml index.xml
                        install.xml
               src/xdocs/bdg creating-a-block.xml
                        what-is-a-block-listener.xml what-is-a-block.xml
               src/xdocs/stylesheets changes.vsl docs.vsl project.xml
                        templates.vm velocity.properties
  Added:       src/java/org/apache/avalon/phoenix/tools/verifier
                        VerifyException.java
               src/xdocs/mx index.xml mxinfo.xml overview.xml structure.xml
                        xdoctags.xml
  Removed:     src/pdk/src/manifest block-archive.mf
               src/xdocs ClassLoader.txt ClassLoader2.txt
                        guide-mx-mxinfo.xml guide-mx-overview.xml
                        guide-mx-structure.xml guide-mx-xdoctags.xml
               src/xdocs/history JNDI-namespace-proposal.txt
                        SystemManager-proposal1.txt atlantis-proposal.txt
                        camelot-proposal.txt sample-Kernel.conf.xml
  Log:
  Merge in the release branch.
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-avalon-phoenix/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/README.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- README.txt	25 May 2002 17:03:06 -0000	1.2
  +++ README.txt	15 Sep 2002 02:07:31 -0000	1.3
  @@ -1,4 +1,4 @@
  -
  + 
                                 P H O E N I X
                           
                                  @version@
  
  
  
  1.167     +14 -5     jakarta-avalon-phoenix/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
  retrieving revision 1.166
  retrieving revision 1.167
  diff -u -r1.166 -r1.167
  --- build.xml	11 Sep 2002 12:47:25 -0000	1.166
  +++ build.xml	15 Sep 2002 02:07:31 -0000	1.167
  @@ -83,7 +83,7 @@
       </path>
   
       <!-- Main target -->
  -    <target name="main" depends="dist-lite-wrapper"
  +    <target name="main" depends="dist-lite"
           description="generates the Phoenix distribution without the javadocs"/>
   
       <target name="rebuild" description="Rebuilds Phoenix">
  @@ -91,7 +91,7 @@
           <antcall target="main"/>
       </target>
   
  -    <target name="all" depends="dist-lite" description="generates the Phoenix distribution">
  +    <target name="all" depends="main" description="generates the Phoenix distribution">
           <ant target="docs" antfile="docs.xml" inheritall="false" />
       </target>
   
  @@ -510,14 +510,20 @@
                   <include name="README.txt"/>
               </fileset>
           </copy>
  -        <mkdir dir="${src.dist.lib}/jing" />
  -        <copy todir="${src.dist.lib}">
  +        <mkdir dir="${src.dist.lib}/jing"/>
  +        <copy todir="${src.dist.lib}/jing">
               <fileset dir="${lib.dir}/jing">
                   <include name="**"/>
               </fileset>
           </copy>
  +        <mkdir dir="${src.dist.lib}/deploy"/>
  +        <copy todir="${src.dist.lib}/deploy">
  +            <fileset dir="${lib.dir}/deploy">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>
   
  -        <mkdir dir="${src.dist.lib}/xdoclet" />
  +        <mkdir dir="${src.dist.lib}/xdoclet"/>
           <copy todir="${src.dist.lib}/xdoclet">
               <fileset dir="${lib.dir}/xdoclet">
                   <include name="**"/>
  @@ -598,6 +604,9 @@
               src="${dist.base}/${dist.name}-bin.tar"/>
   
           <delete file="${dist.base}/${dist.name}-bin.tar"/>
  +        
  +        
  +        
           <delete dir="${dist.name}" />
   
           <antcall target="src-dist">
  
  
  
  1.11      +2 -0      jakarta-avalon-phoenix/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/gump.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- gump.xml	8 Sep 2002 12:17:36 -0000	1.10
  +++ gump.xml	15 Sep 2002 02:07:31 -0000	1.11
  @@ -22,6 +22,7 @@
       <depend project="bsf"/>
       <depend project="excalibur-configuration" runtime="true"/>
       <depend project="excalibur-containerkit" runtime="true"/>
  +    <depend project="excalibur-converter" runtime="true"/>
       <depend project="excalibur-io" runtime="true"/>
       <depend project="excalibur-cli" runtime="true"/>
       <depend project="excalibur-extension" runtime="true"/>
  @@ -39,6 +40,7 @@
       <depend project="jmx" runtime="true"/>
       <depend project="dist-bsf"/>
       <depend project="rhino"/>
  +    <depend project="mx4j"/>
       <!-- depend project="xdoclet" inherit="jars"/ -->
       <depend project="xdoclet-ant15" runtime="true" inherit="runtime"/>
       <depend project="jarv" runtime="true"/>
  
  
  
  1.7       +5 -4      jakarta-avalon-phoenix/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/project.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.properties	26 Aug 2002 22:13:45 -0000	1.6
  +++ project.properties	15 Sep 2002 02:07:31 -0000	1.7
  @@ -4,11 +4,11 @@
   
   name=phoenix
   Name=Phoenix
  -version=4.0beta2
  +version=4.0
   year=1999-2001
  -status=beta2
  -release=2nd
  -short.version=4.0b2
  +status=final
  +release=fcs
  +short.version=4.0
   cvs=jakarta-avalon-phoenix
   
   # This potentially overridden by the same property in ant.properties
  @@ -16,4 +16,5 @@
   
   # This potentially overridden by the same property in ant.properties
   system.manager.impl.class=org.apache.avalon.phoenix.components.manager.NoopSystemManager
  +
   
  
  
  
  1.55      +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
  
  Index: DefaultDeployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- DefaultDeployer.java	6 Sep 2002 09:42:35 -0000	1.54
  +++ DefaultDeployer.java	15 Sep 2002 02:07:31 -0000	1.55
  @@ -49,7 +49,7 @@
   import org.apache.avalon.phoenix.tools.assembler.AssemblyException;
   import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
   import org.apache.avalon.phoenix.tools.verifier.SarVerifier;
  -import org.apache.excalibur.containerkit.verifier.VerifyException;
  +import org.apache.avalon.phoenix.tools.verifier.VerifyException;
   
   /**
    * Deploy .sar files into a kernel using this class.
  
  
  
  1.44      +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java
  
  Index: CLIMain.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- CLIMain.java	6 Sep 2002 11:22:33 -0000	1.43
  +++ CLIMain.java	15 Sep 2002 02:07:31 -0000	1.44
  @@ -8,7 +8,7 @@
   package org.apache.avalon.phoenix.frontends;
   
   import java.io.File;
  -import java.util.Hashtable;
  +import java.util.Map;
   import java.util.Observable;
   import java.util.Observer;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
  @@ -68,7 +68,7 @@
        * @param args the command line arguments
        */
       public int main( final String[] args,
  -                     final Hashtable data,
  +                     final Map data,
                        final boolean blocking )
       {
           try
  @@ -115,7 +115,7 @@
        * @throws Exception if an error occurs
        */
       private void execute( final Parameters parameters,
  -                          final Hashtable data,
  +                          final Map data,
                             final boolean blocking )
           throws Exception
       {
  @@ -175,7 +175,7 @@
        * Startup the embeddor.
        */
       private synchronized boolean startup( final Parameters parameters,
  -                                          final Hashtable data )
  +                                          final Map data )
       {
           try
           {
  
  
  
  1.14      +0 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java
  
  Index: DaemonLauncher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DaemonLauncher.java	6 Aug 2002 11:57:41 -0000	1.13
  +++ DaemonLauncher.java	15 Sep 2002 02:07:31 -0000	1.14
  @@ -127,7 +127,6 @@
           }
           else
           {
  -            Thread.dumpStack();
               final String command = (null != arg) ? arg.toString() : "";
               if( command.equals( "restart" ) )
               {
  
  
  
  1.23      +8 -6      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/Main.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Main.java	6 Aug 2002 11:57:41 -0000	1.22
  +++ Main.java	15 Sep 2002 02:07:31 -0000	1.23
  @@ -16,8 +16,9 @@
   import java.security.Permissions;
   import java.security.Policy;
   import java.util.ArrayList;
  -import java.util.Hashtable;
  +import java.util.Map;
   import java.util.StringTokenizer;
  +import java.util.HashMap;
   
   /**
    * PhoenixLoader is the class that bootstraps and sets up engine ClassLoader.
  @@ -27,8 +28,8 @@
    */
   public final class Main
   {
  -    private static final String MAIN_CLASS = "org.apache.avalon.phoenix.frontends.CLIMain";
  -
  +    private static final String MAIN_CLASS =
  +        "org.apache.avalon.phoenix.frontends.CLIMain";
       private static final String LOADER_JAR = "phoenix-loader.jar";
   
       private static Object c_frontend;
  @@ -42,7 +43,8 @@
       public static final void main( final String[] args )
           throws Exception
       {
  -        int exitCode = startup( args, new Hashtable(), true );
  +        final int exitCode =
  +            startup( args, new HashMap(), true );
           System.exit( exitCode );
       }
   
  @@ -60,7 +62,7 @@
        * @throws Exception if an error occurs
        */
       protected static final int startup( final String[] args,
  -                                        final Hashtable data,
  +                                        final Map data,
                                           final boolean blocking )
           throws Exception
       {
  @@ -84,7 +86,7 @@
               //Create main launcher
               final Class clazz = classLoader.loadClass( MAIN_CLASS );
               final Class[] paramTypes =
  -                new Class[]{args.getClass(), Hashtable.class, Boolean.TYPE};
  +                new Class[]{args.getClass(), Map.class, Boolean.TYPE};
               final Method method = clazz.getMethod( "main", paramTypes );
               c_frontend = clazz.newInstance();
   
  
  
  
  1.8       +16 -7     jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/ConfigurationBuilder.java
  
  Index: ConfigurationBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/configuration/ConfigurationBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ConfigurationBuilder.java	6 Aug 2002 11:57:42 -0000	1.7
  +++ ConfigurationBuilder.java	15 Sep 2002 02:07:31 -0000	1.8
  @@ -35,6 +35,15 @@
                        "org/apache/avalon/phoenix/tools/assembly.dtd" ),
           new DTDInfo( "-//PHOENIX/Mx Info DTD Version 1.0//EN",
                        "http://jakarta.apache.org/phoenix/mxinfo_1_0.dtd",
  +                     "org/apache/avalon/phoenix/tools/mxinfo.dtd" ),
  +        new DTDInfo( "-//PHOENIX/Block Info DTD Version 1.0//EN",
  +                     "http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1_0.dtd",
  +                     "org/apache/avalon/phoenix/tools/blockinfo.dtd" ),
  +        new DTDInfo( "-//PHOENIX/Assembly DTD Version 1.0//EN",
  +                     "http://jakarta.apache.org/avalon/dtds/phoenix/assembly_1_0.dtd",
  +                     "org/apache/avalon/phoenix/tools/assembly.dtd" ),
  +        new DTDInfo( "-//PHOENIX/Mx Info DTD Version 1.0//EN",
  +                     "http://jakarta.apache.org/avalon/dtds/phoenix/mxinfo_1_0.dtd",
                        "org/apache/avalon/phoenix/tools/mxinfo.dtd" )
       };
   
  @@ -65,17 +74,17 @@
        */
       private static void setupXMLReader( final XMLReader reader,
                                           final SAXConfigurationHandler handler,
  -                                        final boolean validate)
  +                                        final boolean validate )
           throws SAXException
       {
           reader.setEntityResolver( c_resolver );
           reader.setContentHandler( handler );
           reader.setErrorHandler( handler );
   
  -        if (validate)
  +        if( validate )
           {
               // Request validation
  -            reader.setFeature("http://xml.org/sax/features/validation", true);
  +            reader.setFeature( "http://xml.org/sax/features/validation", true );
           }
       }
   
  @@ -89,7 +98,7 @@
       }
   
       /**
  -     * Build a configuration object using an URI, and 
  +     * Build a configuration object using an URI, and
        * optionally validate the xml against the DTD.
        */
       public static Configuration build( final String uri, boolean validate )
  @@ -108,7 +117,7 @@
       }
   
       /**
  -     * Build a configuration object using an XML InputSource object, and 
  +     * Build a configuration object using an XML InputSource object, and
        * optionally validate the xml against the DTD.
        */
       public static Configuration build( final InputSource input, boolean validate )
  @@ -119,5 +128,5 @@
           setupXMLReader( reader, handler, validate );
           reader.parse( input );
           return handler.getConfiguration();
  -    }   
  +    }
   }
  
  
  
  1.29      +1 -31     jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java
  
  Index: SarVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/SarVerifier.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- SarVerifier.java	6 Sep 2002 11:17:45 -0000	1.28
  +++ SarVerifier.java	15 Sep 2002 02:07:31 -0000	1.29
  @@ -30,8 +30,6 @@
   import org.apache.avalon.phoenix.metainfo.BlockInfo;
   import org.apache.avalon.phoenix.metainfo.DependencyDescriptor;
   import org.apache.avalon.phoenix.metainfo.ServiceDescriptor;
  -import org.apache.excalibur.containerkit.verifier.ComponentVerifier;
  -import org.apache.excalibur.containerkit.verifier.VerifyException;
   
   /**
    * This Class verifies that Sars are valid. It performs a number
  @@ -380,8 +378,6 @@
                                  block.getBlockInfo().getServices(),
                                  classLoader );
   
  -        verifyAvalonComponent( name, clazz, interfaces );
  -
           for( int i = 0; i < interfaces.length; i++ )
           {
               if( !interfaces[ i ].isAssignableFrom( clazz ) )
  @@ -402,32 +398,6 @@
                                  classname );
               getLogger().error( message );
               System.err.println( message );
  -        }
  -
  -    }
  -
  -    /**
  -     * Verify specified object satisifies the rules of being abn Avalon component.
  -     *
  -     * @param name the components name
  -     * @param clazz the implementation class
  -     * @param interfaces the service classes
  -     */
  -    private void verifyAvalonComponent( final String name, Class clazz, final Class[] interfaces )
  -    {
  -        try
  -        {
  -            final ComponentVerifier verifier = new ComponentVerifier();
  -            setupLogger( verifier );
  -            verifier.
  -                verifyComponent( name, clazz, interfaces );
  -        }
  -        catch( VerifyException ve )
  -        {
  -            //ignore as the above will print out
  -            //error. However the verifier is too
  -            //strict and we need to be more lax for backwards
  -            //compatability
           }
       }
   
  
  
  
  1.6       +2 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/verifier/VerifyException.java
  
  
  
  
  1.10      +4 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestSubTask.java
  
  Index: ManifestSubTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestSubTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ManifestSubTask.java	25 Aug 2002 05:56:40 -0000	1.9
  +++ ManifestSubTask.java	15 Sep 2002 02:07:31 -0000	1.10
  @@ -28,6 +28,9 @@
   
       public ManifestSubTask()
       {
  +        System.out.println( "WARNING: manifest generation has " +
  +                            "never been required by Phoenix and is considered, " +
  +                            "a deprecated practice." );
           setupParams();
       }
   
  
  
  
  1.2       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/blockinfo.xdt
  
  Index: blockinfo.xdt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/blockinfo.xdt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- blockinfo.xdt	25 Aug 2002 05:56:40 -0000	1.1
  +++ blockinfo.xdt	15 Sep 2002 02:07:31 -0000	1.2
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <!DOCTYPE blockinfo PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN"
  -                  "http://jakarta.apache.org/phoenix/blockinfo_1_0.dtd">
  +                  "http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1_0.dtd">
   
   <blockinfo>
   
  
  
  
  1.3       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/mxinfo.xdt
  
  Index: mxinfo.xdt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/mxinfo.xdt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mxinfo.xdt	6 Sep 2002 10:01:40 -0000	1.2
  +++ mxinfo.xdt	15 Sep 2002 02:07:31 -0000	1.3
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   <!DOCTYPE mxinfo PUBLIC "-//PHOENIX/Mx Info DTD Version 1.0//EN"
  -                  "http://jakarta.apache.org/phoenix/mxinfo_1_0.dtd">
  +                  "http://jakarta.apache.org/avalon/dtds/phoenix/mxinfo_1_0.dtd">
   
   <mxinfo>
   
  
  
  
  1.9       +1 -2      jakarta-avalon-phoenix/src/pdk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/pdk/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	5 Jul 2002 07:08:55 -0000	1.8
  +++ build.xml	15 Sep 2002 02:07:32 -0000	1.9
  @@ -57,8 +57,7 @@
       <mkdir dir="build/lib"/>
   
       <!-- block for Phoenix-Demo -->
  -    <jar jarfile="build/lib/${name}-block.jar"
  -         manifest="src/manifest/block-archive.mf">
  +    <jar jarfile="build/lib/${name}-block.jar">
         <fileset dir="build/classes">
           <include name="**"/>
           <exclude name="phoenixdemo/client/**"/>
  
  
  
  1.5       +1 -1      jakarta-avalon-phoenix/src/schema/assembly.dtd
  
  Index: assembly.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/schema/assembly.dtd,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- assembly.dtd	18 Aug 2002 08:23:34 -0000	1.4
  +++ assembly.dtd	15 Sep 2002 02:07:32 -0000	1.5
  @@ -24,7 +24,7 @@
   -->
   <!ELEMENT assembly (block|block-listener|listener)*>
   <!ATTLIST assembly id ID #IMPLIED
  -          xmlns CDATA #FIXED "http://jakarta.apache.org/phoenix/assembly_1_0.dtd" >
  +          xmlns CDATA #FIXED "http://jakarta.apache.org/avalon/dtds/phoenix/assembly_1_0.dtd" >
   
   <!--
   The block element declares a block exists in the application.
  
  
  
  1.12      +1 -1      jakarta-avalon-phoenix/src/schema/blockinfo.dtd
  
  Index: blockinfo.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/schema/blockinfo.dtd,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- blockinfo.dtd	6 Aug 2002 11:13:42 -0000	1.11
  +++ blockinfo.dtd	15 Sep 2002 02:07:32 -0000	1.12
  @@ -27,7 +27,7 @@
   -->
   <!ELEMENT blockinfo (block, services?, management-access-points?, dependencies?)>
   <!ATTLIST blockinfo id ID #IMPLIED
  -          xmlns CDATA #FIXED "http://jakarta.apache.org/phoenix/blockinfo_1_0.dtd" >
  +          xmlns CDATA #FIXED "http://jakarta.apache.org/avalon/dtds/phoenix/blockinfo_1_0.dtd" >
   
   <!--
   The block element describes the block, it defines:
  
  
  
  1.3       +1 -1      jakarta-avalon-phoenix/src/schema/mxinfo.dtd
  
  Index: mxinfo.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/schema/mxinfo.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mxinfo.dtd	7 Aug 2002 07:07:57 -0000	1.2
  +++ mxinfo.dtd	15 Sep 2002 02:07:32 -0000	1.3
  @@ -25,7 +25,7 @@
   -->
   <!ELEMENT mxinfo (topic*,proxy*)>
   <!ATTLIST mxinfo id ID #IMPLIED
  -          xmlns CDATA #FIXED "http://jakarta.apache.org/phoenix/mxinfo_1_0.dtd" >
  +          xmlns CDATA #FIXED "http://jakarta.apache.org/avalon/dtds/phoenix/mxinfo_1_0.dtd" >
   
   <!--
   The topic element describes a set of attributes and operations relating to a
  
  
  
  1.6       +3 -3      jakarta-avalon-phoenix/src/xdocs/announcement.xml
  
  Index: announcement.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/announcement.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- announcement.xml	7 Aug 2002 22:03:56 -0000	1.5
  +++ announcement.xml	15 Sep 2002 02:07:32 -0000	1.6
  @@ -30,10 +30,10 @@
           components and creating a server.
         </para>
         <para>
  -        In order to see Avalon Phoenix at work, you should grab the example
  -        applications or servers that are included in Avalon Cornerstone.
  +        In order to see Avalon-Phoenix at work, you should grab the one of the 
  +        demo applications or servers that are included in Avalon-Apps.
           <ulink uri="http://jakarta.apache.org/james/">Apache James</ulink>
  -        uses Phoenix for it's mail server.
  +        is a production ready mail server that sits on Phoenix.
         </para>
       </description>
       <changes version="@version@" file="changes.xml"/>
  
  
  
  1.17      +52 -1     jakarta-avalon-phoenix/src/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/changes.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- changes.xml	7 Aug 2002 22:03:56 -0000	1.16
  +++ changes.xml	15 Sep 2002 02:07:32 -0000	1.17
  @@ -13,8 +13,59 @@
       <author name="Stephen McConnell" email="mcconnell@osm.net" id="SM"/>
       <author name="Peter Royal" email="proyal@apache.org" id="PR"/>
       <author name="Huw Roberts" email="huw@apache.org" id="HR"/>    
  +    <author name="Eung-ju Park" email="colus@apache.org" id="EP"/>
  +    <author name="David W." email="daveweit@optonline.net" id="DW"/>
     </devs>
  -<release version="4.0b" date="Unreleased">  
  +<release version="4.0b" date="Unreleased">
  +    <action dev="DW" type="change">
  +        Started creating a Administrators guide.
  +    </action>
  +    <action dev="PD" type="change">
  +        Deprecated Manifest generation xdoclet task. It has never been
  +        used, supported or required by Phoenix and is considered a
  +        deprecated practice.
  +    </action>
  +    <action dev="PD" type="change">
  +        Moved the default location of DTDs to be based in directory
  +        http://jakarta.apache.org/avalon/dtds/phoenix/* rather than
  +        http://jakarta.apache.org/phoenix/*. Old style DTD URIs are
  +        still supported.
  +    </action>
  +    <action dev="EP" type="add">
  +        Added support for Blocks that are not proxied.
  +    </action>
  +    <action dev="PR" type="add">
  +        Added support for validation of a Blocks configuration
  +        against a schema (such as XMLSchema, Relax NG etc).
  +    </action>
  +    <action dev="PD" type="add">
  +        Added the ability for Blocks to request shutdown of their
  +        enclosing application via BlockContext.requestShutdown().
  +        This will in turn shutdown the JVM *if* there are no more
  +        applications and the kernel has not been put in persistent
  +        mode.
  +    </action>
  +    <action dev="PD" type="fix">
  +        Made sure that the i18n resources are reloaded whenever an
  +        application is redeployed. This fixed a bug where multiple
  +        re-runs of the same application would not update the i18n Resource
  +        bundles.
  +    </action>
  +    <action dev="PD" type="add">
  +        Added the ability for Blocks to request resources from the
  +        .sar file via BlockContext.getResourceAsStream(String).
  +    </action>
  +    <action dev="PD" type="remove">
  +        Removed support for the JMX RI as it did not support
  +        RequiredMBean objects. We now require the MX4J
  +        implementation.
  +    </action>
  +    <action dev="HR" type="add">
  +        Addded documentation for new Management Info files.
  +    </action>
  +    <action dev="HR" type="add">
  +        Addded xdoclet support for new Management Info files.
  +    </action>
       <action dev="HR" type="add">
           Lots of work on JMX capability for Phoenix.
       </action>
  
  
  
  1.8       +1 -1      jakarta-avalon-phoenix/src/xdocs/getting-started.xml
  
  Index: getting-started.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/getting-started.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- getting-started.xml	16 Jun 2002 10:21:45 -0000	1.7
  +++ getting-started.xml	15 Sep 2002 02:07:32 -0000	1.8
  @@ -4,7 +4,7 @@
   
    <properties>
      <title>Getting Started</title>
  -   <author email="avalon-dev@jakarta.apache.org">Avalon Documentation Team</author>
  +     <author email="avalon-phoenix-dev@jakarta.apache.org">Phoenix Documentation Team</author>
      <author email="leosimons@apache.org">Leo Simons</author>
      <author email="Paul_Hammant@yahoo.com">Paul Hammant</author>
    </properties>
  
  
  
  1.5       +232 -7    jakarta-avalon-phoenix/src/xdocs/guide-administrator.xml
  
  Index: guide-administrator.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/guide-administrator.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- guide-administrator.xml	16 Jun 2002 10:21:45 -0000	1.4
  +++ guide-administrator.xml	15 Sep 2002 02:07:32 -0000	1.5
  @@ -3,7 +3,7 @@
   <document>
       <properties>
           <title>Guide - for Administrators</title>
  -        <author email="bloritsch@apache.org">Berin Loritsch</author>
  +        <author email="daveweit@optonline.net">David W.</author>
       </properties>
       <body>
           <section name="Introduction">
  @@ -19,13 +19,238 @@
                     Phoenix kernel from the point of view of the administrator.
                   </p>
               </subsection>
  -            <subsection name="Guide non-existent, but features are there">
  -                <p>We currently have no info on this whatsoever. However, this doesn't
  -               mean that Phoenix is not easy to administrate - the contrary is true,
  -               since our tight integration with JMX exposes the entire kernel at
  -               runtime.
  -                    </p>
  +        </section>
  +        <section name="Starting and Stopping">
  +            <subsection name="Using Scripts">
  +                <p>
  +                  You can start Phoenix with the following command:
  +
  +                    <source><![CDATA[
  +
  +                    > bin/run.[bat|sh]
  +
  +                    ]]></source>
  +
  +                </p>
  +                <p>
  +                  In Windows versions other than NT, you'll need to set
  +                  the PHOENIX_HOME environment variable first.
  +                </p>
  +                <p>
  +                  In UNIX environments, you can use the <code>phoenix.sh</code>
  +                  script to stop Phoenix.
  +                </p>
  +
  +                    <source><![CDATA[
  +                      > phoenix.sh stop
  +                    ]]></source>
  +
  +                <p>
  +                  phoenix.sh accepts these commands:
  +                  start, stop, run, restart, check.
  +                </p>
  +                <p>
  +                  In Windows, typing CONTROL-C will cause a clean shutdown.
  +                </p>
  +            </subsection>
  +            <subsection name="Using the Java Service Wrapper">
  +              <p>
  +                Another option for starting and stopping Phoenix is to build
  +                it with support for the
  +                <a href="http://wrapper.sourceforge.net/">Java Service Wrapper</a>.
  +              </p>
  +              <p>
  +                The main benifit of using the Java Service Wrapper is that it can
  +                install Phoenix as an NT service.  It can also detect if the JVM
  +                freezes up or crashes and restart the application immediately.
  +              </p>
  +              <p>
  +                To build Phoenix with the Java Service Wrapper, download and
  +                extract the latest version.  Next, in the root of the source tree,
  +                create or modify <code>ant.properties</code> so that it looks
  +                similar to this:
  +              </p>
  +
  +<source>
  +# ${base.path} points to the root of the Phoenix source tree
  +wrapper.home=${base.path}/wrapper_linux_2.2.3
  +wrapper.jar=${wrapper.home}/lib/wrapper.jar
  +
  +# If you're using Linux/Solaris:
  +wrapper.exe=${wrapper.home}/bin/wrapper
  +wrapper.dll=${wrapper.home}/lib/libwrapper.so
  +
  +# If you're using Windows:
  +wrapper.exe=${wrapper.home}/bin/Wrapper.exe
  +wrapper.dll=${wrapper.home}/lib/Wrapper.dll
  +</source>
  +
  +              <p>
  +                Then just build as usual.
  +              </p>
  +              <p>
  +                For usage instructions, move to the <code>bin</code> directory and type
  +              </p>
  +
  +                    <source><![CDATA[
  +
  +                      > wrapper
  +
  +                    ]]></source>
  +
  +              <p>
  +                The Wrapper configuration file is named <code>conf/wrapper.conf</code>.
  +              </p>
  +            </subsection>
  +        </section>
  +        <section name="Using JMX">
  +            <subsection name="JMX Overview">
  +              <p>
  +                Phoenix is tightly integrated with Java Management Extensions (JMX).
  +                TODO: say something else.  Integrate this section with the other
  +                <a href="mx/index.html">JMX info</a>.
  +              </p>
  +            </subsection>
  +            <subsection name="How to Make Your Block an MBean">
  +              <p>
  +                It's actually quite simple.  Suppose you wanted to expose the
  +                interface from the WebServer block
  +                <a href="bdg/making-phoenix-compatible-comps.html">described</a> in
  +                the Block developer's guide.  You only need to do two things.
  +              </p>
  +              <p>
  +                First, create an MBean interface.  It will look something like this:
  +              </p>
  +<source>
  +package examplecomp.block;
  +
  +public interface WebServerMBean {
  +    void mountWar(String contextName, URL pathToWar);
  +    void unMountWar(String contextName);
  +}
  +</source>
  +              <p>
  +                Notice that interface MBean is identical to interface WebServer.
  +                In most cases, it should be.
  +              </p>
  +              <p>
  +                Now just make WebServerBlock implement WebServerMBean
  +              </p>
  +<source>
  +package examplecomp.block;
  +
  +/**
  + * TODO: describe PhoenixXDoclet setup.
  + * @phoenix:mx name="examplecomp.block.WebServerMBean"
  + */
  +public class WebServerBlock
  +    extends AbstractLoggable
  +    implements WebServer, WebServerMBean, Startable, Configurable, Initializable {
  +
  +    // ...
  +
  +}
  +</source>
  +            </subsection>
  +            <subsection name="Using Http Adaptor">
  +              <p>
  +                The MX4J Http Adaptor allows access to a running Phoenix server
  +                with any web browser.
  +              </p>
  +              <p>
  +                TODO: describe configuration methods when they settle down
  +              </p>
  +              <p>
  +                Then just point your browser to
  +                <a href="http://localhost:8082/">http://localhost:8082/</a>.
  +                You should see a list of JMX MBeans you can control.
  +              </p>
  +              <p>
  +                Under the section labled "Domain: Phoenix" you should see
  +                a familier looking name or two.  They depend on the .sar
  +                file packaging and configuration, but the web server above
  +                would have a name similar to
  +  <code>Phoenix:application=webserver,block=webserver,topic=WebServerMBean</code>.
  +                If you click on the name, you'll find a form that allows you
  +                to mount and unmount .war files through the web!
  +              </p>
  +              <p>
  +                If your aren't familiar with the guts of Phoenix, you may
  +                want to browse the source to understand what some of the other
  +                MBeans listed do. For example,
  +                <code>Phoenix:component=Embeddor,topic=Embeddor</code> allows
  +                you to restart and shutdown Phoenix.  It also provides information,
  +                such as the server's start time and uptime, home directory, version,
  +                and build information.
  +              </p>
  +            </subsection>
  +            <subsection name="Using RMI Adaptor">
  +              <p>
  +                If you would like to write an agent that can administrate Phoenix
  +                programatically, you can use the MX4J RMI Adaptor.  This section
  +                is basically duplicating information available in the MX4J
  +                <a href="http://mx4j.sourceforge.net/docs/bk01ch03s13.html#d0e1012">
  +                documentation</a>.  Phoenix uses the JRMP RMI Adaptor.
  +              </p>
  +              <p>
  +                Ensure that the MX4J RMI Adaptor is enabled in kernal.xml
  +              </p>
  +<source><![CDATA[
  +        <component role="org.apache.avalon.phoenix.interfaces.SystemManager"
  +            class="org.apache.avalon.phoenix.components.manager.MX4JSystemManager"
  +            logger="manager" >
  +          <enable-rmi-adaptor>true</enable-rmi-adaptor>
  +          [other enabled adaptors]
  +        </component>
  +]]>
  +</source>
  +              <p>
  +                Place mx4j-jmx.jar, mx4j-tools.jar, and jndi.properties (TODO: include it)
  +                in your classpath.  Suppose you wanted to shut down Phoenix.  Create the
  +                following class:
  +              </p>
  +
  +<source>
  +import mx4j.connector.rmi.jrmp.JRMPConnector;
  +import mx4j.connector.RemoteMBeanServer;
  +import javax.management.ObjectName;
  +
  +public class JrmpShutdown {
  +
  +	public static void main(String[] args) throws Exception
  +	{
  +		// Create a JRMPConnector
  +		JRMPConnector connector = new JRMPConnector();
  +
  +		// Pass in the adaptor's JNDI name, no properties
  +		String jndiName = "jrmp";
  +		connector.connect(jndiName, null);
  +
  +		// Get the remote MBeanServer from the connector
  +		// And use it as if it is an MBeanServer
  +		RemoteMBeanServer server = connector.getRemoteMBeanServer();
  +
  +		ObjectName objName = new ObjectName("Phoenix:component=Embeddor,topic=Embeddor");
  +		server.invoke(objName, "shutdown", new Object[0], new String[0]);
  +	}
  +}
  +</source>
  +              <p>
  +                Compile and run -- presto! The server stops.
  +              </p>
               </subsection>
  +        </section>
  +        <section name="Troubleshooting">
  +          <p>
  +            <b>Phoenix stops immediatly after starting, with no error message</b>
  +          </p>
  +          <p>
  +            Make sure you have a .sar file in the app/ directory.  If there isn't
  +            a service running, Phoenix quits immediately.  You can actually
  +            stop the server by undeploying all registered applications through
  +            JMX (although that would be a strange way of doing it).
  +            TODO: is this behavior a good thing?
  +          </p>
           </section>
       </body>
   </document>
  
  
  
  1.6       +1 -1      jakarta-avalon-phoenix/src/xdocs/guide-deployers.xml
  
  Index: guide-deployers.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/guide-deployers.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- guide-deployers.xml	6 Aug 2002 11:13:42 -0000	1.5
  +++ guide-deployers.xml	15 Sep 2002 02:07:32 -0000	1.6
  @@ -3,7 +3,7 @@
   <document>
     <properties>
       <title>Guide - for Deployers</title>
  -    <author email="peter at apache.org">Peter Donald</author>
  +    <author email="avalon-phoenix-dev@jakarta.apache.org">Phoenix Documentation Team</author>
     </properties>
     <body>
       <section name="Introduction">
  
  
  
  1.5       +5 -19     jakarta-avalon-phoenix/src/xdocs/guide-example-configuration.xml
  
  Index: guide-example-configuration.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/guide-example-configuration.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- guide-example-configuration.xml	16 Jun 2002 10:21:45 -0000	1.4
  +++ guide-example-configuration.xml	15 Sep 2002 02:07:32 -0000	1.5
  @@ -17,25 +17,11 @@
         <p>The orginal post was written by Stephen McConnell from OSM.</p>
       </section>
       <section name="The example">
  -      <p>First we start with a manifest file in a jar the contains
  -      a block.  The manifest contains the declaration of the path
  -      to the block implementation.  This path is also used to
  -      resolve the .xinfo file.  In this case the <code>.xinfo</code>
  -      description will be located under
  -      <code>org/apache/acme/hub/gateway/pki/PKIProcessServer.xinfo</code></p>
  -      <source><![CDATA[
  -
  -Manifest-Version: 1.0
  -Created-By: ACME Corporation
  -
  -Name: org/apache/acme/hub/gateway/pki/PKIProcessServer.class
  -Avalon-Block: true
  -
  -      ]]>
  -      </source>
  -      <p>The <code>.xinfo</code> file contains a description of a
  -      reasonably simple block that serves as a factory for business
  -      processes that handle PKI certification requests:</p>
  +      <p>Each Block has an associated xinfo file and the xinfo file
  +      is stored alongside the block in a jar file. The <code>.xinfo</code>
  +      file contains a description of a reasonably simple block that serves
  +      as a factory for business processes that handle PKI certification
  +      requests:</p>
         <source><![CDATA[
   <?xml version="1.0"?>
   
  
  
  
  1.14      +2 -4      jakarta-avalon-phoenix/src/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/index.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- index.xml	4 Sep 2002 21:43:10 -0000	1.13
  +++ index.xml	15 Sep 2002 02:07:32 -0000	1.14
  @@ -2,9 +2,7 @@
   <document>
     <properties>
       <title>Overview</title>
  -      <author email="bloritsch@apache.org">Berin Loritsch</author>
  -      <author email="peter at apache.org">Peter Donald</author>
  -      <author email="Paul_Hammant@yahoo.com">Paul Hammant</author>
  +      <author email="avalon-phoenix-dev@jakarta.apache.org">Phoenix Documentation Team</author>
     </properties>
     <body>
       <section name="Introduction">
  @@ -52,7 +50,7 @@
               <li><a href="guide-roles.html">Development roles</a></li>
               <li><a href="guide-administrators.html">Administrator Guide</a></li>
               <li><a href="guide-deployers.html">Application Deployer Guide</a></li>
  -            <li><a href="guide-management.html">JMX Management Guide</a></li>
  +            <li><a href="mx/index.html">JMX Management Guide</a></li>
               <li><a href="assemblers/index.html">Server Application Assembler Guide</a></li>
               <li><a href="bdg/index.html">Block Developer Guide</a></li>
               <li><a href="guide-example-configuration.html">Example Configuration.</a></li>
  
  
  
  1.9       +1 -3      jakarta-avalon-phoenix/src/xdocs/install.xml
  
  Index: install.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/install.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- install.xml	16 Jun 2002 10:21:45 -0000	1.8
  +++ install.xml	15 Sep 2002 02:07:32 -0000	1.9
  @@ -4,9 +4,7 @@
   
    <properties>
     <title>Installation</title>
  -
  -   <author email="avalon-dev@jakarta.apache.org">Avalon Documentation Team</author>
  -
  +     <author email="avalon-phoenix-dev@jakarta.apache.org">Phoenix Documentation Team</author>
    </properties>
   
   <body>
  
  
  
  1.6       +2 -12     jakarta-avalon-phoenix/src/xdocs/bdg/creating-a-block.xml
  
  Index: creating-a-block.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/bdg/creating-a-block.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- creating-a-block.xml	6 Aug 2002 11:13:42 -0000	1.5
  +++ creating-a-block.xml	15 Sep 2002 02:07:32 -0000	1.6
  @@ -3,7 +3,7 @@
   <document>
     <properties>
       <title>Guide - Creating a Block</title>
  -    <author email="peter at apache.org">Peter Donald</author>
  +      <author email="avalon-phoenix-dev@jakarta.apache.org">Phoenix Documentation Team</author>
     </properties>
     <body>
       <section name="Introduction">
  @@ -44,18 +44,8 @@
       <section name="Create the jar package">
         <p>
           The final step is packaging up the implementation files, BlockInfos and other
  -        resources into a jar file. The jar file is a standard jar file with special manifest
  -        entries. For each Block that is included in the jar, a new manifest attribute
  -        must be added, namely &quot;Avalon-Block: true&quot;. An example manifest file is
  -        displayed below.
  +        resources into a jar file.
         </p>
  -      <source>
  -Manifest-Version: 1.0
  -Created-By: Apache Avalon Project
  -
  -Name: com/biz/cornerstone/blocks/MyBlock.class
  -Avalon-Block: true
  -      </source>
       </section>
        <section name="Guide Contents">
          <ol>
  
  
  
  1.6       +1 -2      jakarta-avalon-phoenix/src/xdocs/bdg/what-is-a-block-listener.xml
  
  Index: what-is-a-block-listener.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/bdg/what-is-a-block-listener.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- what-is-a-block-listener.xml	6 Aug 2002 11:13:42 -0000	1.5
  +++ what-is-a-block-listener.xml	15 Sep 2002 02:07:32 -0000	1.6
  @@ -3,8 +3,7 @@
   <document>
     <properties>
       <title>Guide - What is a Block Listener?</title>
  -      <author email="peter at apache.org">Peter Donald</author>
  -      <author email="Paul_Hammant@yahoo.com">Paul Hammant</author>
  +      <author email="avalon-phoenix-dev@jakarta.apache.org">Phoenix Documentation Team</author>
     </properties>
     <body>
       <section name="Introduction">
  
  
  
  1.5       +1 -1      jakarta-avalon-phoenix/src/xdocs/bdg/what-is-a-block.xml
  
  Index: what-is-a-block.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/bdg/what-is-a-block.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- what-is-a-block.xml	16 Jun 2002 10:21:46 -0000	1.4
  +++ what-is-a-block.xml	15 Sep 2002 02:07:32 -0000	1.5
  @@ -3,7 +3,7 @@
   <document>
     <properties>
       <title>Guide - What is a Block?</title>
  -    <author email="fede@apache.org">Federico Barbieri</author>
  +      <author email="avalon-phoenix-dev@jakarta.apache.org">Phoenix Documentation Team</author>
     </properties>
     <body>
       <section name="Introduction">
  
  
  
  1.2       +24 -0     jakarta-avalon-phoenix/src/xdocs/mx/index.xml
  
  
  
  
  1.2       +99 -0     jakarta-avalon-phoenix/src/xdocs/mx/mxinfo.xml
  
  
  
  
  1.2       +141 -0    jakarta-avalon-phoenix/src/xdocs/mx/overview.xml
  
  
  
  
  1.2       +97 -0     jakarta-avalon-phoenix/src/xdocs/mx/structure.xml
  
  
  
  
  1.2       +315 -0    jakarta-avalon-phoenix/src/xdocs/mx/xdoctags.xml
  
  
  
  
  1.5       +0 -47     jakarta-avalon-phoenix/src/xdocs/stylesheets/changes.vsl
  
  Index: changes.vsl
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/stylesheets/changes.vsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- changes.vsl	13 Jun 2002 09:20:31 -0000	1.4
  +++ changes.vsl	15 Sep 2002 02:07:33 -0000	1.5
  @@ -1,7 +1,5 @@
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
   
  -#parse( "templates.vm" )
  -
   <!-- Content Stylesheet for Site -->
   
       ## Defined variables
  @@ -20,48 +18,3 @@
   #changes()
   <!-- end the processing -->
   
  -#macro (change $action)
  -  <p>$action.getText() ($action.getAttributeValue("dev"))</p>
  -#end
  -
  -#macro (changeset $release)
  -  <table border="0" cellspacing="0" cellpadding="2" width="100%">
  -    <tr><td bgcolor="$subbannerbg">
  -      <font color="$subbannerfg" face="arial,helvetica,sanserif">
  -        <strong>
  -          Revision $release.getAttributeValue("version") ($release.getAttributeValue("date"))
  -        </strong>
  -      </font>
  -    </td></tr>
  -    <tr><td>
  -      <blockquote>
  -        <ul>
  -        #foreach ($action in $release.getChildren("action"))
  -        <li>#change ($action)</li>
  -        #end
  -        </ul>
  -      </blockquote>
  -    </td></tr>
  -  </table>
  -  </a>
  -#end
  -
  -#macro (changes)
  -  #header
  -  <table border="0" cellspacing="0" cellpadding="2" width="100%">
  -    <tr><td bgcolor="$bannerbg">
  -      <font color="$bannerfg" face="arial,helvetica,sanserif">
  -        <strong>ChangeLog</strong>
  -      </font>
  -    </td></tr>
  -    <tr><td>
  -      <blockquote>
  -      #set ($releases = $root.getChildren("release"))
  -      #foreach ( $release in $releases )
  -        #changeset ($release)
  -      #end
  -      </blockquote>
  -    </td></tr>
  -  </table>
  -  #footer
  -#end
  
  
  
  1.7       +0 -45     jakarta-avalon-phoenix/src/xdocs/stylesheets/docs.vsl
  
  Index: docs.vsl
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/stylesheets/docs.vsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- docs.vsl	9 Jul 2002 07:29:02 -0000	1.6
  +++ docs.vsl	15 Sep 2002 02:07:33 -0000	1.7
  @@ -1,49 +1,4 @@
   <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
   
  -#parse ( "templates.vm" )
  -
  -#macro(document)
  -  #header()
  -  #set($allSections = $root.getChild("body").getChildren("section"))
  -  #foreach( $section in $allSections )
  -    #section ($section)
  -  #end
  -  #footer()
  -#end
  -
  -#macro ( subsection $subsection)
  -  <div class="h4">
  -    #if ( $subsection.getAttributeValue("anchor") )
  -      #set ($anchor = $subsection.getAttributeValue("anchor"))
  -    #else
  -      #set ($anchor = $subsection.getAttributeValue("name"))
  -    #end
  -    <h4><a name="$anchor">$subsection.getAttributeValue("name")</a></h4>
  -    #foreach ( $items in $subsection.getChildren() )
  -      #copy($items)
  -    #end
  -  </div>
  -#end
  -
  -#macro (section $section)
  -  <div class="h3">
  -    #if ( $section.getAttributeValue("anchor") )
  -      #set ($anchor = $section.getAttributeValue("anchor"))
  -    #else
  -      #set ($anchor = $section.getAttributeValue("name"))
  -    #end
  -    <h3><a name="$anchor">$section.getAttributeValue("name")</a></h3>
  -    #foreach ( $items in $section.getChildren() )
  -      #if ($items.getName().equals("subsection"))
  -        #subsection ($items)
  -      #else
  -        #copy($items)
  -      #end
  -    #end
  -  </div>
  -#end
  -
  -#parse ( "templates.vm" )
  -
   <!-- This is a generated file.  Do not edit. -->
   #document()
  
  
  
  1.5       +1 -0      jakarta-avalon-phoenix/src/xdocs/stylesheets/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/stylesheets/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	30 Jun 2002 21:34:45 -0000	1.4
  +++ project.xml	15 Sep 2002 02:07:33 -0000	1.5
  @@ -23,6 +23,7 @@
               <item name="for Deployers" href="/guide-deployers.html"/>
               <item name="for Assemblers" href="/assemblers/index.html"/>
               <item name="for Block Developers" href="/bdg/index.html" />
  +            <item name="Management Guide" href="/mx/index.html" />
               <item name="Example configuration" href="/guide-example-configuration.html" />
           </menu>
   
  
  
  
  1.8       +88 -1     jakarta-avalon-phoenix/src/xdocs/stylesheets/templates.vm
  
  Index: templates.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/stylesheets/templates.vm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- templates.vm	9 Jul 2002 07:29:02 -0000	1.7
  +++ templates.vm	15 Sep 2002 02:07:33 -0000	1.8
  @@ -256,7 +256,7 @@
   	#set ($authors = $root.getChild("properties").getChildren("author"))
   	#foreach ( $au in $authors )
    #if( $velocityCount == 1 )by #end
  - #if( $velocityCount != 1 ),#end <a href="$au.getAttributeValue("email")">$au.getText()</a>
  + #if( $velocityCount != 1 ),#end <a href="mailto:$au.getAttributeValue("email")">$au.getText()</a>
   	#end
   	</div>
   #end
  @@ -273,4 +273,91 @@
     #else
       $element.content
     #end
  +#end
  +
  +#macro(document)
  +  #header()
  +  #set($allSections = $root.getChild("body").getChildren("section"))
  +  #foreach( $section in $allSections )
  +    #section ($section)
  +  #end
  +  #footer()
  +#end
  +
  +#macro ( subsection $subsection)
  +  <div class="h4">
  +    #if ( $subsection.getAttributeValue("anchor") )
  +      #set ($anchor = $subsection.getAttributeValue("anchor"))
  +    #else
  +      #set ($anchor = $subsection.getAttributeValue("name"))
  +    #end
  +    <h4><a name="$anchor">$subsection.getAttributeValue("name")</a></h4>
  +    #foreach ( $items in $subsection.getChildren() )
  +      #copy($items)
  +    #end
  +  </div>
  +#end
  +
  +#macro (section $section)
  +  <div class="h3">
  +    #if ( $section.getAttributeValue("anchor") )
  +      #set ($anchor = $section.getAttributeValue("anchor"))
  +    #else
  +      #set ($anchor = $section.getAttributeValue("name"))
  +    #end
  +    <h3><a name="$anchor">$section.getAttributeValue("name")</a></h3>
  +    #foreach ( $items in $section.getChildren() )
  +      #if ($items.getName().equals("subsection"))
  +        #subsection ($items)
  +      #else
  +        #copy($items)
  +      #end
  +    #end
  +  </div>
  +#end
  +
  +#macro (change $action)
  +  <p>$action.getText() ($action.getAttributeValue("dev"))</p>
  +#end
  +
  +#macro (changeset $release)
  +  <table border="0" cellspacing="0" cellpadding="2" width="100%">
  +    <tr><td bgcolor="$subbannerbg">
  +      <font color="$subbannerfg" face="arial,helvetica,sanserif">
  +        <strong>
  +          Revision $release.getAttributeValue("version") ($release.getAttributeValue("date"))
  +        </strong>
  +      </font>
  +    </td></tr>
  +    <tr><td>
  +      <blockquote>
  +        <ul>
  +        #foreach ($action in $release.getChildren("action"))
  +        <li>#change ($action)</li>
  +        #end
  +        </ul>
  +      </blockquote>
  +    </td></tr>
  +  </table>
  +  </a>
  +#end
  +
  +#macro (changes)
  +  #header
  +  <table border="0" cellspacing="0" cellpadding="2" width="100%">
  +    <tr><td bgcolor="$bannerbg">
  +      <font color="$bannerfg" face="arial,helvetica,sanserif">
  +        <strong>ChangeLog</strong>
  +      </font>
  +    </td></tr>
  +    <tr><td>
  +      <blockquote>
  +      #set ($releases = $root.getChildren("release"))
  +      #foreach ( $release in $releases )
  +        #changeset ($release)
  +      #end
  +      </blockquote>
  +    </td></tr>
  +  </table>
  +  #footer
   #end
  
  
  
  1.4       +1 -0      jakarta-avalon-phoenix/src/xdocs/stylesheets/velocity.properties
  
  Index: velocity.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/xdocs/stylesheets/velocity.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- velocity.properties	26 May 2002 20:46:17 -0000	1.3
  +++ velocity.properties	15 Sep 2002 02:07:33 -0000	1.4
  @@ -1,2 +1,3 @@
   file.resource.loader.path=src/xdocs/stylesheets
   # disable this for now velocimacro.library=templates.vm
  +velocimacro.library=templates.vm
  \ No newline at end of file
  
  
  

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


Mime
View raw message