mcconnell 2003/01/29 05:50:40
Modified: assembly default.properties
assembly/src/java/org/apache/avalon/assembly/appliance
DefaultAppliance.java
info default.properties
merlin default.properties
meta build.xml default.properties
meta/src/java/org/apache/avalon/meta/info
ContextDescriptor.java InfoDescriptor.java
meta/src/java/org/apache/avalon/meta/info/builder
TypeFactory.java XMLLegacyCreator.java
XMLTypeCreator.java
site default.properties
Log:
Build and javadoc updates together with reference updates to Excalibur i18n 1.1
Revision Changes Path
1.13 +2 -2 avalon-sandbox/assembly/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/assembly/default.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- default.properties 27 Jan 2003 23:52:32 -0000 1.12
+++ default.properties 29 Jan 2003 13:50:39 -0000 1.13
@@ -38,10 +38,10 @@
# ----- Excalibur -----
excalibur.home=${basedir}/../../jakarta-avalon-excalibur
-# ----- Excalibur i18n, version 1.0 or later -----
+# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${excalibur.home}/i18n
excalibur-i18n.lib=${excalibur-i18n.home}/build/lib
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
# ----- Excalibur Extension -----
excalibur-extension.home=${excalibur.home}/extension
1.29 +1 -1
avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DefaultAppliance.java 28 Jan 2003 13:26:12 -0000 1.28
+++ DefaultAppliance.java 29 Jan 2003 13:50:39 -0000 1.29
@@ -140,7 +140,7 @@
* appliance.release( object, this );
*
* </pre>
- * @see ApplianceContext
+ * @see DefaultApplianceContext
* @author <a href="mailto:[EMAIL PROTECTED]";>Avalon Development
Team</a>
* @version $Revision$ $Date$
*/
1.6 +2 -2 avalon-sandbox/info/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/info/default.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default.properties 3 Jan 2003 19:35:31 -0000 1.5
+++ default.properties 29 Jan 2003 13:50:39 -0000 1.6
@@ -21,10 +21,10 @@
avalon-framework.lib=${avalon-framework.home}/target/lib
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
-# ----- Excalibur i18n, version 1.0 or later -----
+# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${basedir}/../../jakarta-avalon-excalibur/i18n/dist
excalibur-i18n.lib=${excalibur-i18n.home}
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
# ----- jakarta-site CVS module, latest version (Anakia) -----
jakarta-site.dir=${basedir}/../../jakarta-site
1.14 +2 -2 avalon-sandbox/merlin/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- default.properties 27 Jan 2003 23:52:33 -0000 1.13
+++ default.properties 29 Jan 2003 13:50:39 -0000 1.14
@@ -49,10 +49,10 @@
# ----- Excalibur -----
excalibur.home=${basedir}/../../jakarta-avalon-excalibur
-# ----- Excalibur i18n, version 1.0 or later -----
+# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${excalibur.home}/i18n
excalibur-i18n.lib=${excalibur-i18n.home}/build/lib
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
# ----- Excalibur Extension, version 1.0 or later -----
excalibur-extension.home=${excalibur.home}/extension
1.6 +36 -33 avalon-sandbox/meta/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 27 Jan 2003 23:52:33 -0000 1.5
+++ build.xml 29 Jan 2003 13:50:39 -0000 1.6
@@ -11,9 +11,8 @@
<!-- Classpath for product -->
<path id="project.class.path">
- <pathelement location="${qdox.jar}"/>
- <pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-i18n.jar}"/>
+ <pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-configuration.jar}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${checkstyle.jar}"/>
@@ -22,8 +21,12 @@
</path>
<path id="tools.class.path">
+ <pathelement location="${avalon-framework.jar}"/>
<pathelement location="${junit.jar}"/>
<fileset dir="${jakarta-site.dir}/lib"/>
+ <fileset dir="${build.dir}/lib">
+ <include name="${jar.name}"/>
+ </fileset>
</path>
<path id="test.class.path">
@@ -81,37 +84,6 @@
</target>
- <!-- Compiles the unit test source code -->
- <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
- <mkdir dir="${build.testsrc}"/>
-
- <!-- Copy over all of the tests applying test filters -->
- <copy todir="${build.testsrc}">
- <fileset dir="${test.dir}"/>
- </copy>
-
- <mkdir dir="${build.testclasses}"/>
-
- <!-- Compile all test classes. -->
- <javac srcdir="${build.testsrc}"
- destdir="${build.testclasses}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- deprecation="${build.deprecation}"
- target="1.2">
- <classpath refid="test.class.path" />
- <include name="**/*.java"/>
- </javac>
-
- <copy todir="${build.testclasses}">
- <fileset dir="${test.dir}">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </copy>
-
- </target>
-
<!-- Copies and filters the license. Used by jar and dist -->
<target name="prepare-conf">
<mkdir dir="${build.conf}"/>
@@ -164,6 +136,37 @@
value=""Copyright © ${year} Apache Avalon Project.
All Rights Reserved.""/>
</doclet>
</javadoc>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+ <mkdir dir="${build.testsrc}"/>
+
+ <!-- Copy over all of the tests applying test filters -->
+ <copy todir="${build.testsrc}">
+ <fileset dir="${test.dir}"/>
+ </copy>
+
+ <mkdir dir="${build.testclasses}"/>
+
+ <!-- Compile all test classes. -->
+ <javac srcdir="${build.testsrc}"
+ destdir="${build.testclasses}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="test.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
+ <copy todir="${build.testclasses}">
+ <fileset dir="${test.dir}">
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.html"/>
+ </fileset>
+ </copy>
+
</target>
<target name="test" depends="compile-test" description="Perform the unit tests"
unless="skip.tests">
1.5 +8 -5 avalon-sandbox/meta/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/default.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.properties 27 Jan 2003 23:52:33 -0000 1.4
+++ default.properties 29 Jan 2003 13:50:39 -0000 1.5
@@ -12,6 +12,8 @@
package-version=1.0
year=2000-2003
+lib.dir = lib
+
# --------------------------------------------------
# REQUIRED LIBRARIES
# --------------------------------------------------
@@ -27,10 +29,10 @@
# ----- Excalibur -----
excalibur.home=${basedir}/../../jakarta-avalon-excalibur
-# ----- Excalibur i18n, version 1.0 or later -----
+# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${excalibur.home}/i18n
excalibur-i18n.lib=${excalibur-i18n.home}/build/lib
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
# ----- Excalibur Configuration -----
excalibur-configuration.home=${excalibur.home}/configuration
@@ -38,9 +40,7 @@
excalibur-configuration.jar=${excalibur-configuration.lib}/excalibur-configuration-1.0.jar
# ----- QDOX -----
-qdox.home=.
-qdox.lib=${qdox.home}/tools
-qdox.jar=${qdox.lib}/qdox-1.0.jar
+qdox.jar=${lib.dir}/qdox-1.1.jar
# --------------------------------------------------
@@ -62,6 +62,7 @@
build.reports = ${build.dir}/reports
build.docs = ${build.dir}/docs
build.javadocs = ${build.docs}/api
+build.tools = ${build.dir}/tools
# Set the properties for source directories
src.dir = src
@@ -69,6 +70,7 @@
conf.dir = ${src.dir}/conf
test.dir = ${src.dir}/test
etc.dir = ${src.dir}/etc
+tools.dir = ${src.dir}/tools
# Set the properties for distribution directories
dist.dir = dist
@@ -83,6 +85,7 @@
# name of jar file
jar.name = ${name}-${package-version}.jar
+tool.name = ${name}-tool-${package-version}.jar
# property indicating directory where all distribution archives are placed
dist.base = distributions
1.6 +3 -5
avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/ContextDescriptor.java
Index: ContextDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/ContextDescriptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextDescriptor.java 15 Jan 2003 09:11:32 -0000 1.5
+++ ContextDescriptor.java 29 Jan 2003 13:50:39 -0000 1.6
@@ -50,8 +50,6 @@
package org.apache.avalon.meta.info;
-import java.util.Map;
-import java.util.Hashtable;
import java.util.Properties;
import java.util.Arrays;
import java.util.List;
@@ -91,7 +89,7 @@
/**
* Create a descriptor.
- * @param type the classname of the context class
+ * @param reference the reference descriptor describing the context type
* @param entries the set of entries required within the context
* @param attributes supplimentary atrtributes associated with the context
* @exception NullPointerException if type or entries argument is null
@@ -170,7 +168,7 @@
*
* @param entries the entries to merge
* @return the mergerged set of entries
- * @exception Exception of a entry conflict occurs
+ * @exception IllegalArgumentException if a entry conflict occurs
*/
public EntryDescriptor[] merge( EntryDescriptor[] entries )
throws IllegalArgumentException
1.5 +16 -1
avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/InfoDescriptor.java
Index: InfoDescriptor.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/InfoDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InfoDescriptor.java 15 Jan 2003 09:11:32 -0000 1.4
+++ InfoDescriptor.java 29 Jan 2003 13:50:39 -0000 1.5
@@ -101,6 +101,21 @@
* @param attributes a set of attributes associated with the component type
* @exception IllegalArgumentException if the implementation key is not a
classname
*/
+ public InfoDescriptor( final String classname )
+ throws IllegalArgumentException
+ {
+ this( null, classname, null, null );
+ }
+
+ /**
+ * Creation of a new component descriptor using a supplied name, key, version
+ * and attribute set.
+ * @param name the component name
+ * @param classname the implemetation classname
+ * @param version the implementation version
+ * @param attributes a set of attributes associated with the component type
+ * @exception IllegalArgumentException if the implementation key is not a
classname
+ */
public InfoDescriptor( final String name,
final String classname,
final Version version,
1.2 +2 -3
avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/builder/TypeFactory.java
Index: TypeFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/builder/TypeFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeFactory.java 26 Nov 2002 17:12:14 -0000 1.1
+++ TypeFactory.java 29 Jan 2003 13:50:40 -0000 1.2
@@ -50,7 +50,6 @@
package org.apache.avalon.meta.info.builder;
-import java.io.InputStream;
import org.apache.avalon.meta.info.Type;
import org.apache.avalon.framework.configuration.Configuration;
@@ -71,7 +70,7 @@
*
* @param path the class resource name of component type that we are looking up
* @param xinfo the configuration fragment for the type
- * @param xinfo the configuration fragment for the default configuration
+ * @param defaults the configuration fragment for the default configuration
* @return the newly created {@link Type}
* @exception Exception if an error occurs
*/
1.2 +50 -55
avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java
Index: XMLLegacyCreator.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLLegacyCreator.java 15 Jan 2003 09:21:04 -0000 1.1
+++ XMLLegacyCreator.java 29 Jan 2003 13:50:40 -0000 1.2
@@ -1,57 +1,52 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, 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", "Avalon", 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 [EMAIL PROTECTED]
- *
- * 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 (INCLUDING, 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/>.
- */
+/*
+
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1999-2002 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 [EMAIL PROTECTED]
+
+ 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/>.
+
+*/
package org.apache.avalon.meta.info.builder;
1.7 +9 -2
avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLTypeCreator.java 15 Jan 2003 09:11:32 -0000 1.6
+++ XMLTypeCreator.java 29 Jan 2003 13:50:40 -0000 1.7
@@ -116,10 +116,12 @@
*
* @param classname The classname of Component
* @param info the Type configuration
+ * @param defaults the default configuration
* @return the created Type
* @throws Exception if an error occurs
*/
- public Type createType( final String classname, final Configuration info, final
Configuration defaults )
+ public Type createType(
+ final String classname, final Configuration info, final Configuration
defaults )
throws Exception
{
final String topLevelName = info.getName();
@@ -491,6 +493,11 @@
return new ExtensionDescriptor( reference, context, attributes );
}
+ /**
+ * Creation of a reference descriptor from the supplied path.
+ * @param path the classname
+ * @return the reference descriptor
+ */
public ReferenceDescriptor createReference( String path )
{
final String type;
1.3 +2 -2 avalon-sandbox/site/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/site/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 19 Jan 2003 15:28:02 -0000 1.2
+++ default.properties 29 Jan 2003 13:50:40 -0000 1.3
@@ -45,10 +45,10 @@
# ----- Excalibur -----
excalibur.home=${basedir}/../../jakarta-avalon-excalibur
-# ----- Excalibur i18n, version 1.0 or later -----
+# ----- Excalibur i18n, version 1.1 or later -----
excalibur-i18n.home=${excalibur.home}/i18n
excalibur-i18n.lib=${excalibur-i18n.home}/build/lib
-excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.1.jar
# ----- Excalibur Configuration -----
excalibur-configuration.home=${excalibur.home}/configuration
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
