niclas 2004/02/02 20:53:41
Modified: merlin INSTALL.TXT maven.xml
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
AbstractTestCase.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultSystemContext.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model
AbstractTestCase.java
repository maven.xml
util maven.xml
Log:
Fixed various issues to make a clean build work.
Revision Changes Path
1.9 +99 -99 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- INSTALL.TXT 20 Jan 2004 01:28:48 -0000 1.8
+++ INSTALL.TXT 3 Feb 2004 04:53:41 -0000 1.9
@@ -1,99 +1,99 @@
-
-PROJECT: Merlin @VERSION@
-====================================================================
-
-DESCRIPTION:
-------------
-
-This directory contains the merlin system installation and related
-resources.
-
- /merlin
- /bin
- /config
- /system
- README.TXT
- LICENSE.TXT
- INSTALL.TXT
- /plugins
- @META_PLUGIN_JAR@
- @MERLIN_PLUGIN_JAR@
-
-
-Installing Merlin.
-------------------
-
-To use Merlin command line support or the Merlin NT Service
-you will need to define the MERLIN_HOME environment
-variable for your system and include MERLIN_HOME/bin in
-your system path. The MERLIN_HOME environment variable
-should point to the merlin directory.
-
-Under Windows you can set environment variables by selecting the
-Environment Tab from the System Control Panel.
-
-Under Lunix you can do this as follows:
-
- $ echo '
- > # set location of merlin
- > export MERLIN_HOME=/opt/merlin
- > # include it in the path
- > export PATH=$PATH:$MERLIN_HOME/bin
- > ' >> ~/.bash_profile
- $ source ~/.bash_profile
-
-Versions of Merlin prior to the 3.2-dev 20031210 build maintained
-a local repository of jar files under the %MERLIN_HOME%/repository
-directory. As of the 20031210 build the repository is maintained
-under AVALON_HOME which defaults to ${user.home}/.avalon. To
-override this behaviour you can either define a AVALON_HOME
-environment variable or you can add a merlin.properties file to
-${user.home} containing the "merlin.repository" property key and
-a value point to you preferred repository location.
-
-To confirm that your environment variables are correct, you
-should open a new command window and invoke the Merlin
-CLI application.
-
-Under DOS:
-
- $ merlin -version
-
-Under Lunix:
-
- $ merlin.sh -version
-
-The installation of Merlin is now complete, however, two plugins are
-provided with the installation supporting merlin development under the
-Maven platform. These plugins should be placed in the Maven plugin
-directory (${maven.home.local}\plugins).
-
- [EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
-
-Please note that if you are upgrading an existing installation you must
-delete the following two directories:
-
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
-
-Replace the existing avalon-meta and merlin plugin jar files with the supplied
-versions. Finally, delete all *.cache files in the Maven plugin directory.
-
-You now have everything in place to start using the Merlin Tutorial or
-building you own components. If you have any problems, please subscribe
-and post a message to [EMAIL PROTECTED]
-
-Special Note for JRE 1.3 and earlier.
--------------------------------------
-
-Some applications assume that XML parsing classes are available withing
-the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
-you can copy the following files to the JAVAHOME/lib/ext directory or
-declare an alternative directory as a JVM argument under the
-MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
-
- system/xml-apis/jars/xml-apis-2.0.2.jar
- system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
- system/xerces/jars/xerces-2.4.0.jar
-
+
+PROJECT: Merlin @VERSION@
+====================================================================
+
+DESCRIPTION:
+------------
+
+This directory contains the merlin system installation and related
+resources.
+
+ /merlin
+ /bin
+ /config
+ /system
+ README.TXT
+ LICENSE.TXT
+ INSTALL.TXT
+ /plugins
+ @META_PLUGIN_JAR@
+ @MERLIN_PLUGIN_JAR@
+
+
+Installing Merlin.
+------------------
+
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path. The MERLIN_HOME environment variable
+should point to the merlin directory.
+
+Under Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+
+Under Lunix you can do this as follows:
+
+ $ echo '
+ > # set location of merlin
+ > export MERLIN_HOME=/opt/merlin
+ > # include it in the path
+ > export PATH=$PATH:$MERLIN_HOME/bin
+ > ' >> ~/.bash_profile
+ $ source ~/.bash_profile
+
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory. As of the 20031210 build the repository is maintained
+under AVALON_HOME which defaults to ${user.home}/.avalon. To
+override this behaviour you can either define a AVALON_HOME
+environment variable or you can add a merlin.properties file to
+${user.home} containing the "merlin.repository" property key and
+a value point to you preferred repository location.
+
+To confirm that your environment variables are correct, you
+should open a new command window and invoke the Merlin
+CLI application.
+
+Under DOS:
+
+ $ merlin -version
+
+Under Lunix:
+
+ $ merlin.sh -version
+
+The installation of Merlin is now complete, however, two plugins are
+provided with the installation supporting merlin development under the
+Maven platform. These plugins should be placed in the Maven plugin
+directory (${maven.home.local}\plugins).
+
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+
+Please note that if you are upgrading an existing installation you must
+delete the following two directories:
+
+ [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
+
+Replace the existing avalon-meta and merlin plugin jar files with the supplied
+versions. Finally, delete all *.cache files in the Maven plugin directory.
+
+You now have everything in place to start using the Merlin Tutorial or
+building you own components. If you have any problems, please subscribe
+and post a message to [EMAIL PROTECTED]
+
+Special Note for JRE 1.3 and earlier.
+-------------------------------------
+
+Some applications assume that XML parsing classes are available withing
+the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
+you can copy the following files to the JAVAHOME/lib/ext directory or
+declare an alternative directory as a JVM argument under the
+MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
+
+ system/xml-apis/jars/xml-apis-2.0.2.jar
+ system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
+ system/xerces/jars/xerces-2.4.0.jar
+
1.46 +2 -2 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- maven.xml 2 Feb 2004 21:10:52 -0000 1.45
+++ maven.xml 3 Feb 2004 04:53:41 -0000 1.46
@@ -14,7 +14,7 @@
==============================================================================
-->
- <ant:property name="avalon.plugin.version" value="1.0"/>
+ <ant:property name="avalon.util.plugin.version" value="1.0-SNAPSHOT"/>
<ant:property name="meta.plugin.version" value="1.3.2"/>
<ant:property name="merlin.cli.version" value="3.3-SNAPSHOT"/>
<ant:property name="merlin.plugin.version" value="3.3-SNAPSHOT"/>
@@ -26,7 +26,7 @@
-->
<ant:property name="avalon.plugin.jar"
- value="avalon-plugin-${avalon.plugin.version}.jar"/>
+ value="avalon-util-plugin-${avalon.util.plugin.version}.jar"/>
<ant:property name="meta.plugin.jar"
value="avalon-meta-plugin-${meta.plugin.version}.jar"/>
<ant:property name="merlin.cli.jar"
1.11 +1 -1
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/AbstractTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractTestCase.java 24 Jan 2004 23:25:22 -0000 1.10
+++ AbstractTestCase.java 3 Feb 2004 04:53:41 -0000 1.11
@@ -117,7 +117,7 @@
m_system =
DefaultSystemContext.createSystemContext(
- context, base, local, ConsoleLogger.LEVEL_INFO, m_secured );
+ context, base, local, ConsoleLogger.LEVEL_INFO, m_secured, 3000 );
m_logger = m_system.getLogger();
//
1.13 +3 -3
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
Index: DefaultSystemContext.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultSystemContext.java 25 Jan 2004 13:18:48 -0000 1.12
+++ DefaultSystemContext.java 3 Feb 2004 04:53:41 -0000 1.13
@@ -71,7 +71,7 @@
*/
public static SystemContext createSystemContext(
InitialContext context, File base, File root,
- int priority, boolean secure )
+ int priority, boolean secure, long deploymenttimeout )
throws Exception
{
//
@@ -92,7 +92,7 @@
final File temp = new File( base, "temp" );
return new DefaultSystemContext(
- logging, base, home, temp, repository, "system", false, 1000, secure );
+ logging, base, home, temp, repository, "system", false,
deploymenttimeout, secure );
}
private static CacheManager createCacheManager( InitialContext context, File
root )
1.6 +1 -1
avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/AbstractTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTestCase.java 24 Jan 2004 23:25:28 -0000 1.5
+++ AbstractTestCase.java 3 Feb 2004 04:53:41 -0000 1.6
@@ -80,7 +80,7 @@
{
SystemContext system =
DefaultSystemContext.createSystemContext(
- context, base, root, PRIORITY, true );
+ context, base, root, PRIORITY, true, 1000 );
m_model =
system.getFactory().createContainmentModel(
source.toURL() );
1.11 +2 -2 avalon/repository/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 2 Feb 2004 00:41:23 -0000 1.10
+++ maven.xml 3 Feb 2004 04:53:41 -0000 1.11
@@ -82,7 +82,7 @@
<util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
<j:if test="${jarFile.exists()}">
<checksum file="${jarFile}"/>
- <j:if test="${maven.gpg.exe != ''}">
+ <j:if test="${maven.gpg.exec != null}">
<ant:exec executable="${maven.gpg.exec}">
<ant:arg value="--armour"/>
<ant:arg value="--yes"/>
@@ -94,7 +94,7 @@
<util:file var="metaFile" name="${maven.build.dir}/jars/${path}.jar.meta"/>
<j:if test="${metaFile.exists()}">
<checksum file="${metaFile}"/>
- <j:if test="${maven.gpg.exe != ''}">
+ <j:if test="${maven.gpg.exec != null}">
<ant:exec executable="${maven.gpg.exec}">
<ant:arg value="--armour"/>
<ant:arg value="--yes"/>
1.8 +1 -1 avalon/util/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/util/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 2 Feb 2004 00:38:45 -0000 1.7
+++ maven.xml 3 Feb 2004 04:53:41 -0000 1.8
@@ -62,7 +62,7 @@
<j:set var="path"
value="${child.artifactId}-${child.currentVersion}.jar"/>
<checksum file="${maven.build.dir}/jars/${path}"/>
- <j:if test="${maven.gpg.exe != ''}">
+ <j:if test="${maven.gpg.exec != null}">
<ant:exec executable="${maven.gpg.exec}">
<ant:arg value="--armour"/>
<ant:arg value="--yes"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
