Author: mcconnell Date: Sun May 30 05:51:19 2004 New Revision: 20647 Added: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/unit.xml Modified: avalon/trunk/central/site/src/xdocs/planet/components/connection.xml avalon/trunk/central/site/src/xdocs/planet/components/datasource.xml avalon/trunk/central/site/src/xdocs/planet/components/index.xml avalon/trunk/central/site/src/xdocs/planet/components/navigation.xml avalon/trunk/central/site/src/xdocs/planet/components/scheduler.xml avalon/trunk/central/site/src/xdocs/planet/components/sockets.xml avalon/trunk/central/site/src/xdocs/planet/components/store.xml avalon/trunk/central/site/src/xdocs/planet/components/threads.xml avalon/trunk/central/site/src/xdocs/planet/facilities/db.txt avalon/trunk/central/site/src/xdocs/planet/facilities/finder.xml avalon/trunk/central/site/src/xdocs/planet/facilities/http.xml avalon/trunk/central/site/src/xdocs/planet/facilities/index.xml avalon/trunk/central/site/src/xdocs/planet/facilities/jmx.xml avalon/trunk/central/site/src/xdocs/planet/facilities/navigation.xml avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml avalon/trunk/central/site/src/xdocs/products/runtime/embedded/index.xml avalon/trunk/central/site/src/xdocs/products/runtime/embedded/main.xml avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml avalon/trunk/central/site/src/xdocs/products/runtime/embedded/servlet.xml avalon/trunk/central/site/src/xdocs/products/runtime/tools/index.xml avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/deploy.xml avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/index.xml avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/meta.xml avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/properties.xml avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/replicate.xml Log: Tweaking content and presentation.
Modified: avalon/trunk/central/site/src/xdocs/planet/components/connection.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/components/connection.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/components/connection.xml Sun May 30 05:51:19 2004 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Cornerstone Connection</title> + <title>Avalon Planet</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/planet/components/datasource.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/components/datasource.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/components/datasource.xml Sun May 30 05:51:19 2004 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Cornerstone Connection</title> + <title>Avalon Planet</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/planet/components/index.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/components/index.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/components/index.xml Sun May 30 05:51:19 2004 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Cornerstone Thread Manager</title> + <title>Avalon Planet</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/planet/components/navigation.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/components/navigation.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/components/navigation.xml Sun May 30 05:51:19 2004 @@ -21,8 +21,8 @@ <title>Cornerstone Threads</title> <body> <menu name="Cornerstone"> - <item name="Overview" href="index.html"/> <item name="Datasource" href="datasource.html"/> + <item name="Conection" href="connection.html"/> <item name="Scheduler" href="scheduler.html"/> <item name="Sockets" href="sockets.html"/> <item name="Store" href="store.html"/> Modified: avalon/trunk/central/site/src/xdocs/planet/components/scheduler.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/components/scheduler.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/components/scheduler.xml Sun May 30 05:51:19 2004 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Cornerstone Connection</title> + <title>Avalon Planet</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/planet/components/sockets.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/components/sockets.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/components/sockets.xml Sun May 30 05:51:19 2004 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Cornerstone Scheduler</title> + <title>Avalon Planet</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/planet/components/store.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/components/store.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/components/store.xml Sun May 30 05:51:19 2004 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Cornerstone Store</title> + <title>Avalon Planet</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/planet/components/threads.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/components/threads.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/components/threads.xml Sun May 30 05:51:19 2004 @@ -4,7 +4,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Cornerstone Scheduler</title> + <title>Avalon Planet</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/planet/facilities/db.txt ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/facilities/db.txt (original) +++ avalon/trunk/central/site/src/xdocs/planet/facilities/db.txt Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> - <title>HSQL Server</title> + <title>Avalon Planet</title> <author email="dev@avalon.apache.org">Avalon Development Team</author> </properties> Modified: avalon/trunk/central/site/src/xdocs/planet/facilities/finder.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/facilities/finder.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/facilities/finder.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> - <title>Avalon Finder Facility</title> + <title>Avalon Planet</title> <author email="dev@avalon.apache.org">Avalon Development Team</author> </properties> Modified: avalon/trunk/central/site/src/xdocs/planet/facilities/http.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/facilities/http.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/facilities/http.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> - <title>Avalon HTTP Facility</title> + <title>Avalon Planet</title> <author email="dev@avalon.apache.org">Avalon Development Team</author> </properties> Modified: avalon/trunk/central/site/src/xdocs/planet/facilities/index.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/facilities/index.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/facilities/index.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> - <title>Facilities</title> + <title>Avalon Planet</title> <author email="dev@avalon.apache.org">Avalon Development Team</author> </properties> Modified: avalon/trunk/central/site/src/xdocs/planet/facilities/jmx.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/facilities/jmx.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/facilities/jmx.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> - <title>JMX Extension</title> + <title>Avalon Planet</title> <author email="dev@avalon.apache.org">Avalon Development Team</author> </properties> Modified: avalon/trunk/central/site/src/xdocs/planet/facilities/navigation.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/planet/facilities/navigation.xml (original) +++ avalon/trunk/central/site/src/xdocs/planet/facilities/navigation.xml Sun May 30 05:51:19 2004 @@ -23,7 +23,6 @@ <body> <menu> - <item name="Overview" href="index.html"/> <item name="Finder" href="finder.html"/> <item name="HTTP" href="http.html"/> <item name="JMX" href="jmx.html"/> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml Sun May 30 05:51:19 2004 @@ -21,7 +21,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Merlin Service Management</title> + <title>Merlin Runtime</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/index.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/embedded/index.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/index.xml Sun May 30 05:51:19 2004 @@ -1,66 +1,135 @@ -<?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="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Specification</title> - </properties> - - <body> - - <section name="Embedded Deployment Solutions"> - - <subsection name="Index"> - <table> - <tr><th>Topic</th><th>Summary</th></tr> - <tr> - <td><a href="cli.html">Merlin Command-line</a></td> - <td> - The classic Merlin CLI application. - </td> - </tr> - <tr> - <td><a href="main.html">Generic Embedding</a></td> - <td> - Overview and code sample describing generic embedding solutions. - </td> - </tr> - <tr> - <td><a href="servlet.html">Servlet</a></td> - <td> - Demonstration of Merlin emebedded in a servlet. - </td> - </tr> - <tr> - <td><a href="unit.html">Merlin Unit Test</a></td> - <td> - The Merlin UnitTest system. - </td> - </tr> - </table> - </subsection> - </section> - - </body> - -</document> - - +<?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="[EMAIL PROTECTED]">Stephen McConnell</author> + <title>Merlin Runtime</title> + </properties> + + <body> + + <section name="Generic Embedding"> + + <subsection name="Overview"> + + <p> + The folowing information is a step by step decomposition of + a example of Merlin embedded in a main method. The details + presented here are the same as that used in all embedded Merlin + scenarios. Typically a embedded application will deviate from + this model to take into account the embedded context by resolving + factory parameters relative to the execution environment. + </p> + + </subsection> + + <subsection name="Sample Main"> +<source> +/* + * 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. + */ + +package tutorial; + +import java.io.File; +import java.util.Map; + +import org.apache.avalon.repository.Artifact; +import org.apache.avalon.repository.provider.Builder; +import org.apache.avalon.repository.provider.Factory; +import org.apache.avalon.repository.provider.InitialContextFactory; +import org.apache.avalon.repository.provider.InitialContext; +import org.apache.avalon.repository.main.DefaultInitialContextFactory; +import org.apache.avalon.repository.Artifact; + +/** + * An example of the embedding of a merlin kernel inside a main + * method. The objective of the example is to demonstrate a + * simple embedded scenario. + */ +public class Main +{ + public static void main( String[] args ) throws Exception + { + // + // Create the initial context factory. This establishes + // the application group from which properties will + // be resolved. It also provides operations supporting + // customization of the application environment. + // + + InitialContextFactory initial = + new DefaultInitialContextFactory( "merlin" ); + File home = initial.getHomeDirectory(); + initial.setCacheDirectory( new File( home, "system" ) ); + InitialContext context = initial.createInitialContext(); + + // + // Using the initial context we can now load any repository + // application using an artifact specification. Meta + // information associated with the artifact is used to + // construct the classloader that the application needs in + // order to execute. + // + + String spec = "artifact:merlin/merlin-impl#3.3-SNAPSHOT"; + Artifact artifact = Artifact.createArtifact( spec ); + Builder builder = context.newBuilder( artifact ); + + // + // With the classloader established we can go ahead and + // and get the application factory. The factory has already + // been parameterized with defaults derived from properties + // based on the application group. We can provide + // overriding values by setting the factory criteria to + // application specific values following which we instantiate + // the application. + // + + Factory factory = builder.getFactory(); + Map criteria = factory.createDefaultCriteria(); + factory.create( criteria ); + } +} +</source> + </subsection> + + </section> + + </body> + +</document> + + + Modified: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/main.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/embedded/main.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/main.xml Sun May 30 05:51:19 2004 @@ -21,7 +21,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Specification</title> + <title>Merlin Runtime</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/navigation.xml Sun May 30 05:51:19 2004 @@ -23,9 +23,10 @@ <body> <menu> - <item name="CLI" href="cli.html"/> - <item name="Application" href="main.html"/> + <item name="Application" href="index.html"/> + <item name="CLI" href="cli.html"/> <item name="Servlet" href="servlet.html"/> + <item name="Unit" href="unit.html"/> </menu> </body> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/servlet.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/embedded/servlet.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/servlet.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> - <title>Merlin Servlet</title> + <title>Merlin Runtime</title> <author email="dev@avalon.apache.org">Avalon Development Team</author> </properties> Added: avalon/trunk/central/site/src/xdocs/products/runtime/embedded/unit.xml ============================================================================== --- (empty file) +++ avalon/trunk/central/site/src/xdocs/products/runtime/embedded/unit.xml Sun May 30 05:51:19 2004 @@ -0,0 +1,41 @@ +<?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="dev@avalon.apache.org">Avalon Documentation Team</author> + <title>Merlin Runtime</title> + </properties> + + + <body> + <section name="Merlin Unit (JUnit TestCase)"> + <subsection name="Overview"> + <p> +Infomation in preparation. + </p> + </subsection> + </section> + </body> + +</document> + + Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tools/index.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/tools/index.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/tools/index.xml Sun May 30 05:51:19 2004 @@ -21,7 +21,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Merlin Extensions</title> + <title>Merlin Runtime</title> </properties> <body> @@ -46,9 +46,9 @@ </tr> </table> </subsection> - <subsection name="Related Resources">s + <subsection name="Related Resources"> <table> - <tr><th>Topic</th><th>Summary</th></tr>ss + <tr><th>Topic</th><th>Summary</th></tr> <tr> <td> <a href="http://avalon.apache.org/meta/tools/index.html">Avalon Meta Plugin</a></td> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/deploy.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/deploy.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/deploy.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Merlin Plugin for Maven</title> + <title>Merlin Runtime</title> </properties> <body> <section name="Merlin Plugin for Maven"> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/index.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/index.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/index.xml Sun May 30 05:51:19 2004 @@ -21,7 +21,7 @@ <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Merlin Extensions</title> + <title>Merlin Runtime</title> </properties> <body> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/meta.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/meta.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/meta.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Merlin Plugin for Maven</title> + <title>Merlin Runtime</title> </properties> <body> <section name="Merlin Plugin for Maven"> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/properties.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/properties.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/properties.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Merlin Plugin for Maven</title> + <title>Merlin Runtime</title> </properties> <body> <section name="Merlin Plugin for Maven"> Modified: avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/replicate.xml ============================================================================== --- avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/replicate.xml (original) +++ avalon/trunk/central/site/src/xdocs/products/runtime/tools/maven/replicate.xml Sun May 30 05:51:19 2004 @@ -20,7 +20,7 @@ <document> <properties> <author email="[EMAIL PROTECTED]">Stephen McConnell</author> - <title>Merlin Plugin for Maven</title> + <title>Merlin Runtime</title> </properties> <body> <section name="Merlin Plugin for Maven"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]