leosimons 2003/04/05 11:39:39
Modified: . build.xml depchecker.xml
compatibility/examples/basic BasicCLI.java
compatibility/examples/incompat_options IncompatOptions.java
compatibility/examples/no_aliasing NoAlias.java
compatibility/examples/option_arguments OptionArguments.java
compatibility/src/java/org/apache/avalon/excalibur/collections
FixedSizeBuffer.java
compatibility/src/java/org/apache/avalon/excalibur/concurrent
DijkstraSemaphore.java ReadWriteLock.java
ThreadBarrier.java
component/src/java/org/apache/avalon/excalibur/component
ComponentHandler.java DefaultComponentFactory.java
configuration default.properties
configuration/src/java/org/apache/excalibur/configuration
ConfigurationUtil.java
datasource default.properties
event build.xml default.properties
event/src/java/org/apache/excalibur/event
DequeueInterceptor.java EnqueuePredicate.java
EventHandler.java Message.java Queue.java
Signal.java
event/src/java/org/apache/excalibur/event/impl
RateLimitingPredicate.java
event/src/test/org/apache/excalibur/event/test
AbstractQueueTestCase.java
FixedSizeQueuePerformanceTestCase.java
FixedSizeQueueTestCase.java QueueTestCase.java
extension build.xml
extension/src/java/org/apache/avalon/excalibur/extension
Specification.java
fortress build.xml default.properties
fortress/src/java/org/apache/avalon/fortress
RoleManager.java
fortress/src/java/org/apache/avalon/fortress/impl
AbstractContainer.java DefaultContainerManager.java
fortress/src/java/org/apache/avalon/fortress/impl/lookup
ComponentKey.java
i18n build.xml
instrument build.xml
instrument/src/java/org/apache/excalibur/instrument
InstrumentProxy.java
instrument/src/test/org/apache/excalibur/instrument/test
AbstractInstrumentableImpl.java
AbstractLogEnabledInstrumentableImpl.java
TestInstrumentProxy.java
instrument-client/src/java/org/apache/excalibur/instrument/client
AbstractInternalFrame.java
InstrumentManagerTree.java
InstrumentManagerTreeCellRenderer.java
InstrumentManagerTreeModel.java
InstrumentNodeData.java
InstrumentSampleNodeData.java
InstrumentableNodeData.java LargeMenu.java
NodeData.java
instrument-manager/src/java/org/apache/excalibur/instrument/manager
DefaultInstrumentManager.java
lifecycle build.xml
loader build.xml
logger build.xml default.properties
logger/src/java/org/apache/avalon/excalibur/logger
LoggerManager.java
naming build.xml
policy build.xml
policy/src/java/org/apache/excalibur/policy/runtime
AbstractPolicy.java
pool build.xml default.properties
sourceresolve build.xml
store build.xml
store/src/java/org/apache/excalibur/store/impl
AbstractJispFilesystemStore.java
thread build.xml default.properties
thread/src/java/org/apache/avalon/excalibur/thread/impl
DefaultThreadPool.java
threadcontext build.xml
xfc build.xml default.properties
xmlutil build.xml default.properties
xmlutil/src/java/org/apache/excalibur/xml/xslt
XSLTProcessorImpl.java
Log:
fix the build, run tests by default, fix some tests
Revision Changes Path
1.206 +7 -1 avalon-excalibur/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/build.xml,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- build.xml 22 Mar 2003 11:25:06 -0000 1.205
+++ build.xml 5 Apr 2003 19:39:33 -0000 1.206
@@ -147,7 +147,7 @@
<!-- Ant to decide on the correct build order. -->
<target name="build-all-subprojects"
depends="prj-compatibility, prj-loader,
- prj-naming, prj-threadcontext,
+ prj-naming, prj-threadcontext,
prj-i18n, prj-extension,
prj-configuration, prj-event,
prj-thread, prj-monitor, prj-fortress, prj-datasource,
@@ -168,6 +168,12 @@
<target name="build-subprojects-dist" depends="jar">
<ant target="build-all-subprojects">
<property name="subproject-target" value="dist"/>
+ </ant>
+ </target>
+
+ <target name="test" depends="jar">
+ <ant target="build-all-subprojects">
+ <property name="subproject-target" value="test"/>
</ant>
</target>
1.50 +3 -6 avalon-excalibur/depchecker.xml
Index: depchecker.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/depchecker.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- depchecker.xml 23 Mar 2003 12:11:51 -0000 1.49
+++ depchecker.xml 5 Apr 2003 19:39:33 -0000 1.50
@@ -474,11 +474,8 @@
</ant>
</target>
<target name="checkTestcase">
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="proj.jar.name" value="excalibur-testcase.jar"/>
- <property name="path" value="${excalibur-testcase.jar}"/>
- <property name="proj.home" value="${basedir}/../testcase"/>
- </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent">
+ </ant>
</target>
<target name="checkThreadcontext">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
1.5 +1 -1 avalon-excalibur/compatibility/examples/basic/BasicCLI.java
Index: BasicCLI.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/compatibility/examples/basic/BasicCLI.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicCLI.java 22 Mar 2003 12:46:22 -0000 1.4
+++ BasicCLI.java 5 Apr 2003 19:39:33 -0000 1.5
@@ -168,4 +168,4 @@
System.exit( 0 );
}
-}
\ No newline at end of file
+}
1.5 +1 -1
avalon-excalibur/compatibility/examples/incompat_options/IncompatOptions.java
Index: IncompatOptions.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/compatibility/examples/incompat_options/IncompatOptions.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IncompatOptions.java 22 Mar 2003 12:46:22 -0000 1.4
+++ IncompatOptions.java 5 Apr 2003 19:39:33 -0000 1.5
@@ -134,4 +134,4 @@
}
}
}
-}
\ No newline at end of file
+}
1.5 +1 -1 avalon-excalibur/compatibility/examples/no_aliasing/NoAlias.java
Index: NoAlias.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/compatibility/examples/no_aliasing/NoAlias.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NoAlias.java 22 Mar 2003 12:46:22 -0000 1.4
+++ NoAlias.java 5 Apr 2003 19:39:33 -0000 1.5
@@ -123,4 +123,4 @@
}
}
}
-}
\ No newline at end of file
+}
1.5 +1 -1
avalon-excalibur/compatibility/examples/option_arguments/OptionArguments.java
Index: OptionArguments.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/compatibility/examples/option_arguments/OptionArguments.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OptionArguments.java 22 Mar 2003 12:46:22 -0000 1.4
+++ OptionArguments.java 5 Apr 2003 19:39:33 -0000 1.5
@@ -146,4 +146,4 @@
}
}
}
-}
\ No newline at end of file
+}
1.5 +1 -1
avalon-excalibur/compatibility/src/java/org/apache/avalon/excalibur/collections/FixedSizeBuffer.java
Index: FixedSizeBuffer.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/compatibility/src/java/org/apache/avalon/excalibur/collections/FixedSizeBuffer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FixedSizeBuffer.java 22 Mar 2003 12:46:22 -0000 1.4
+++ FixedSizeBuffer.java 5 Apr 2003 19:39:33 -0000 1.5
@@ -148,4 +148,4 @@
return element;
}
-}
\ No newline at end of file
+}
1.5 +2 -2
avalon-excalibur/compatibility/src/java/org/apache/avalon/excalibur/concurrent/DijkstraSemaphore.java
Index: DijkstraSemaphore.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/compatibility/src/java/org/apache/avalon/excalibur/concurrent/DijkstraSemaphore.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DijkstraSemaphore.java 22 Mar 2003 12:46:23 -0000 1.4
+++ DijkstraSemaphore.java 5 Apr 2003 19:39:33 -0000 1.5
@@ -256,4 +256,4 @@
}
}
}
-}
\ No newline at end of file
+}
1.8 +2 -2
avalon-excalibur/compatibility/src/java/org/apache/avalon/excalibur/concurrent/ReadWriteLock.java
Index: ReadWriteLock.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/compatibility/src/java/org/apache/avalon/excalibur/concurrent/ReadWriteLock.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReadWriteLock.java 2 Apr 2003 09:24:44 -0000 1.7
+++ ReadWriteLock.java 5 Apr 2003 19:39:33 -0000 1.8
@@ -270,4 +270,4 @@
protected synchronized int getNumWaitingForWrite() {
return m_numWaitingForWrite;
}
-}
\ No newline at end of file
+}
1.5 +2 -2
avalon-excalibur/compatibility/src/java/org/apache/avalon/excalibur/concurrent/ThreadBarrier.java
Index: ThreadBarrier.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/compatibility/src/java/org/apache/avalon/excalibur/concurrent/ThreadBarrier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ThreadBarrier.java 22 Mar 2003 12:46:23 -0000 1.4
+++ ThreadBarrier.java 5 Apr 2003 19:39:33 -0000 1.5
@@ -103,4 +103,4 @@
}
}
}
-}
\ No newline at end of file
+}
1.12 +48 -48
avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ComponentHandler.java
Index: ComponentHandler.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/ComponentHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ComponentHandler.java 20 Feb 2003 17:12:34 -0000 1.11
+++ ComponentHandler.java 5 Apr 2003 19:39:34 -0000 1.12
@@ -162,53 +162,53 @@
final String
instrumentableName )
throws Exception
{
- // If componentClass extends Component, everything
- // is fly, as no proxy needs to be generated, and we can pass
- // in null for the role. If not, we check for a public ROLE
- // member and use that. If that fails, we complain loudly...
- String role = null;
- final boolean isComponent = Component.class.isAssignableFrom( componentClass );
+ // If componentClass extends Component, everything
+ // is fly, as no proxy needs to be generated, and we can pass
+ // in null for the role. If not, we check for a public ROLE
+ // member and use that. If that fails, we complain loudly...
+ String role = null;
+ final boolean isComponent = Component.class.isAssignableFrom( componentClass );
- if( role == null && !isComponent )
- {
- try
- {
- final Field field = componentClass.getField( "ROLE" );
- final boolean isStatic =
Modifier.isStatic(field.getModifiers());
- if( !isStatic )
- throw new IllegalArgumentException( "the
componentClass you provided" +
- "does not implement Component, and you also
did not" +
- "specify a role." );
-
- final Object fieldContents = field.get(null);
- if( fieldContents instanceof String )
- role = (String)field.get(null); // found the role
- }
- catch( NoSuchFieldException nsfe )
- {
- throw new IllegalArgumentException( "the componentClass you
provided" +
- "does not implement Component, and you also
did not" +
- "specify a role." );
- }
- catch( SecurityException se )
- {
- throw new IllegalArgumentException( "the componentClass you
provided" +
- "does not implement Component, and you also
did not" +
- "specify a role." );
- }
- catch( IllegalArgumentException iae )
- {
- // won't happen
- throw iae;
- }
- catch( IllegalAccessException iae )
- {
- // won't happen
- throw new IllegalArgumentException( "the componentClass you
provided" +
- "does not implement Component, and you also
did not" +
- "specify a role." );
- }
- }
+ if( role == null && !isComponent )
+ {
+ try
+ {
+ final Field field = componentClass.getField( "ROLE" );
+ final boolean isStatic = Modifier.isStatic(field.getModifiers());
+ if( !isStatic )
+ throw new IllegalArgumentException( "the componentClass you
provided" +
+ "does not implement Component, and you also did not" +
+ "specify a role." );
+
+ final Object fieldContents = field.get(null);
+ if( fieldContents instanceof String )
+ role = (String)field.get(null); // found the role
+ }
+ catch( NoSuchFieldException nsfe )
+ {
+ throw new IllegalArgumentException( "the componentClass you provided" +
+ "does not implement Component, and you also did not" +
+ "specify a role." );
+ }
+ catch( SecurityException se )
+ {
+ throw new IllegalArgumentException( "the componentClass you provided" +
+ "does not implement Component, and you also did not" +
+ "specify a role." );
+ }
+ catch( IllegalArgumentException iae )
+ {
+ // won't happen
+ throw iae;
+ }
+ catch( IllegalAccessException iae )
+ {
+ // won't happen
+ throw new IllegalArgumentException( "the componentClass you provided" +
+ "does not implement Component, and you also did not" +
+ "specify a role." );
+ }
+ }
return ComponentHandler.getComponentHandler( role,
componentClass,
configuration,
1.21 +4 -4
avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultComponentFactory.java 25 Feb 2003 16:28:21 -0000 1.20
+++ DefaultComponentFactory.java 5 Apr 2003 19:39:34 -0000 1.21
@@ -338,9 +338,9 @@
// This makes it possible to use components which are not real Components
// with the ECM. We need to remember to unwrap this when the component is
// decommissioned.
- //
- // note that ComponentHandler depends on this specific
- // component instanceof Component check to be made
+ //
+ // note that ComponentHandler depends on this specific
+ // component instanceof Component check to be made
Component returnableComponent;
if( !( component instanceof Component ) )
{
1.10 +10 -0 avalon-excalibur/configuration/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/configuration/default.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- default.properties 31 Mar 2003 15:17:07 -0000 1.9
+++ default.properties 5 Apr 2003 19:39:34 -0000 1.10
@@ -21,6 +21,16 @@
avalon-framework.lib=${avalon-framework.home}/target/lib
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
+# ----- Isorelax -----
+isorelax.home=${basedir}
+isorelax.lib=${isorelax.home}/lib
+isorelax.jar=${isorelax.lib}/isorelax.jar
+
+# ----- Jing -----
+jing.home=${basedir}
+jing.lib=${jing.home}/lib
+jing.jar=${jing.lib}/jing.jar
+
# --------------------------------------------------
# Settings used to configure compile environment
1.17 +1 -1
avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/ConfigurationUtil.java
Index: ConfigurationUtil.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/configuration/src/java/org/apache/excalibur/configuration/ConfigurationUtil.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ConfigurationUtil.java 25 Feb 2003 16:28:35 -0000 1.16
+++ ConfigurationUtil.java 5 Apr 2003 19:39:34 -0000 1.17
@@ -227,4 +227,4 @@
{
return
org.apache.avalon.framework.configuration.ConfigurationUtil.equals(c1, c2 );
}
-}
\ No newline at end of file
+}
1.25 +1 -1 avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/datasource/default.properties,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- default.properties 31 Mar 2003 18:32:54 -0000 1.24
+++ default.properties 5 Apr 2003 19:39:34 -0000 1.25
@@ -70,7 +70,7 @@
test.jdbc.url=jdbc:hsqldb:hsql://localhost
test.jdbc.user=SA
test.jdbc.password=
-skip.tests=true
+#skip.tests=true
# --------------------------------------------------
1.47 +4 -5 avalon-excalibur/event/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/event/build.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- build.xml 31 Mar 2003 15:31:25 -0000 1.46
+++ build.xml 5 Apr 2003 19:39:34 -0000 1.47
@@ -18,17 +18,16 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${util.concurrent.jar}"/>
- <pathelement location="${excalibur-scratchpad.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${checkstyle.jar}"/>
<pathelement path="${java.class.path}"/>
+
+ <!-- optional -->
+ <pathelement location="${checkstyle.jar}"/>
</path>
<path id="tools.class.path">
<pathelement location="${junit.jar}"/>
<pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib"/>
- <fileset dir="${tools.dir}/ext"/>
</path>
<path id="test.class.path">
@@ -45,7 +44,7 @@
<target name="check-dependencies" depends="junit-check"/>
<target name="import-dependencies" depends="import-junit"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
1.41 +0 -11 avalon-excalibur/event/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/event/default.properties,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- default.properties 31 Mar 2003 15:31:26 -0000 1.40
+++ default.properties 5 Apr 2003 19:39:34 -0000 1.41
@@ -22,11 +22,6 @@
# ----- Doug Lea's Concurrent Utils, version 1.3 or later -----
util.concurrent.jar=../lib/util.concurrent-1.3.1.jar
-# ----- Excalibur Core -----
-excalibur-core.home=${basedir}/../all
-excalibur-core.lib=${excalibur-core.home}/build/lib
-excalibur-core.jar=${excalibur-core.lib}/excalibur-core.jar
-
# ----- Avalon Framework, version 4.1 or later -----
avalon-framework.home=${basedir}/../../avalon
avalon-framework.lib=${avalon-framework.home}/target/lib
@@ -58,12 +53,6 @@
excalibur-instrument.home=${basedir}/../instrument/dist
excalibur-instrument.lib=${excalibur-instrument.home}
excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-1.0.jar
-
-# ----- Excalibur instrument-manager, version 1.0 or later -----
-excalibur-instrument-manager.home=${basedir}/../instrument-manager/dist
-excalibur-instrument-manager.lib=${excalibur-instrument-manager.home}
-excalibur-instrument-manager.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-1.0.jar
-excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-interfaces-1.0.jar
# --------------------------------------------------
1.5 +2 -2
avalon-excalibur/event/src/java/org/apache/excalibur/event/DequeueInterceptor.java
Index: DequeueInterceptor.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/java/org/apache/excalibur/event/DequeueInterceptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DequeueInterceptor.java 22 Mar 2003 12:46:27 -0000 1.4
+++ DequeueInterceptor.java 5 Apr 2003 19:39:34 -0000 1.5
@@ -91,4 +91,4 @@
* @param context The source from which the dequeue is performed.
*/
public void after(Source context);
-}
\ No newline at end of file
+}
1.6 +2 -2
avalon-excalibur/event/src/java/org/apache/excalibur/event/EnqueuePredicate.java
Index: EnqueuePredicate.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/java/org/apache/excalibur/event/EnqueuePredicate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EnqueuePredicate.java 22 Mar 2003 12:46:27 -0000 1.5
+++ EnqueuePredicate.java 5 Apr 2003 19:39:34 -0000 1.6
@@ -88,4 +88,4 @@
* <code>false</code> otherwise.
*/
boolean accept(Object elements[], Sink modifyingSink);
-}
\ No newline at end of file
+}
1.13 +1 -1
avalon-excalibur/event/src/java/org/apache/excalibur/event/EventHandler.java
Index: EventHandler.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/java/org/apache/excalibur/event/EventHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- EventHandler.java 22 Mar 2003 12:46:27 -0000 1.12
+++ EventHandler.java 5 Apr 2003 19:39:34 -0000 1.13
@@ -77,4 +77,4 @@
* @param elements The array of elements that the EventHandler must process
*/
void handleEvents( Object[] elements );
-}
\ No newline at end of file
+}
1.12 +1 -1
avalon-excalibur/event/src/java/org/apache/excalibur/event/Message.java
Index: Message.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/java/org/apache/excalibur/event/Message.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Message.java 22 Mar 2003 12:46:27 -0000 1.11
+++ Message.java 5 Apr 2003 19:39:34 -0000 1.12
@@ -83,4 +83,4 @@
* Clear the attachment.
*/
void clear();
-}
\ No newline at end of file
+}
1.10 +1 -1
avalon-excalibur/event/src/java/org/apache/excalibur/event/Queue.java
Index: Queue.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/java/org/apache/excalibur/event/Queue.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Queue.java 22 Mar 2003 12:46:27 -0000 1.9
+++ Queue.java 5 Apr 2003 19:39:34 -0000 1.10
@@ -112,4 +112,4 @@
* The dequeue executable for this sink.
*/
public DequeueInterceptor getDequeueInterceptor();
-}
\ No newline at end of file
+}
1.9 +1 -1
avalon-excalibur/event/src/java/org/apache/excalibur/event/Signal.java
Index: Signal.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/java/org/apache/excalibur/event/Signal.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Signal.java 22 Mar 2003 12:46:27 -0000 1.8
+++ Signal.java 5 Apr 2003 19:39:34 -0000 1.9
@@ -64,4 +64,4 @@
*/
public interface Signal
{
-}
\ No newline at end of file
+}
1.5 +2 -2
avalon-excalibur/event/src/java/org/apache/excalibur/event/impl/RateLimitingPredicate.java
Index: RateLimitingPredicate.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/java/org/apache/excalibur/event/impl/RateLimitingPredicate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RateLimitingPredicate.java 22 Mar 2003 12:46:28 -0000 1.4
+++ RateLimitingPredicate.java 5 Apr 2003 19:39:34 -0000 1.5
@@ -257,4 +257,4 @@
m_depth = depth;
}
-}
\ No newline at end of file
+}
1.13 +1 -1
avalon-excalibur/event/src/test/org/apache/excalibur/event/test/AbstractQueueTestCase.java
Index: AbstractQueueTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/test/org/apache/excalibur/event/test/AbstractQueueTestCase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractQueueTestCase.java 22 Mar 2003 12:46:29 -0000 1.12
+++ AbstractQueueTestCase.java 5 Apr 2003 19:39:35 -0000 1.13
@@ -182,4 +182,4 @@
results = queue.dequeue( queue.size() );
assertEquals( 0, queue.size() );
}
-}
\ No newline at end of file
+}
1.9 +1 -1
avalon-excalibur/event/src/test/org/apache/excalibur/event/test/FixedSizeQueuePerformanceTestCase.java
Index: FixedSizeQueuePerformanceTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/test/org/apache/excalibur/event/test/FixedSizeQueuePerformanceTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FixedSizeQueuePerformanceTestCase.java 22 Mar 2003 12:46:29 -0000 1.8
+++ FixedSizeQueuePerformanceTestCase.java 5 Apr 2003 19:39:35 -0000 1.9
@@ -74,4 +74,4 @@
{
this.performMillionIterationTenElements( new FixedSizeQueue( 32 ) );
}
-}
\ No newline at end of file
+}
1.16 +1 -1
avalon-excalibur/event/src/test/org/apache/excalibur/event/test/FixedSizeQueueTestCase.java
Index: FixedSizeQueueTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/test/org/apache/excalibur/event/test/FixedSizeQueueTestCase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FixedSizeQueueTestCase.java 22 Mar 2003 12:46:29 -0000 1.15
+++ FixedSizeQueueTestCase.java 5 Apr 2003 19:39:35 -0000 1.16
@@ -76,4 +76,4 @@
{
this.performQueue( new DefaultQueue( new ThresholdEnqueuePredicate( 32 ) )
);
}
-}
\ No newline at end of file
+}
1.14 +1 -1
avalon-excalibur/event/src/test/org/apache/excalibur/event/test/QueueTestCase.java
Index: QueueTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/event/src/test/org/apache/excalibur/event/test/QueueTestCase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- QueueTestCase.java 22 Mar 2003 12:46:29 -0000 1.13
+++ QueueTestCase.java 5 Apr 2003 19:39:35 -0000 1.14
@@ -68,4 +68,4 @@
{
this.performQueue( new DefaultQueue() );
}
-}
\ No newline at end of file
+}
1.55 +9 -9 avalon-excalibur/extension/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/extension/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 29 Jan 2003 14:07:39 -0000 1.54
+++ build.xml 5 Apr 2003 19:39:35 -0000 1.55
@@ -28,7 +28,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
@@ -283,8 +283,8 @@
<fileset dir="${build.lib}">
<include name="*.jar"/>
</fileset>
- </copy>
- </target>
+ </copy>
+ </target>
<!-- Creates a minimal distribution -->
<target name="dist.lite"
@@ -340,16 +340,16 @@
</fileset>
</copy>
</target>
-
- <target name="site" depends="docs" description=" Places Docs ready for hosting
on website">
-
- <mkdir dir="../site/dist/docs/${dir-name}"/>
+
+ <target name="site" depends="docs" description=" Places Docs ready for hosting
on website">
+
+ <mkdir dir="../site/dist/docs/${dir-name}"/>
<copy todir="../site/dist/docs/${dir-name}">
<fileset dir="${docs.dir}">
<include name="**"/>
</fileset>
- </copy>
-
+ </copy>
+
</target>
<!-- Cleans up build and distribution directories -->
1.9 +2 -2
avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/Specification.java
Index: Specification.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/extension/src/java/org/apache/avalon/excalibur/extension/Specification.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Specification.java 22 Mar 2003 12:46:30 -0000 1.8
+++ Specification.java 5 Apr 2003 19:39:35 -0000 1.9
@@ -680,4 +680,4 @@
impTitle, impVersion, impVendor,
new String[]{section} );
}
-}
\ No newline at end of file
+}
1.81 +19 -76 avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/build.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- build.xml 18 Mar 2003 17:28:02 -0000 1.80
+++ build.xml 5 Apr 2003 19:39:35 -0000 1.81
@@ -16,8 +16,7 @@
<pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
<pathelement location="${logkit.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${util.concurrent.jar}"/>
- <pathelement location="${qdox.jar}"/>
+ <pathelement location="${util.concurrent.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-instrument-manager.jar}"/>
<pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
@@ -27,17 +26,12 @@
<pathelement location="${excalibur-lifecycle.jar}"/>
<pathelement location="${checkstyle.jar}"/>
<pathelement path="${java.class.path}"/>
- </path>
-
- <path id="optional.class.path">
- <pathelement location="${excalibur-meta.jar}"/>
+ <pathelement location="${qdox.jar}"/>
</path>
<path id="tools.class.path">
<pathelement location="${junit.jar}"/>
<pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib"/>
- <fileset dir="${tools.dir}/ext"/>
</path>
<path id="test.class.path">
@@ -61,16 +55,15 @@
<pathelement location="${jaxen-full.jar}"/>
<path refid="project.class.path"/>
</path>
+ <path id="build.path">
+ <path refid="project.class.path"/>
+ </path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="big-jar" description="Build the project"/>
+ <target name="main" depends="test,big-jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
- <target name="copy-optional-libs" if="include.meta">
- <copy file="${excalibur-meta.jar}" todir="${build.dir}/tempjars"/>
- </target>
-
- <target name="big-jar" depends="jar,copy-optional-libs" description="Build the
big jar with all dependencies included">
+ <target name="big-jar" depends="jar" description="Build the big jar with all
dependencies included">
<jar destfile="${build.lib}/${name}-complete-${version}.jar"
duplicate="preserve">
<manifest>
@@ -99,11 +92,9 @@
</jar>
</target>
- <target name="optional.dependencies" description="Check dependencies"
if="include.meta">
- </target>
-
- <target name="dependencies" depends="optional.dependencies" description="Check
dependencies" unless="skip.dependencies">
+ <target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommonsCollections"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkAltrmi"/>
@@ -135,23 +126,16 @@
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLUtil"/>
</target>
- <target name="path-builder" depends="path-with-meta,path-without-meta"/>
-
- <target name="path-with-meta" if="include.meta">
- <path id="build.path">
- <path refid="project.class.path"/>
- <path refid="optional.class.path"/>
- </path>
+ <target name="path-builder" depends="path-without-meta">
+ <echo>deprecated!</echo>
</target>
- <target name="path-without-meta" unless="include.meta">
- <path id="build.path">
- <path refid="project.class.path"/>
- </path>
+ <target name="path-without-meta">
+ <echo>deprecated!</echo>
</target>
<!-- Compiles the source code -->
- <target name="compile" depends="dependencies,path-builder"
description="Compiles the source code">
+ <target name="compile" depends="dependencies" description="Compiles the source
code">
<mkdir dir="${build.classes}"/>
@@ -164,9 +148,6 @@
target="1.2">
<classpath refid="build.path"/>
<include name="**/*.java"/>
- <exclude name="**/*Type*.java" unless="include.meta"/>
- <exclude name="**/*Meta*.java" unless="include.meta"/>
- <exclude name="**/*Assembly*.java" unless="include.meta"/>
</javac>
<!-- copy resources to same location as .class files -->
@@ -197,7 +178,7 @@
</target>
<!-- Compiles the unit test source code -->
- <target name="compile-test" depends="compile,dependencies-test,path-builder"
description="Compiles the 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 -->
@@ -217,9 +198,6 @@
<classpath refid="test.class.path" />
<classpath refid="build.path" />
<include name="**/*.java"/>
- <exclude name="**/*Type*.java" unless="include.meta"/>
- <exclude name="**/*Meta*.java" unless="include.meta"/>
- <exclude name="**/*Assembly*.java" unless="include.meta"/>
</javac>
<copy todir="${build.testclasses}">
@@ -332,9 +310,10 @@
<include name="**/test/*ContainerProfile.class"/>
<exclude name="**/Abstract*"/>
<exclude name="**/*Profile.class" unless="run.profile.tests"/>
- <exclude name="**/*Type*.java" unless="include.meta"/>
- <exclude name="**/*Meta*.java" unless="include.meta"/>
- <exclude name="**/*Assembly*.java" unless="include.meta"/>
+ <!-- todo: remove these and their tests -->
+ <exclude name="**/*Type*.java"/>
+ <exclude name="**/*Meta*.java"/>
+ <exclude name="**/*Assembly*.java"/>
</fileset>
</batchtest>
</junit>
@@ -353,15 +332,6 @@
</fileset>
<report format="frames" todir="${build.reports}/junit"/>
</junitreport>
-
- <!-- Clean up the xml reports used by the junitreport task -->
- <!--
- <delete>
- <fileset dir="${build.tests}" includes="TEST-*.xml"/>
- <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
- </delete>
- -->
-
</target>
<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
@@ -474,33 +444,6 @@
<copy file="../KEYS" todir="${dist.dir}"/>
<copy file="README.txt" todir="${dist.dir}"/>
- </target>
-
-
- <!-- Setup the filters -->
- <target name="setup-filters">
- <filter token="Name" value="Avalon ${Name}"/>
- <filter token="name" value="${dir-name}"/>
- <filter token="version" value="${version}"/>
- <filter token="year" value="${year}"/>
- <filter token="status" value="${status}"/>
- <filter token="release" value="${release}"/>
- <filter token="short-version" value="${short.version}"/>
-
- <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
- <property name="framework.base"
value="http://jakarta.apache.org/avalon/framework"/>
- <property name="phoenix.base"
value="http://jakarta.apache.org/avalon/phoenix"/>
- <property name="cornerstone.base"
value="http://jakarta.apache.org/avalon/cornerstone"/>
- <property name="logkit.base"
value="http://jakarta.apache.org/avalon/logkit"/>
- <property name="testlet.base"
value="http://jakarta.apache.org/avalon/testlet"/>
-
- <filter token="year" value="${year}"/>
- <filter token="AVALON_BASE" value="${avalon.base}"/>
- <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
- <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
- <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
- <filter token="LOGKIT_BASE" value="${logkit.base}"/>
- <filter token="TESTLET_BASE" value="${testlet.base}"/>
</target>
<!-- Prepares the documentation directory -->
1.72 +6 -6 avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/default.properties,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- default.properties 29 Mar 2003 18:53:24 -0000 1.71
+++ default.properties 5 Apr 2003 19:39:35 -0000 1.72
@@ -87,6 +87,11 @@
logkit.lib=${logkit.home}/build/lib
logkit.jar=${logkit.lib}/logkit.jar
+# ----- Excalibur Pool, version 1.0 or later -----
+excalibur-pool.home=${basedir}/../pool/dist
+excalibur-pool.lib=${excalibur-pool.home}
+excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
+
# --------------------------------------------------
# REQUIRED LIBRARIES FOR UNIT TESTS
# --------------------------------------------------
@@ -98,11 +103,6 @@
excalibur-datasource.lib=${excalibur-datasource.home}
excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.1.jar
-# ----- Excalibur Pool, version 1.0 or later -----
-excalibur-pool.home=${basedir}/../pool/dist
-excalibur-pool.lib=${excalibur-pool.home}
-excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
-
# ----- Excalibur component, version 1.0 or later -----
excalibur-component.home=${basedir}/../component/dist
excalibur-component.lib=${excalibur-component.home}
@@ -113,7 +113,7 @@
# ----- Excalibur Monitor, version 1.0 or later -----
excalibur-monitor.home=${basedir}/../monitor/dist
excalibur-monitor.lib=${excalibur-monitor.home}
-excalibur-monitor.jar=${excalibur-monitor.lib}/excalibur-monitor-1.0.jar
+excalibur-monitor.jar=${excalibur-monitor.lib}/excalibur-monitor-1.0.1.jar
xml-apis.jar = ${basedir}/../lib/xml-apis.jar
xalan.jar = ${basedir}/../lib/xalan-2.3.1.jar
1.7 +2 -2
avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/RoleManager.java
Index: RoleManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/RoleManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RoleManager.java 22 Mar 2003 12:46:32 -0000 1.6
+++ RoleManager.java 5 Apr 2003 19:39:35 -0000 1.7
@@ -88,4 +88,4 @@
* @return the proper [EMAIL PROTECTED] org.apache.avalon.fortress.RoleEntry}
*/
RoleEntry getRoleForClassname( String classname );
-}
\ No newline at end of file
+}
1.20 +2 -2
avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractContainer.java 4 Apr 2003 16:17:56 -0000 1.19
+++ AbstractContainer.java 5 Apr 2003 19:39:35 -0000 1.20
@@ -662,4 +662,4 @@
{
return m_serviceManager;
}
-}
\ No newline at end of file
+}
1.12 +2 -2
avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java
Index: DefaultContainerManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/DefaultContainerManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultContainerManager.java 22 Mar 2003 12:46:33 -0000 1.11
+++ DefaultContainerManager.java 5 Apr 2003 19:39:35 -0000 1.12
@@ -337,4 +337,4 @@
// Made public to get to the logger at the impl setup level.
return m_logger;
}
-}
\ No newline at end of file
+}
1.6 +1 -1
avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup/ComponentKey.java
Index: ComponentKey.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/lookup/ComponentKey.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComponentKey.java 22 Mar 2003 12:46:34 -0000 1.5
+++ ComponentKey.java 5 Apr 2003 19:39:35 -0000 1.6
@@ -72,4 +72,4 @@
{
return m_component.hashCode();
}
-}
\ No newline at end of file
+}
1.54 +1 -1 avalon-excalibur/i18n/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/i18n/build.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- build.xml 27 Feb 2003 19:09:58 -0000 1.53
+++ build.xml 5 Apr 2003 19:39:35 -0000 1.54
@@ -27,7 +27,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
1.52 +2 -2 avalon-excalibur/instrument/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument/build.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- build.xml 10 Mar 2003 16:13:53 -0000 1.51
+++ build.xml 5 Apr 2003 19:39:35 -0000 1.52
@@ -34,7 +34,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<!-- Checks the environment for existing resources -->
@@ -306,7 +306,7 @@
<zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
<zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
</zip>
-
+
<checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
</target>
1.3 +2 -2
avalon-excalibur/instrument/src/java/org/apache/excalibur/instrument/InstrumentProxy.java
Index: InstrumentProxy.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument/src/java/org/apache/excalibur/instrument/InstrumentProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstrumentProxy.java 20 Feb 2003 17:07:55 -0000 1.2
+++ InstrumentProxy.java 5 Apr 2003 19:39:36 -0000 1.3
@@ -96,4 +96,4 @@
* @param value The new value for the Instrument.
*/
void setValue( int value );
-}
\ No newline at end of file
+}
1.3 +2 -2
avalon-excalibur/instrument/src/test/org/apache/excalibur/instrument/test/AbstractInstrumentableImpl.java
Index: AbstractInstrumentableImpl.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument/src/test/org/apache/excalibur/instrument/test/AbstractInstrumentableImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractInstrumentableImpl.java 27 Feb 2003 15:20:57 -0000 1.2
+++ AbstractInstrumentableImpl.java 5 Apr 2003 19:39:36 -0000 1.3
@@ -101,4 +101,4 @@
// Make this method public for testing.
super.addChildInstrumentable( child );
}
-}
\ No newline at end of file
+}
1.3 +2 -2
avalon-excalibur/instrument/src/test/org/apache/excalibur/instrument/test/AbstractLogEnabledInstrumentableImpl.java
Index: AbstractLogEnabledInstrumentableImpl.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument/src/test/org/apache/excalibur/instrument/test/AbstractLogEnabledInstrumentableImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractLogEnabledInstrumentableImpl.java 27 Feb 2003 15:20:57 -0000 1.2
+++ AbstractLogEnabledInstrumentableImpl.java 5 Apr 2003 19:39:36 -0000 1.3
@@ -101,4 +101,4 @@
// Make this method public for testing.
super.addChildInstrumentable( child );
}
-}
\ No newline at end of file
+}
1.3 +2 -2
avalon-excalibur/instrument/src/test/org/apache/excalibur/instrument/test/TestInstrumentProxy.java
Index: TestInstrumentProxy.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument/src/test/org/apache/excalibur/instrument/test/TestInstrumentProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestInstrumentProxy.java 27 Feb 2003 15:20:57 -0000 1.2
+++ TestInstrumentProxy.java 5 Apr 2003 19:39:36 -0000 1.3
@@ -124,4 +124,4 @@
{
return m_value;
}
-}
\ No newline at end of file
+}
1.8 +2 -2
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/AbstractInternalFrame.java
Index: AbstractInternalFrame.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/AbstractInternalFrame.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractInternalFrame.java 22 Mar 2003 12:46:36 -0000 1.7
+++ AbstractInternalFrame.java 5 Apr 2003 19:39:36 -0000 1.8
@@ -278,7 +278,7 @@
public void internalFrameClosed( InternalFrameEvent event )
{
// On closing Swing will bring forward the window at the bottom,
- // rather than the next window. So we need to move it back and show the
correct one.
+ // rather than the next window. So we need to move it back and show the
correct one.
if( m_nextFrame != null )
{
// The getSelectedFrame method was added in JDK1.3, so it may not yet
exist.
1.8 +1 -1
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerTree.java
Index: InstrumentManagerTree.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerTree.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InstrumentManagerTree.java 22 Mar 2003 12:46:36 -0000 1.7
+++ InstrumentManagerTree.java 5 Apr 2003 19:39:36 -0000 1.8
@@ -198,4 +198,4 @@
}
}
}
-}
\ No newline at end of file
+}
1.6 +1 -1
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerTreeCellRenderer.java
Index: InstrumentManagerTreeCellRenderer.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerTreeCellRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InstrumentManagerTreeCellRenderer.java 22 Mar 2003 12:46:37 -0000 1.5
+++ InstrumentManagerTreeCellRenderer.java 5 Apr 2003 19:39:36 -0000 1.6
@@ -103,4 +103,4 @@
/*---------------------------------------------------------------
* Methods
*-------------------------------------------------------------*/
-}
\ No newline at end of file
+}
1.14 +3 -3
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerTreeModel.java
Index: InstrumentManagerTreeModel.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentManagerTreeModel.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- InstrumentManagerTreeModel.java 22 Mar 2003 12:46:37 -0000 1.13
+++ InstrumentManagerTreeModel.java 5 Apr 2003 19:39:36 -0000 1.14
@@ -235,7 +235,7 @@
public void valueForPathChanged( TreePath path, Object newValue )
{
//getLogger.debug( "InstrumentManagerTreeModel.valueForPathChanged(" + path
+
- // ", " + newValue + ")" );
+ // ", " + newValue + ")" );
}
/**
@@ -464,7 +464,7 @@
InstrumentSampleNodeData sampleNodeData =
(InstrumentSampleNodeData)leasedSampleArray[i].getUserObject();
//System.out.println(" check: " + sampleNodeData + " remaining " +
- // ( sampleNodeData.getRemainingLeaseTime() / 1000 ) + "
seconds." );
+ // ( sampleNodeData.getRemainingLeaseTime() / 1000 ) + " seconds." );
if ( sampleNodeData.getRemainingLeaseTime() < 0 )
{
// Update the Instrument containing the sample.
@@ -1103,4 +1103,4 @@
fireTreeNodesChanged( new TreeModelEvent( this,
sampleTreeNode.getPath(), new int[ 0 ], new Object[ 0 ] ) );
}
-}
\ No newline at end of file
+}
1.7 +1 -1
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentNodeData.java
Index: InstrumentNodeData.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentNodeData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InstrumentNodeData.java 22 Mar 2003 12:46:37 -0000 1.6
+++ InstrumentNodeData.java 5 Apr 2003 19:39:36 -0000 1.7
@@ -328,4 +328,4 @@
return changed;
}
-}
\ No newline at end of file
+}
1.7 +1 -1
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentSampleNodeData.java
Index: InstrumentSampleNodeData.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentSampleNodeData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InstrumentSampleNodeData.java 22 Mar 2003 12:46:37 -0000 1.6
+++ InstrumentSampleNodeData.java 5 Apr 2003 19:39:36 -0000 1.7
@@ -512,4 +512,4 @@
return m_sampleFrame;
}
*/
-}
\ No newline at end of file
+}
1.6 +1 -1
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentableNodeData.java
Index: InstrumentableNodeData.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/InstrumentableNodeData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InstrumentableNodeData.java 22 Mar 2003 12:46:37 -0000 1.5
+++ InstrumentableNodeData.java 5 Apr 2003 19:39:36 -0000 1.6
@@ -209,4 +209,4 @@
return changed;
}
-}
\ No newline at end of file
+}
1.7 +3 -3
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/LargeMenu.java
Index: LargeMenu.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/LargeMenu.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LargeMenu.java 22 Mar 2003 12:46:38 -0000 1.6
+++ LargeMenu.java 5 Apr 2003 19:39:36 -0000 1.7
@@ -122,8 +122,8 @@
* Code is copied from JDK1.3 source, but has been patched.
*
* @return a <code>Point</code> in the coordinate space of the
- * menu which should be used as the origin
- * of the <code>JMenu</code>'s popup menu
+ * menu which should be used as the origin
+ * of the <code>JMenu</code>'s popup menu
*/
protected Point getPopupMenuOrigin()
{
1.6 +1 -1
avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/NodeData.java
Index: NodeData.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-client/src/java/org/apache/excalibur/instrument/client/NodeData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NodeData.java 22 Mar 2003 12:46:38 -0000 1.5
+++ NodeData.java 5 Apr 2003 19:39:36 -0000 1.6
@@ -170,4 +170,4 @@
{
return m_description;
}
-}
\ No newline at end of file
+}
1.6 +2 -2
avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java
Index: DefaultInstrumentManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/instrument-manager/src/java/org/apache/excalibur/instrument/manager/DefaultInstrumentManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultInstrumentManager.java 25 Feb 2003 16:28:16 -0000 1.5
+++ DefaultInstrumentManager.java 5 Apr 2003 19:39:36 -0000 1.6
@@ -253,7 +253,7 @@
}
// Configure the instrumentables.
- Configuration instrumentablesConf = configuration.getChild(
"instrumentables" );
+ Configuration instrumentablesConf = configuration.getChild(
"instrumentables" );
Configuration[] instrumentableConfs =
instrumentablesConf.getChildren( "instrumentable" );
for( int i = 0; i < instrumentableConfs.length; i++ )
1.4 +2 -2 avalon-excalibur/lifecycle/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/lifecycle/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 12 Mar 2003 13:38:31 -0000 1.3
+++ build.xml 5 Apr 2003 19:39:36 -0000 1.4
@@ -32,7 +32,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<!-- Checks the environment for existing resources -->
@@ -304,7 +304,7 @@
<zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
<zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
</zip>
-
+
<checksum file="${dist.base}/${dist.name}.zip" fileext=".md5"/>
</target>
1.10 +1 -1 avalon-excalibur/loader/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/loader/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 29 Jan 2003 14:07:40 -0000 1.9
+++ build.xml 5 Apr 2003 19:39:37 -0000 1.10
@@ -33,7 +33,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
1.39 +5 -3 avalon-excalibur/logger/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/logger/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 10 Mar 2003 15:07:04 -0000 1.38
+++ build.xml 5 Apr 2003 19:39:37 -0000 1.39
@@ -30,13 +30,13 @@
<path id="tools.class.path">
<pathelement location="${junit.jar}"/>
<pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib"/>
- <fileset dir="${tools.dir}/ext"/>
</path>
<path id="test.class.path">
<pathelement location="${build.testclasses}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
<pathelement location="${excalibur-component.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
@@ -54,7 +54,7 @@
<echo>**********************************************</echo>
</target>
- <target name="main" depends="jar,cocoon-warning" description="Build the
project"/>
+ <target name="main" depends="test,jar,cocoon-warning" description="Build the
project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<!-- Checks the environment for existing resources -->
@@ -124,6 +124,8 @@
description="Check unit test dependencies" unless="skip.dependencies">
<!-- Need the jar to prevent recursive deps. -->
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommonsCollections"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
1.23 +7 -0 avalon-excalibur/logger/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/logger/default.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- default.properties 10 Mar 2003 15:07:04 -0000 1.22
+++ default.properties 5 Apr 2003 19:39:37 -0000 1.23
@@ -60,6 +60,13 @@
excalibur-i18n.lib=${excalibur-i18n.home}
excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
+# ----- Excalibur Instrument -----
+excalibur-instrument.home=${basedir}/../instrument/dist
+excalibur-instrument.jar=${excalibur-instrument.home}/excalibur-instrument-1.0.jar
+
+# ----- Commons collections, version 2.1 or later -----
+commons-collections.jar=${basedir}/../lib/commons-collections-2.1.jar
+
# --------------------------------------------------
# Settings used to configure compile environment
1.7 +2 -2
avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/LoggerManager.java
Index: LoggerManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/LoggerManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoggerManager.java 22 Mar 2003 12:46:48 -0000 1.6
+++ LoggerManager.java 5 Apr 2003 19:39:37 -0000 1.7
@@ -72,4 +72,4 @@
* as getting the Logger for the "" category.
*/
Logger getDefaultLogger();
-}
\ No newline at end of file
+}
1.55 +1 -1 avalon-excalibur/naming/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/naming/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 22 Mar 2003 05:42:30 -0000 1.54
+++ build.xml 5 Apr 2003 19:39:37 -0000 1.55
@@ -28,7 +28,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
1.3 +1 -1 avalon-excalibur/policy/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/policy/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 29 Jan 2003 14:07:41 -0000 1.2
+++ build.xml 5 Apr 2003 19:39:37 -0000 1.3
@@ -31,7 +31,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
1.6 +1 -1
avalon-excalibur/policy/src/java/org/apache/excalibur/policy/runtime/AbstractPolicy.java
Index: AbstractPolicy.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/policy/src/java/org/apache/excalibur/policy/runtime/AbstractPolicy.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractPolicy.java 22 Mar 2003 12:46:54 -0000 1.5
+++ AbstractPolicy.java 5 Apr 2003 19:39:37 -0000 1.6
@@ -355,4 +355,4 @@
return buff.toString();
}
-}
\ No newline at end of file
+}
1.35 +2 -2 avalon-excalibur/pool/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/pool/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build.xml 31 Mar 2003 15:25:50 -0000 1.34
+++ build.xml 5 Apr 2003 19:39:37 -0000 1.35
@@ -37,7 +37,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
@@ -347,7 +347,7 @@
<fileset dir="${build.docs}">
<include name="**"/>
</fileset>
- </copy>
+ </copy>
</target>
<target name="site" depends="docs" description=" Places Docs ready for hosting
on website">
1.22 +1 -0 avalon-excalibur/pool/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/pool/default.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- default.properties 31 Mar 2003 15:25:50 -0000 1.21
+++ default.properties 5 Apr 2003 19:39:37 -0000 1.22
@@ -36,6 +36,7 @@
# ----- Excalibur component, version 1.1 or later -----
excalibur-component.home=${basedir}/../component/dist
excalibur-component.lib=${excalibur-component.home}
+excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.1.jar
excalibur-testcase.jar=${excalibur-component.lib}/excalibur-testcase-1.1.jar
# ----- Logkit -----
1.32 +8 -5 avalon-excalibur/sourceresolve/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/sourceresolve/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 4 Apr 2003 16:36:51 -0000 1.31
+++ build.xml 5 Apr 2003 19:39:37 -0000 1.32
@@ -31,7 +31,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
@@ -176,14 +176,17 @@
<formatter type="xml"/> <!-- xml reports for junitreport -->
<formatter type="plain" usefile="false"/> <!-- text reports for humans
-->
-
+
+ <!-- added the next line because the standard approach does not seem to
be working -->
+ <test name="org.apache.excalibur.source.SourceResolverImplTestCase"
todir="${build.tests}"/>
+
<batchtest todir="${build.tests}">
<fileset dir="${build.testclasses}">
<include name="**/test/*TestCase.class"/>
<exclude name="**/Abstract*"/>
</fileset>
</batchtest>
-
+
</junit>
</target>
@@ -342,10 +345,10 @@
<fileset dir="${build.docs}">
<include name="**"/>
</fileset>
- </copy>
+ </copy>
</target>
-
+
<target name="site" depends="docs" description=" Places Docs ready for hosting
on website">
<mkdir dir="../site/dist/docs/${dir-name}"/>
1.16 +3 -3 avalon-excalibur/store/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/store/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 20 Feb 2003 15:41:25 -0000 1.15
+++ build.xml 5 Apr 2003 19:39:37 -0000 1.16
@@ -32,7 +32,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
@@ -336,10 +336,10 @@
<fileset dir="${build.docs}">
<include name="**"/>
</fileset>
- </copy>
+ </copy>
</target>
-
+
<target name="site" depends="docs" description=" Places Docs ready for hosting
on website">
<mkdir dir="../site/dist/docs/${dir-name}"/>
1.7 +2 -2
avalon-excalibur/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java
Index: AbstractJispFilesystemStore.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/store/src/java/org/apache/excalibur/store/impl/AbstractJispFilesystemStore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractJispFilesystemStore.java 22 Mar 2003 12:46:55 -0000 1.6
+++ AbstractJispFilesystemStore.java 5 Apr 2003 19:39:38 -0000 1.7
@@ -378,4 +378,4 @@
return tmp.toString();
}
}
-}
\ No newline at end of file
+}
1.34 +3 -3 avalon-excalibur/thread/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/thread/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 31 Mar 2003 15:52:54 -0000 1.33
+++ build.xml 5 Apr 2003 19:39:38 -0000 1.34
@@ -40,7 +40,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
@@ -354,10 +354,10 @@
<fileset dir="${build.docs}">
<include name="**"/>
</fileset>
- </copy>
+ </copy>
</target>
-
+
<target name="site" depends="docs" description=" Places Docs ready for hosting
on website">
<mkdir dir="../site/dist/docs/${dir-name}"/>
1.26 +1 -0 avalon-excalibur/thread/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/thread/default.properties,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- default.properties 31 Mar 2003 15:52:54 -0000 1.25
+++ default.properties 5 Apr 2003 19:39:38 -0000 1.26
@@ -50,6 +50,7 @@
# ----- Excalibur Testcase, version 1.0 or later -----
excalibur-component.home=${basedir}/../component/dist
excalibur-component.lib=${excalibur-component.home}
+excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.1.jar
excalibur-testcase.jar=${excalibur-component.lib}/excalibur-testcase-1.1.jar
# ----- Logkit -----
1.18 +1 -1
avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java
Index: DefaultThreadPool.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/thread/src/java/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultThreadPool.java 23 Mar 2003 03:00:44 -0000 1.17
+++ DefaultThreadPool.java 5 Apr 2003 19:39:38 -0000 1.18
@@ -100,7 +100,7 @@
public DefaultThreadPool( final String name,
final int min,
- final int max,
+ final int max,
final ThreadContext context )
throws Exception
{
1.26 +4 -4 avalon-excalibur/threadcontext/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/threadcontext/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 24 Mar 2003 20:42:35 -0000 1.25
+++ build.xml 5 Apr 2003 19:39:38 -0000 1.26
@@ -30,7 +30,7 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
@@ -277,7 +277,7 @@
<zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
<zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
</zip>
-
+
<checksum fileext=".md5">
<fileset dir="${dist.base}"/>
</checksum>
@@ -338,10 +338,10 @@
<fileset dir="${build.docs}">
<include name="**"/>
</fileset>
- </copy>
+ </copy>
</target>
-
+
<target name="site" depends="docs" description=" Places Docs ready for hosting
on website">
<mkdir dir="../site/dist/docs/${dir-name}"/>
1.10 +8 -8 avalon-excalibur/xfc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/xfc/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 20 Feb 2003 15:45:02 -0000 1.9
+++ build.xml 5 Apr 2003 19:39:38 -0000 1.10
@@ -14,7 +14,7 @@
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${checkstyle.jar}"/>
- <pathelement location="${excalibur-cli.jar}"/>
+ <pathelement location="${excalibur-compatibility.jar}"/>
<pathelement path="${java.class.path}"/>
</path>
@@ -36,8 +36,8 @@
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project">
- <copy todir="${build.lib}" file="${excalibur-cli.jar}"/>
+ <target name="main" depends="test,jar" description="Build the project">
+ <copy todir="${build.lib}" file="${excalibur-compatibility.jar}"/>
<copy todir="${build.lib}" file="${avalon-framework.jar}"/>
<copy todir="${build.lib}" file="${xerces.jar}"/>
<copy todir="${build.lib}" file="${xml-apis.jar}"/>
@@ -48,7 +48,7 @@
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCli"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCompatibility"/>
</target>
<target name="dependencies-test" depends="dist-jar, dependencies"
@@ -61,7 +61,7 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkDatasource"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkSourceResolve"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkConfiguration"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkConfiguration"/>
</target>
@@ -362,17 +362,17 @@
-->
<target name="patch">
- <replace dir="src/java"
+ <replace dir="src/java"
token="getTypes("
value="getTypeEntries(" >
<include name="**/classloader/*.java"/>
</replace>
- <replace dir="src/java"
+ <replace dir="src/java"
token="getBlocks("
value="getBlockEntries(" >
<include name="**/classloader/*.java"/>
</replace>
- <replace dir="src"
+ <replace dir="src"
token="getServices("
value="getServiceEntries(" >
<include name="**/classloader/*.java"/>
1.10 +7 -2 avalon-excalibur/xfc/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/xfc/default.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- default.properties 6 Feb 2003 13:38:35 -0000 1.9
+++ default.properties 5 Apr 2003 19:39:38 -0000 1.10
@@ -31,6 +31,11 @@
excalibur-cli.lib=${excalibur-cli.home}/build/lib
excalibur-cli.jar=${excalibur-cli.lib}/excalibur-cli-1.0.jar
+# ----- Excalibur Compatibility -----
+excalibur-compatibility.home=${basedir}/../compatibility
+excalibur-compatibility.lib=${excalibur-compatibility.home}/build/lib
+excalibur-compatibility.jar=${excalibur-compatibility.lib}/excalibur-compatibility-1.0.jar
+
# ----- Excalibur Configuration -----
excalibur-configuration.home=${basedir}/../configuration
excalibur-configuration.lib=${excalibur-configuration.home}/build/lib
@@ -54,12 +59,12 @@
# ----- Excalibur DataSource -----
excalibur-datasource.home=${basedir}/../datasource
excalibur-datasource.lib=${excalibur-datasource.home}/build/lib
-excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.0.jar
+excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.1.jar
# ----- Excalibur Instrumentable -----
excalibur-instrument.home=${basedir}/../instrument
excalibur-instrument.lib=${excalibur-instrument.home}/build/lib
-excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.3.jar
+excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-1.0.jar
# ----- Misc tools -----
xml-apis.jar = ${basedir}/../lib/xml-apis.jar
1.36 +3 -1 avalon-excalibur/xmlutil/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/xmlutil/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build.xml 18 Mar 2003 17:28:02 -0000 1.35
+++ build.xml 5 Apr 2003 19:39:38 -0000 1.36
@@ -39,13 +39,14 @@
<path id="test.class.path">
<pathelement location="${build.testclasses}"/>
<pathelement location="${junit.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
<pathelement location="${excalibur-i18n.jar}"/>
<path refid="project.class.path"/>
</path>
<property name="cp" refid="test.class.path"/>
- <target name="main" depends="jar" description="Build the project"/>
+ <target name="main" depends="test,jar" description="Build the project"/>
<target name="rebuild" depends="clean,main" description="Rebuild the project"/>
<!-- Checks the environment for existing resources -->
@@ -92,6 +93,7 @@
<!-- Need the jar to prevent recursive deps. -->
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommonsCollections"/>
</target>
1.27 +3 -0 avalon-excalibur/xmlutil/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/xmlutil/default.properties,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- default.properties 18 Mar 2003 17:28:03 -0000 1.26
+++ default.properties 5 Apr 2003 19:39:38 -0000 1.27
@@ -61,6 +61,9 @@
excalibur-store.lib=${excalibur-store.home}
excalibur-store.jar=${excalibur-store.lib}/excalibur-store-1.0.jar
+# ----- Commons collections, version 2.1 or later -----
+commons-collections.jar=${basedir}/../lib/commons-collections-2.1.jar
+
# --------------------------------------------------
xml-apis.jar = ${basedir}/../lib/xml-apis.jar
xalan.jar = ${basedir}/../lib/xalan-2.3.1.jar
1.29 +2 -2
avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/xslt/XSLTProcessorImpl.java
Index: XSLTProcessorImpl.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/xmlutil/src/java/org/apache/excalibur/xml/xslt/XSLTProcessorImpl.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XSLTProcessorImpl.java 29 Mar 2003 18:53:26 -0000 1.28
+++ XSLTProcessorImpl.java 5 Apr 2003 19:39:39 -0000 1.29
@@ -311,7 +311,7 @@
// Create transformer handler
final TransformerHandler handler =
m_factory.newTransformerHandler( template );
handler.getTransformer().setErrorListener( m_errorHandler );
- handler.getTransformer().setURIResolver( this );
+ handler.getTransformer().setURIResolver( this );
// Create aggregated validity
AggregatedValidity aggregated = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
