jstrachan 01/08/29 01:58:35
Modified: messenger build.xml
messenger/src/java/org/apache/commons/messenger
MessengerManager.java
Log:
Tidied build process to make website and javadoc neater
Revision Changes Path
1.6 +12 -3 jakarta-commons-sandbox/messenger/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/messenger/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/08/29 07:53:52 1.5
+++ build.xml 2001/08/29 08:58:35 1.6
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.5 2001/08/29 07:53:52 jstrachan Exp $ -->
+<!-- $Id: build.xml,v 1.6 2001/08/29 08:58:35 jstrachan Exp $ -->
<project name="messenger" default="test" basedir=".">
<!-- patternset describing files to be copied from the doc directory -->
@@ -49,7 +49,7 @@
<!-- now combine the classpaths -->
<property name="classpath"
value="${cp}:${j2ee.jar}:${digester.jar}:${collections.jar}:${beanutils.jar}:${junit.jar}"/>
- <property name="name" value="commons-messenger"/>
+ <property name="name" value="messenger"/>
<property name="Name" value="Commons Messenger"/>
<property name="Name-Long" value="Jakarta Commons Messenger Package"/>
@@ -72,7 +72,8 @@
<property name="dest.doc" value="${dest}/doc"/>
<property name="dest.doc.api" value="${dest.doc}/api"/>
<property name="dest.jardir" value="${dest}"/>
- <property name="dest.jardir.jar" value="${dest.jardir}/${name}.jar"/>
+ <property name="dest.jardir.jar" value="${dest.jardir}/commons-${name}.jar"/>
+ <property name="javadoc-website-dir"
value="../../jakarta-commons/docs/${name}/api"/>
<available property="available-doc" file="${source.doc}"/> <!-- does this
module have docs? -->
<available property="available-src-java" file="${source.src.java}"/> <!--
does this module have java src? -->
@@ -176,9 +177,17 @@
nohelp="true"
nonavbar="false"
serialwarn="false">
+ <link href="http://java.sun.com/j2ee/j2sdkee/techdocs/api"/>
<link href="http://java.sun.com/products/jdk/1.3/docs/api"/>
</javadoc>
<delete dir="${workdir}"/>
+ </target>
+
+ <!-- Updates the JavaDoc in the jakarta-commons/docs area -->
+ <target name="website" depends="doc-javadoc" if="available-src-java">
+ <copy todir="${javadoc-website-dir}" filtering="no">
+ <fileset dir="${dest.doc.api}"/>
+ </copy>
</target>
<!-- ######################################################### -->
1.2 +29 -3
jakarta-commons-sandbox/messenger/src/java/org/apache/commons/messenger/MessengerManager.java
Index: MessengerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/messenger/src/java/org/apache/commons/messenger/MessengerManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessengerManager.java 2001/08/28 22:38:28 1.1
+++ MessengerManager.java 2001/08/29 08:58:35 1.2
@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*
- * $Id: MessengerManager.java,v 1.1 2001/08/28 22:38:28 jstrachan Exp $
+ * $Id: MessengerManager.java,v 1.2 2001/08/29 08:58:35 jstrachan Exp $
*/
package org.apache.commons.messenger;
@@ -19,7 +19,7 @@
/** <p><code>MessengerManager</code> is a manager of {@link Messenger}
instances.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>James Strachan</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class MessengerManager {
@@ -42,7 +42,9 @@
return getInstance().getMessenger( name );
}
- /** A helper method to load a MessengerManager from a given XML configuration
file */
+ /** A helper method to load a MessengerManager
+ * from a given XML deployment configuration document
+ */
public static MessengerManager load( String xmlURL ) throws JMSException {
try {
MessengerDigester digester = new MessengerDigester();
@@ -55,6 +57,21 @@
}
}
+ /** A helper method to explicitly configure the MessengerManager singleton
+ * from a given XML deployment configuration document
+ */
+ public static void configure( String xmlURL ) throws JMSException {
+ try {
+ MessengerDigester digester = new MessengerDigester();
+ setInstance( (MessengerManager) digester.parse( xmlURL ) );
+ }
+ catch (Exception e) {
+ JMSException newException = new JMSException( "Could not load the
Messenger XML config file from: " + xmlURL );
+ newException.setLinkedException(e);
+ throw newException;
+ }
+ }
+
/** Returns the messenger for the given name */
public Messenger getMessenger(String name) {
return (Messenger) messengers.get(name);
@@ -91,6 +108,15 @@
/** Factory method to create the singleton MessengerManager instance */
protected static MessengerManager createInstance() throws JMSException {
+ String config = null;
+ try {
+ config = System.getProperty( "org.apache.commons.messenger" );
+ }
+ catch (Exception e) {
+ }
+ if ( config != null ) {
+ load( config );
+ }
URL url = MessengerManager.class.getClassLoader().getResource(
"Messenger.xml" );
if ( url != null ) {
return load( url.toString() );
