avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 20648 - in avalon/trunk/central: site/src/xdocs/central site/src/xdocs/central/news site/src/xdocs/central/news/2003 site/src/xdocs/central/news/2003/december site/src/xdocs/central/news/2003/october site/src/xdocs/central/news/2003/september site/src/xdocs/central/news/2004 site/src/xdocs/central/news/2004/february site/src/xdocs/central/news/2004/january site/src/xdocs/central/news/2004/march site/src/xdocs/products/runtime/reference/containment site/src/xdocs/products/studio system/themes/avalon2/html/resources/styles
Date Sun, 30 May 2004 13:27:38 GMT
Author: mcconnell
Date: Sun May 30 06:27:37 2004
New Revision: 20648

Added:
   avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/container.xml
Modified:
   avalon/trunk/central/site/src/xdocs/central/download.xml
   avalon/trunk/central/site/src/xdocs/central/navigation.xml
   avalon/trunk/central/site/src/xdocs/central/news/2003/december/index.xml
   avalon/trunk/central/site/src/xdocs/central/news/2003/index.xml
   avalon/trunk/central/site/src/xdocs/central/news/2003/october/index.xml
   avalon/trunk/central/site/src/xdocs/central/news/2003/september/index.xml
   avalon/trunk/central/site/src/xdocs/central/news/2004/february/index.xml
   avalon/trunk/central/site/src/xdocs/central/news/2004/index.xml
   avalon/trunk/central/site/src/xdocs/central/news/2004/january/index.xml
   avalon/trunk/central/site/src/xdocs/central/news/2004/march/SinglePlatform.xml
   avalon/trunk/central/site/src/xdocs/central/news/2004/march/index.xml
   avalon/trunk/central/site/src/xdocs/central/news/index.xml
   avalon/trunk/central/site/src/xdocs/products/studio/index.xml
   avalon/trunk/central/system/themes/avalon2/html/resources/styles/style.css
Log:


Modified: avalon/trunk/central/site/src/xdocs/central/download.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/download.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/download.xml	Sun May 30 06:27:37 2004
@@ -21,7 +21,7 @@
 
   <properties>
     <author email="mcconnell@apache.org">Stephen McConnell</author>
-    <title>Cornerstone</title>
+    <title>Avalon Central</title>
   </properties>
 
   <body>
@@ -29,14 +29,15 @@
       <subsection name="Binary Downloads">
 
         <p>
-        Binary downloads of the official release of Merlin installation, tutorials, and 
+        Binary downloads of the Merlin products and 
         related documentation are available at on the following 
         <a href="http://avalon.apache.org/download.cgi">Avalon Download Mirror</a>.
         </p>
 
         <p>
-        <a href="http://www.dpml.net/merlin/distributions/?M=D">Final, interim and
snapshot builds</a> of the 
-        Merlin platform are also hosted under the DPML.  Please note that interim and snapshot
builds are 
+        <a href="http://www.dpml.net/merlin/distributions/?M=D">
+        Final interim and snapshot builds</a> are also hosted under 
+        the DPML.  Please note that interim and snapshot builds are 
         not subject to a formal release review process.
         </p>
 

Modified: avalon/trunk/central/site/src/xdocs/central/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/navigation.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/navigation.xml	Sun May 30 06:27:37 2004
@@ -24,6 +24,7 @@
  <body>
     <menu>
       <item name="News" href="news/index.html"/>
+      <item name="Download" href="download.html"/>
       <item name="Community" href="community/index.html"/>
       <item name="Laboratory" href="laboratory/index.html"/>
       <item name="Tutorials" href="tutorials/index.html"/>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2003/december/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2003/december/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2003/december/index.xml	Sun May 30 06:27:37
2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2003/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2003/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2003/index.xml	Sun May 30 06:27:37 2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2003/october/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2003/october/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2003/october/index.xml	Sun May 30 06:27:37
2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2003/september/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2003/september/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2003/september/index.xml	Sun May 30 06:27:37
2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2004/february/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2004/february/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2004/february/index.xml	Sun May 30 06:27:37
2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2004/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2004/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2004/index.xml	Sun May 30 06:27:37 2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2004/january/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2004/january/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2004/january/index.xml	Sun May 30 06:27:37
2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2004/march/SinglePlatform.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2004/march/SinglePlatform.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2004/march/SinglePlatform.xml	Sun May
30 06:27:37 2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Apache Avalon News</title>
+    <title>Avalon Central</title>
   </properties> 
   
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/2004/march/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/2004/march/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/2004/march/index.xml	Sun May 30 06:27:37
2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/site/src/xdocs/central/news/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/news/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/central/news/index.xml	Sun May 30 06:27:37 2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>News</title>
+    <title>Avalon Central</title>
   </properties> 
 
   <body>

