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/10 04:47:21 UTC
cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/tools/tags attribute.xml context.xml dependency.xml entry.xml extension.xml index.xml lifestyle.xml logger.xml name.xml namespace.xml navigation.xml service.xml stage.xml version.xml
mcconnell 2003/06/09 19:47:21
Modified: merlin README.TXT maven.xml project.properties project.xml
merlin/assembly project.xml
merlin/merlin-platform .cvsignore README.TXT
Added: merlin/merlin-platform maven.xml project.xml
merlin/merlin-platform/lib TANUKISOFTWARE_LICENSE.txt
Wrapper.dll wrapper.jar
merlin/merlin-platform/src/config kernel-service.xml
kernel.xml wrapper.conf
merlin/merlin-platform/src/etc LICENSE.txt site.jsl
stylesheet.css
merlin/merlin-platform/src/repository README.TXT
Removed: merlin/merlin-smp .cvsignore maven.xml project.xml
merlin/merlin-smp/lib TANUKISOFTWARE_LICENSE.txt Wrapper.dll
wrapper.jar
merlin/merlin-smp/xdocs .cvsignore index.xml navigation.xml
merlin/merlin-smp/xdocs/about benefits.xml features.xml
index.xml navigation.xml purpose.xml
merlin/merlin-smp/xdocs/extensions/jndi index.xml
navigation.xml
merlin/merlin-smp/xdocs/extensions/servlet index.xml
navigation.xml
merlin/merlin-smp/xdocs/images Profile.gif
ServiceDefinition.gif Type.gif asf_logo_wide.gif
cover.gif merlin-service-dialog.gif meta.gif
overview.gif packages.gif service-dialog.gif
service.gif simple-servlet.gif uml-top-level.gif
merlin/merlin-smp/xdocs/merlin index.xml navigation.xml
merlin/merlin-smp/xdocs/merlin/appliance assembly.xml
index.xml lifecycle.xml lifestyle.xml
navigation.xml
merlin/merlin-smp/xdocs/merlin/block index.xml
navigation.xml
merlin/merlin-smp/xdocs/merlin/kernel cli.xml index.xml
navigation.xml nt.xml
merlin/merlin-smp/xdocs/meta index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/info index.xml navigation.xml
service.xml
merlin/merlin-smp/xdocs/meta/info/attributes attribute.xml
index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/info/type index.xml info.xml
navigation.xml
merlin/merlin-smp/xdocs/meta/info/type/context entry.xml
index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/info/type/dependencies
dependency.xml index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/info/type/extensions
extension.xml index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/info/type/loggers index.xml
logger.xml navigation.xml
merlin/merlin-smp/xdocs/meta/info/type/services index.xml
navigation.xml service.xml
merlin/merlin-smp/xdocs/meta/info/type/stages index.xml
navigation.xml stage.xml
merlin/merlin-smp/xdocs/meta/model index.xml navigation.xml
profile.xml
merlin/merlin-smp/xdocs/meta/model/block dependencies.xml
index.xml info.xml navigation.xml services.xml
merlin/merlin-smp/xdocs/meta/model/block/container
categories.xml components.xml containers.xml
includes.xml index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/model/block/container/components
configuration.xml index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/model/block/container/components/categories
category.xml index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/model/block/container/components/context
import.xml index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/model/block/container/components/context/entry
index.xml navigation.xml parameter.xml
merlin/merlin-smp/xdocs/meta/model/block/container/components/parameters
index.xml navigation.xml parameter.xml
merlin/merlin-smp/xdocs/meta/model/block/export export.xml
index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/model/block/import import.xml
index.xml navigation.xml
merlin/merlin-smp/xdocs/meta/model/kernel categories.xml
engine.xml index.xml logging.xml navigation.xml
system.xml
merlin/merlin-smp/xdocs/resources download.xml index.xml
navigation.xml notebook.xml roadmap.xml
merlin/merlin-smp/xdocs/starting index.xml installation.xml
navigation.xml
merlin/merlin-smp/xdocs/starting/examples index.xml
navigation.xml
merlin/merlin-smp/xdocs/starting/examples/afs index.xml
navigation.xml
merlin/merlin-smp/xdocs/starting/examples/afs/simple
build.xml implementation.xml index.xml
interfaces.xml navigation.xml servlet.xml
merlin/merlin-smp/xdocs/starting/examples/james about.xml
block.xml index.xml navigation.xml resources.xml
runtime.xml
merlin/merlin-smp/xdocs/starting/hello creation.xml
dependencies.xml execution.xml index.xml
internal.xml navigation.xml services.xml
merlin/merlin-smp/xdocs/starting/hello/config block.xml
configurable.xml defaults.xml index.xml
navigation.xml override.xml
merlin/merlin-smp/xdocs/starting/hello/context casting.xml
entries.xml index.xml navigation.xml standard.xml
merlin/merlin-smp/xdocs/tools ant.xml index.xml maven.xml
navigation.xml
merlin/merlin-smp/xdocs/tools/tags attribute.xml context.xml
dependency.xml entry.xml extension.xml index.xml
lifestyle.xml logger.xml name.xml namespace.xml
navigation.xml service.xml stage.xml version.xml
Log:
Renaming of the merlin-smp sub-project to merlin-platform together with some reorganization of the tutorial and examples.
Revision Changes Path
1.5 +1 -1 avalon-sandbox/merlin/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/README.TXT,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.TXT 8 May 2003 23:37:00 -0000 1.4
+++ README.TXT 10 Jun 2003 02:47:14 -0000 1.5
@@ -23,7 +23,7 @@
+-- meta-tools meta info generator task
+-- merlin-extensions
+- merlin-jndi merlin JNDI connector
- +-- merlin-smp site and installation resources
+ +-- merlin-platform site and installation resources
+- src
+- tutorial several merlin tutorials
+- target
1.13 +14 -14 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maven.xml 8 May 2003 03:02:39 -0000 1.12
+++ maven.xml 10 Jun 2003 02:47:14 -0000 1.13
@@ -20,7 +20,7 @@
<mkdir dir="${merlin.build.inst.dir}/lib/system"/>
<mkdir dir="${merlin.build.inst.dir}/lib/shared"/>
<copy toDir="${merlin.build.inst.dir}/lib">
- <fileset dir="${basedir}/merlin-smp/lib"/>
+ <fileset dir="${basedir}/merlin-platform/lib"/>
</copy>
<!--
@@ -32,7 +32,7 @@
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="merlin-smp/*,merlin-plugin/*"
+ excludes="merlin-platform/*,merlin-plugin/*"
goals="merlin-propergate"
banner="Installing:"
ignoreFailures="false" />
@@ -44,7 +44,7 @@
<maven:reactor
basedir="${basedir}"
- includes="merlin-smp/project.xml"
+ includes="merlin-platform/project.xml"
goals="merlin-import-external-jars"
banner="Resolving dependencies:"
ignoreFailures="false"/>
@@ -65,12 +65,12 @@
-->
<copy toDir="${merlin.build.inst.dir}">
- <fileset dir="${basedir}/merlin-smp/src">
+ <fileset dir="${basedir}/merlin-platform/src">
<include name="bin/**/*"/>
<include name="config/**/*"/>
<include name="repository/**/*"/>
</fileset>
- <fileset dir="${basedir}/merlin-smp/src/etc">
+ <fileset dir="${basedir}/merlin-platform/src/etc">
<include name="LICENSE.txt"/>
</fileset>
</copy>
@@ -86,7 +86,7 @@
<goal name="testing">
<copy toDir="${merlin.build.inst.dir}" flatten="true">
- <fileset dir="${basedir}/merlin-smp/src/etc">
+ <fileset dir="${basedir}/merlin-platform/src/etc">
<include name="LICENSE.txt"/>
</fileset>
</copy>
@@ -129,7 +129,7 @@
description="Build the Merlin site.">
<maven:reactor
basedir="${basedir}"
- includes="merlin-smp/project.xml"
+ includes="merlin-platform/project.xml"
goals="xjavadoc,site"
banner="Building site."
ignoreFailures="false"/>
@@ -140,7 +140,7 @@
description="Build the Merlin site.">
<maven:reactor
basedir="${basedir}"
- includes="merlin-smp/project.xml"
+ includes="merlin-platform/project.xml"
goals="site"
banner="Building site."
ignoreFailures="false"/>
@@ -151,7 +151,7 @@
description="Build the Merlin site.">
<maven:reactor
basedir="${basedir}"
- includes="merlin-smp/project.xml"
+ includes="merlin-platform/project.xml"
goals="xjavadoc"
banner="Building site."
ignoreFailures="false"/>
@@ -168,7 +168,7 @@
<maven:reactor
basedir="${basedir}"
- includes="merlin-smp/project.xml"
+ includes="merlin-platform/project.xml"
goals="site:fsdeploy"
banner="Deploying site."
ignoreFailures="false"/>
@@ -289,7 +289,7 @@
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="merlin-smp/*"
+ excludes="merlin-platform/*"
goals="jar"
banner="Building jar:"
ignoreFailures="false"/>
@@ -299,7 +299,7 @@
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="merlin-smp/*"
+ excludes="merlin-platform/*"
goals="jar:snapshot"
banner="Building shapshot:"
ignoreFailures="false"/>
@@ -309,7 +309,7 @@
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="merlin-smp/*"
+ excludes="merlin-platform/*"
goals="jar:install-snapshot"
banner="Installing snapshot:"
ignoreFailures="false"/>
@@ -319,7 +319,7 @@
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
- excludes="merlin-smp/*"
+ excludes="merlin-platform/*"
goals="clean,jar:install"
banner="Installing jar:"
ignoreFailures="false"/>
1.3 +2 -2 avalon-sandbox/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 28 Apr 2003 21:19:42 -0000 1.2
+++ project.properties 10 Jun 2003 02:47:14 -0000 1.3
@@ -5,8 +5,8 @@
maven.ui.banner.background = #fff
maven.ui.banner.foreground = #000
-maven.xdoc.jsl = file:/${basedir}/../merlin-smp/src/etc/site.jsl
-maven.javadoc.stylesheet =${basedir}/../merlin-smp/src/etc/stylesheet.css
+maven.xdoc.jsl = file:/${basedir}/../merlin-platform/src/etc/site.jsl
+maven.javadoc.stylesheet =${basedir}/../merlin-platform/src/etc/stylesheet.css
#
1.14 +19 -2 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 3 Jun 2003 17:14:51 -0000 1.13
+++ project.xml 10 Jun 2003 02:47:14 -0000 1.14
@@ -134,8 +134,9 @@
<name>David Bernard</name>
<email>dwayne@java-fan.com</email>
<roles>
- <role>Documentation and tutorial review, testing and patches. Updates to lifecycle handlers.</role>
+ <role>Documentation and tutorial review, testing and patches. Updates to lifecycle handlers. Contribution to JMX related development.</role>
</roles>
+ <organization>BNP</organization>
</contributor>
<contributor>
<name>Kristian Meier</name>
@@ -144,6 +145,22 @@
<role>Patches enhancing the meta-info generation sources and documentation.</role>
</roles>
</contributor>
+ <contributor>
+ <name>Aaron Far</name>
+ <email>Aaron.Farr@am.sony.com</email>
+ <roles>
+ <role>Testing, bug reporting, and early access trial participation.</role>
+ </roles>
+ <organization>Sony Electronics</organization>
+ </contributor>
+ <contributor>
+ <name>Laurent Rieu</name>
+ <email>Laurent.Rieu@fr.ibm.com</email>
+ <roles>
+ <role>Testing, bug reporting, and early access trial participation.</role>
+ </roles>
+ <organization>IBM Global Services</organization>
+ </contributor>
</contributors>
<build>
@@ -194,7 +211,7 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../merlin-smp/src/etc</directory>
+ <directory>${basedir}/../merlin-platform/src/etc</directory>
<includes>
<include>LICENSE.txt</include>
</includes>
1.7 +1 -1 avalon-sandbox/merlin/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 1 May 2003 10:45:23 -0000 1.6
+++ project.xml 10 Jun 2003 02:47:14 -0000 1.7
@@ -154,7 +154,7 @@
</includes>
</resource>
<resource>
- <directory>${basedir}/../merlin-smp/src/etc</directory>
+ <directory>${basedir}/../merlin-platform/src/etc</directory>
<includes>
<include>LICENSE.txt</include>
</includes>
1.2 +4 -1 avalon-sandbox/merlin/merlin-platform/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Jun 2003 21:23:49 -0000 1.1
+++ .cvsignore 10 Jun 2003 02:47:14 -0000 1.2
@@ -1,5 +1,8 @@
maven.log
velocity.log
+build.xml
build.properties
+build.properties~
target
-maven.log
\ No newline at end of file
+maven.log
+docs
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/README.TXT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.TXT 9 Jun 2003 21:23:49 -0000 1.1
+++ README.TXT 10 Jun 2003 02:47:14 -0000 1.2
@@ -1,6 +1,6 @@
-This directory is currently a placeholder for the merlin-smp package.
-The merlin-smp contents will me migrated to directory in due course.
+This directory is currently a placeholder for the merlin-platform content.
+The merlin-platform contents will me migrated to directory in due course.
Stephen McConnell, 09 JUNE 2003
1.1 avalon-sandbox/merlin/merlin-platform/maven.xml
Index: maven.xml
===================================================================
<project default="site" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
<property name="maven.license.licenseFile"
value="${basedir}/src/etc/LICENSE.txt"/>
<property name="maven.javadoc.stylesheet"
value="${basedir}/src/etc/stylesheet.css"/>
<preGoal name="site">
<attainGoal name="license"/>
</preGoal>
</project>
1.1 avalon-sandbox/merlin/merlin-platform/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<extend>${basedir}/../project.xml</extend>
<id>merlin-platform</id>
<name>Merlin Platform</name>
<package>org.apache.avalon</package>
<currentVersion>1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Service Management Platform</shortDescription>
<dependencies>
<!-- avalon dependencies -->
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-framework</artifactId>
<version>4.1.4</version>
</dependency>
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-lifecycle</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>avalon</groupId>
<artifactId>avalon-logkit</artifactId>
<version>1.2</version>
</dependency>
<!-- excalibur dependencies -->
<dependency>
<groupId>excalibur</groupId>
<artifactId>excalibur-i18n</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>excalibur</groupId>
<artifactId>excalibur-configuration</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>excalibur</groupId>
<artifactId>excalibur-extension</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>excalibur</groupId>
<artifactId>excalibur-pool</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>excalibur</groupId>
<artifactId>excalibur-util-concurrent</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>excalibur</groupId>
<artifactId>excalibur-event</artifactId>
<version>2.0</version>
</dependency>
<!-- commons dependencies -->
<dependency>
<id>commons-collections</id>
<version>2.1</version>
</dependency>
<dependency>
<id>commons-cli</id>
<version>1.0</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
<dependency>
<id>xml-apis</id>
<version>1.0.b2</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
<dependency>
<id>xerces</id>
<version>2.2.1</version>
<url>http://xml.apache.org/xerces2-j/</url>
</dependency>
</dependencies>
<packageGroups>
<packageGroup>
<title>Merlin SPI</title>
<packages>org.apache.avalon.merlin.block,org.apache.avalon.merlin.container,org.apache.avalon.merlin.kernel</packages>
</packageGroup>
<packageGroup>
<title>Merlin Service Management Platform</title>
<packages>org.apache.avalon.merlin.block.impl,org.apache.avalon.merlin.container.impl,org.apache.avalon.merlin.kernel.impl</packages>
</packageGroup>
<packageGroup>
<title>Assembly SPI</title>
<packages>org.apache.avalon.assembly.appliance,org.apache.avalon.assembly.engine,org.apache.avalon.assembly.engine.model,org.apache.avalon.assembly.engine.profile,org.apache.avalon.assembly.engine.service,org.apache.avalon.assembly.engine.type,org.apache.avalon.assembly.lifecycle,org.apache.avalon.assembly.lifestyle,org.apache.avalon.assembly.locator,org.apache.avalon.assembly.logging,org.apache.avalon.assembly.repository,org.apache.avalon.assembly.util</packages>
</packageGroup>
<packageGroup>
<title>Assembly Framework</title>
<packages>org.apache.avalon.assembly.*</packages>
</packageGroup>
<packageGroup>
<title>Meta Model</title>
<packages>org.apache.avalon.meta,org.apache.avalon.meta.*</packages>
</packageGroup>
</packageGroups>
<reports>
<report>maven-changelog-plugin</report>
<report>maven-file-activity-plugin</report>
<report>maven-developer-activity-plugin</report>
<!--<report>maven-tasklist-plugin</report>-->
</reports>
</project>
1.1 avalon-sandbox/merlin/merlin-platform/lib/TANUKISOFTWARE_LICENSE.txt
Index: TANUKISOFTWARE_LICENSE.txt
===================================================================
Copyright (c) 1999, 2003 TanukiSoftware.org
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
1.1 avalon-sandbox/merlin/merlin-platform/lib/Wrapper.dll
<<Binary file>>
1.1 avalon-sandbox/merlin/merlin-platform/lib/wrapper.jar
<<Binary file>>
1.1 avalon-sandbox/merlin/merlin-platform/src/config/kernel-service.xml
Index: kernel-service.xml
===================================================================
<!--
kernel-service.xml
The kernel-process.xml file contains the definition of a Merlin kernel. The kernel
can contain the following declarations:
1. a system descriptor that declares the hostname of this machine
2. a logging descriptor for establishment of the logging subsystem
3. a logging catagories descriptor that establishes logging priority
for the kernel
4. an engine descriptor used to configure the pool
Once a kernel is established the controlling application supplies one or block
configurations to the kernel for deployment.
-->
<kernel>
<system host="localhost"/>
<!-- logging system parameters -->
<logging target="kernel" priority="INFO">
<category name="/sys/logger" priority="WARN"/>
<target name="kernel">
<file location="logs/kernel.log" />
</target>
</logging>
<!-- logging categories for the kernel -->
<categories>
<category name="/sys" priority="INFO"/>
</categories>
<!-- root engine -->
<engine>
<!-- The shared extension directory. -->
<library scope="system" dir="." >
<include name="ext"/>
</library>
<!-- Setup the thread, command and pool manager parameters. -->
<pool>
<threads-per-processor>2</threads-per-processor>
<sleep>1000</sleep>
<timeout>250</timeout>
</pool>
</engine>
</kernel>
1.1 avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml
Index: kernel.xml
===================================================================
<!--
kernel.xml
The kernel.xml file contains the definition of a Merlin kernel. The kernel
can contain the following declarations:
1. a system descriptor that declares the hostname of this machine
2. a logging descriptor for establishment of the logging subsystem
3. a logging catagories descriptor that establishes logging priority
for the kernel
4. an engine descriptor used to configure the pool
Once a kernel is established the controlling application supplies one or block
configurations to the kernel for deployment.
-->
<kernel>
<system host="localhost"/>
<!-- logging system parameters -->
<logging target="default" priority="INFO">
<category name="/sys/logger" priority="WARN"/>
<target name="kernel">
<file location="logs/kernel.log" />
</target>
</logging>
<!-- logging categories for the kernel -->
<categories>
<category name="/sys" priority="INFO"/>
</categories>
<!-- root engine -->
<engine>
<!-- The shared extension directory. -->
<library scope="system" dir="." >
<include name="ext"/>
</library>
<!-- Setup the thread, command and pool manager parameters. -->
<pool>
<threads-per-processor>2</threads-per-processor>
<sleep>1000</sleep>
<timeout>250</timeout>
</pool>
</engine>
</kernel>
1.1 avalon-sandbox/merlin/merlin-platform/src/config/wrapper.conf
Index: wrapper.conf
===================================================================
#********************************************************************
# Wrapper parameters
#********************************************************************
# Java Application
wrapper.java.command=java
# Java Main class
wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=../lib/wrapper.jar
wrapper.java.classpath.2=../lib/system/merlin-cli-1.0.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../lib
# Java Additional Parameters
#wrapper.java.additional.1=
# Initial Java Heap Size (in MB)
wrapper.java.initmemory=3
# Maximum Java Heap Size (in MB)
wrapper.java.maxmemory=64
# Application parameters. Add parameters as needed starting from 1
wrapper.app.parameter.1=Merlin
wrapper.app.parameter.2=-system
wrapper.app.parameter.3=../
wrapper.app.parameter.4=-kernel
wrapper.app.parameter.5=../config/kernel-service.xml
wrapper.app.parameter.6=-home
wrapper.app.parameter.7=../
wrapper.app.parameter.8=../repository/demo/block.xml
# Port which the native wrapper code will attempt to connect to
wrapper.port=1777
#********************************************************************
# Wrapper Logging parameters
#********************************************************************
# Format of output for the console. (See docs for formats)
wrapper.console.format=PM
# Log Level for console output. (See docs for log levels)
wrapper.console.loglevel=INFO
# Log file to use for wrapper output logging.
wrapper.logfile=../logs/wrapper.log
# Format of output for the log file. (See docs for formats)
wrapper.logfile.format=LPTM
# Log Level for log file output. (See docs for log levels)
wrapper.logfile.loglevel=DEBUG
# Maximum size that the log file will be allowed to grow to before
# the log is rolled. Size is specified in bytes. The default value
# of 0, disables log rolling. May abbreviate with the 'k' (kb) or
# 'm' (mb) suffix. For example: 10m = 10 megabytes.
wrapper.logfile.maxsize=0
# Maximum number of rolled log files which will be allowed before old
# files are deleted. The default value of 0 implies no limit.
wrapper.logfile.maxfiles=0
# Log Level for sys/event log output. (See docs for log levels)
wrapper.syslog.loglevel=NONE
#********************************************************************
# Wrapper NT Service parameters
#********************************************************************
# WARNING - Do not modify any of these parameters when an application
# using this configuration file has been installed as a service.
# Please uninstall the service before modifying this section. The
# service can then be reinstalled.
# Name of the service
wrapper.ntservice.name=merlin
# Display name of the service
wrapper.ntservice.displayname=Merlin Service Manager 2.1
# Description of the service
wrapper.ntservice.description=Avalon Merlin Service Management Platform.
# Service dependencies. Add dependencies as needed starting from 1
wrapper.ntservice.dependency.1=
# Mode in which the service is installed. AUTO_START or DEMAND_START
wrapper.ntservice.starttype=AUTO_START
# Priority at which the service is run. NORMAL, LOW, HIGH, or
# REALTIME
wrapper.ntservice.process_priority=NORMAL
# Allow the service to interact with the desktop.
wrapper.ntservice.interactive=false
1.1 avalon-sandbox/merlin/merlin-platform/src/etc/LICENSE.txt
Index: LICENSE.txt
===================================================================
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
"Apache Software Foundation" must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact apache@apache.org.
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
1.1 avalon-sandbox/merlin/merlin-platform/src/etc/site.jsl
Index: site.jsl
===================================================================
<?xml version="1.0"?>
<!-- stylesheet to be used -->
<jsl:stylesheet select="$doc"
xmlns:define="jelly:define"
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:log="jelly:log"
xmlns:util="jelly:util"
xmlns:x="jelly:xml"
xmlns:doc="doc"
xmlns="dummy" trim="false">
<jsl:template match="document" trim="false">
<x:doctype name="html"
publicId="-//CollabNet//DTD XHTML 1.0 Transitional//EN"
systemId="http://www.collabnet.com/dtds/collabnet_transitional_10.dtd"/>
<html>
<head>
<j:set var="docTitle">
<x:expr select="./properties/title"/>
</j:set>
<x:if select="$nav/title">
<title>
<x:expr select="$nav/title"/> - ${docTitle}
</title>
</x:if>
<x:if select="not($nav/title)">
<title>${pom.name} - ${docTitle}</title>
</x:if>
<j:set var="tigrisCss" value='"${relativePath}/style/tigris.css"'/>
<j:set var="mavenCss" value='"${relativePath}/style/maven.css"'/>
<j:set var="osmCss" value='"${relativePath}/style/osm.css"'/>
<style type="text/css"><![CDATA[
@import url(${tigrisCss});
@import url(${mavenCss});
@import url(${osmCss});
]]></style>
<!-- FIXME: once someone works out how to stop this breaking
<x:element name="script"><x:attribute name="type">text/javascript</x:attribute>
if (document.layers) {
document.writeln(''+
'<link rel="stylesheet" type="text/css" href="${relativePath}/style/ns4_only.css" media="screen" /><link rel="stylesheet" type="text/css" href="${relativePath}/style/maven_ns4_only.css" media="screen"/>');
}
</x:element>
-->
<link rel="stylesheet" type="text/css" href="${relativePath}/style/print.css" media="print"/>
<x:forEach var="author" select="./properties/author">
<meta name="author" value="${author.text}"/>
<meta name="email" value="${author.attribute('email').value}"/>
</x:forEach>
</head>
<body class="composite" marginwidth="0" marginheight="0">
<div id="banner">
<table border="0" cellspacing="0" cellpadding="8" width="100%" height="103">
<tr>
<!-- organization logo -->
<td>
<j:set var="logo" value="${pom.organization.logo}"/>
<j:if test="${!empty(logo)}">
<!-- set url to org or project url -->
<j:set var="url" value="${pom.organization.url}"/>
<j:if test="${!empty(url)}">
<j:set var="home" value="${pom.organization.url}"/>
</j:if>
<j:if test="${empty(url)}">
<j:set var="home" value="${pom.url}"/>
</j:if>
<!-- set image to relative or complete -->
<j:set var="image" value="${pom.organization.logo}"/>
<j:if test="${!image.startsWith('http://')}">
<j:set var="image" value="${relativePath}${image}"/>
</j:if>
<a href="${home}">
<img src="${image}" align="left" alt="${pom.organization.name}" border="0"/>
</a>
</j:if>
</td>
<!-- project logo and link -->
<td>
<div align="right" id="login">
<j:set var="logo" value="${pom.logo}"/>
<j:if test="${logo != null and logo != ''}">
<!-- set image to relative or complete -->
<j:set var="image" value="${pom.logo}"/>
<j:if test="${!image.startsWith('http://')}">
<j:set var="image" value="${relativePath}${image}"/>
</j:if>
<a href="${pom.url}">
<img src="${image}" align="right" alt="${pom.name}" border="0"/>
</a>
</j:if>
</div>
</td>
</tr>
</table>
</div>
<div id="breadcrumbs">
<table border="0" cellspacing="0" cellpadding="4" width="100%">
<tr>
<j:if test="${date == 'left'}">
<j:set var="version" value="${maven.xdoc.version}"/>
<td>Last published: ${build.date}
<j:if test="${!empty(version)}">| Doc for ${version}</j:if>
</td>
</j:if>
<td>
<div align="right">
<j:if test="${date == 'right'}">
Last published: ${build.date}
<x:if select="$nav/body/links">|</x:if>
</j:if>
<!-- render links -->
<x:if select="$nav/body/links">
<jsl:applyTemplates select="$nav/body/links"/>
</x:if>
<x:if select="not($nav/body/links)">
<!-- FIXME -->
</x:if>
</div>
</td>
</tr>
</table>
</div>
<!-- Body of the page -->
<table border="0" cellspacing="0" cellpadding="8" width="100%"> <!--id="main" -->
<tr valign="top">
<td id="leftcol" width="200">
<div id="navcolumn">
<j:if test="${context.findVariable('maven.xdoc.date') == 'navigation-top'}">
<div>
<small>Last published: ${buildDate}</small>
</div>
</j:if>
<x:if select="$nav">
<jsl:applyTemplates select="$nav/body/menu"/>
</x:if>
<!-- Standard Maven Navigation -->
<j:set var="fileName">${file}</j:set>
<!--
! Check to see if the user wishes to include the
! maven-generated docs on their site.
!-->
<j:if test="${includeProjectDocumentation.equals('yes')}">
<div>
<strong>Project Documentation</strong>
<!--
<div>
<small>
<a href="${relativePath}/index.html">Front Page</a>
</small>
</div>
-->
<div>
<small>
<a href="${relativePath}/project-info.html">Project Info</a>
</small>
<util:tokenize var="projectInfoFiles" delim=",">${maven.xdoc.projectInfo}</util:tokenize>
<j:forEach var="infoFile" items="${projectInfoFiles}">
<j:if test="${relativePath == '.' and fileName.endsWith(infoFile)}">
<div>
<small>
<a href="${relativePath}/mail-lists.html">Mailing Lists</a>
</small>
</div>
<div>
<small>
<a href="${relativePath}/team-list.html">Project Team</a>
</small>
</div>
<div>
<small>
<a href="${relativePath}/dependencies.html">Dependencies</a>
</small>
</div>
<j:if test="${!empty(pom.repository.url)}">
<div>
<small>
<a href="${relativePath}/cvs-usage.html">Source Repository</a>
</small>
</div>
</j:if>
<j:if test="${!empty(pom.issueTrackingUrl)}">
<div>
<small>
<a href="${relativePath}/issue-tracking.html">Issue Tracking</a>
</small>
</div>
</j:if>
</j:if>
</j:forEach>
</div>
<div>
<small>
<a href="${relativePath}/maven-reports.html">Project Reports</a>
</small>
<j:choose>
<j:when test="${!pom.reports.isEmpty()}">
<!--
| Check to see if we need to include the report
| links in this document. The only time we
| need to do this is when the current document
| either the maven-reports.xml doc (the page
| is displayed when clicking on Project
| Reports) or when the current document is one
| of the actual reports (in which case we want
| to leave the project report links expanded.
|-->
<j:set var="includeReportLinks" value="false"/>
<j:forEach var="report" items="${reports}">
<j:set var="linkWithXmlExt" value="${report.link}.xml"/>
<j:if test="${relativePath == '.' and (fileName.endsWith('maven-reports.xml') or fileName.endsWith(linkWithXmlExt))}">
<j:set var="includeReportLinks" value="true"/>
</j:if>
</j:forEach>
<!--
| If we need to include the report links, then
| do so. This is determined by the above
| block.
|-->
<j:if test="${includeReportLinks == 'true'}">
<j:forEach var="report" items="${reports}">
<div>
<small>
<a href="${relativePath}/${report.link}.html">
${report.name}
</a>
</small>
</div>
</j:forEach>
</j:if>
</j:when>
<j:otherwise>
<!-- The old static method -->
<util:tokenize var="projectReportFiles" delim=",">${maven.xdoc.projectReports}</util:tokenize>
<j:forEach var="reportFile" items="${projectReportFiles}">
<j:if test="${relativePath == '.' and fileName.endsWith(reportFile.trim())}">
<util:available file="${maven.docs.src}/tasks.xml">
<div>
<small>
<a href="${relativePath}/tasks.html">Tasks</a>
</small>
</div>
</util:available>
<util:available file="${maven.gen.docs}/task-list.xml">
<div>
<small>
<a href="${relativePath}/task-list.html">Task List</a>
</small>
</div>
</util:available>
<util:available file="${maven.docs.src}/changes.xml">
<div>
<small>
<a href="${relativePath}/changes.html">Changes</a>
</small>
</div>
</util:available>
<j:if test="${!empty(pom.repository.connection)}">
<div>
<small>
<a href="${relativePath}/changelog-report.html">Change Log</a>
</small>
</div>
<div>
<small>
<a href="${relativePath}/developer-activity-report.html">Developer Activity</a>
</small>
</div>
<div>
<small>
<a href="${relativePath}/file-activity-report.html">File Activity</a>
</small>
</div>
</j:if>
<j:if test="${unitTestSourcesPresent}">
<div>
<small>
<a href="${relativePath}/junit-report.html">Unit Tests</a>
</small>
</div>
</j:if>
<j:if test="${sourcesPresent}">
<div>
<small>
<a href="${relativePath}/jdepend-report.html">Metric Results</a>
</small>
</div>
<div>
<small>
<a href="${relativePath}/checkstyle-report.html">Checkstyle Report</a>
</small>
</div>
<div>
<small>
<a href="${relativePath}/javadoc.html">Javadoc Report</a>
</small>
</div>
</j:if>
<util:available file="${maven.docs.dest}/clover">
<div>
<small>
<a href="${relativePath}/clover/index.html">Clover Test Coverage</a>
</small>
</div>
</util:available>
<util:available file="${maven.gen.docs}/cactus-report.xml">
<div>
<small>
<a href="${relativePath}/cactus-report.html">Cactus Tests</a>
</small>
</div>
</util:available>
</j:if>
</j:forEach>
</j:otherwise>
</j:choose>
</div>
<j:if test="${pom.reports.isEmpty()}">
<j:if test="${sourcesPresent}">
<div>
<small>
<a href="${relativePath}/apidocs/index.html">JavaDocs</a>
</small>
</div>
<div>
<small>
<a href="${relativePath}/xref/index.html">Source XReference</a>
</small>
</div>
<j:if test="${unitTestSourcesPresent == 'true'}">
<div>
<small>
<a href="${relativePath}/xref-test/index.html">Test XReference</a>
</small>
</div>
</j:if>
</j:if>
</j:if>
<!--
<j:set var="devProcess" value="false"/>
<util:available file="${maven.docs.src}/development-process.xml">
<j:set var="devProcess" value="true"/>
</util:available>
<j:if test="${devProcess}">
<div>
<small>
<a href="${relativePath}/development-process.html">Development Process</a>
</small>
</div>
</j:if>
<j:if test="${!devProcess}">
<div>
<small>
<j:set var="devProcess">${maven.xdoc.developmentProcessUrl}</j:set>
<a href="${devProcess}">Development Process</a>
</small>
</div>
</j:if>
-->
<div>
<small>
<a href="${relativePath}/license.html">License</a>
</small>
</div>
</div>
</j:if>
<j:if test="${context.findVariable('maven.xdoc.date') == 'navigation-bottom'}">
<div>
<small>Last published: ${build.date}</small>
</div>
</j:if>
</div>
</td>
<td>
<div id="bodycol">
<!-- Insert MAIN body here -->
<div class="app">
<!-- FIXME really shouldn't use $doc, but jelly loses it's context again -->
<jsl:applyTemplates select="$doc/document/body/section"/>
<jsl:applyTemplates select="$doc/document/body/glossary" />
<jsl:applyTemplates select="$doc/document/body/release" />
<jsl:applyTemplates select="$doc/document/body/changelog" />
<jsl:applyTemplates select="$doc/document/body/taskList" />
<jsl:applyTemplates select="$doc/document/body/goals" />
</div>
</div>
</td>
</tr>
</table>
<div id="footer">
<table border="0" cellspacing="0" cellpadding="4">
<tr>
<td>
<j:if test="${!empty(pom.organization.name)}">
<j:if test="${!empty(pom.inceptionYear)}">
<j:if test="${pom.inceptionYear == mavenCurrentYear}">
<!-- FIXME © -->${mavenCurrentYear}, ${pom.organization.name}
</j:if>
<j:if test="${pom.inceptionYear != mavenCurrentYear}">
<!-- FIXME © --> ${pom.inceptionYear}-${mavenCurrentYear}, ${pom.organization.name}
</j:if>
</j:if>
<j:if test="${empty(pom.inceptionYear)}">
<!-- FIXME © --> ${mavenCurrentYear}, ${pom.organization.name}
</j:if>
</j:if>
<j:if test="${context.findVariable('maven.xdoc.date') == 'bottom'}">
- Last published: ${build.date}
</j:if>
</td>
<j:if test="${context.findVariable('maven.xdoc.date') == 'bottom-right'}">
<td align="right">Last published: ${build.date}</td>
</j:if>
</tr>
</table>
</div>
</body>
</html>
</jsl:template>
<!-- process the properties of the doc -->
<jsl:template match="properties" trim="false">
<!-- stick head block here later -->
</jsl:template>
<!-- Process a menu for the navigation bar -->
<jsl:template match="menu" trim="false">
<div>
<strong><x:expr select="@name"/></strong>
<jsl:applyTemplates select="item"/>
</div>
</jsl:template>
<jsl:template match="item" trim="false">
<div>
<j:set var="_name"><x:expr select="@name"/></j:set>
<j:set var="_link"><x:expr select="@href"/></j:set>
<small><doc:itemLink name="${_name}" link="${_link}"/></small>
<jsl:applyTemplates select="item"/>
</div>
</jsl:template>
<!-- Process the breadcrumb navbar -->
<jsl:template match="links" trim="false">
<j:set var="linkCount" value="1"/>
<x:forEach var="link" select="item">
<j:if test="${linkCount != 1}">|</j:if>
<j:set var="_name">
<x:expr select="@name"/>
</j:set>
<j:set var="_link">
<x:expr select="@href"/>
</j:set>
<doc:itemLink name="${_name}" link="${_link}"/>
<j:set var="linkCount" value="${1+linkCount}"/>
</x:forEach>
</jsl:template>
<!-- process a documentation section -->
<jsl:template match="section" trim="false">
<div class="h3">
<j:set var="_sectionName"><x:expr select="@name"/></j:set>
<j:if test="${!empty(_sectionName)}">
<h3>
<a name="${_sectionName}">${_sectionName}</a>
</h3>
</j:if>
<jsl:applyTemplates select="*"/>
</div>
</jsl:template>
<jsl:template match="subsection" trim="false">
<div class="h4">
<j:set var="_sectionName"><x:expr select="@name"/></j:set>
<j:if test="${!empty(_sectionName)}">
<h4>
<a name="${_sectionName}">${_sectionName}</a>
</h4>
</j:if>
<jsl:applyTemplates select="*"/>
</div>
</jsl:template>
<jsl:template match="source" trim="false">
<div id="source">
<pre><x:expr select="."/></pre>
</div>
</jsl:template>
<jsl:template match="table" trim="false">
<j:set var="rowcount" value="0"/>
<table cellpadding="3" cellspacing="2" border="1" width="100%">
<jsl:applyTemplates select="*"/>
</table>
</jsl:template>
<jsl:template match="tr" trim="false">
<j:choose>
<j:when test="${rowMode == 'a'}">
<j:set var="rowMode" value="b"/>
</j:when>
<j:otherwise>
<j:set var="rowMode" value="a"/>
</j:otherwise>
</j:choose>
<!-- copy attributes FIXME: Shouldn't this only be colspan|rowspan? -->
<x:element name="tr"><j:whitespace trim="true">
<x:attribute name="class">${rowMode}</x:attribute>
<x:forEach var="attr" select="@*">
<x:attribute name="${attr.name}">${attr.value}</x:attribute>
</x:forEach>
<jsl:applyTemplates select="*"/>
</j:whitespace></x:element>
</jsl:template>
<!--************************-->
<!-- glossary documentation -->
<!--************************-->
<jsl:template match="glossary" trim="false">
<jsl:applyTemplates select="glossary-entries/glossary-entry" />
</jsl:template>
<jsl:template match="glossary-entry" trim="false">
<strong><x:expr select="name" /></strong>
<br/>
<x:expr select="definition" />
<p/>
</jsl:template>
<!--************************-->
<!-- goals documentation -->
<!--************************-->
<jsl:template match="goals" trim="false">
<!-- reset row alternation -->
<j:set var="rowMode" value="" />
<div class="h3">
<h3><a name="Goals">Goals</a></h3>
<table>
<tr width='100%'><th>Goal</th><th>Description</th></tr>
<jsl:applyTemplates select="goal"/>
</table>
</div>
</jsl:template>
<!-- a goal -->
<!-- FIXME: this is copied from tr - there must be a way of
calling templates in jsl? -->
<jsl:template match="goal" trim="false">
<j:choose>
<j:when test="${rowMode == 'a'}">
<j:set var="rowMode" value="b"/>
</j:when>
<j:otherwise>
<j:set var="rowMode" value="a"/>
</j:otherwise>
</j:choose>
<x:element name="tr"><j:whitespace trim="true">
<x:attribute name="class">${rowMode}</x:attribute>
<j:set var="_goalName"><x:expr select="./name" /></j:set>
<td width='200'><a name="${_goalName}">${_goalName}</a></td>
<td><jsl:applyTemplates select="description" /></td>
</j:whitespace></x:element>
</jsl:template>
<jsl:template match="description">
<x:expr select="."/>
</jsl:template>
<!--************************-->
<!-- changelog documentation-->
<!--************************-->
<jsl:template match="changelog" trim="false">
<j:set var="rowMode" value="" />
<table width="100%">
<tr>
<th>Date</th><th>Author</th><th>Files/Message</th>
</tr>
<jsl:applyTemplates select="changelog-entry" />
</table>
</jsl:template>
<!-- transform a changelog entry -->
<!-- FIXME: tr code copied from above -->
<jsl:template match="changelog-entry" trim="false">
<j:choose>
<j:when test="${rowMode == 'a'}">
<j:set var="rowMode" value="b"/>
</j:when>
<j:otherwise>
<j:set var="rowMode" value="a"/>
</j:otherwise>
</j:choose>
<x:element name="tr"><j:whitespace trim="true">
<x:attribute name="class">${rowMode}</x:attribute>
<td><x:expr select="date" /> <x:expr select="time" /></td>
<td><x:expr select="author"/></td>
<td><jsl:applyTemplates select="*" />
<pre><x:expr select="msg"/></pre>
</td>
</j:whitespace></x:element>
</jsl:template>
<jsl:template match="file">
<j:set var="url">${pom.repository.url}<x:expr select="name"/></j:set>
<j:set var="revUrl">${url}?<x:expr select="revision"/>&content-type=text/vnd.viewcvs-markup</j:set>
<a href="${url}"><x:expr select="name"/></a> -
<a href="${revUrl}">v<x:expr select="revision"/></a>
<br/>
</jsl:template>
<!-- copy any other elements through -->
<jsl:template match="*" trim="false">
<jsl:copy trim="false">
<jsl:applyTemplates trim="false"/>
</jsl:copy>
</jsl:template>
<!-- element values don't pass through as text -->
<jsl:template match="@*"/>
</jsl:stylesheet>
1.1 avalon-sandbox/merlin/merlin-platform/src/etc/stylesheet.css
Index: stylesheet.css
===================================================================
/* Javadoc style sheet */
/* Define colors, fonts and other style attributes here to override the defaults */
/* Page background color */
body { background-color: #FFFFFF }
/* Table colors */
.TableHeadingColor { background: #CCCCFF } /* Dark mauve */
.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */
.TableRowColor { background: #FFFFFF } /* White */
/* Font used in left-hand frame lists */
.FrameTitleFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif }
.FrameHeadingFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif }
.FrameItemFont { font-size: 10pts; font-family: Helvetica, Arial, san-serif }
/* Example of smaller, sans-serif font in frames */
/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */
/* Navigation bar fonts and colors */
.NavBarCell1 { background-color:#EEEEFF;}/* Light mauve */
.NavBarCell1Rev { background-color:#00008B;}/* Dark Blue */
.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;}
.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
1.1 avalon-sandbox/merlin/merlin-platform/src/repository/README.TXT
Index: README.TXT
===================================================================
placeholder
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org