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 2004/03/14 07:32:28 UTC
cvs commit: avalon/merlin/platform/xdocs/merlin/kernel properties.xml
mcconnell 2004/03/13 22:32:28
Modified: merlin/platform/xdocs/merlin/kernel properties.xml
Log:
Add ${merlin.temp} prepoerty reference.
Revision Changes Path
1.6 +13 -13 avalon/merlin/platform/xdocs/merlin/kernel/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/merlin/kernel/properties.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml 14 Feb 2004 21:33:56 -0000 1.5
+++ properties.xml 14 Mar 2004 06:32:28 -0000 1.6
@@ -116,6 +116,14 @@
the context key urn:avalon:home.</td>
</tr>
<tr>
+ <td>merlin.temp</td>
+ <td>${java.io.tmpdir}</td>
+ <td>The root directory used by merlin to construct the
+ persistent temp directory supplied to a component under
+ the context key urn:avalon:temp. If undefined, the JVM
+ temp directory will be used.</td>
+ </tr>
+ <tr>
<td>merlin.ext</td>
<td>${merlin.dir}</td>
<td>The root directory used by merlin to resolve jar
@@ -187,31 +195,23 @@
<td>
Artifact reference.
Overrides the automatic selection of the underlying runtime activation
- framework. If undeclared a default runtime wil be assigned based on the
- standing security policy. Since 3.3.
- </td>
- </tr>
- <tr>
- <td>merlin.runtime.standard.implementation</td>
- <td></td>
- <td>
- Artifact reference.
- Override the standard non-secure implementation. Since 3.3.
+ framework. Since 3.3.
</td>
</tr>
<tr>
- <td>merlin.runtime.csi.implementation</td>
+ <td>merlin.runtime.implementation</td>
<td></td>
<td>
Artifact reference.
- Override the code-secure implementation. Since 3.3.
+ The default merlin runtime implementation artifact reference.
+ Since 3.3.
</td>
</tr>
<tr>
<td>merlin.code.security.enabled</td>
<td>false</td>
<td>
- If true the code-secure runtime will be assigned as ${merlin.runtime}.
+ If true the component security protection model will be enabled.
Since 3.3.
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org