JBoss Portal SVN: r12287 - in branches/JBoss_Portal_Branch_2_7: core and 8 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-11-10 16:47:13 -0500 (Mon, 10 Nov 2008)
New Revision: 12287
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core-admin/build.xml
branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
branches/JBoss_Portal_Branch_2_7/core-identity/build.xml
branches/JBoss_Portal_Branch_2_7/core-management/build.xml
branches/JBoss_Portal_Branch_2_7/core-samples/build.xml
branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml
branches/JBoss_Portal_Branch_2_7/core/build.xml
branches/JBoss_Portal_Branch_2_7/faces/build.xml
branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
Log:
aligning dependency with that of EAP as much as possible.
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -47,24 +47,24 @@
<componentref name="jboss-portal/modules/portlet" version="2.0.4"/>
<componentref name="jboss-portal/modules/identity" version="1.0.5"/>
<componentref name="jboss-portal/modules/cms" version="1.2.1"/>
- <componentref name="antlr" version="2.7.6.ga"/>
+ <componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
- <componentref name="apache-beanutils" version="1.7.0"/>
+ <componentref name="apache-beanutils" version="1.7.0clean-brew"/>
<componentref name="apache-codec" version="1.3.0"/>
- <componentref name="apache-collections" version="3.1"/>
- <componentref name="apache-digester" version="1.6"/>
+ <componentref name="apache-collections" version="3.1-brew"/>
+ <componentref name="apache-digester" version="1.7-brew"/>
<componentref name="apache-fileupload" version="1.2"/>
<componentref name="apache-httpclient" version="3.0.1"/>
<componentref name="apache-lang" version="2.1"/>
- <componentref name="apache-log4j" version="1.2.8"/>
- <componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
+ <componentref name="apache-log4j" version="1.2.14-brew"/>
+ <componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
<componentref name="apache-lucene" version="2.2.0"/>
<componentref name="apache-net" version="1.4.1"/>
- <componentref name="apache-xerces" version="2.7.1"/>
+ <componentref name="apache-xerces" version="2.7.1-brew"/>
<componentref name="asm" version="1.5.3"/>
- <componentref name="beanshell" version="1.3.0"/>
- <componentref name="cglib" version="2.1.3"/>
+ <componentref name="beanshell" version="1.3.0-brew"/>
+ <componentref name="cglib" version="2.1.3dep-brew"/>
<componentref name="commons-el" version="1.0"/>
<componentref name="dbunit" version="2.1"/>
<componentref name="dom4j" version="1.6.1jboss"/>
@@ -73,54 +73,53 @@
<componentref name="facelets" version="1.1.15-B1"/>
<componentref name="richfaces" version="3.2.2.GA"/>
<componentref name="jboss/portlet-bridge" version="1.0.0.B4"/>
- <componentref name="hibernate" version="3.2.4.SP1"/>
+ <componentref name="hibernate" version="3.2.4.SP1_CP06-brew"/>
<componentref name="httpunit" version="1.6"/>
- <componentref name="hsqldb" version="1.8.0.2"/>
+ <componentref name="hsqldb" version="1.8.0.8.patch01-brew"/>
<componentref name="ibm-wsdl4j" version="1.6.2"/>
<componentref name="jakarta-cactus" version="1.7.2"/>
<componentref name="jakarta-io" version="1.0"/>
<componentref name="jbossas/core-libs" version="4.0.4.GA"/>
<componentref name="jboss/aop" version="1.5.2.GA"/>
- <componentref name="jboss/cache" version="1.4.1.SP9-brew"/>
+ <componentref name="jboss/cache" version="1.4.1.SP10-brew"/>
<componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/>
<componentref name="jboss/jbossws" version="2.0.1.SP2"/>
- <componentref name="jboss/jbossxb" version="1.0.0.CR7"/>
- <componentref name="jboss/microcontainer" version="1.0.2"/>
- <componentref name="jboss/remoting" version="2.2.0.SP4"/>
- <componentref name="jboss/serialization" version="1.0.1.GA"/>
+ <componentref name="jboss/jbossxb" version="1.0.0.SP3-brew"/>
+ <componentref name="jboss/microcontainer" version="1.0.2-brew"/>
+ <componentref name="jboss/remoting" version="2.2.2.SP10-brew"/>
+ <componentref name="jboss/serialization" version="1.0.3.GA-brew"/>
<componentref name="jboss/test" version="1.0.0.CR1"/>
<componentref name="jflex" version="1.4.0"/>
<componentref name="jcaptcha" version="1.0.6"/>
<componentref name="jwebunit" version="1.2"/>
<componentref name="jcr" version="1.0"/>
<componentref name="jetty" version="6.0"/>
- <componentref name="jgroups" version="2.4.1.SP4"/>
+ <componentref name="jgroups" version="2.4.4.GA-brew"/>
<componentref name="jsunit" version="2.1"/>
- <componentref name="junit" version="3.8.1"/>
- <componentref name="odmg" version="3.0"/>
+ <componentref name="junit" version="3.8.2-brew"/>
+ <componentref name="odmg" version="3.0-brew"/>
<componentref name="oswego-concurrent" version="1.3.4"/>
- <componentref name="qdox" version="1.4"/>
- <componentref name="trove" version="1.0.2"/>
+ <componentref name="qdox" version="1.6.1-brew"/>
+ <componentref name="trove" version="1.0.2-brew"/>
<componentref name="sleepycat" version="3.0.12"/>
<componentref name="slf4j" version="1.3.0"/>
<componentref name="stax-api" version="1.0"/>
- <componentref name="sun-jaf" version="1.1"/>
- <componentref name="sun-javacc" version="3.2-portal"/>
- <componentref name="sun-javamail" version="1.3.1"/>
- <componentref name="sun-jsf" version="1.2_08-brew"/>
- <componentref name="sun-opends" version="snapshot"/>
- <componentref name="sun-servlet" version="2.4"/>
+ <componentref name="glassfish/jaf" version="1.1.0-brew"/>
+ <componentref name="sun-javacc" version="3.2-brew"/>
+ <componentref name="glassfish/javamail" version="1.4.0-brew"/>
+ <componentref name="glassfish/jsf" version="1.2_09-brew"/>
+ <componentref name="sun-opends" version="snapshot"/>
+ <componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-jaxb" version="2.1.4"/>
- <componentref name="xdoclet" version="1.2.3"/>
+ <componentref name="xdoclet" version="1.2.3-brew"/>
<componentref name="jbpm/jpdl" version="3.2.2"/>
<componentref name="freemarker" version="2.3.9"/>
<componentref name="wutka-dtdparser" version="1.2.1"/>
<componentref name="portals-bridges" version="1.0.3"/>
<componentref name="tagsoup" version="1.2"/>
<componentref name="portlet" version="2.0-Draft32"/>
- <componentref name="sun-jstl" version="1.2"/>
- <componentref name="jboss/web" version="2.1.0.GA"/>
-
+ <componentref name="glassfish/jstl" version="1.2.0-brew"/>
+ <componentref name="jboss/web" version="2.0.0.GA_CP08-brew"/>
<!-- To use new jboss-cahce/hibernate integration library-->
<componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/>
Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -107,7 +107,7 @@
<path refid="apache.fileupload.classpath"/>
<path refid="jakarta.io.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jwebunit.jwebunit.classpath"/>
<path refid="dbunit.dbunit.classpath"/>
<path refid="sun.jaf.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -95,7 +95,7 @@
<path refid="jboss.cache.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
- <path refid="sun.jsf.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="el.el.classpath"/>
@@ -189,7 +189,7 @@
<!-- portal-admin.war -->
<copy todir="${build.resources}/portal-admin-war/WEB-INF/lib">
- <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/>
+ <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/>
<fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -105,10 +105,10 @@
<path refid="apache.fileupload.classpath"/>
<path refid="jakarta.io.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jwebunit.jwebunit.classpath"/>
<path refid="dbunit.dbunit.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="portals.bridges.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="facelets.facelets.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -106,7 +106,7 @@
<path refid="jakarta.cactus.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="jbpm.jpdl.classpath"/>
- <path refid="sun.jsf.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="el.el.classpath"/>
<path refid="richfaces.richfaces.classpath"/>
<path refid="facelets.facelets.classpath"/>
@@ -207,7 +207,7 @@
<!-- portal-identity.war -->
<copy todir="${build.resources}/portal-identity-war/WEB-INF/lib">
<fileset dir="${build.lib}" includes="portal-core-identity-ui-lib.jar"/>
- <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/>
+ <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/>
<fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-management/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-management/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core-management/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -103,10 +103,10 @@
<path refid="apache.fileupload.classpath"/>
<path refid="jakarta.io.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jwebunit.jwebunit.classpath"/>
<path refid="dbunit.dbunit.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="portals.bridges.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="facelets.facelets.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -102,10 +102,10 @@
<path refid="apache.fileupload.classpath"/>
<path refid="jakarta.io.classpath"/>
<path refid="oswego.concurrent.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
<path refid="jwebunit.jwebunit.classpath"/>
<path refid="dbunit.dbunit.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<path refid="portals.bridges.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="facelets.facelets.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -98,7 +98,7 @@
<path refid="apache.log4j.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="sun.jsf.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="el.el.classpath"/>
<path refid="richfaces.richfaces.classpath"/>
<path refid="facelets.facelets.classpath"/>
@@ -204,7 +204,7 @@
<!-- Classes loaded by Portal's specific JSF wrapper. Note that it looks for classes in WEB-INF/lib2 -->
<copy todir="${build.wsrp-admin.war}/WEB-INF/lib">
- <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/>
+ <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/>
<fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/>
Modified: branches/JBoss_Portal_Branch_2_7/faces/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/faces/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/faces/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -92,8 +92,8 @@
<path refid="jboss.portal/modules/common.classpath"/>
<path refid="jboss.portal/modules/portlet.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="sun.jsf.classpath"/>
- <path refid="sun.jstl.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
+ <path refid="glassfish.jstl.classpath"/>
<path refid="facelets.facelets.classpath"/>
<path refid="el.el.classpath"/>
<path refid="apache.log4j.classpath"/>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-11-10 19:06:56 UTC (rev 12286)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-11-10 21:47:13 UTC (rev 12287)
@@ -107,7 +107,7 @@
<path refid="oswego.concurrent.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-common.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-jmx.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-system.jar"/>
@@ -124,7 +124,7 @@
<path refid="apache.httpclient.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
<path refid="apache.fileupload.classpath"/>
- <path refid="sun.javamail.classpath"/>
+ <path refid="glassfish.javamail.classpath"/>
</path>
<!-- Libraries required for tests -->
15 years, 6 months
JBoss Portal SVN: r12286 - branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-11-10 14:06:56 -0500 (Mon, 10 Nov 2008)
New Revision: 12286
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
Log:
Inlined 2 methods that were only used once and were one-liners
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-11-10 18:37:42 UTC (rev 12285)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-11-10 19:06:56 UTC (rev 12286)
@@ -456,33 +456,12 @@
*/
Registration getRegistrationOrFailIfInvalid(RegistrationContext registrationContext) throws InvalidRegistrationFault, OperationFailedFault
{
- Registration registration = getRegistrationFrom(registrationContext);
- isRegistrationValid(registration, true);
+ Registration registration = registrationHandler.getRegistrationFrom(registrationContext);
+ registrationHandler.isRegistrationValid(registration, true);
return registration;
}
- /**
- * @param registration
- * @param throwExceptionIfInvalid
- * @return
- * @since 2.6.2
- */
- boolean isRegistrationValid(Registration registration, boolean throwExceptionIfInvalid) throws InvalidRegistrationFault
- {
- return registrationHandler.isRegistrationValid(registration, throwExceptionIfInvalid);
- }
-
- /**
- * @param registrationContext
- * @return
- * @since 2.6.2
- */
- Registration getRegistrationFrom(RegistrationContext registrationContext)
- {
- return registrationHandler.getRegistrationFrom(registrationContext);
- }
-
private Boolean remotableByDefault;
public Boolean isRemotableByDefault()
15 years, 6 months
JBoss Portal SVN: r12285 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-11-10 13:37:42 -0500 (Mon, 10 Nov 2008)
New Revision: 12285
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
Log:
jboss test
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2008-11-10 17:39:13 UTC (rev 12284)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2008-11-10 18:37:42 UTC (rev 12285)
@@ -21,7 +21,7 @@
<property name="node0" value="localhost" />
<property name="jboss.test.home" value="${env.JBOSS_TEST_HOME}" />
<property name="jboss.home" value="${env.JBOSS_HOME}" />
- <property name="jboss.test.jar" value="${env.JBOSSTESTJAR}" />
+ <property name="jboss.test.jar" value="../../tools/lib/jboss-test.jar" />
<property name="jboss.portal.dir" value="${env.JBOSS_UNZIPED_DIR}" />
<property name="portal_archive" value="${env.JBOSS_ARCHIVE}" />
<property name="portal.instance" value="default" />
15 years, 6 months
JBoss Portal SVN: r12284 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-11-10 12:39:13 -0500 (Mon, 10 Nov 2008)
New Revision: 12284
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
Log:
build for windows
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2008-11-10 17:05:06 UTC (rev 12283)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/build.xml 2008-11-10 17:39:13 UTC (rev 12284)
@@ -43,7 +43,18 @@
</path>
<taskdef name="testng" classpathref="libraries.cp" classname="org.testng.TestNGAntTask" />
-
+ <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath id="server.taskdef.classpath">
+ <path refid="jboss.test.classpath" />
+ </classpath>
+ </taskdef>
+ <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath refid="server.taskdef.classpath" />
+ </taskdef>
+ <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask" uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath refid="server.taskdef.classpath" />
+ </taskdef>
+
<target name="init">
<echo message="Browser : ${browser}" />
<echo message="Workspace : ${workspace}" />
@@ -87,12 +98,44 @@
<delete dir="${test.build.dir}" />
</target>
+ <server:config javaHome="${java.home}" jbossHome="${jboss.home}">
+ <server name="${portal.instance}" host="${node0}">
+ <!-- jvmarg value="${jpda.cmdline}" / -->
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=128m" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed" />
+ </server>
+ </server:config>
+
+
<target name="cleanup">
<echo message="Cleaning up..." />
<antcall target="stop-src" />
</target>
+ <target name="run-and-build" depends="init, compile, run-src">
+ <echo message="Starting portal instance : ${portal.instance}" />
+ <server:start name="${portal.instance}" />
+
+ <echo message="Runing TestNG" />
+ <mkdir dir="test-output" />
+ <testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="test-output" listeners="org.testng.reporters.JUnitXMLReporter"
+ suitename="SeleniumSuite">
+
+ <xmlfileset dir="." includes="testng.xml" />
+
+ <!--classfileset dir="${test.build.dir}"
+ includes="org/jboss/portal/test/selenium/*Test.class" / -->
+ <sysproperty key="browser" value="${browser}" />
+ <jvmarg value="-ea" />
+
+ </testng>
+ <echo message="Stoping portal instance : ${portal.instance}" />
+ <server:stop name="${portal.instance}" />
+ <antcall target="cleanup" />
+ </target>
+
<target name="single-test" depends="init, compile, run-src">
<testng classpathref="test.cp" sourcedir="${test.src.dir}" outputdir="${testng.output.dir}" suitename="SeleniumTest" testname="org.jboss.portal.test.selenium.SingleTestCase">
15 years, 6 months
JBoss Portal SVN: r12283 - branches/JBoss_Portal_Branch_2_7/testsuite.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-11-10 12:05:06 -0500 (Mon, 10 Nov 2008)
New Revision: 12283
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/build.xml
Log:
cms is a separate module now
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/build.xml 2008-11-10 16:57:06 UTC (rev 12282)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/build.xml 2008-11-10 17:05:06 UTC (rev 12283)
@@ -106,9 +106,11 @@
<server:start name="default"/>
<sequential>
<antcall target="agent-deploy"/>
+ <!-- cms is a module now
<antcall target="internal-test-module">
<param name="module" value="cms"/>
</antcall>
+ -->
<antcall target="internal-test-module">
<param name="module" value="faces"/>
</antcall>
15 years, 6 months
JBoss Portal SVN: r12282 - branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2008-11-10 11:57:06 -0500 (Mon, 10 Nov 2008)
New Revision: 12282
Modified:
branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
Log:
enabling dashboard tests
Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-11-10 13:43:17 UTC (rev 12281)
+++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-11-10 16:57:06 UTC (rev 12282)
@@ -28,15 +28,11 @@
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
- //selenium.setSpeed("0");
login("admin", "admin");
- //selenium.setSpeed("10000");
}
@AfterMethod(groups = { "log" })
public void logoutAfterTest() {
- //selenium.setSpeed("0");
-
logout();
}
@@ -168,7 +164,7 @@
Assert.assertTrue(selenium.isTextPresent("[admin]"));
//selenium.setSpeed("0");
}
-/*
+
@Test(enabled = true, dependsOnMethods = { "testCreatePage","testAddPortlet" })
public void testMovePortlet() {
final String pageName = "DashMovePage";
@@ -340,5 +336,5 @@
public void testReorder() {
}
-*/
+
}
15 years, 6 months
JBoss Portal SVN: r12281 - in branches/JBoss_Portal_Branch_2_7/wsrp/src/resources: portal-wsrp-war/WEB-INF/wsdl and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-11-10 08:43:17 -0500 (Mon, 10 Nov 2008)
New Revision: 12281
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-client-jar/META-INF/wsdl/wsrp_v1_types.xsd
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_v1_types.xsd
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/webservice/wsrp_v1_types.xsd
Log:
- Switch to use processContents=skip as it can help with extension processing... though it needs to be checked!
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-client-jar/META-INF/wsdl/wsrp_v1_types.xsd
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-client-jar/META-INF/wsdl/wsrp_v1_types.xsd 2008-11-10 13:42:04 UTC (rev 12280)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-client-jar/META-INF/wsdl/wsrp_v1_types.xsd 2008-11-10 13:43:17 UTC (rev 12281)
@@ -50,8 +50,8 @@
<complexType name="Extension">
<sequence>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" processContents="skip"/>
</sequence>
</complexType>
@@ -502,8 +502,8 @@
<sequence>
<!-- Would prefer this to be a choice ... Axis and JAX-RPC failed to handle that -->
<element name="stringValue" type="xsd:string" minOccurs="0"/>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
<!-- end prefer this to be a choice -->
</sequence>
<attribute name="name" type="xsd:string" use="required"/>
@@ -536,8 +536,8 @@
<complexType name="ModelTypes">
<sequence>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" processContents="skip"/>
</sequence>
</complexType>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_v1_types.xsd
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_v1_types.xsd 2008-11-10 13:42:04 UTC (rev 12280)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/portal-wsrp-war/WEB-INF/wsdl/wsrp_v1_types.xsd 2008-11-10 13:43:17 UTC (rev 12281)
@@ -50,8 +50,8 @@
<complexType name="Extension">
<sequence>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" processContents="skip"/>
</sequence>
</complexType>
@@ -502,8 +502,8 @@
<sequence>
<!-- Would prefer this to be a choice ... Axis and JAX-RPC failed to handle that -->
<element name="stringValue" type="xsd:string" minOccurs="0"/>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
<!-- end prefer this to be a choice -->
</sequence>
<attribute name="name" type="xsd:string" use="required"/>
@@ -536,8 +536,8 @@
<complexType name="ModelTypes">
<sequence>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" processContents="skip"/>
</sequence>
</complexType>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/webservice/wsrp_v1_types.xsd
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/webservice/wsrp_v1_types.xsd 2008-11-10 13:42:04 UTC (rev 12280)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/webservice/wsrp_v1_types.xsd 2008-11-10 13:43:17 UTC (rev 12281)
@@ -50,8 +50,8 @@
<complexType name="Extension">
<sequence>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" processContents="skip"/>
</sequence>
</complexType>
@@ -502,8 +502,8 @@
<sequence>
<!-- Would prefer this to be a choice ... Axis and JAX-RPC failed to handle that -->
<element name="stringValue" type="xsd:string" minOccurs="0"/>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
<!-- end prefer this to be a choice -->
</sequence>
<attribute name="name" type="xsd:string" use="required"/>
@@ -536,8 +536,8 @@
<complexType name="ModelTypes">
<sequence>
- <!-- JBoss modification: added processContents="lax" to better process extensions. -->
- <any namespace="##other" processContents="lax"/>
+ <!-- JBoss modification: added processContents="skip" to better process extensions. -->
+ <any namespace="##other" processContents="skip"/>
</sequence>
</complexType>
15 years, 6 months
JBoss Portal SVN: r12280 - branches/JBoss_Portal_Branch_2_7/wsrp.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-11-10 08:42:04 -0500 (Mon, 10 Nov 2008)
New Revision: 12280
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
Log:
- Added WSRPExtensionHandlerTestCase to test suite so that it gets run.
- Minor clean up.
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-11-10 13:39:22 UTC (rev 12279)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-11-10 13:42:04 UTC (rev 12280)
@@ -108,12 +108,6 @@
<path refid="junit.junit.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="sun.jaf.classpath"/>
- <!--<pathelement path="${jboss.home}/lib/jboss-common.jar"/>
- <pathelement path="${jboss.home}/lib/jboss-jmx.jar"/>
- <pathelement path="${jboss.home}/lib/jboss-system.jar"/>
- <pathelement path="${jboss.deploy.lib.dir}/jboss-j2ee.jar"/>
- <pathelement path="${jboss.deploy.lib.dir}/jboss-jaxrpc.jar"/>
- <pathelement path="${jboss.deploy.lib.dir}/jboss-saaj.jar"/>-->
<pathelement path="${jbossas/core.libs.lib}/jboss-common.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-jmx.jar"/>
<pathelement path="${jbossas/core.libs.lib}/jboss-system.jar"/>
@@ -872,6 +866,7 @@
<test todir="${test.reports}"
name="org.jboss.portal.test.wsrp.other.RegistrationPropertyDescriptionTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.test.wsrp.handler.RequestHeaderClientHandlerTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.handler.WSRPExtensionHandlerTestCase"/>
</x-test>
<x-sysproperty>
<!--<jvmarg value="-Xdebug"/>
15 years, 6 months
JBoss Portal SVN: r12279 - branches/JBoss_Portal_Branch_2_6/wsrp.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-11-10 08:39:22 -0500 (Mon, 10 Nov 2008)
New Revision: 12279
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
Log:
- Added test case in test suite so that it gets run.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2008-11-10 13:37:50 UTC (rev 12278)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2008-11-10 13:39:22 UTC (rev 12279)
@@ -23,13 +23,13 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<!DOCTYPE project [
- <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
- <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
- <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
- ]>
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+ <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
+ <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
+ ]>
<!-- $Id$ -->
@@ -72,13 +72,13 @@
<pathelement location="${project.tools}/lib/cargo-core-uberjar-0.8.jar"/>
</path>
<taskdef
- name="deploy"
- classname="org.jboss.portal.common.ant.Deploy"
- classpathref="portal.task.classpath"/>
+ name="deploy"
+ classname="org.jboss.portal.common.ant.Deploy"
+ classpathref="portal.task.classpath"/>
<taskdef
- name="undeploy"
- classname="org.jboss.portal.common.ant.Undeploy"
- classpathref="portal.task.classpath"/>
+ name="undeploy"
+ classname="org.jboss.portal.common.ant.Undeploy"
+ classpathref="portal.task.classpath"/>
<target name="init" depends="_buildmagic:init">
<!-- Add module specific elements here -->
@@ -209,9 +209,9 @@
<path refid="qdox.qdox.classpath"/>
</path>
<taskdef
- name="aopc"
- classname="org.jboss.aop.ant.AopC"
- classpathref="jbossaop.task.classpath"/>
+ name="aopc"
+ classname="org.jboss.aop.ant.AopC"
+ classpathref="jbossaop.task.classpath"/>
</target>
<target name="configure-explode">
@@ -855,6 +855,7 @@
<test todir="${test.reports}"
name="org.jboss.portal.test.wsrp.other.RegistrationPropertyDescriptionTestCase"/>
<test todir="${test.reports}" name="org.jboss.portal.test.wsrp.handler.RequestHeaderClientHandlerTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.handler.WSRPExtensionHandlerTestCase"/>
</x-test>
<x-sysproperty>
<!--<jvmarg value="-Xdebug"/>
15 years, 6 months
JBoss Portal SVN: r12278 - in branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal: wsrp/handler and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-11-10 08:37:50 -0500 (Mon, 10 Nov 2008)
New Revision: 12278
Added:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPBody.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/WSRPExtensionHandlerTestCase.java
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/WSRPExtensionHandler.java
Log:
- JBPORTAL-2233:
+ Re-wrote traversal logic of WSRPExtensionHandler to traverse the whole tree.
+ Added test case.
+ Removed dependency on DOMUtils.
Added: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPBody.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPBody.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPBody.java 2008-11-10 13:37:50 UTC (rev 12278)
@@ -0,0 +1,57 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.test.wsrp.handler;
+
+import org.jboss.util.xml.DOMUtils;
+import org.w3c.dom.Element;
+
+import javax.xml.soap.SOAPBody;
+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class MockSOAPBody implements InvocationHandler
+{
+ Element body;
+
+ public MockSOAPBody(Element body)
+ {
+ this.body = body;
+ }
+
+ public static SOAPBody newInstance(String body) throws IOException
+ {
+ return (SOAPBody)Proxy.newProxyInstance(MockSOAPBody.class.getClassLoader(), new Class[]{SOAPBody.class},
+ new MockSOAPBody(DOMUtils.parse(body)));
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ return method.invoke(body, args);
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java 2008-11-10 13:37:35 UTC (rev 12277)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java 2008-11-10 13:37:50 UTC (rev 12278)
@@ -25,6 +25,7 @@
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
@@ -42,8 +43,8 @@
public class MockSOAPMessage extends SOAPMessage
{
MimeHeaders headers;
+ String messageBody;
-
public MockSOAPMessage()
{
headers = new MimeHeaders();
@@ -54,6 +55,24 @@
this.headers = headers;
}
+ public void setMessageBody(String messageBody)
+ {
+ this.messageBody = messageBody;
+ }
+
+ @Override
+ public SOAPBody getSOAPBody() throws SOAPException
+ {
+ try
+ {
+ return MockSOAPBody.newInstance(messageBody);
+ }
+ catch (IOException e)
+ {
+ throw new SOAPException(e);
+ }
+ }
+
public MimeHeaders getMimeHeaders()
{
return headers;
Added: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/WSRPExtensionHandlerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/WSRPExtensionHandlerTestCase.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/WSRPExtensionHandlerTestCase.java 2008-11-10 13:37:50 UTC (rev 12278)
@@ -0,0 +1,239 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.test.wsrp.handler;
+
+import junit.framework.TestCase;
+import org.jboss.portal.wsrp.handler.WSRPExtensionHandler;
+
+import javax.xml.rpc.handler.HandlerInfo;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class WSRPExtensionHandlerTestCase extends TestCase
+{
+ private WSRPExtensionHandler handler;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ handler = new WSRPExtensionHandler();
+
+ HandlerInfo info = new HandlerInfo();
+ Map<String, String> config = new HashMap<String, String>();
+ config.put("debug", "false");
+ config.put("removeExtensions", "true");
+ info.setHandlerConfig(config);
+ handler.init(info);
+ }
+
+ public void testRemoveExtensions() throws SOAPException
+ {
+ MockSOAPMessage message = new MockSOAPMessage();
+ message.setMessageBody("<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'\n" +
+ "\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'\n" +
+ "\txmlns:xsd='http://www.w3.org/2001/XMLSchema'\n" +
+ "\txmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\n" +
+ "\t<env:Body>\n" +
+ "\t\t<ns0:getMarkup xmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t<ns0:registrationContext\n" +
+ "\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t<ns0:registrationHandle\n" +
+ "\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t17\n" +
+ "\t\t\t\t</ns0:registrationHandle>\n" +
+ "\t\t\t\t<ns0:registrationState\n" +
+ "\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types' />\n" +
+ "\t\t\t</ns0:registrationContext>\n" +
+ "\t\t\t<ns0:portletContext\n" +
+ "\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t<ns0:portletHandle\n" +
+ "\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t_18\n" +
+ "\t\t\t\t</ns0:portletHandle>\n" +
+ "\t\t\t\t<ns0:portletState\n" +
+ "\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types' />\n" +
+ "\t\t\t</ns0:portletContext>\n" +
+ "\t\t\t<ns0:runtimeContext\n" +
+ "\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t<ns0:userAuthentication xmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\twsrp:none\n" +
+ "\t\t\t\t</ns0:userAuthentication>\n" +
+ "\t\t\t\t<ns0:portletInstanceKey\n" +
+ "\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t949994222\n" +
+ "\t\t\t\t</ns0:portletInstanceKey>\n" +
+ "\t\t\t\t<ns0:namespacePrefix\n" +
+ "\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t__ns949994222_\n" +
+ "\t\t\t\t</ns0:namespacePrefix>\n" +
+ "\t\t\t</ns0:runtimeContext>\n" +
+ "\t\t\t<ns0:userContext\n" +
+ "\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t<ns0:userContextKey\n" +
+ "\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\twsrp:minimal\n" +
+ "\t\t\t\t</ns0:userContextKey>\n" +
+ "\t\t\t\t<ns0:profile\n" +
+ "\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types' />\n" +
+ "\t\t\t</ns0:userContext>\n" +
+ "\t\t\t<ns0:markupParams\n" +
+ "\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t<ns0:secureClientCommunication xmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\tfalse\n" +
+ "\t\t\t\t\t</ns0:secureClientCommunication>\n" +
+ "\t\t\t\t\t<ns0:locales\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\ten-US\n" +
+ "\t\t\t\t\t</ns0:locales>\n" +
+ "\t\t\t\t\t<ns0:mimeTypes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\ttext/html\n" +
+ "\t\t\t\t\t</ns0:mimeTypes>\n" +
+ "\t\t\t\t\t<ns0:mimeTypes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\ttext/xml\n" +
+ "\t\t\t\t\t</ns0:mimeTypes>\n" +
+ "\t\t\t\t\t<ns0:mimeTypes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\ttext/vnd.oracle.mobilexml\n" +
+ "\t\t\t\t\t</ns0:mimeTypes>\n" +
+ "\t\t\t\t\t<ns0:mimeTypes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t*\n" +
+ "\t\t\t\t\t</ns0:mimeTypes>\n" +
+ "\t\t\t\t\t<ns0:mode\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\twsrp:view\n" +
+ "\t\t\t\t\t</ns0:mode>\n" +
+ "\t\t\t\t\t<ns0:windowState\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\twsrp:normal\n" +
+ "\t\t\t\t\t</ns0:windowState>\n" +
+ "\t\t\t\t\t<ns0:clientData\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t<ns0:userAgent\n" +
+ "\t\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\tMozilla/5.0 (Windows; U; Windows NT 5.1;\n" +
+ "\t\t\t\t\t\t\ten-US; rv:1.9.0.3) Gecko/2008092417\n" +
+ "\t\t\t\t\t\t\tFirefox/3.0.3\n" +
+ "\t\t\t\t\t\t</ns0:userAgent>\n" +
+ "\t\t\t\t\t\t<ns0:extensions\n" +
+ "\t\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t<ns1:GenericExtension\n" +
+ "\t\t\t\t\t\t\t\txmlns:ns1='http://xmlns.oracle.com/portal/wsrp/v1'>\n" +
+ "\t\t\t\t\t\t\t\t<ns0:NamedString name='CONNECTION'\n" +
+ "\t\t\t\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t\t\t<ns0:value\n" +
+ "\t\t\t\t\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t\t\t\tkeep-alive\n" +
+ "\t\t\t\t\t\t\t\t\t</ns0:value>\n" +
+ "\t\t\t\t\t\t\t\t</ns0:NamedString>\n" +
+ "\t\t\t\t\t\t\t\t<ns0:NamedString name='ACCEPT-ENCODING'\n" +
+ "\t\t\t\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t\t\t<ns0:value xmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t\t\t\tgzip,deflate\n" +
+ "\t\t\t\t\t\t\t\t\t\t</ns0:value>\n" +
+ "\t\t\t\t\t\t\t\t</ns0:NamedString>\n" +
+ "\t\t\t\t\t\t\t\t<ns0:NamedString name='KEEP-ALIVE'\n" +
+ "\t\t\t\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t\t\t<ns0:value xmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t\t\t\t300\n" +
+ "\t\t\t\t\t\t\t\t\t</ns0:value>\n" +
+ "\t\t\t\t\t\t\t\t</ns0:NamedString>\n" +
+ "\t\t\t\t\t\t\t\t<ns0:NamedString name='HOST'\n" +
+ "\t\t\t\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t\t\t<ns0:value xmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\t\t\t\t\t127.0.0.1:8988\n" +
+ "\t\t\t\t\t\t\t\t\t</ns0:value>\n" +
+ "\t\t\t\t\t\t\t\t</ns0:NamedString>\n" +
+ "\t\t\t\t\t\t\t</ns1:GenericExtension>\n" +
+ "\t\t\t\t\t\t</ns0:extensions>\n" +
+ "\t\t\t\t\t</ns0:clientData>\n" +
+ "\t\t\t\t\t<ns0:markupCharacterSets\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\tUTF-8\n" +
+ "\t\t\t\t\t</ns0:markupCharacterSets>\n" +
+ "\t\t\t\t\t<ns0:validNewModes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\twsrp:view\n" +
+ "\t\t\t\t\t</ns0:validNewModes>\n" +
+ "\t\t\t\t\t<ns0:validNewModes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\turn:javax:portlet:mode:custo m:edit_defaults\n" +
+ "\t\t\t\t\t</ns0:validNewModes>\n" +
+ "\t\t\t\t\t<ns0:validNewModes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\twsrp:edit\n" +
+ "\t\t\t\t\t</ns0:validNewModes>\n" +
+ "\t\t\t\t\t<ns0:validNewModes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\twsrp:help\n" +
+ "\t\t\t\t\t</ns0:validNewModes>\n" +
+ "\t\t\t\t\t<ns0:validNewModes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\turn:javax:portlet:mode:custo m:about\n" +
+ "\t\t\t\t\t</ns0:validNewModes>\n" +
+ "\t\t\t\t\t<ns0:validNewModes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\turn:javax:portlet:mode:custo m:print\n" +
+ "\t\t\t\t\t</ns0:validNewModes>\n" +
+ "\t\t\t\t\t<ns0:validNewModes\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\turn:javax:portlet:mode:custo m:config\n" +
+ "\t\t\t\t\t</ns0:validNewModes>\n" +
+ "\t\t\t\t\t<ns0:validNewWindowStates\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\twsrp:normal\n" +
+ "\t\t\t\t\t</ns0:validNewWindowStates>\n" +
+ "\t\t\t\t\t<ns0:validNewWindowStates\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\twsrp:maximized\n" +
+ "\t\t\t\t\t</ns0:validNewWindowStates>\n" +
+ "\t\t\t\t\t<ns0:validNewWindowStates\n" +
+ "\t\t\t\t\t\txmlns:ns0='urn:oasis:names:tc:wsrp:v1:types'>\n" +
+ "\t\t\t\t\t\twsrp:minimized\n" +
+ "\t\t\t\t\t</ns0:validNewWindowStates>\n" +
+ "\t\t\t</ns0:markupParams>\n" +
+ "\t\t</ns0:getMarkup>\n" +
+ "\t</env:Body>\n" +
+ "</env:Envelope>");
+
+
+ SOAPMessageContext msgContext = MockSOAPMessageContext.createMessageContext(message, getClass().getClassLoader());
+
+ handler.handleRequest(msgContext);
+
+ SOAPBody body = msgContext.getMessage().getSOAPBody();
+ String asString = body.toString();
+ assertFalse(asString.contains("ns0:extensions"));
+ assertFalse(asString.contains("ns1:GenericExtensions"));
+ assertFalse(asString.contains("ACCEPT-ENCODING"));
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/WSRPExtensionHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/WSRPExtensionHandler.java 2008-11-10 13:37:35 UTC (rev 12277)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/WSRPExtensionHandler.java 2008-11-10 13:37:50 UTC (rev 12278)
@@ -23,23 +23,18 @@
package org.jboss.portal.wsrp.handler;
import org.jboss.logging.Logger;
-import org.jboss.util.xml.DOMUtils;
-import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
import javax.xml.namespace.QName;
import javax.xml.rpc.handler.GenericHandler;
import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
-import javax.xml.soap.Node;
import javax.xml.soap.SOAPBody;
import javax.xml.soap.SOAPMessage;
-import java.util.Iterator;
-//$Id$
-
/**
- * JAX-RPC Handler that strips the SOAP Message of any WSRP extensions. Right now, only operates on response messages.
+ * JAX-RPC Handler that strips the SOAP Message of any WSRP extensions.
*
* @author <a href="mailto:Anil.Saldhana@jboss.org">Anil Saldhana</a>
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -93,31 +88,7 @@
if (removeExtensions)
{
SOAPBody soapBody = soapMessage.getSOAPBody();
- Element firstEl = DOMUtils.getFirstChildElement(soapBody);
- Iterator iter = DOMUtils.getChildElements(firstEl);
- while (iter.hasNext())
- {
- Element elt = (Element)iter.next();
- String nodeName = elt.getNodeName();
- if (EXTENSIONS.equals(nodeName))
- {
- removeChildrenOf(elt);
- }
- else
- {
- Iterator extensions = DOMUtils.getChildElements(elt, EXTENSIONS);
- if (extensions.hasNext())
- {
- log.debug("extensions exist on " + nodeName);
- Element exts = (Element)extensions.next();
- removeChildrenOf(exts);
- if (debug)
- {
- soapMessage.writeTo(System.out);
- }
- }
- }
- }
+ traverseAndRemoveExtensions(soapBody);
}
}
catch (Exception e)
@@ -126,27 +97,39 @@
}
}
- private void removeChildrenOf(Element element)
+ /**
+ * Remove extensions nodes recursively, depth-first.
+ *
+ * @param node
+ */
+ private void traverseAndRemoveExtensions(org.w3c.dom.Node node)
{
- Iterator children = DOMUtils.getChildElements(element);
- while (children.hasNext())
+ NodeList children = node.getChildNodes();
+ int childrenNb = children.getLength();
+ for (int i = 0; i < childrenNb; i++)
{
- Node node = (Node)children.next();
- element.removeChild(node);
- }
- }
+ org.w3c.dom.Node child = children.item(i);
- /*private boolean shouldRemoveWSRPExtensions(SOAPHeader soapHeader)
- {
- boolean result = false;
- if (soapHeader != null)
- {
- Iterator iter = DOMUtils.getChildElements(soapHeader, "jboss_wsrp_remove_extension");
- if (iter.hasNext())
+ // only process elements
+ if (org.w3c.dom.Node.ELEMENT_NODE == child.getNodeType())
{
- result = true;
+ String name = child.getLocalName();
+
+ // if we found an extension, remove it or continue
+ if (EXTENSIONS.equals(name))
+ {
+ if (debug)
+ {
+ log.debug("Extensions removed on " + name);
+ }
+ node.removeChild(child);
+ break;
+ }
+ else
+ {
+ traverseAndRemoveExtensions(child);
+ }
}
}
- return result;
- }*/
+ }
}
15 years, 6 months