Added: avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/container.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/reference/containment/container.xml
Sun May 30 06:27:37 2004
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+
+<!-- 
+ 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.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.
+-->
+
+<document>
+
+  <properties>
+    <author email="mcconnell@apache.org">Stephen McConnell</author>
+    <title>Deployment Specification</title>
+  </properties>
+
+  <body>
+
+    <section name="container">
+      <subsection name="Nested Elements">
+
+        <table>
+          <tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
+          <tr>
+            <td><a href="services/index.html">services</a></td><td>0..1</td>
+            <td>
+             A container can declare the export of a set of services established
+             by the components contained within it.  This enables a container to 
+             function as a composite component relative to its peers.
+            </td>
+          </tr>
+          <tr>
+            <td><a href="classloader/index.html">classloader</a></td><td>0..1</td>
+            <td>
+             The classloader to assign to the container.
+            </td>
+          </tr>
+          <tr>
+            <td><a href="components/index.html">component</a></td><td>0..n</td>
+            <td>
+             A component directive is an instruction to merlin to build
+             a component of the type specified, and deploy the component 
+             in accordance with a stated policy.
+            </td>
+          </tr>
+          <tr>
+            <td><a href="index.html">container</a></td><td>0..n</td>
+            <td>
+             A container directive is simply a composite component.  A container
+             establishes a partition within which a set of other components and 
+             containers can be declared.
+            </td>
+          </tr>
+          <tr>
+            <td><a href="include/index.html">include</a></td><td>0..n</td>
+            <td>
+             An include directive instructs Merlin to include an external 
+             block within the container.  Services exported by the block will 
+             be made available to other components at the same level as the 
+             included block.
+            </td>
+          </tr>
+        </table>
+      </subsection>
+
+      <subsection name="Sample XML">
+        <p>
+           The following XML is a sample of a implementation declaration
+           containing an engine, components, subcontainers and block includes.
+        </p>
+
+<source><![CDATA[
+ <!-- block implementation declaration -->
+<container>
+  
+     <!-- 
+     declaration of the classloader that this block 
+     will execute within 
+     -->
+
+     <classloader>
+       <classpath>
+         <repository>
+           <resource id="tutorial:composition-api" version="1.0"/>
+         </repository>
+       </classpath>
+     </classloader>
+
+     <!-- 
+     declaration of a root component (services provided by this component
+     will be avbailable to all other components at the same or lower levels
+     in the container hierachy
+     -->
+
+     <component name="application" 
+        class="tutorial.application.Application" activation="startup">
+     </component>
+
+     <!-- 
+     declaration of a container contining other components
+     -->
+
+     <container name="subcontainer">
+       
+       <!--
+       This component is only visible to other components at the same
+       level or lower in this branch of the container hierachy
+       -->
+
+       <component name="test2" class="AnotherComponent"/>
+
+       <!--
+       A subcontainer declaring a custom container type.
+       -->
+
+       <container name="testing" class="MySpecialContainerClass">
+         <!-- etc. -->
+       </container>
+
+     </container>
+
+     <!--
+     Declaration of a block to includes.  The inclusion of a block
+     results in the establishment of a container with a name correponding
+     to the name of the block.
+     -->
+
+     <include path="example-block.xml"/>
+     <include id="osm:collaboration" version="1.0"/>
+
+</container>
+
+]]></source>
+      </subsection>
+
+    </section>
+
+  </body>
+
+</document>
+
+

Modified: avalon/trunk/central/site/src/xdocs/products/studio/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/studio/index.xml	(original)
+++ avalon/trunk/central/site/src/xdocs/products/studio/index.xml	Sun May 30 06:27:37 2004
@@ -2,7 +2,7 @@
 <document>
   <properties>
     <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
-    <title>Runtime Products</title>
+    <title>Merlin Studio</title>
   </properties> 
 
   <body>

Modified: avalon/trunk/central/system/themes/avalon2/html/resources/styles/style.css
==============================================================================
--- avalon/trunk/central/system/themes/avalon2/html/resources/styles/style.css	(original)
+++ avalon/trunk/central/system/themes/avalon2/html/resources/styles/style.css	Sun May 30
06:27:37 2004
@@ -180,7 +180,7 @@
 {
     background-color: white;
     color: black;
-    margin-right: 190px;
+    margin-right: 200px;
     min-height: 400px;
 }
 
@@ -221,8 +221,8 @@
     border-top: 1px solid;
     margin-top: 30px;
     margin-bottom: 20px;
-    margin-right: 160px;
-    margin-left: 2em;
+    margin-right: 220px;
+    margin-left: 1em;
     padding-top: 2px;
     padding-bottom: 30px;
     font-size: 75%;

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


Mime
View raw message