crafterm 2002/07/23 05:41:38
Modified: fortress build.xml default.properties
fortress/src/java/org/apache/excalibur/fortress/util
ExcaliburRoleManager.java
fortress/src/test/org/apache/excalibur/fortress/util/test
ExcaliburRoleManagerTestCase.java
Log:
Fixes up tests, several packages had moved locations/package names and
some new dependancies needed to be added.
Revision Changes Path
1.32 +6 -2 jakarta-avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 21 Jul 2002 09:15:51 -0000 1.31
+++ build.xml 23 Jul 2002 12:41:37 -0000 1.32
@@ -44,8 +44,10 @@
<pathelement location="${excalibur-cache.jar}"/>
<pathelement location="${excalibur-monitor.jar}"/>
<pathelement location="${excalibur-xmlutil.jar}"/>
+ <pathelement location="${excalibur-xmlbundle.jar}"/>
<pathelement location="${excalibur-scratchpad.jar}"/>
<pathelement location="${excalibur-concurrent.jar}"/>
+ <pathelement location="${excalibur-thread.jar}"/>
<pathelement location="${xalan.jar}"/>
<path refid="project.class.path"/>
</path>
@@ -84,6 +86,8 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkDatasource"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCache"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThread"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLBundle"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkMonitor"/>
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLUtil"/>
</target>
@@ -206,8 +210,8 @@
<classpath refid="project.class.path" />
<doclet name="com.sun.tools.doclets.standard.Standard">
<param name="-author"/>
- <param name="-version"/>
- <param name="-breakiterator"/>
+ <param name="-version"/>
+ <param name="-breakiterator"/>
<param name="-doctitle" value="${Name}"/>
<param name="-windowtitle" value="${Name} API"/>
<param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
1.23 +19 -4 jakarta-avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- default.properties 17 Jul 2002 20:55:27 -0000 1.22
+++ default.properties 23 Jul 2002 12:41:37 -0000 1.23
@@ -59,6 +59,16 @@
excalibur-component.lib=${excalibur-component.home}
excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.0.jar
+# ----- Excalibur XMLUtil, version 1.0 or later -----
+excalibur-xmlutil.home=${basedir}/../xmlutil/dist
+excalibur-xmlutil.lib=${excalibur-xmlutil.home}
+excalibur-xmlutil.jar=${excalibur-xmlutil.lib}/excalibur-xmlutil-1.0.jar
+
+# ----- Excalibur XMLBundle, version 1.0 or later -----
+excalibur-xmlbundle.home=${basedir}/../xmlbundle/dist
+excalibur-xmlbundle.lib=${excalibur-xmlbundle.home}
+excalibur-xmlbundle.jar=${excalibur-xmlbundle.lib}/excalibur-xmlbundle-1.0.jar
+
# ----- Excalibur logger, version 1.0 or later -----
excalibur-logger.home=${basedir}/../logger/dist
excalibur-logger.lib=${excalibur-logger.home}
@@ -105,10 +115,15 @@
excalibur-monitor.lib=${excalibur-monitor.home}
excalibur-monitor.jar=${excalibur-monitor.lib}/excalibur-monitor-1.0.jar
-# ----- Excalibur XMLBundle, version 1.0 or later -----
-excalibur-xmlutil.home=${basedir}/../xmlutil/dist
-excalibur-xmlutil.lib=${excalibur-xmlutil.home}
-excalibur-xmlutil.jar=${excalibur-xmlutil.lib}/excalibur-xmlutil-1.0.jar
+# ----- 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 Thread, version 1.0 or later -----
+excalibur-thread.home=${basedir}/../thread/dist
+excalibur-thread.lib=${excalibur-thread.home}
+excalibur-thread.jar=${excalibur-thread.lib}/excalibur-thread-1.0.jar
# ----- Excalibur Concurrent, version 1.0 or later -----
excalibur-concurrent.home=${basedir}/../concurrent/dist
1.12 +3 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java
Index: ExcaliburRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExcaliburRoleManager.java 4 Jun 2002 16:53:37 -0000 1.11
+++ ExcaliburRoleManager.java 23 Jul 2002 12:41:37 -0000 1.12
@@ -81,8 +81,8 @@
/* Set up i18n relations */
setup( shorts, classes, handlers, "i18n",
- "org.apache.avalon.excalibur.i18n.BundleSelector",
- "org.apache.avalon.excalibur.i18n.BundleSelector",
+ "org.apache.excalibur.xmlbundle.BundleSelector",
+ "org.apache.excalibur.xmlbundle.BundleSelector",
"org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
/* Set up Monitor relations */
1.11 +8 -8
jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java
Index: ExcaliburRoleManagerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ExcaliburRoleManagerTestCase.java 4 Jun 2002 16:53:38 -0000 1.10
+++ ExcaliburRoleManagerTestCase.java 23 Jul 2002 12:41:38 -0000 1.11
@@ -75,7 +75,7 @@
}
assertEquals(
roles.getClassForName( "i18n" ),
- Class.forName( "org.apache.avalon.excalibur.i18n.BundleSelector" )
+ Class.forName( "org.apache.excalibur.xmlbundle.BundleSelector" )
);
assertEquals(
roles.getClassForName( "monitor" ),
@@ -139,7 +139,7 @@
);
}
assertEquals(
- roles.getNameForClass( Class.forName(
"org.apache.avalon.excalibur.i18n.BundleSelector" ) ),
+ roles.getNameForClass( Class.forName(
"org.apache.excalibur.xmlbundle.BundleSelector" ) ),
"i18n"
);
assertEquals(
@@ -204,8 +204,8 @@
);
}
assertEquals(
- roles.getRoleForClass( Class.forName(
"org.apache.avalon.excalibur.i18n.BundleSelector" ) ),
- "org.apache.avalon.excalibur.i18n.BundleSelector"
+ roles.getRoleForClass( Class.forName(
"org.apache.excalibur.xmlbundle.BundleSelector" ) ),
+ "org.apache.excalibur.xmlbundle.BundleSelector"
);
assertEquals(
roles.getRoleForClass( Class.forName(
"org.apache.avalon.excalibur.monitor.ActiveMonitor" ) ),
@@ -274,11 +274,11 @@
);
}
- classes = roles.getClassesForRole(
"org.apache.avalon.excalibur.i18n.BundleSelector" );
+ classes = roles.getClassesForRole(
"org.apache.excalibur.xmlbundle.BundleSelector" );
assertEquals(
classes[ 0 ],
- Class.forName( "org.apache.avalon.excalibur.i18n.BundleSelector" )
+ Class.forName( "org.apache.excalibur.xmlbundle.BundleSelector" )
);
classes = roles.getClassesForRole(
"org.apache.avalon.excalibur.monitor.Monitor" );
@@ -354,7 +354,7 @@
);
}
assertEquals(
- roles.getHandlerClassForClass( Class.forName(
"org.apache.avalon.excalibur.i18n.BundleSelector" ) ),
+ roles.getHandlerClassForClass( Class.forName(
"org.apache.excalibur.xmlbundle.BundleSelector" ) ),
Class.forName(
"org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
);
assertEquals(
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
