hammant 2002/12/21 12:32:37
Modified: altrmi base.xml build.xml
altrmi/src/java/org/apache/excalibur/altrmi/server
AttributeHelper.java
PublicationDescriptionItem.java
altrmi/src/test/org/apache/excalibur/altrmi/test/http
KludgeServlet.java
Log:
Async tests now pass.
Revision Changes Path
1.8 +2 -0 jakarta-avalon-excalibur/altrmi/base.xml
Index: base.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/base.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- base.xml 25 Nov 2002 21:17:06 -0000 1.7
+++ base.xml 21 Dec 2002 20:32:36 -0000 1.8
@@ -20,6 +20,8 @@
<!-- Construct compile classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
+ <pathelement location="${jakarta-commons-attributes.jar}"/>
+ <pathelement location="${jakarta-commons-logging.jar}"/>
</path>
<taskdef name="altrmiproxies"
classname="org.apache.excalibur.altrmi.generator.ant.AltrmiProxyTask">
1.53 +4 -3 jakarta-avalon-excalibur/altrmi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- build.xml 21 Dec 2002 19:34:43 -0000 1.52
+++ build.xml 21 Dec 2002 20:32:36 -0000 1.53
@@ -264,10 +264,11 @@
<formatter type="plain" usefile="false"/> <!-- text reports for humans
-->
<batchtest todir="${build.tests}">
<fileset dir="${build.testclasses}">
+<!--
<include name="**/test/**/CustomHttpServletTestCase.class"/>
-
-<!-- <include name="**/test/**/*TestCase.class"/>
- <exclude name="**/Abstract*"/> -->
+ -->
+ <include name="**/test/**/*TestCase.class"/>
+ <exclude name="**/Abstract*"/>
<exclude name="**/JSXObjectStreamTestCase.class"/>
</fileset>
</batchtest>
1.2 +4 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AttributeHelper.java
Index: AttributeHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AttributeHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttributeHelper.java 3 Dec 2002 00:19:57 -0000 1.1
+++ AttributeHelper.java 21 Dec 2002 20:32:37 -0000 1.2
@@ -16,20 +16,21 @@
protected boolean isMethodAsync(Method method)
{
+ System.out.println("method " + method.toString());
Attribute attr = Attributes.getAttribute(method, "altrmi:method");
- return (attr.getValue().equals("async"));
+ return (attr == null ? false : attr.getValue().equals("async"));
}
protected boolean isMethodAsyncCommit(Method method)
{
Attribute attr = Attributes.getAttribute(method, "altrmi:method");
- return (attr.getValue().equals("commit"));
+ return (attr == null ? false :attr.getValue().equals("commit"));
}
protected boolean isMethodAsyncRollback(Method method)
{
Attribute attr = Attributes.getAttribute(method, "altrmi:method");
- return (attr.getValue().equals("rollback"));
+ return (attr == null ? false : attr.getValue().equals("rollback"));
}
1.7 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/PublicationDescriptionItem.java
Index: PublicationDescriptionItem.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/PublicationDescriptionItem.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PublicationDescriptionItem.java 21 Dec 2002 19:34:43 -0000 1.6
+++ PublicationDescriptionItem.java 21 Dec 2002 20:32:37 -0000 1.7
@@ -53,7 +53,7 @@
}
catch (NoClassDefFoundError ncdfe)
{
- System.out.println("--> ncdfe-" + ncdfe.getMessage() +
ncdfe.getCause());
+ System.out.println("--> ncdfe " + ncdfe.getMessage());
ncdfe.printStackTrace();
// attribute jars are missing.
// This allowed for when there is no Async functionality.
1.3 +0 -1
jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/http/KludgeServlet.java
Index: KludgeServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/test/org/apache/excalibur/altrmi/test/http/KludgeServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KludgeServlet.java 16 Dec 2002 01:00:01 -0000 1.2
+++ KludgeServlet.java 21 Dec 2002 20:32:37 -0000 1.3
@@ -22,7 +22,6 @@
public static void setRealServlet(CustomHttpServlet realServlet)
{
KludgeServlet.realServlet = realServlet;
- System.out.println("---> kludge");
}
protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse
httpServletResponse) throws ServletException, IOException
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
