mcconnell 2004/04/17 07:20:26
Modified: maven-plugins/merlin project.properties project.xml
maven-plugins/merlin/xdocs properties.xml
Log:
Remove merlin-impl dependency, fix properties doc xml, and set checkstyle to avalon
(although the avalon defintion in the checkstyle plugin is incorrect)
Revision Changes Path
1.2 +1 -1 avalon/maven-plugins/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/merlin/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 17 Apr 2004 10:22:50 -0000 1.1
+++ project.properties 17 Apr 2004 14:20:26 -0000 1.2
@@ -23,6 +23,6 @@
maven.xdoc.version=${pom.currentVersion}
maven.license.licenseFile=${basedir}/../../LICENSE.txt
maven.checkstyle.header.file=${basedir}/../../LICENSE.txt
-maven.checkstyle.format = turbine
+maven.checkstyle.format = avalon
maven.artifact.type=plugin
1.2 +0 -9 avalon/maven-plugins/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/merlin/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 17 Apr 2004 10:22:50 -0000 1.1
+++ project.xml 17 Apr 2004 14:20:26 -0000 1.2
@@ -47,14 +47,5 @@
</properties>
</dependency>
- <dependency>
- <groupId>&merlin-id;</groupId>
- <artifactId>&merlin-impl-id;</artifactId>
- <version>&merlin-impl-version;</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
-
</dependencies>
</project>
1.2 +42 -39 avalon/maven-plugins/merlin/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/merlin/xdocs/properties.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- properties.xml 17 Apr 2004 10:22:50 -0000 1.1
+++ properties.xml 17 Apr 2004 14:20:26 -0000 1.2
@@ -69,61 +69,64 @@
</td>
</tr>
</table>
+ </subsection>
+
<subsection name="Merlin Runtime Properties" >
- <table>
- <tr><th>Property</th><th>Default</th><th>Description</th></tr>
- <tr>
- <td>merlin.dir</td>
- <td>${user.dir}</td>
- <td>
+ <table>
+ <tr><th>Property</th><th>Default</th><th>Description</th></tr>
+ <tr>
+ <td>merlin.dir</td>
+ <td>${user.dir}</td>
+ <td>
The working directory.
If the system property ${basedir} is defined it will take priority.
- </td>
- </tr>
- <tr>
- <td>merlin.context</td>
- <td>${merlin.dir}/home</td>
- <td>
+ </td>
+ </tr>
+ <tr>
+ <td>merlin.context</td>
+ <td>${merlin.dir}/home</td>
+ <td>
The partition root directory. The partition root directory serves
as the root anchor for the establishment of the directory supplied
to a component via the urn:avalon:home context value.
- </td>
- </tr>
- <tr>
- <td>merlin.ext</td>
- <td>${merlin.dir}</td>
- <td>
+ </td>
+ </tr>
+ <tr>
+ <td>merlin.ext</td>
+ <td>${merlin.dir}</td>
+ <td>
The root anchor directory from which extension directory references
will be anchored to.
- </td>
- </tr>
- <tr>
- <td>merlin.info</td>
- <td>false</td>
- <td>
+ </td>
+ </tr>
+ <tr>
+ <td>merlin.info</td>
+ <td>false</td>
+ <td>
The info generation policy. If 'true' a short infomation header is
generated on startup detailing the kernel parameterization state.
- </td>
- </tr>
- <tr>
- <td>merlin.debug</td>
- <td>false</td>
- <td>
+ </td>
+ </tr>
+ <tr>
+ <td>merlin.debug</td>
+ <td>false</td>
+ <td>
The debug generation policy. If 'true' all logging channels are
assigned the DEBUG logging priority.
- </td>
- </tr>
- <tr>
- <td>merlin.server</td>
- <td>true</td>
- <td>
+ </td>
+ </tr>
+ <tr>
+ <td>merlin.server</td>
+ <td>true</td>
+ <td>
The default execution model. If 'true' the merlin kernel will
continue until expliciy stopped or process termination is invoked.
If 'false' the kernel will initiate decommissioning on completion
of the deployment phase.
- </td>
- </tr>
- </table>
+ </td>
+ </tr>
+ </table>
+ </subsection>
</section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
