You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/28 00:58:07 UTC
cvs commit: avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/repository cache.xml hosts.xml index.xml navigation.xml proxy.xml
mcconnell 2003/06/27 15:58:07
Modified: merlin/merlin-platform/xdocs/meta/model/kernel index.xml
navigation.xml
Added: merlin/merlin-platform/xdocs/meta/model/kernel/repository
cache.xml hosts.xml index.xml navigation.xml
proxy.xml
Log:
Updated to include repository configuration.
Revision Changes Path
1.2 +10 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 10 Jun 2003 02:14:23 -0000 1.1
+++ index.xml 27 Jun 2003 22:58:07 -0000 1.2
@@ -28,6 +28,10 @@
<td><a href="categories.html">categories</a></td><td>0..1</td>
<td>Defintion of the logging category parameters used internally within the Merlin system.</td>
</tr>
+ <tr>
+ <td><a href="repository/index.html">repository</a></td><td>0..1</td>
+ <td>Defintion of the repository sub-system including proxy settings, cache directory and remote host list.</td>
+ </tr>
</table>
</subsection>
@@ -53,6 +57,12 @@
<categories>
<category name="/sys" priority="INFO"/>
</categories>
+
+ <repository>
+ <hosts>
+ <host>http://www.ibiblio.org/maven/</host>
+ </hosts>
+ </repository>
</kernel>
]]></source>
1.3 +1 -0 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 23 Jun 2003 02:04:33 -0000 1.2
+++ navigation.xml 27 Jun 2003 22:58:07 -0000 1.3
@@ -23,6 +23,7 @@
<item name="System" href="/meta/model/kernel/system.html"/>
<item name="Logging" href="/meta/model/kernel/logging.html"/>
<item name="Categories" href="/meta/model/kernel/categories.html"/>
+ <item name="Repository" href="/meta/model/kernel/repository/index.html"/>
</item>
<item name="Block" href="/meta/model/block/index.html"/>
</item>
1.1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/repository/cache.xml
Index: cache.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Repository Proxy</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Proxy">
<subsection name="Description">
<p>A local directory to be used as the cache. If not
declared, the value defaults to '[MERLIN-HOME]/repository'.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<repository>
<cache>C:/maven/repository</cache>
</repository>
]]></source>
</subsection>
</section>
</body>
</document>
1.1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/repository/hosts.xml
Index: hosts.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Repository Hosts</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Hosts">
<subsection name="Nested Elements">
<table>
<tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
<td>host</td><td>0..1</td>
<td>
<p>Declaration of a remote host. The value of the element
is an http address of a server the implements the Maven
style repository model.</p>
<p>I.e. [root]/[group-id]/[type-id]s/[artifact-name][-[version]].[type]</p>
<source><![CDATA[
<host>http://www.ibiblio.org/maven/</host>
]]></source>
</td>
</tr>
</table>
</subsection>
<subsection name="Description">
<p>If a resource is unknown within the local cache, the
repository implementation will attempt to resolve the
resource relative to one or more an external hosts.
Hosts are checked relative to the order listed under
this element.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<repository>
<hosts>
<host>http://www.osm.net/repository/</host>
<host>http://www.ibiblio.org/maven/</host>
</hosts>
</repository>
]]></source>
</subsection>
</section>
</body>
</document>
1.1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/repository/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Kernel Logging Categories</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Repository">
<subsection name="Nested Elements">
<table>
<tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
<td><a href="cache.html">cache</a></td><td>0..1</td>
<td>
A local directory to be used as the cache. If not
declared, the value defaults to '[MERLIN-HOME]/repository'.
</td>
</tr>
<tr>
<td><a href="proxy.html">proxy</a></td><td>0..1</td>
<td>
Declaration of proxy host, port and credentials.
</td>
</tr>
<tr>
<td><a href="hosts.html">hosts</a></td><td>n</td>
<td>
A list of remote repositories.
</td>
</tr>
</table>
</subsection>
<subsection name="Description">
<p>Merlin provides a resouces repository against which jar files may be resolved relative to group, artifact and version. Aspects of the repository may be qualified using the <repository> element.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<kernel>
<!-- declaration of the local repository -->
<repository>
<!--
The default local cache is the [MERLIN-HOME]/repository.
In the following example the local cache is changed
to use the Maven repository.
-->
<cache>C:/maven/repository</cache>
<!--
If a resource cannot be located in the local repository
cache, Merlin will attempt to locate the resource in one
or more remote repositories. If you have a proxy server
you will need to declare it under the proxy element. If
you declare a proxy, the host and port elements must be
declared. You can also declare a 'credentials' element if
your proxy requires password authentication.
-->
<proxy>
<host>proxy.somewhere.com</host>
<port>proxy.somewhere.com</port>
<credentials>
<username>test</username>
<password>test</password>
</credentials>
</proxy>
<!--
Merlin will attempt to locate resource from the local cache.
If a resource is unavailable, Merlin willl attempt to
download the resource from one or more remote hosts. The
hosts element contains the list of hosts that Merlin should
attempt to connect to when resolving unsatisfied resource
requests.
-->
<hosts>
<host>http://www.osm.net/repository/</host>
<host>http://www.ibiblio.org/maven/</host>
</hosts>
</repository>
</kernel>
]]></source>
</subsection>
</section>
</body>
</document>
1.1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/repository/navigation.xml
Index: navigation.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project>
<title>Merlin</title>
<body>
<links>
<item name="Home" href="http://avalon.apache.org/"/>
<item name="Framework" href="http://avalon.apache.org/framework/"/>
<item name="Components" href="http://avalon.apache.org/components"/>
<item name="Containers" href="http://avalon.apache.org/containers/"/>
<item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
</links>
<menu name="About Merlin">
<item name="Overview" href="/about/index.html"/>
<item name="Getting Started" href="/starting/index.html"/>
<item name="Merlin System" href="/merlin/index.html"/>
<item name="Meta Model" href="/meta/index.html">
<item name="Descriptors" href="/meta/info/index.html"/>
<item name="Directives" href="/meta/model/index.html">
<item name="Kernel" href="/meta/model/kernel/index.html">
<item name="System" href="/meta/model/kernel/system.html"/>
<item name="Logging" href="/meta/model/kernel/logging.html"/>
<item name="Categories" href="/meta/model/kernel/categories.html"/>
<item name="Repository" href="/meta/model/kernel/repository/index.html">
<item name="Cache" href="/meta/model/kernel/repository/cache.html"/>
<item name="Proxy" href="/meta/model/kernel/repository/proxy.html"/>
<item name="Hosts" href="/meta/model/kernel/repository/hosts.html"/>
</item>
</item>
<item name="Block" href="/meta/model/block/index.html"/>
</item>
</item>
<item name="Tools" href="/tools/index.html"/>
<item name="Resources" href="/resources/index.html"/>
</menu>
<menu name="Extensions">
<item name="JNDI" href="/extensions/jndi/index.html"/>
<item name="Servlet" href="/extensions/servlet/index.html"/>
</menu>
</body>
</project>
1.1 avalon-sandbox/merlin/merlin-platform/xdocs/meta/model/kernel/repository/proxy.xml
Index: proxy.xml
===================================================================
<?xml version="1.0"?>
<document>
<header>
<title>Repository Proxy</title>
<authors>
<person name="Stephen McConnell" email="mcconnell@apache.org"/>
</authors>
</header>
<body>
<section name="Proxy">
<subsection name="Nested Elements">
<table>
<tr><th>Element</th><th>Occurance</th><th>Description</th></tr>
<tr>
<td>host</td><td>1</td>
<td>
<p>The host name of the proxy server.</p>
</td>
</tr>
<tr>
<td>port</td><td>1</td>
<td>
<p>The proxy server port number.</p>
</td>
</tr>
<tr>
<td>credentials</td><td>0..1</td>
<td>
<p>If a resource is unknown within the local cache, the
repository implementation will attempt to resolve the
resource relative to one or more an external hosts.
Hosts are checked relative to the order listed under
this element.</p>
</td>
</tr>
</table>
</subsection>
<subsection name="Description">
<p>Declaration of a proxy server to use when resolving remotely located jar files.</p>
</subsection>
<subsection name="Sample XML">
<source><![CDATA[
<proxy>
<host>proxy.somewhere.com</host>
<port>9090</port>
<credentials>
<username>test</username>
<password>test</password>
</credentials>
</proxy>
]]></source>
</subsection>
</section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org