9:04 a.m.
Author: chris.laprun(a)jboss.com
Date: 2007-09-23 10:04:41 -0400 (Sun, 23 Sep 2007)
New Revision: 8449
Modified:
trunk/core/build.xml
trunk/wsrp/build.xml
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPActionContext.java
Log:
- Fixed build problems on JDK 1.4.
Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml 2007-09-23 14:04:00 UTC (rev 8448)
+++ trunk/core/build.xml 2007-09-23 14:04:41 UTC (rev 8449)
@@ -161,11 +161,11 @@
<path refid="ehcache.ehcache.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
</path>
-
+
<path id="aop.classpath">
<pathelement
path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
<pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
- <path refid="javassist.javassist.classpath"/>
+ <path refid="javassist.javassist.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="trove.trove.classpath"/>
<path refid="qdox.qdox.classpath"/>
@@ -179,7 +179,7 @@
classpathref="explode.task.classpath"/>
</target>
-
+
<target name="configure-explode">
<path id="explode.task.classpath">
<pathelement location="${project.tools}/lib/explode.jar"/>
@@ -190,7 +190,7 @@
classname="org.jboss.portal.common.ant.Explode"
classpathref="explode.task.classpath"/>
</target>
-
+
<target name="configure-jbossaop">
<path id="jbossaop.task.classpath">
<path refid="jboss.aop.classpath"/>
@@ -224,7 +224,7 @@
<path id="bilto">
<path refid="sun.servlet.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="jbossas/core.libs.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.serialization.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
@@ -249,7 +249,7 @@
<aoppath path="${source.etc}/jboss-aop/base-aop.xml"/>
<include
name="org/jboss/portal/core/aspects/server/TransactionInterceptor.class"/>
<include
name="org/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer.class"/>
- <include
name="org/jboss/portal/core/aspects/portlet/TransactionInterceptor.class"/>
+ <include
name="org/jboss/portal/core/aspects/portlet/TransactionInterceptor.class"/>
<include
name="org/jboss/portal/core/deployment/jboss/ObjectDeployment.class"/>
<include
name="org/jboss/portal/core/deployment/jboss/PortletAppDeployment.class"/>
<include
name="org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.class"/>
@@ -354,8 +354,8 @@
</copy>
</target>
-
-
+
+
<target name="explode" depends="init">
<explode
file="${build.lib}/jboss-portal.sar"
@@ -369,18 +369,18 @@
<copy todir="${build.resources}/jboss-portal-ha.sar">
<fileset dir="${build.resources}/jboss-portal"
excludes="**/*.xml"/>
</copy>
-
+
<copy todir="${build.resources}/jboss-portal-ha.sar">
<filterset>
<filtersfile file="../build/etc/clustered.properties"/>
</filterset>
<fileset dir="${build.resources}/jboss-portal"
includes="**/*.xml"/>
- </copy>
-
+ </copy>
+
<implode
dir="${build.resources}/jboss-portal-ha.sar"
tofile="${build.lib}/jboss-portal-ha.sar"/>
-
+
</target>
<!-- Build the jboss-portal.sar -->
@@ -389,7 +389,7 @@
<copy todir="${build.resources}/jboss-portal.sar">
<fileset dir="${build.resources}/jboss-portal"
excludes="**/*.xml"/>
</copy>
-
+
<copy todir="${build.resources}/jboss-portal.sar">
<filterset>
<filtersfile file="../build/etc/single.properties"/>
@@ -512,7 +512,7 @@
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<copy file="${build.lib}/jboss-portal.sar"
todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
</target>
-
+
<target name="deploy-ha"
description="Deploy high availability."
depends="output-ha">
@@ -529,7 +529,7 @@
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<delete
file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
</target>
-
+
<target name="undeploy-ha"
description="Undeploy."
depends="init">
@@ -678,16 +678,16 @@
ant -Dtest=org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase
one-test
-->
<target name="one-test" depends="init" if="test"
description="Run a single unit test">
- <property name="build.testlog"
value="${module.output}/log"/>
+ <property name="build.testlog"
value="${module.output}/log"/>
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
-
- <junit printsummary="yes" showoutput="yes"
dir="${module.output}">
+
+ <junit printsummary="yes" showoutput="yes"
dir="${module.output}">
<!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" /-->
<sysproperty key="build.testlog"
value="${build.testlog}"/>
- <sysproperty key="build.resources"
value="${build.resources}"/>
+ <sysproperty key="build.resources"
value="${build.resources}"/>
<classpath>
<path refid="apache.xerces.classpath"/>
@@ -712,7 +712,7 @@
</classpath>
- <formatter type="plain" usefile="true"/>
+ <formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
<test todir="${test.reports}" name="${test}"
fork="true"/>
@@ -732,21 +732,21 @@
</target>
<!--
- Some convenience build targets to help deployment during development
+ Some convenience build targets to help deployment during development
-->
<target name="deploy-explode" depends="output,explode">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<copy
todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"
overwrite="true">
<fileset dir="${build.lib}/jboss-portal-exploded.sar"/>
</copy>
- </target>
+ </target>
<target name="explode-ha" depends="init">
<explode
file="${build.lib}/jboss-portal-ha.sar"
todir="${build.lib}"
name="jboss-portal-ha-exploded.sar"
/>
- </target>
+ </target>
<target name="deploy-ha-explode" description="Deploy high
availability." depends="output-ha,explode-ha">
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
<copy
todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar"
overwrite="true">
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-09-23 14:04:00 UTC (rev 8448)
+++ trunk/wsrp/build.xml 2007-09-23 14:04:41 UTC (rev 8449)
@@ -129,6 +129,10 @@
<pathelement path="${jbossas/core.libs.lib}/jboss-j2ee.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-jaxrpc.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-saaj.jar"/>
+
+ <!-- needed to compile on JDK 1.4 -->
+ <pathelement path="${jbossas/core.libs.lib}/namespace.jar"/>
+
<path refid="ibm.wsdl4j.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="apache.httpclient.classpath"/>
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPActionContext.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPActionContext.java 2007-09-23
14:04:00 UTC (rev 8448)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPActionContext.java 2007-09-23
14:04:41 UTC (rev 8449)
@@ -376,7 +376,9 @@
}
catch (Exception e)
{
- throw new IllegalArgumentException("Invalid upload context", e);
+ IllegalArgumentException illegalArgumentException = new
IllegalArgumentException("Invalid upload context");
+ illegalArgumentException.initCause(e); // init cause for JDK 1.4
+ throw illegalArgumentException;
}
}
else