September 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8295 - in modules/web/trunk/web: src/main/org/jboss/portal/web/impl/generic and 13 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-16 09:44:20 -0400 (Sun, 16 Sep 2007) New Revision: 8295 Added: modules/web/trunk/web/src/resources/test/spi/generic/ modules/web/trunk/web/src/resources/test/spi/generic/app-war/ modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/web.xml modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/web.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/context.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/web.xml Modified: modules/web/trunk/web/build.xml modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/GenericServletContainerContext.java modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/PortletContainerBootstrapServlet.java modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml Log: - added testing of generic integration with jboss 4.2 and tomcat 6.0 Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-15 23:44:37 UTC (rev 8294) +++ modules/web/trunk/web/build.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -195,6 +195,10 @@ <fileset dir="${build.resources}/portal-web-test-jar"/> </jar> +  +  +  +  <copy todir="${build.resources}/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> @@ -214,6 +218,63 @@ </jar>  + <jar jarfile="${build.lib}/tomcat-6.0-container-servlet/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/app-war"/> + </jar> + +  +  +  + +  + <copy todir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/lib"> + <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar,portal-test-generic-lib.jar"/> + </copy> + <mkdir dir="${build.lib}/tomcat-6.0-lifecycle-listener"/> + <jar jarfile="${build.lib}/tomcat-6.0-lifecycle-listener/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war"/> + </jar> + +  + <jar jarfile="${build.lib}/tomcat-6.0-container-servlet/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/app-war"/> + </jar> + +  +  +  + +  + <mkdir dir="${build.resources}/test/spi/tomcat-6.0-generic/server-war/WEB-INF/lib"/> + <copy todir="${build.resources}/test/spi/tomcat-6.0-generic/server-war/WEB-INF/lib"> + <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar,portal-test-generic-lib.jar"/> + <fileset dir="${jboss.microcontainer.lib}" includes="jboss-container.jar,jboss-dependency.jar,jboss-microcontainer.jar"/> + <fileset dir="${jboss.common.lib}" includes="jboss-common.jar"/> + <fileset dir="${oswego.concurrent.lib}" includes="concurrent.jar"/> + <fileset dir="${jboss.remoting.lib}" includes="jboss-remoting.jar"/> + <fileset dir="${jboss.jbossxb.lib}" includes="jboss-xml-binding.jar"/> + <fileset dir="${apache.log4j.lib}" includes="log4j.jar"/> + <fileset dir="${apache.xerces.lib}" includes="xercesImpl.jar"/> + </copy> + <mkdir dir="${build.lib}/tomcat-6.0-generic"/> + <jar jarfile="${build.lib}/tomcat-6.0-generic/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/tomcat-6.0-generic/server-war"/> + </jar> + +  + <jar jarfile="${build.lib}/tomcat-6.0-generic/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/generic/app-war"/> + </jar> + +  +  +  + +  <copy todir="${build.resources}/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-mc-lib.jar"/> @@ -225,19 +286,28 @@ </jar>  - <copy todir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/lib"> + <jar jarfile="${build.lib}/jboss-4.2-container-servlet/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/app-war"/> + </jar> + +  +  +  + +  + <copy todir="${build.resources}/test/spi/jboss-4.2-generic/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> - <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> - <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar,portal-test-generic-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-mc-lib.jar"/> + <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> </copy> - <mkdir dir="${build.lib}/tomcat-6.0-lifecycle-listener"/> - <jar jarfile="${build.lib}/tomcat-6.0-lifecycle-listener/test-spi-server.war"> - <fileset dir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war"/> + <mkdir dir="${build.lib}/jboss-4.2-generic"/> + <jar jarfile="${build.lib}/jboss-4.2-generic/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/jboss-4.2-generic/server-war"/> </jar>  - <jar jarfile="${build.lib}/test-spi-app.war"> - <fileset dir="${build.resources}/test/spi/app-war"/> + <jar jarfile="${build.lib}/jboss-4.2-generic/test-spi-app.war"> + <fileset dir="${build.resources}/test/spi/generic/app-war"/> </jar> </target> @@ -275,7 +345,7 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> - <deployable type="war" file="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> + <deployable type="war" file="${test.spi.server.path}"/> </configuration> </cargo> </target> @@ -311,8 +381,11 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> + +  + <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> - <deployable type="war" file="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/> + <deployable type="war" file="${test.spi.server.path}"/> </configuration> </cargo> </target> @@ -328,36 +401,84 @@ </cargo> </target> + <target name="tests" depends="init"> + <antcall target="tests.local"/> + <antcall target="tests.jboss.container-servlet"/> + <antcall target="tests.jboss.generic"/> + <antcall target="tests.tomcat.container-servlet"/> + <antcall target="tests.tomcat.generic"/> + </target> + <target name="tests.jboss" depends="init"> + <antcall target="tests.jboss.container-servlet"/> + </target> + + <target name="tests.jboss.container-servlet" depends="init"> <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> <antcall target="cargo.jboss.start"> <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteJBoss_4_2"/> + <param name="test.server.name" value="RemoteJBoss_4_2"/> + <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-container-servlet"/> + <param name="test.type" value="container-servlet"/> </antcall> <antcall target="cargo.jboss.stop"> </antcall> </target> + <target name="tests.jboss.generic" depends="init"> + <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> + <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> + <antcall target="cargo.jboss.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-generic/test-spi-server.war"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="RemoteJBoss_4_2"/> + <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-generic"/> + <param name="test.type" value="generic"/> + </antcall> + <antcall target="cargo.jboss.stop"> + </antcall> + </target> + <target name="tests.tomcat" depends="init"> + <antcall target="tests.tomcat.container-servlet"/> + </target> + + <target name="tests.tomcat.container-servlet" depends="init"> <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> <antcall target="cargo.tomcat.start"> <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteTomcat_6_0"/> + <param name="test.server.name" value="RemoteTomcat_6_0"/> + <param name="test.deploy.dir" value="${build.lib}/tomcat-6.0-container-servlet"/> + <param name="test.type" value="container-servlet"/> </antcall> <antcall target="cargo.tomcat.stop"> </antcall> </target> - <target name="tests" depends="init"> - <antcall target="tests.local"/> - <antcall target="tests.jboss"/> - <antcall target="tests.tomcat"/> + <target name="tests.tomcat.generic" depends="init"> + <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> + <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> + <antcall target="cargo.tomcat.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/tomcat-6.0-generic/test-spi-server.war"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="RemoteTomcat_6_0"/> + <param name="test.deploy.dir" value="${build.lib}/tomcat-6.0-generic"/> + <param name="test.type" value="generic"/> + </antcall> + <antcall target="cargo.tomcat.stop"> + </antcall> </target> <target name="tests.local" depends="init"> @@ -405,13 +526,13 @@ <zest todir="${test.reports}" name="org.jboss.portal.test.web.spi.SPITestCase" - outfile="TEST-${server.name}.org.jboss.portal.test.web.spi.SPITestCase" - id="org.jboss.portal.test.web.spi.SPITestCase,serverName=${server.name}"> - <parameter name="serverName" value="${server.name}"/> + outfile="TEST-${test.server.name}-${test.type}.org.jboss.portal.test.web.spi.SPITestCase" + id="org.jboss.portal.test.web.spi.SPITestCase,serverName=${test.server.name},type=${test.type}"> + <parameter name="serverName" value="${test.server.name}"/> </zest> </x-test> <x-sysproperty> - <sysproperty key="test.root" value="${build.lib}"/> + <sysproperty key="test.root" value="${test.deploy.dir}"/>  <pathelement location="${build.resources}/test/config"/> + <path refid="oswego.concurrent.classpath"/> <path refid="jboss.remoting.classpath"/> @@ -433,9 +557,6 @@ <path refid="apache.httpclient.classpath"/> <path refid="apache.logging.classpath"/> <path refid="apache.codec.classpath"/> - <pathelement location="${build.resources}/test"/> - <pathelement location="${source.java}"/> - <pathelement location="${jboss.portal-portlet.root}/classes"/> <pathelement location="${jboss.portal/modules/test.lib}/portal-test-generic-lib.jar"/> <path refid="codehaus.cargo.classpath"/> <path refid="library.classpath"/> Modified: modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/GenericServletContainerContext.java =================================================================== --- modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/GenericServletContainerContext.java 2007-09-15 23:44:37 UTC (rev 8294) +++ modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/GenericServletContainerContext.java 2007-09-16 13:44:20 UTC (rev 8295) @@ -41,7 +41,7 @@ { /** . */ - private static final GenericServletContainerContext instance = new GenericServletContainerContext(); + static final GenericServletContainerContext instance = new GenericServletContainerContext(); /** . */ private Registration registration; @@ -51,19 +51,19 @@ DefaultServletContainerFactory.registerContext(instance); } - static void register(GenericWebAppContext webAppContext) + void register(GenericWebAppContext webAppContext) { - if (instance.registration != null) + if (registration != null) { - instance.registration.registerWebApp(webAppContext); + registration.registerWebApp(webAppContext); } } - static void unregister(String webAppId) + void unregister(String webAppId) { - if (instance.registration != null) + if (registration != null) { - instance.registration.unregisterWebApp(webAppId); + registration.unregisterWebApp(webAppId); } } Modified: modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/PortletContainerBootstrapServlet.java =================================================================== --- modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/PortletContainerBootstrapServlet.java 2007-09-15 23:44:37 UTC (rev 8294) +++ modules/web/trunk/web/src/main/org/jboss/portal/web/impl/generic/PortletContainerBootstrapServlet.java 2007-09-16 13:44:20 UTC (rev 8295) @@ -51,7 +51,7 @@ GenericWebAppContext webAppContext = new GenericWebAppContext(servletContext, contextPath, classLoader); // - GenericServletContainerContext.register(webAppContext); + GenericServletContainerContext.instance.register(webAppContext); this.contextPath = contextPath; } catch (Exception e) @@ -64,7 +64,7 @@ { if (contextPath != null) { - GenericServletContainerContext.unregister(contextPath); + GenericServletContainerContext.instance.unregister(contextPath); } } } Added: modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/generic/app-war/WEB-INF/web.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,38 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <servlet> + <servlet-name>BootstrapServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.generic.PortletContainerBootstrapServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>BootstrapServlet</servlet-name> + <url-pattern>/jbossportlet</url-pattern> + </servlet-mapping> +</web-app> Modified: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml 2007-09-15 23:44:37 UTC (rev 8294) +++ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -1,2 +1,2 @@ -<Context privileged="true" crossContext="true"> +<Context privileged="true">  </Context> \ No newline at end of file Added: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-generic/server-war/WEB-INF/web.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/jboss/portal/test/web/spi/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>SPITestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.spi.SPITestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>SPITestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> +</web-app> Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/META-INF/context.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/log4j.properties 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/classes/logging.properties 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-generic/server-war/WEB-INF/web.xml 2007-09-16 13:44:20 UTC (rev 8295) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/jboss/portal/test/web/spi/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>SPITestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.spi.SPITestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>SPITestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> +</web-app>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8294 - in modules/web/trunk/web: src/resources/test/spi and 12 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 19:44:37 -0400 (Sat, 15 Sep 2007) New Revision: 8294 Added: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/context.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/log4j.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/logging.properties modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/web.xml Removed: modules/web/trunk/web/src/resources/test/spi/jboss-container-servlet-4.2/ modules/web/trunk/web/src/resources/test/spi/tomcat-container-servlet-6.0/ modules/web/trunk/web/src/resources/test/spi/tomcat-lifecycle-listener-6.0/ Modified: modules/web/trunk/web/build.xml Log: rename top directories containing the war files to test Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-15 23:30:10 UTC (rev 8293) +++ modules/web/trunk/web/build.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -196,7 +196,7 @@ </jar>  - <copy todir="${build.resources}/test/spi/tomcat-container-servlet-6.0/server-war/WEB-INF/lib"> + <copy todir="${build.resources}/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar,portal-test-generic-lib.jar"/> @@ -208,31 +208,31 @@ <fileset dir="${apache.log4j.lib}" includes="log4j.jar"/> <fileset dir="${apache.xerces.lib}" includes="xercesImpl.jar"/> </copy> - <mkdir dir="${build.lib}/tomcat-container-servlet-6.0"/> - <jar jarfile="${build.lib}/tomcat-container-servlet-6.0/test-spi-server.war"> - <fileset dir="${build.resources}/test/spi/tomcat-container-servlet-6.0/server-war"/> + <mkdir dir="${build.lib}/tomcat-6.0-container-servlet"/> + <jar jarfile="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/tomcat-6.0-container-servlet/server-war"/> </jar>  - <copy todir="${build.resources}/test/spi/jboss-container-servlet-4.2/server-war/WEB-INF/lib"> + <copy todir="${build.resources}/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-mc-lib.jar"/> <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> </copy> - <mkdir dir="${build.lib}/jboss-container-servlet-4.2"/> - <jar jarfile="${build.lib}/jboss-container-servlet-4.2/test-spi-server.war"> - <fileset dir="${build.resources}/test/spi/jboss-container-servlet-4.2/server-war"/> + <mkdir dir="${build.lib}/jboss-4.2-container-servlet"/> + <jar jarfile="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/jboss-4.2-container-servlet/server-war"/> </jar>  - <copy todir="${build.resources}/test/spi/tomcat-lifecycle-listener-6.0/server-war/WEB-INF/lib"> + <copy todir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portal-web-test-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-mc-lib.jar"/> <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-lib.jar,portal-test-generic-lib.jar"/> </copy> - <mkdir dir="${build.lib}/tomcat-lifecycle-listener-6.0"/> - <jar jarfile="${build.lib}/tomcat-lifecycle-listener-6.0/test-spi-server.war"> - <fileset dir="${build.resources}/test/spi/tomcat-lifecycle-listener-6.0/server-war"/> + <mkdir dir="${build.lib}/tomcat-6.0-lifecycle-listener"/> + <jar jarfile="${build.lib}/tomcat-6.0-lifecycle-listener/test-spi-server.war"> + <fileset dir="${build.resources}/test/spi/tomcat-6.0-lifecycle-listener/server-war"/> </jar>  @@ -275,7 +275,7 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> - <deployable type="war" file="${build.lib}/jboss-container-servlet-4.2/test-spi-server.war"/> + <deployable type="war" file="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> </configuration> </cargo> </target> @@ -312,7 +312,7 @@ <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> - <deployable type="war" file="${build.lib}/tomcat-container-servlet-6.0/test-spi-server.war"/> + <deployable type="war" file="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/> </configuration> </cargo> </target> Added: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/context.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,54 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/jboss/portal/test/web/spi/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>SPITestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.spi.SPITestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>SPITestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> +</web-app> Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/context.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/context.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/META-INF/context.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/log4j.properties 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/classes/logging.properties 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,54 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/jboss/portal/test/web/spi/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>SPITestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.spi.SPITestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>SPITestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> +</web-app> Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/log4j.properties 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/logging.properties =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/classes/logging.properties 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/web.xml =================================================================== --- modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/web.xml (rev 0) +++ modules/web/trunk/web/src/resources/test/spi/tomcat-6.0-lifecycle-listener/server-war/WEB-INF/web.xml 2007-09-15 23:44:37 UTC (rev 8294) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/jboss/portal/test/web/spi/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>SPITestServlet</servlet-name> + <servlet-class>org.jboss.portal.test.web.spi.SPITestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>SPITestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> +</web-app>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8293 - modules/web/trunk/web/src/main/org/jboss/portal/web/spi.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 19:30:10 -0400 (Sat, 15 Sep 2007) New Revision: 8293 Added: modules/web/trunk/web/src/main/org/jboss/portal/web/spi/WebAppContext.java Log: added WebAppContext interface to the web mdule Added: modules/web/trunk/web/src/main/org/jboss/portal/web/spi/WebAppContext.java =================================================================== --- modules/web/trunk/web/src/main/org/jboss/portal/web/spi/WebAppContext.java (rev 0) +++ modules/web/trunk/web/src/main/org/jboss/portal/web/spi/WebAppContext.java 2007-09-15 23:30:10 UTC (rev 8293) @@ -0,0 +1,89 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.web.spi; + +import javax.servlet.ServletContext; +import java.io.InputStream; +import java.io.IOException; + +/** + * A web application context. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface WebAppContext +{ + + /** + * Start the web application context usage from a client point of view. The life cycle is not related to the + * web application deployment life cycle. The invocation means that the servlet container spi framework + * want to start to use the web application. + * + * @throws Exception any exception that would veto the usage of the web application + */ + void start() throws Exception; + + /** + * Stop the web application context usage. + */ + void stop(); + + /** + * Returns the servlet context of the web application. + * + * @return the servlet context + */ + ServletContext getServletContext(); + + /** + * Returns the class loader of the web application. + * + * @return the web application class loader + */ + ClassLoader getClassLoader(); + + /** + * Returns the context path of the web application. + * + * @return the web application context path + */ + String getContextPath(); + + /** + * Import a file in the war file. The file could not be created for some reasons which are : + * <ul> + * <li>The parent dir exists and is a file</li> + * <li>The parent dir does not exist and its creation failed</li> + * <li>An underlying exception occurs when writing bytes from the source <code>Inputstream</code> to the target <code>OutputStream</code></li> + * </ul> + * + * @param parentDirRelativePath the parent relative path in the web app starting from the app root + * @param name the name the created file should have + * @param source the data of the target file + * @param overwrite if false and the file already exists nothing is done + * @return true if the file has been created + * @throws java.io.IOException if the file cannot be created + */ + boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) throws IOException; +}

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8292 - modules/portlet/trunk.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 17:23:22 -0400 (Sat, 15 Sep 2007) New Revision: 8292 Modified: modules/portlet/trunk/jboss-portal-portlet.iws Log: update idea files for portlet module Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-15 21:23:00 UTC (rev 8291) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-15 21:23:22 UTC (rev 8292) @@ -16,14 +16,7 @@ <option name="USER" value="" /> </component> <component name="ChangeListManager"> - <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/lib/explode.jar" afterPath="$PROJECT_DIR$/tools/lib/explode.jar" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/build.xml" afterPath="$PROJECT_DIR$/testsuite/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/build.xml" afterPath="$PROJECT_DIR$/portlet/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/test/servers.xml" afterPath="$PROJECT_DIR$/test/src/resources/test/servers.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" /> - </list> + <list default="true" name="Default" comment="" /> </component> <component name="ChangeListSynchronizer" /> <component name="ChangesViewManager" flattened_view="true" /> @@ -744,6 +737,32 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java" line="267" class="org.jboss.portal.test.portlet.state.AbstractStatefulPortletInvokerTestCase" package="org.jboss.portal.test.portlet.state"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java" line="290" class="org.jboss.portal.test.portlet.state.AbstractStatefulPortletInvokerTestCase" package="org.jboss.portal.test.portlet.state"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -799,51 +818,96 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> + <file leaf-file-name="AbstractStatefulPortletInvokerTestCase.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="47" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.76325524"> + <state line="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <file leaf-file-name="StringValue.class" pinned="false" current="false" current-in-tab="false"> + <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/org/jboss/portal/common/value/StringValue.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="366" column="0" selection-start="18512" selection-end="18512" vertical-scroll-proportion="0.76325524"> + <state line="11" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.14796548"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="servers.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> + <file leaf-file-name="ConsumerStatefulPortletInvokerTestCase.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="25" selection-start="762" selection-end="762" vertical-scroll-proportion="0.35511714"> + <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="buildmagic.ent" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <file leaf-file-name="ConsumerPortletInvoker.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> + <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <file leaf-file-name="ProducerPortletInvoker.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="620" column="39" selection-start="35681" selection-end="35681" vertical-scroll-proportion="0.2219482"> + <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="PortletInvokerSupport.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="PreferencesInfoSupport.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="353" column="16" selection-start="18024" selection-end="18024" vertical-scroll-proportion="0.57090014"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="AbstractConsumerPersistenceManagerService.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ConsumerPersistenceManagerService.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -939,7 +1003,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="testsuite" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -949,11 +1013,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="testsuite" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -963,21 +1027,15 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="test" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -987,47 +1045,33 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="test" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1035,39 +1079,35 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="test" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1089,9 +1129,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1111,32 +1159,14 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -1184,7 +1214,7 @@ </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager"> + <component name="RunManager" selected="Remote.Runner"> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1244,6 +1274,11 @@ <option name="TRANSPORT" value="0" /> <option name="LOCAL" value="false" /> </RunnerSettings> + <RunnerSettings RunnerId="JProfiler"> + <option name="WINDOW" value="false" /> + <option name="JVMPI" value="false" /> + <option name="INTERPRETED" value="false" /> + </RunnerSettings> <ConfigurationWrapper RunnerId="Debug" /> <method> <option name="Make" value="true" /> @@ -1260,6 +1295,11 @@ <option name="TRANSPORT" value="0" /> <option name="LOCAL" value="false" /> </RunnerSettings> + <RunnerSettings RunnerId="JProfiler"> + <option name="WINDOW" value="false" /> + <option name="JVMPI" value="false" /> + <option name="INTERPRETED" value="false" /> + </RunnerSettings> <ConfigurationWrapper RunnerId="Debug" /> <method> <option name="Make" value="true" /> @@ -1386,12 +1426,12 @@ </component> <component name="VcsManagerConfiguration"> <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> - <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> + <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" /> <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="remove empty dirs" /> + <option name="LAST_COMMIT_MESSAGE" value="- fix minor bug in AbstractConsumerPersistenceManagerService that was making consumer invoker test failing
- set emptySessionPath=true for the tomcat test in order to make the session test pass" /> <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> @@ -1413,6 +1453,7 @@ <MESSAGE value="- somehow the portal servlet can almost render portlets" /> <MESSAGE value="improve singleton access to RemoteTestDriverServer" /> <MESSAGE value="remove empty dirs" /> + <MESSAGE value="- fix minor bug in AbstractConsumerPersistenceManagerService that was making consumer invoker test failing
- set emptySessionPath=true for the tomcat test in order to make the session test pass" /> </component> <component name="VssConfiguration"> <option name="CLIENT_PATH" value="" /> @@ -1466,109 +1507,107 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/management/build.xml"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="100" column="0" selection-start="5483" selection-end="5539" vertical-scroll-proportion="0.50308263"> + <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/bridge/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="64" selection-start="4063" selection-end="4063" vertical-scroll-proportion="0.014796548"> + <state line="243" column="12" selection-start="12668" selection-end="12668" vertical-scroll-proportion="0.33291456"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildmagic/aliases.ent"> + <entry file="file://$PROJECT_DIR$/test/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="329" column="67" selection-start="16466" selection-end="16466" vertical-scroll-proportion="-4.4685574"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ContentTypesTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="38" column="13" selection-start="2241" selection-end="2241" vertical-scroll-proportion="0.16276202"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PortletInfoSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="13" selection-start="3539" selection-end="3539" vertical-scroll-proportion="0.13316892"> + <state line="36" column="13" selection-start="2277" selection-end="2277" vertical-scroll-proportion="0.22594142"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/modules.ent"> + <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/org/jboss/portal/common/value/StringValue.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="6" column="52" selection-start="280" selection-end="314" vertical-scroll-proportion="0.088779286"> + <state line="11" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.14796548"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/defaults.ent"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="52" selection-start="3295" selection-end="3308" vertical-scroll-proportion="0.7398274"> + <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="13" selection-start="2776" selection-end="2776" vertical-scroll-proportion="0.16582915"> + <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="13" selection-start="3139" selection-end="3139" vertical-scroll-proportion="0.1356784"> + <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="88" column="77" selection-start="4986" selection-end="5002" vertical-scroll-proportion="0.33291456"> + <state line="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="620" column="39" selection-start="35681" selection-end="35681" vertical-scroll-proportion="0.2219482"> + <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> + <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="24" column="25" selection-start="762" selection-end="762" vertical-scroll-proportion="0.35511714"> + <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="366" column="0" selection-start="18512" selection-end="18512" vertical-scroll-proportion="0.76325524"> + <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="109" column="47" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.76325524"> + <state line="353" column="16" selection-start="18024" selection-end="18024" vertical-scroll-proportion="0.57090014"> <folding /> </state> </provider>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8291 - in modules/portlet/trunk: portlet/src/main/org/jboss/portal/portlet/impl/state/consumer and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 17:23:00 -0400 (Sat, 15 Sep 2007) New Revision: 8291 Modified: modules/portlet/trunk/portlet/build.xml modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java modules/portlet/trunk/test/build.xml Log: - fix minor bug in AbstractConsumerPersistenceManagerService that was making consumer invoker test failing - set emptySessionPath=true for the tomcat test in order to make the session test pass Modified: modules/portlet/trunk/portlet/build.xml =================================================================== --- modules/portlet/trunk/portlet/build.xml 2007-09-15 20:31:45 UTC (rev 8290) +++ modules/portlet/trunk/portlet/build.xml 2007-09-15 21:23:00 UTC (rev 8291) @@ -355,7 +355,7 @@ <x-sysproperty>  </x-sysproperty> <x-classpath> Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java 2007-09-15 20:31:45 UTC (rev 8290) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java 2007-09-15 21:23:00 UTC (rev 8291) @@ -72,7 +72,7 @@ { throw new IllegalArgumentException(); } - if (get(stateId) != null) + if (get(stateId) == null) { throw new NoSuchStateException(stateId); } Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-09-15 20:31:45 UTC (rev 8290) +++ modules/portlet/trunk/test/build.xml 2007-09-15 21:23:00 UTC (rev 8291) @@ -326,6 +326,7 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> + <property name="cargo.tomcat.connector.emptySessionPath" value="true"/> <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> <deployable type="war" file="${build.lib}/tomcat-6.0/portlet-test.war"/> </configuration>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8290 - modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 16:31:45 -0400 (Sat, 15 Sep 2007) New Revision: 8290 Removed: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/ Log: remove empty dirs

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8289 - modules/web/trunk/testsuite.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 10:08:42 -0400 (Sat, 15 Sep 2007) New Revision: 8289 Modified: modules/web/trunk/testsuite/build.xml Log: make web module test suite clean work Modified: modules/web/trunk/testsuite/build.xml =================================================================== --- modules/web/trunk/testsuite/build.xml 2007-09-15 14:06:19 UTC (rev 8288) +++ modules/web/trunk/testsuite/build.xml 2007-09-15 14:08:42 UTC (rev 8289) @@ -122,8 +122,8 @@ <target name="clean">  <delete> - <fileset dir="../test" includes="*.log"/> - <fileset dir="../test" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> + <fileset dir="../web" includes="*.log"/> + <fileset dir="../web" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> </delete>  <delete includeEmptyDirs="true" quiet="true">

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8288 - in modules/portlet/trunk: portlet and 5 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 10:06:19 -0400 (Sat, 15 Sep 2007) New Revision: 8288 Modified: modules/portlet/trunk/jboss-portal-portlet.iws modules/portlet/trunk/portlet/build.xml modules/portlet/trunk/test/build.xml modules/portlet/trunk/test/src/resources/test/servers.xml modules/portlet/trunk/testsuite/build.xml modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent modules/portlet/trunk/tools/lib/explode.jar Log: make the portlet container test suite work Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-15 14:06:19 UTC (rev 8288) @@ -17,10 +17,11 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="DELETED" beforePath="$PROJECT_DIR$/tools/lib/cargo-core-uberjar-0.8.jar" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/lib/explode.jar" afterPath="$PROJECT_DIR$/tools/lib/explode.jar" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/build.xml" afterPath="$PROJECT_DIR$/testsuite/build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/build.xml" afterPath="$PROJECT_DIR$/portlet/build.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/test/servers.xml" afterPath="$PROJECT_DIR$/test/src/resources/test/servers.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" /> </list> </component> @@ -799,23 +800,50 @@ <component name="FileEditorManager"> <leaf> <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="622" column="0" selection-start="34293" selection-end="34293" vertical-scroll-proportion="0.76942044"> + <state line="109" column="47" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.76325524"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="366" column="0" selection-start="18512" selection-end="18512" vertical-scroll-proportion="0.76325524"> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="servers.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="24" column="25" selection-start="762" selection-end="762" vertical-scroll-proportion="0.35511714"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="buildmagic.ent" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <provider selected="true" editor-type-id="text-editor"> + <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/test/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="620" column="39" selection-start="35681" selection-end="35681" vertical-scroll-proportion="0.2219482"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -904,10 +932,6 @@ <option name="myItemId" value="jboss-portal-portlet.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -915,13 +939,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tools" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -929,17 +949,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tools" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -947,34 +963,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc/buildfragments" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> @@ -1058,16 +1046,28 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF" /> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1077,33 +1077,47 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="test" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2" /> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1111,15 +1125,15 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="test" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1466,20 +1480,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="105" column="0" selection-start="5717" selection-end="5783" vertical-scroll-proportion="0.9321825"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="48" column="0" selection-start="2701" selection-end="2701" vertical-scroll-proportion="0.21331689"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/tools/etc/buildmagic/aliases.ent"> <provider selected="true" editor-type-id="text-editor"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> @@ -1517,13 +1517,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> - <provider selected="true" editor-type-id="text-editor"> - <state line="887" column="20" selection-start="32706" selection-end="32706" vertical-scroll-proportion="0.4522613"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java"> <provider selected="true" editor-type-id="text-editor"> <state line="47" column="13" selection-start="2776" selection-end="2776" vertical-scroll-proportion="0.16582915"> @@ -1545,20 +1538,41 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/test/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="620" column="39" selection-start="35681" selection-end="35681" vertical-scroll-proportion="0.2219482"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <provider selected="true" editor-type-id="text-editor"> + <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="24" column="25" selection-start="762" selection-end="762" vertical-scroll-proportion="0.35511714"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="622" column="0" selection-start="34293" selection-end="34293" vertical-scroll-proportion="0.76942044"> + <state line="366" column="0" selection-start="18512" selection-end="18512" vertical-scroll-proportion="0.76325524"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="109" column="47" selection-start="4897" selection-end="4897" vertical-scroll-proportion="0.76325524"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: modules/portlet/trunk/portlet/build.xml =================================================================== --- modules/portlet/trunk/portlet/build.xml 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/portlet/build.xml 2007-09-15 14:06:19 UTC (rev 8288) @@ -342,7 +342,6 @@ <target name="test-framework" depends="init"> <execute-tests> <x-test> - <test todir="${test.reports}" name="org.jboss.portal.test.portlet.deployment.UnmarshallerTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.LocalStoreProducerStatefulPortletInvokerTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.RemoteStoreProducerStatefulPortletInvokerTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.LocalStoreConsumerStatefulPortletInvokerTestCase"/> @@ -355,10 +354,6 @@ </x-test> <x-sysproperty>  - @@ -369,7 +364,6 @@ <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="apache.xerces.classpath"/> - <path refid="jbossas/core.libs.classpath"/> <pathelement location="${source.java}"/> <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/test/build.xml 2007-09-15 14:06:19 UTC (rev 8288) @@ -350,7 +350,7 @@ <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteJBoss-4.2"/> + <param name="server.name" value="RemoteJBoss_4_2"/> </antcall> <antcall target="cargo.jboss.stop"> </antcall> @@ -363,7 +363,7 @@ <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteTomcat-6.0"/> + <param name="server.name" value="RemoteTomcat_6_0"/> </antcall> <antcall target="cargo.tomcat.stop"> </antcall> @@ -377,78 +377,78 @@  <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-dispatcher.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletinterface.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletrequests.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletresponses.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portletsession.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-portleturl.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-preferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-windowstates.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -456,92 +456,92 @@  <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-actionrequest.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-actionresponse.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portalcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletpreferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletsession.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portletsessionutil.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-portleturl.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-renderrequest.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-renderresponse.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-api-windowstate.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -549,71 +549,71 @@  <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-dispatcher.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-portletrequests.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-portletresponses.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-preferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-session.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-expiringcache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-neverexpiringcache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase"> + outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase,serverName=${server.name}"> <parameter name="archive" value="test-jsr168-ext-nocache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -622,8 +622,8 @@  <target name="tests" depends="init"> + <antcall target="internal-test-module"> + <param name="module" value="portlet"/> + </antcall> + <antcall target="internal-test-module"> + <param name="module" value="test"/> + </antcall> + <antcall target="internal-test-module"> + <param name="module" value="federation"/> + </antcall> <antcall target="reports"/> </target> @@ -122,12 +122,25 @@ </junitreport> </target> + <target name="internal-invoke-clean"> + <delete> + <fileset dir="../${module}" includes="*.log"/> + <fileset dir="../${module}" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> + </delete> + </target> + <target name="clean">  - <delete> - <fileset dir="../common" includes="*.log"/> - <fileset dir="../common" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> - </delete> + <antcall target="internal-invoke-clean"> + <param name="module" value="portlet"/> + </antcall> + <antcall target="internal-invoke-clean"> + <param name="module" value="test"/> + </antcall> + <antcall target="internal-invoke-clean"> + <param name="module" value="federation"/> + </antcall> +  <delete includeEmptyDirs="true" quiet="true"> <fileset dir="output"/> Modified: modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-15 13:30:20 UTC (rev 8287) +++ modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-15 14:06:19 UTC (rev 8288) @@ -1121,16 +1121,4 @@  <target name="_buildmagic:configure:deployment"> - <path id="portal.task.classpath"> - <pathelement location="${project.tools}/lib/ant.jar"/> - <pathelement location="${project.tools}/lib/explode.jar"/> - </path> - <taskdef - 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"/> </target> Modified: modules/portlet/trunk/tools/lib/explode.jar =================================================================== (Binary files differ)

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8287 - in modules/common/trunk: common and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 09:30:20 -0400 (Sat, 15 Sep 2007) New Revision: 8287 Modified: modules/common/trunk/build/ide/intellij/idea60/modules/common/common.iml modules/common/trunk/common/build.xml Log: update common module to produce a correct explode.jar which contains the junit ant tasks Modified: modules/common/trunk/build/ide/intellij/idea60/modules/common/common.iml =================================================================== --- modules/common/trunk/build/ide/intellij/idea60/modules/common/common.iml 2007-09-15 13:29:47 UTC (rev 8286) +++ modules/common/trunk/build/ide/intellij/idea60/modules/common/common.iml 2007-09-15 13:30:20 UTC (rev 8287) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="FacetManager"> <facet type="web" name="Web"> <configuration> @@ -216,6 +216,7 @@ </configuration> </facet> </component> + <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/../../../../../../common/output/idea50/classes" /> <exclude-output /> Modified: modules/common/trunk/common/build.xml =================================================================== --- modules/common/trunk/common/build.xml 2007-09-15 13:29:47 UTC (rev 8286) +++ modules/common/trunk/common/build.xml 2007-09-15 13:30:20 UTC (rev 8287) @@ -145,7 +145,8 @@  <jar jarfile="${build.lib}/explode.jar"> <fileset dir="${build.classes}"> - <include name="org/jboss/portal/common/ant/**/*"/> + <include name="org/jboss/portal/common/ant/**"/> + <include name="org/jboss/portal/common/junit/ant/**"/> </fileset> </jar> </target>

18 years, 10 months

1
0
0 / 0

JBoss Portal SVN: r8286 - in modules/web/trunk: tools/lib and 4 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-15 09:29:47 -0400 (Sat, 15 Sep 2007) New Revision: 8286 Modified: modules/web/trunk/testsuite/build.xml modules/web/trunk/tools/lib/explode.jar modules/web/trunk/web/build.xml modules/web/trunk/web/src/main/org/jboss/portal/test/web/spi/SPITestCase.java modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/client-beans.xml modules/web/trunk/web/src/resources/test/config/servers.xml Log: update web module to have the testsuite run and produce correct reports for several containers Modified: modules/web/trunk/testsuite/build.xml =================================================================== --- modules/web/trunk/testsuite/build.xml 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/testsuite/build.xml 2007-09-15 13:29:47 UTC (rev 8286) @@ -43,21 +43,13 @@ &defaults; &libraries; + - <taskdef - 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"/> - <target name="init"> <mkdir dir="${log.dir}"/> <mkdir dir="${reports.dir}"/> @@ -67,6 +59,7 @@ <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> </target> +  <target name="copy-logs"> <copy todir="${log.dir}"> @@ -110,6 +103,9 @@  <target name="tests" depends="init"> + <antcall target="internal-test-module"> + <param name="module" value="web"/> + </antcall> <antcall target="reports"/> </target> @@ -126,8 +122,8 @@ <target name="clean">  <delete> - <fileset dir="../common" includes="*.log"/> - <fileset dir="../common" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> + <fileset dir="../test" includes="*.log"/> + <fileset dir="../test" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> </delete>  <delete includeEmptyDirs="true" quiet="true"> Modified: modules/web/trunk/tools/lib/explode.jar =================================================================== (Binary files differ) Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/web/build.xml 2007-09-15 13:29:47 UTC (rev 8286) @@ -253,6 +253,12 @@ </target> <target name="cargo.jboss.start" depends="cargo.setup"> +  <cargo containerId="jboss42x" home="${jboss-4.2.home}" @@ -298,7 +304,6 @@ <path location="${apache.log4j.lib}/log4j.jar"/> <path location="${oswego.concurrent.lib}/concurrent.jar"/> <path location="${jboss.portal/modules/common.lib}/portal-common-lib.jar"/> - <path location="${jboss.portal/modules/test.lib}/portal-test-lib.jar"/> <path location="${sun.jaf.lib}/activation.jar"/> <path location="${junit.junit.lib}/junit.jar"/> <path location="${build.lib}/portal-web-lib.jar"/> @@ -330,7 +335,7 @@ <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteJBoss-4.2"/> + <param name="server.name" value="RemoteJBoss_4_2"/> </antcall> <antcall target="cargo.jboss.stop"> </antcall> @@ -343,7 +348,7 @@ <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteTomcat-6.0"/> + <param name="server.name" value="RemoteTomcat_6_0"/> </antcall> <antcall target="cargo.tomcat.stop"> </antcall> @@ -397,7 +402,11 @@ <execute-tests> <x-test> - <zest todir="${test.reports}" name="org.jboss.portal.test.web.spi.SPITestCase"> + <zest + todir="${test.reports}" + name="org.jboss.portal.test.web.spi.SPITestCase" + outfile="TEST-${server.name}.org.jboss.portal.test.web.spi.SPITestCase" + id="org.jboss.portal.test.web.spi.SPITestCase,serverName=${server.name}"> <parameter name="serverName" value="${server.name}"/> </zest> </x-test> @@ -434,4 +443,5 @@ </x-classpath> </execute-tests> </target> + </project> Modified: modules/web/trunk/web/src/main/org/jboss/portal/test/web/spi/SPITestCase.java =================================================================== --- modules/web/trunk/web/src/main/org/jboss/portal/test/web/spi/SPITestCase.java 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/web/src/main/org/jboss/portal/test/web/spi/SPITestCase.java 2007-09-15 13:29:47 UTC (rev 8286) @@ -52,6 +52,19 @@ /** . */ private JUnitAdapter adapter; + /** . */ + private SPITestConfig config; + + public SPITestConfig getConfig() + { + return config; + } + + public void setConfig(SPITestConfig config) + { + this.config = config; + } + public Deployer getDeployer() { return deployer; Modified: modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/client-beans.xml =================================================================== --- modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/client-beans.xml 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/web/src/resources/portal-web-test-jar/org/jboss/portal/test/web/spi/client-beans.xml 2007-09-15 13:29:47 UTC (rev 8286) @@ -83,6 +83,7 @@ <property name="deployer"><inject bean="Deployer"/></property> <property name="nodeManager"><inject bean="NodeManager"/></property> <property name="adapter"><inject bean="JUnitAdapter"/></property> + <property name="config"><inject bean="Config"/></property> </bean> </deployment> Modified: modules/web/trunk/web/src/resources/test/config/servers.xml =================================================================== --- modules/web/trunk/web/src/resources/test/config/servers.xml 2007-09-15 12:20:46 UTC (rev 8285) +++ modules/web/trunk/web/src/resources/test/config/servers.xml 2007-09-15 13:29:47 UTC (rev 8286) @@ -1,6 +1,6 @@ <servers> <server> - <server-name>RemoteTomcat-6.0</server-name> + <server-name>RemoteTomcat_6_0</server-name> <node> <node-id>default</node-id> <service> @@ -22,7 +22,7 @@ </node> </server> <server> - <server-name>RemoteJBoss-4.2</server-name> + <server-name>RemoteJBoss_4_2</server-name> <node> <node-id>default</node-id> <service>

18 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits September 2007