April 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r10658 - in modules/web/trunk: web and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-20 18:55:30 -0400 (Sun, 20 Apr 2008) New Revision: 10658 Modified: modules/web/trunk/build/pom.xml modules/web/trunk/web/pom.xml modules/web/trunk/web/src/test/build.xml Log: update web module to MC 2.0.0.Beta13 Modified: modules/web/trunk/build/pom.xml =================================================================== --- modules/web/trunk/build/pom.xml 2008-04-20 22:54:17 UTC (rev 10657) +++ modules/web/trunk/build/pom.xml 2008-04-20 22:55:30 UTC (rev 10658) @@ -28,14 +28,15 @@ <version.concurrent>1.3.4</version.concurrent> <version.sun.servlet>2.4</version.sun.servlet> <version.apache.tomcat>5.5.12</version.apache.tomcat> - <version.jboss-logging>2.0.3.GA</version.jboss-logging> + <version.apache.log4j>1.2.14</version.apache.log4j> + <version.jboss-logging>2.0.4.GA</version.jboss-logging> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common> <version.jboss.unit>1.2.0.Beta2</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> - <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer> + <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer> <version.cargo>0.9-portal</version.cargo> <version.junit>3.8.1</version.junit> <version.ant>1.7.0</version.ant> @@ -90,6 +91,11 @@ <version>${version.jboss.portal.common}</version> </dependency> <dependency> + <groupId>org.jboss.portal.common</groupId> + <artifactId>common-mc</artifactId> + <version>${version.jboss.portal.common}</version> + </dependency> + <dependency> <groupId>sun-servlet</groupId> <artifactId>servlet-api</artifactId> <version>${version.sun.servlet}</version> @@ -99,18 +105,13 @@ <artifactId>catalina</artifactId> <version>${version.apache.tomcat}</version> </dependency> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>${version.concurrent}</version> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <version>${version.apache.log4j}</version> </dependency> + <dependency> - <groupId>org.jboss.portal.common</groupId> - <artifactId>common-mc</artifactId> - <version>${version.jboss.portal.common}</version> - </dependency> - <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> <version>${version.jboss.unit}</version> @@ -140,102 +141,36 @@ <artifactId>portal-test-generic</artifactId> <version>${version.jboss.unit}</version> </dependency> + <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-jdk</artifactId> + <artifactId>jboss-common-logging-jdk</artifactId> <version>${version.jboss-logging}</version> </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-log4j</artifactId> + <artifactId>jboss-common-logging-log4j</artifactId> <version>${version.jboss-logging}</version> </dependency> + <dependency> <groupId>jboss</groupId> <artifactId>jboss-remoting</artifactId> <version>${version.jboss-remoting}</version> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - <version>${version.jboss.microcontainer}</version> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>${version.concurrent}</version> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-classloader</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-impl</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <version>${version.jboss.microcontainer}</version> </dependency> + <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-managed</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-metatype</artifactId> - <version>${version.jboss.microcontainer}</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${version.apache.commons-logging}</version> Modified: modules/web/trunk/web/pom.xml =================================================================== --- modules/web/trunk/web/pom.xml 2008-04-20 22:54:17 UTC (rev 10657) +++ modules/web/trunk/web/pom.xml 2008-04-20 22:55:30 UTC (rev 10658) @@ -36,6 +36,10 @@ <groupId>apache-tomcat</groupId> <artifactId>catalina</artifactId> </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency>  @@ -81,12 +85,12 @@ </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-jdk</artifactId> + <artifactId>jboss-common-logging-jdk</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>jboss</groupId> - <artifactId>jboss-logging-log4j</artifactId> + <artifactId>jboss-common-logging-log4j</artifactId> <scope>test</scope> </dependency> <dependency> @@ -95,85 +99,10 @@ </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-aop-mc-int</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-classloader</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-container</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-dependency</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-impl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-structure-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs-spi</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-managed</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-metatype</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>test</scope> @@ -230,56 +159,50 @@ <property name="runtime_classpath" refid="maven.runtime.classpath"/> <property name="test_classpath" refid="maven.test.classpath"/> <property name="plugin_classpath" refid="maven.plugin.classpath"/> - <property name="project.version" value="${project.version}"/> +  + <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/> + <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> + <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> + <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/> + <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> + <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> + +  + <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> + <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> + +  + <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> + <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> + <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> + <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> + <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> + <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> + +  <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/> <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/> - <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/> - <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/> - <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/> - <property name="dependency.jboss-vfs.jar" value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/> - <property name="dependency.jboss-aop-mc-int.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/> - <property name="dependency.jboss-classloader.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/> - <property name="dependency.jboss-container.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/> - <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> - <property name="dependency.jboss-deployers-client-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client-spi.jar.path}"/> - <property name="dependency.jboss-deployers-client.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client.jar.path}"/> - <property name="dependency.jboss-deployers-core-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core-spi.jar.path}"/> - <property name="dependency.jboss-deployers-core.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core.jar.path}"/> - <property name="dependency.jboss-deployers-impl.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-impl.jar.path}"/> - <property name="dependency.jboss-deployers-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-spi.jar.path}"/> - <property name="dependency.jboss-deployers-structure-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-structure-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs.jar.path}"/> + <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/> + <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/> + <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/> <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> - <property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> - <property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> - <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> - <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> + <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> + <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/> <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> + <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> + <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/> + <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/> <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/> - <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> - <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> - <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> - <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> - <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> - <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> - <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> - <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> - <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}"/> - <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> - <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> - <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/> - <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> - <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/> </ant> + </tasks> </configuration> <goals> Modified: modules/web/trunk/web/src/test/build.xml =================================================================== --- modules/web/trunk/web/src/test/build.xml 2008-04-20 22:54:17 UTC (rev 10657) +++ modules/web/trunk/web/src/test/build.xml 2008-04-20 22:55:30 UTC (rev 10658) @@ -122,109 +122,73 @@ <fileset dir="${target}/test-classes/support"/> </copy> - <path id="mc.concurrent"> - <pathelement path="${dependency.concurrent.jar}"/> - </path> - <path id="mc.trove"> - <pathelement path="${dependency.trove.jar}"/> - </path> - <path id="mc.xerces"> - <pathelement path="${dependency.xercesImpl.jar}"/> - <pathelement path="${dependency.resolver.jar}"/> - <pathelement path="${dependency.xml-apis.jar}"/> - </path> - <path id="mc.javassist"> - <pathelement path="${dependency.javassist.jar}"/> - </path> - <path id="mc.jboss_common_logging_spi"> + <path id="jboss-logging"> <pathelement path="${dependency.jboss-logging-spi.jar}"/> - </path> - <path id="mc.jboss_common_logging_jdk"> <pathelement path="${dependency.jboss-logging-jdk.jar}"/> - </path> - <path id="mc.jboss_common_logging_log4j"> <pathelement path="${dependency.jboss-logging-log4j.jar}"/> </path> - <path id="mc.jboss_common_core"> + + <path id="jboss-microcontainer"> + <pathelement path="${dependency.jboss-kernel.jar}"/> + <pathelement path="${dependency.jboss-dependency.jar}"/> + <pathelement path="${dependency.jboss-reflect.jar}"/> <pathelement path="${dependency.jboss-common-core.jar}"/> - </path> - <path id="mc.jboss_vfs"> - <pathelement path="${dependency.jboss-vfs.jar}"/> - </path> - <path id="mc.jboss_xb"> + <pathelement path="${dependency.jboss-mdr.jar}"/> + <pathelement path="${dependency.jaxb.jar}"/> <pathelement path="${dependency.jbossxb.jar}"/> </path> - <path id="mc.jboss_aop"> - <pathelement path="${dependency.jboss-aop.jar}"/> - </path> - <path id="mc.jboss_microcontainer"> - <pathelement path="${dependency.jboss-aop-mc-int.jar}"/> - <pathelement path="${dependency.jboss-classloader.jar}"/> - <pathelement path="${dependency.jboss-container.jar}"/> - <pathelement path="${dependency.jboss-dependency.jar}"/> - <pathelement path="${dependency.jboss-container-metadata.jar}"/> - <pathelement path="${dependency.jboss-container-metadata-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-core.jar}"/> - <pathelement path="${dependency.jboss-deployers-core-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-client.jar}"/> - <pathelement path="${dependency.jboss-deployers-client-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-impl.jar}"/> - <pathelement path="${dependency.jboss-deployers-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-structure-spi.jar}"/> - <pathelement path="${dependency.jboss-deployers-vfs.jar}"/> - <pathelement path="${dependency.jboss-deployers-vfs-spi.jar}"/> - <pathelement path="${dependency.jboss-managed.jar}"/> - <pathelement path="${dependency.jboss-metatype.jar}"/> - <pathelement path="${dependency.jboss-kernel.jar}"/> - </path> - <path id="mc.portal-common"> + + <path id="portal-common"> <pathelement path="${dependency.portal-common-mc.jar}"/> </path> - <path id="mc.jboss-unit"> + + <path id="portal-common-shared"> + <pathelement path="${dependency.portal-common-common.jar}"/> + </path> + + <path id="jboss-unit"> <pathelement path="${dependency.jboss-unit.jar}"/> <pathelement path="${dependency.jboss-unit-mc.jar}"/> <pathelement path="${dependency.jboss-unit-remote.jar}"/> <pathelement path="${dependency.portal-test-generic.jar}"/> <pathelement path="${dependency.portal-test.jar}"/> - </path> - <path id="mc.portal-test-generic"> - <pathelement path="${dependency.portal-test-generic.jar}"/> - </path> - <path id="mc.jboss-remoting"> <pathelement path="${dependency.jboss-remoting.jar}"/> </path> - <path id="mc.log4j"> - <pathelement path="${dependency.log4j.jar}"/> - </path> <path id="jboss-4.2"> - <path refid="mc.portal-common"/> - <path refid="mc.portal-test-generic"/> - <path refid="mc.trove"/> - <path refid="mc.javassist"/> - <path refid="mc.jboss_common_core"/> - <path refid="mc.jboss_vfs"/> - <path refid="mc.jboss_xb"/> - <path refid="mc.jboss_aop"/> - <path refid="mc.jboss_microcontainer"/> + <path refid="portal-common"/> + <path refid="jboss-microcontainer"/> </path> + <path id="jboss-4.2-shared"> + <path refid="portal-common-shared"/> + <path location="${dependency.jboss-unit.jar}"/> + <path location="${dependency.jboss-unit-remote.jar}"/> + <path location="${target}/web-web-${project.version}.jar"/> + </path> + <path id="tomcat-6.0"> - <path refid="mc.portal-common"/> - <path refid="mc.jboss-unit"/> - <path refid="mc.jboss-remoting"/> - <path refid="mc.log4j"/> - <path refid="mc.concurrent"/> - <path refid="mc.trove"/> - <path refid="mc.xerces"/> - <path refid="mc.javassist"/> - <path refid="mc.jboss_common_core"/> - <path refid="mc.jboss_vfs"/> - <path refid="mc.jboss_xb"/> - <path refid="mc.jboss_aop"/> - <path refid="mc.jboss_microcontainer"/> + <path refid="portal-common"/> + <path refid="jboss-unit"/> + <path refid="jboss-microcontainer"/> + <pathelement path="${dependency.log4j.jar}"/> + <pathelement path="${dependency.javassist.jar}"/> + <pathelement path="${dependency.xercesImpl.jar}"/> + <pathelement path="${dependency.resolver.jar}"/> + <pathelement path="${dependency.xml-apis.jar}"/> + <pathelement path="${dependency.trove.jar}"/> + <pathelement path="${dependency.concurrent.jar}"/> </path> + <path id="tomcat-6.0-shared"> + <path refid="jboss-logging"/> + <path refid="portal-common-shared"/> + <path location="${dependency.log4j.jar}"/> + <path location="${dependency.activation.jar}"/> + <path location="${dependency.junit.jar}"/> + <path location="${target}/web-web-${project.version}.jar"/> + </path> +  <mkdir dir="${test.temp.lib}"/> @@ -418,7 +382,6 @@ org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84) --> - <cargo containerId="jboss42x" home="${test.jboss-4.2.home}" @@ -428,10 +391,7 @@ wait="${cargo.wait}"> <sharedClasspath> - <path location="${dependency.portal-common.jar}"/> - <path location="${dependency.jboss-unit.jar}"/> - <path location="${dependency.jboss-unit-remote.jar}"/> - <path location="${target}/web-web-${project.version}.jar"/> + <path refid="jboss-4.2-shared"/> </sharedClasspath> <configuration> @@ -509,7 +469,7 @@ </antcall> </target> - <target name="tests.jboss-4.2" if="biltobilto"> + <target name="tests.jboss-4.2">  @@ -555,18 +515,8 @@ wait="${cargo.wait}"> <sharedClasspath> - <path refid="mc.jboss_common_logging_spi"/> - <path refid="mc.jboss_common_logging_jdk"/> - <path refid="mc.jboss_common_logging_log4j"/> + <path refid="tomcat-6.0-shared"/> - <path location="${dependency.log4j.jar}"/> - <path location="${dependency.concurrent.jar}"/> - <path location="${dependency.portal-common.jar}"/> - <path location="${dependency.activation.jar}"/> - <path location="${dependency.junit.jar}"/> - - <path location="${target}/web-web-${project.version}.jar"/> - </sharedClasspath> <configuration> <property name="cargo.servlet.port" value="8080"/>

18 years

1
0
0 / 0

JBoss Portal SVN: r10657 - in modules/common/trunk: mc and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-20 18:54:17 -0400 (Sun, 20 Apr 2008) New Revision: 10657 Modified: modules/common/trunk/build/pom.xml modules/common/trunk/mc/pom.xml modules/common/trunk/mc/src/main/java/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java Log: update common module to use MC Beta13 + add validate(deployment) in WebBootstrap Modified: modules/common/trunk/build/pom.xml =================================================================== --- modules/common/trunk/build/pom.xml 2008-04-20 22:49:10 UTC (rev 10656) +++ modules/common/trunk/build/pom.xml 2008-04-20 22:54:17 UTC (rev 10657) @@ -20,7 +20,7 @@ <version.jboss-jmx>4.2.0.GA</version.jboss-jmx> <version.log4j>1.2.14</version.log4j> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> - <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer> + <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer> <version.cargo>0.8</version.cargo> <version.junit>3.8.1</version.junit> <version.ant>1.6.5</version.ant> Modified: modules/common/trunk/mc/pom.xml =================================================================== --- modules/common/trunk/mc/pom.xml 2008-04-20 22:49:10 UTC (rev 10656) +++ modules/common/trunk/mc/pom.xml 2008-04-20 22:54:17 UTC (rev 10657) @@ -30,11 +30,4 @@ </dependencies> - <build> - - </build> - - - <properties/> - </project> Modified: modules/common/trunk/mc/src/main/java/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java =================================================================== --- modules/common/trunk/mc/src/main/java/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java 2008-04-20 22:49:10 UTC (rev 10656) +++ modules/common/trunk/mc/src/main/java/org/jboss/portal/common/mc/bootstrap/WebBootstrap.java 2008-04-20 22:54:17 UTC (rev 10657) @@ -183,6 +183,7 @@ { log.debug("About to deploy beans url=" + url); deployment = deployer.deploy(url); + deployer.validate(deployment); } else {

18 years

1
0
0 / 0

JBoss Portal SVN: r10656 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-04-20 18:49:10 -0400 (Sun, 20 Apr 2008) New Revision: 10656 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml Log: 6.3.3. Log in to Dashboard changing one tiny bit around... Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-20 20:54:58 UTC (rev 10655) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-20 22:49:10 UTC (rev 10656) @@ -1649,7 +1649,7 @@ <sect2 id="descriptor_debug"> <title>Portlet Debugging (<filename>jboss-portal.sar/conf/config.xml</filename>)</title> <para> - By default, JBoss Portal is configured to display all errors; however, this behavior can be fine-tuned by modifying the <filename>jboss-portal.sar/conf/config.xml</filename> file: + By default, JBoss Portal is configured to display all errors. This behavior can be configured by modifying the <filename>jboss-portal.sar/conf/config.xml</filename> file: </para> <para> <screen><![CDATA[ @@ -1673,7 +1673,7 @@ <title>Log in to Dashboard</title> <para> By default, when a user logs in, they are forwarded to the default page of the default portal. In order to - forward a user to their Dashboard, in the <filename>jboss-portal.sar/conf/config.xml</filename> file, set the <computeroutput>core.login.namespace</computeroutput> value to <computeroutput>dashboard</computeroutput>: + forward a user to their Dashboard, set the <computeroutput>core.login.namespace</computeroutput> value to <computeroutput>dashboard</computeroutput> in the <filename>jboss-portal.sar/conf/config.xml</filename> file: </para> <para> <screen><![CDATA[

18 years

1
0
0 / 0

JBoss Portal SVN: r10655 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-20 16:54:58 -0400 (Sun, 20 Apr 2008) New Revision: 10655 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferenceInfo.java Log: make getDefaultValue() available on PreferenceInfo and explain that it may sometime not be available Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferenceInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferenceInfo.java 2008-04-19 21:08:12 UTC (rev 10654) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferenceInfo.java 2008-04-20 20:54:58 UTC (rev 10655) @@ -24,6 +24,8 @@ import org.jboss.portal.common.i18n.LocalizedString; +import java.util.List; + /** * Describes a Portlet preference. * @@ -64,9 +66,9 @@ Boolean isReadOnly(); /** - * Return the default value or null if it cannot be determined. + * Return the default value or null if it cannot be determined (for instance WSRP v1 does not define it). * * @return the default value */ -// Value getDefaultValue(); + List<String> getDefaultValue(); }

18 years

1
0
0 / 0

JBoss Portal SVN: r10654 - modules/portlet/trunk/test.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-19 17:08:12 -0400 (Sat, 19 Apr 2008) New Revision: 10654 Modified: modules/portlet/trunk/test/pom.xml Log: more readable Modified: modules/portlet/trunk/test/pom.xml =================================================================== --- modules/portlet/trunk/test/pom.xml 2008-04-19 14:51:15 UTC (rev 10653) +++ modules/portlet/trunk/test/pom.xml 2008-04-19 21:08:12 UTC (rev 10654) @@ -258,112 +258,65 @@ <property name="project.version" value="${project.version}"/> - <property name="dependency.concurrent.jar" - value="${maven.dependency.concurrent.concurrent.jar.path}"/> + <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/> <property name="dependency.trove.jar" value="${maven.dependency.trove.trove.jar.path}"/> - <property name="dependency.jboss-logging-spi.jar" - value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/> - <property name="dependency.jboss-logging-jdk.jar" - value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/> - <property name="dependency.jboss-logging-log4j.jar" - value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/> - <property name="dependency.jboss-vfs.jar" - value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/> - <property name="dependency.jboss-aop-mc-int.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/> - <property name="dependency.jboss-classloader.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/> - <property name="dependency.jboss-container.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/> - <property name="dependency.jboss-dependency.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> - <property name="dependency.jboss-deployers-client-spi.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client-spi.jar.path}"/> - <property name="dependency.jboss-deployers-client.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client.jar.path}"/> - <property name="dependency.jboss-deployers-core-spi.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core-spi.jar.path}"/> - <property name="dependency.jboss-deployers-core.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core.jar.path}"/> - <property name="dependency.jboss-deployers-impl.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-impl.jar.path}"/> - <property name="dependency.jboss-deployers-spi.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-spi.jar.path}"/> - <property name="dependency.jboss-deployers-structure-spi.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-structure-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs-spi.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs-spi.jar.path}"/> - <property name="dependency.jboss-deployers-vfs.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs.jar.path}"/> - <property name="dependency.jboss-kernel.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> - <property name="dependency.jboss-managed.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> - <property name="dependency.jboss-metatype.jar" - value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> - <property name="dependency.jboss-aop.jar" - value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> - <property name="dependency.pluggable-instrumentor.jar" - value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/> - <property name="dependency.javassist.jar" - value="${maven.dependency.org.jboss.javassist.jar.path}"/> - <property name="dependency.jboss-common-core.jar" - value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> - <property name="dependency.resolver.jar" - value="${maven.dependency.apache-xerces.resolver.jar.path}"/> - <property name="dependency.xercesImpl.jar" - value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> - <property name="dependency.xml-apis.jar" - value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> + <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/> + <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/> + <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/> + <property name="dependency.jboss-vfs.jar" value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/> + <property name="dependency.jboss-aop-mc-int.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/> + <property name="dependency.jboss-classloader.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/> + <property name="dependency.jboss-container.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/> + <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> + <property name="dependency.jboss-deployers-client-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client-spi.jar.path}"/> + <property name="dependency.jboss-deployers-client.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-client.jar.path}"/> + <property name="dependency.jboss-deployers-core-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core-spi.jar.path}"/> + <property name="dependency.jboss-deployers-core.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-core.jar.path}"/> + <property name="dependency.jboss-deployers-impl.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-impl.jar.path}"/> + <property name="dependency.jboss-deployers-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-spi.jar.path}"/> + <property name="dependency.jboss-deployers-structure-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-structure-spi.jar.path}"/> + <property name="dependency.jboss-deployers-vfs-spi.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs-spi.jar.path}"/> + <property name="dependency.jboss-deployers-vfs.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-deployers-vfs.jar.path}"/> + <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/> + <property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> + <property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> + <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> + <property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/> + <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> + <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> + <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/> + <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> + <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/> - <property name="dependency.jboss-remoting.jar" - value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> - <property name="dependency.portal-common.jar" - value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> - <property name="dependency.portal-common-portal.jar" - value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/> - <property name="dependency.portal-common-mc.jar" - value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> - <property name="dependency.jboss-unit.jar" - value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> - <property name="dependency.jboss-unit-mc.jar" - value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> - <property name="dependency.jboss-unit-remote.jar" - value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> - <property name="dependency.portal-test.jar" - value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> - <property name="dependency.portal-test-generic.jar" - value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> + <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> + <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> + <property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/> + <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/> + <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> + <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> + <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> + <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> + <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> <property name="dependency.log4j.jar" value="${maven.dependency.log4j.log4j.jar.path}"/> - <property name="dependency.commons-logging.jar" - value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> - <property name="dependency.commons-httpclient.jar" - value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> - <property name="dependency.activation.jar" - value="${maven.dependency.javax.activation.activation.jar.path}"/> + <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/> + <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/> + <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/> <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> - <property name="dependency.cargo-manager.war" - value="${maven.dependency.cargo.cargo-manager.war.path}"/> + <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/> <property name="dependency.portal-web.jar" value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/> -  <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/> <property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/> - <property name="dependency.portal-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/> <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/> <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-mc.jar.path}"/> <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/> - <property name="dependency.cargo-core-uberjar.jar" value="${maven.dependency.cargo.cargo-core-uberjar.jar.path}"/> <property name="dependency.cargo-ant.jar" value="${maven.dependency.cargo.cargo-ant.jar.path}"/> - <property name="dependency.jaxb-api.jar" - value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> + <property name="dependency.jaxb-api.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>  - <property name="dependency.apache-jstl.jar" - value="${maven.dependency.apache-taglibs.jstl.jar.path}"/> - <property name="dependency.apache-standard.jar" - value="${maven.dependency.apache-taglibs.standard.jar.path}"/> + <property name="dependency.apache-jstl.jar" value="${maven.dependency.apache-taglibs.jstl.jar.path}"/> + <property name="dependency.apache-standard.jar" value="${maven.dependency.apache-taglibs.standard.jar.path}"/> <ant antfile="${basedir}/src/test/build.xml"> <target name="tests"/>

18 years

1
0
0 / 0

JBoss Portal SVN: r10653 - in modules/portlet/trunk/portlet/src: test/java/org/jboss/portal/test/portlet/jsr286/tck/event and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-19 10:51:15 -0400 (Sat, 19 Apr 2008) New Revision: 10653 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/NonDeclaredEventPublicationDuringActionTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/NonDeclaredEventPublicationDuringEventTestCase.java Log: - fix a bug when the publication of a non declared event with a payload was throwing an NPE - complete the NonDeclaredEventPublicationDuring*TestCase to publish an event with a payload Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-04-19 14:21:09 UTC (rev 10652) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2008-04-19 14:51:15 UTC (rev 10653) @@ -290,20 +290,24 @@ } } - // - // Check type ContainerEventInfo eventInfo = preq.container.getInfo().getEventing().getProducedEvents().get(name); - ContainerTypeInfo typeInfo = eventInfo.getType(); - if (typeInfo != null) + + // If we have event info it means we need to check the type validity otherwise it is a non declared event + // and it is up to the controller to manage the payload. + if (eventInfo != null) { - Class expectedType = typeInfo.getType(); + ContainerTypeInfo typeInfo = eventInfo.getType(); + if (typeInfo != null) + { + Class expectedType = typeInfo.getType(); - // - if (!expectedType.isInstance(value)) - { - throw new IllegalArgumentException("The provided event value type " + valueType.getName() + - " does not match the declared event type " + expectedType.getName()); + // + if (!expectedType.isInstance(value)) + { + throw new IllegalArgumentException("The provided event value type " + valueType.getName() + + " does not match the declared event type " + expectedType.getName()); + } } } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/NonDeclaredEventPublicationDuringActionTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/NonDeclaredEventPublicationDuringActionTestCase.java 2008-04-19 14:21:09 UTC (rev 10652) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/NonDeclaredEventPublicationDuringActionTestCase.java 2008-04-19 14:51:15 UTC (rev 10653) @@ -66,7 +66,7 @@ { protected void run(Portlet portlet, ActionRequest request, ActionResponse response, PortletTestContext context) throws PortletException, IOException { - // We just test that we can publish it + // We test that we can publish it try { response.setEvent("SomeNonDeclaredString", null); @@ -75,6 +75,16 @@ { fail(e); } + + // We test that we can publish it with a payload + try + { + response.setEvent("SomeNonDeclaredString", "Payload"); + } + catch (IllegalArgumentException e) + { + fail(e); + } } }); seq.bindAction(1, UTP7.EVENT_JOIN_POINT, new PortletEventTestAction() Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/NonDeclaredEventPublicationDuringEventTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/NonDeclaredEventPublicationDuringEventTestCase.java 2008-04-19 14:21:09 UTC (rev 10652) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/event/NonDeclaredEventPublicationDuringEventTestCase.java 2008-04-19 14:51:15 UTC (rev 10653) @@ -75,7 +75,7 @@ { protected void run(Portlet portlet, EventRequest request, EventResponse response, PortletTestContext context) throws PortletException, IOException { - // We just test that we can publish it + // We test that we can publish it try { response.setEvent("SomeNonDeclaredString", null); @@ -84,6 +84,16 @@ { fail(e); } + + // We test that we can publish it with a payload + try + { + response.setEvent("SomeNonDeclaredString", "Payload"); + } + catch (IllegalArgumentException e) + { + fail(e); + } } }); seq.bindAction(1, UTP8.RENDER_JOIN_POINT, new PortletRenderTestAction()

18 years

1
0
0 / 0

JBoss Portal SVN: r10652 - in modules/portlet/trunk: controller/src/main/java/org/jboss/portal/portlet/controller/impl and 6 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-19 10:21:09 -0400 (Sat, 19 Apr 2008) New Revision: 10652 Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractRendererContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java Log: refactor portlet window rendition code into the portlet controller so it can be reused easily Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -24,11 +24,23 @@ package org.jboss.portal.portlet.controller; import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.invocation.RenderInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.request.PortletRequest; import org.jboss.portal.portlet.controller.request.PortletResourceRequest; import org.jboss.portal.portlet.controller.response.ControllerResponse; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; +import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import javax.servlet.http.Cookie; +import java.util.Map; +import java.util.List; + /** * <p>The portlet controller which handles the page state management and the interactions between the action phase and the * event phase. It really only does that and not more.</p> @@ -166,4 +178,61 @@ // return handler.handle(controllerContext, controllerRequest); } + + public PortletInvocationResponse render( + PortletControllerContext controllerContext, + List<Cookie> cookies, + PortletPageNavigationalState pageNavigationalState, + String windowId) throws PortletInvokerException + { + PortletWindowNavigationalState windowNS = null; + if (pageNavigationalState != null) + { + windowNS = pageNavigationalState.getPortletWindowNavigationalState(windowId); + } + + // + Map<String, String[]> publicNS = null; + if (pageNavigationalState != null) + { + publicNS = pageNavigationalState.getPortletPublicNavigationalState(windowId); + } + + // + Mode mode = Mode.VIEW; + WindowState windowState = WindowState.NORMAL; + StateString portletNS = null; + + // + if (windowNS != null) + { + if (windowNS.getMode() != null) + { + mode = windowNS.getMode(); + } + if (windowNS.getWindowState() != null) + { + windowState = windowNS.getWindowState(); + } + if (windowNS.getPortletNavigationalState() != null) + { + portletNS = windowNS.getPortletNavigationalState(); + } + } + + // + PortletInvocationContext renderContext = controllerContext.createPortletInvocationContext(windowId, pageNavigationalState); + + // + RenderInvocation render = new RenderInvocation(renderContext); + + // + render.setMode(mode); + render.setWindowState(windowState); + render.setNavigationalState(portletNS); + render.setPublicNavigationalState(publicNS); + + // + return controllerContext.invoke(cookies, render); + } } Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -30,6 +30,7 @@ import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; +import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.PortletInvocationContext; @@ -62,10 +63,12 @@ */ PortletInvocationContext createPortletInvocationContext(String windowId, PortletPageNavigationalState pageNavigationalState); - PortletInvocationResponse invoke( ActionInvocation actionInvocation) throws PortletInvokerException; + PortletInvocationResponse invoke(ActionInvocation actionInvocation) throws PortletInvokerException; PortletInvocationResponse invoke(List<Cookie> requestCookies, EventInvocation eventInvocation) throws PortletInvokerException; + PortletInvocationResponse invoke(List<Cookie> requestCookies, RenderInvocation renderInvocation) throws PortletInvokerException; + PortletInvocationResponse invoke(ResourceInvocation resourceInvocation) throws PortletInvokerException; EventControllerContext getEventControllerContext(); Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java =================================================================== --- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -43,6 +43,7 @@ import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; +import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.spi.PortalContext; @@ -168,6 +169,28 @@ return invoke(eventInvocation); } + public PortletInvocationResponse invoke(List<Cookie> requestCookies, RenderInvocation renderInvocation) throws PortletInvokerException + { + ControllerPortletInvocationContext context = (ControllerPortletInvocationContext)renderInvocation.getContext(); + + // + String windowId = context.getWindowId(); + Portlet portlet = getPortlet(windowId); + + // + renderInvocation.setClientContext(new AbstractClientContext(req, requestCookies)); + renderInvocation.setServerContext(new AbstractServerContext(req, resp)); + renderInvocation.setInstanceContext(new AbstractInstanceContext(portlet.getContext().getId())); + renderInvocation.setUserContext(new AbstractUserContext(req)); + renderInvocation.setWindowContext(new AbstractWindowContext(windowId)); + renderInvocation.setPortalContext(PORTAL_CONTEXT); + renderInvocation.setSecurityContext(new AbstractSecurityContext(req)); + renderInvocation.setTarget(portlet.getContext()); + + // + return invoke(renderInvocation); + } + public PortletInvocationResponse invoke(ResourceInvocation resourceInvocation) throws PortletInvokerException { ControllerPortletInvocationContext context = (ControllerPortletInvocationContext)resourceInvocation.getContext(); Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java =================================================================== --- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -36,6 +36,7 @@ import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.OpaqueStateString; @@ -117,6 +118,11 @@ return invoke(eventInvocation); } + public PortletInvocationResponse invoke(List<Cookie> requestCookies, RenderInvocation renderInvocation) throws PortletInvokerException + { + return invoke((PortletInvocation)renderInvocation); + } + public PortletInvocationResponse invoke(ResourceInvocation resourceInvocation) throws PortletInvokerException { return invoke((PortletInvocation)resourceInvocation); Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java =================================================================== --- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -22,30 +22,22 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp; -import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; +import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.impl.spi.AbstractClientContext; -import org.jboss.portal.portlet.impl.spi.AbstractServerContext; -import org.jboss.portal.portlet.impl.spi.AbstractUserContext; -import org.jboss.portal.portlet.impl.spi.AbstractWindowContext; -import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; -import org.jboss.portal.portlet.impl.spi.AbstractInstanceContext; -import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.Cookie; import javax.xml.namespace.QName; import java.util.Map; import java.util.HashMap; import java.util.Set; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -125,61 +117,9 @@ return portletControllerContext; } - private PortletInvocationResponse render(Portlet portlet, String windowId) throws PortletInvokerException + private PortletInvocationResponse render(List<Cookie> cookies, String windowId) throws PortletInvokerException { - PortletWindowNavigationalState windowNS = null; - if (pageNavigationalState != null) - { - windowNS = pageNavigationalState.getPortletWindowNavigationalState(windowId); - } - - // - Map<String, String[]> publicNS = null; - if (pageNavigationalState != null) - { - publicNS = pageNavigationalState.getPortletPublicNavigationalState(windowId); - } - - // - Mode mode = Mode.VIEW; - WindowState windowState = WindowState.NORMAL; - StateString portletNS = null; - - // - if (windowNS != null) - { - if (windowNS.getMode() != null) - { - mode = windowNS.getMode(); - } - if (windowNS.getWindowState() != null) - { - windowState = windowNS.getWindowState(); - } - if (windowNS.getPortletNavigationalState() != null) - { - portletNS = windowNS.getPortletNavigationalState(); - } - } - - // - PortletInvocationContext renderContext = portletControllerContext.createPortletInvocationContext(windowId, pageNavigationalState); - RenderInvocation render = new RenderInvocation(renderContext); - render.setClientContext(new AbstractClientContext(portletControllerContext.getClientRequest())); - render.setServerContext(new AbstractServerContext(portletControllerContext.getClientRequest(), portletControllerContext.getClientResponse())); - render.setInstanceContext(new AbstractInstanceContext(portlet.getContext().getId())); - render.setUserContext(new AbstractUserContext(portletControllerContext.getClientRequest())); - render.setWindowContext(new AbstractWindowContext(windowId)); - render.setPortalContext(AbstractPortletControllerContext.PORTAL_CONTEXT); - render.setSecurityContext(new AbstractSecurityContext(portletControllerContext.getClientRequest())); - render.setTarget(portlet.getContext()); - render.setMode(mode); - render.setWindowState(windowState); - render.setNavigationalState(portletNS); - render.setPublicNavigationalState(publicNS); - - // - return portletControllerContext.invoke(render); + return new PortletController().render(portletControllerContext, cookies, pageNavigationalState, windowId); } private void render(PortalPrepareResponse prepareResponse) @@ -196,7 +136,7 @@ // if (portlet != null) { - PortletInvocationResponse portletResponse = render(portlet, windowId); + PortletInvocationResponse portletResponse = render(null, windowId); // WindowResult result = new WindowResult(windowDef, portletResponse); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -63,37 +63,45 @@ MultiValuedPropertyMap<String> headers = new SimpleMultiValuedPropertyMap<String>(); for (Enumeration<String> e = request.getHeaderNames();e.hasMoreElements();) { - String headerName = (String)e.nextElement(); + String headerName = e.nextElement(); for (Enumeration<String> f = request.getHeaders(headerName);f.hasMoreElements();) { - String headerValue = (String)f.nextElement(); + String headerValue = f.nextElement(); headers.addValue(headerName, headerValue); } } // + Cookie[] requestCookies = request.getCookies(); + + // + int length = (requestCookies == null ? 0 : requestCookies.length) + (additionalCookies == null ? 0 : additionalCookies.size()); List<Cookie> cookies; - Cookie[] tmp = request.getCookies(); - if (tmp == null || tmp.length == 0) + if (length == 0) { cookies = Collections.emptyList(); } else { - cookies = new ArrayList<Cookie>(tmp.length); - for (Cookie cookie : tmp) + cookies = new ArrayList<Cookie>(length); + if (requestCookies != null) { - Cookie copy = (Cookie)cookie.clone(); - cookies.add(copy); + for (Cookie cookie : requestCookies) + { + Cookie copy = (Cookie)cookie.clone(); + cookies.add(copy); + } } + if (additionalCookies != null) + { + for (Cookie cookie : additionalCookies) + { + Cookie copy = (Cookie)cookie.clone(); + cookies.add(copy); + } + } } - for (Cookie cookie : additionalCookies) - { - Cookie copy = (Cookie)cookie.clone(); - cookies.add(copy); - } - // this.headers = headers; this.method = request.getMethod(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractRendererContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractRendererContext.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractRendererContext.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -23,14 +23,16 @@ package org.jboss.portal.portlet.test.controller; import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.PortletController; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.Cookie; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -42,13 +44,9 @@ /** . */ private final AbstractPortletControllerContext portletControllerContext; - /** . */ - private final PortletInvoker portletInvoker; - - protected AbstractRendererContext(AbstractPortletControllerContext portletControllerContext, PortletInvoker portletInvoker) + protected AbstractRendererContext(AbstractPortletControllerContext portletControllerContext) { this.portletControllerContext = portletControllerContext; - this.portletInvoker = portletInvoker; } public HttpServletRequest getClientRequest() @@ -66,8 +64,8 @@ return portletControllerContext; } - public PortletInvocationResponse render(RenderInvocation render) throws PortletInvokerException + public PortletInvocationResponse render(List<Cookie> cookies, PortletPageNavigationalState pageNavigationalState, String windowId) throws PortletInvokerException { - return portletInvoker.invoke(render); + return new PortletController().render(portletControllerContext, cookies, pageNavigationalState, windowId); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -23,38 +23,23 @@ package org.jboss.portal.portlet.test.controller; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.common.xml.XMLTools; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.impl.spi.AbstractClientContext; -import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; -import org.jboss.portal.portlet.impl.spi.AbstractServerContext; -import org.jboss.portal.portlet.impl.spi.AbstractUserContext; -import org.jboss.portal.portlet.impl.spi.AbstractWindowContext; -import org.jboss.portal.portlet.impl.spi.AbstractInstanceContext; -import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; -import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; import org.w3c.dom.Element; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -143,40 +128,11 @@ for (Portlet portlet : portlets) { - PortletWindowNavigationalState windowNS = pageNavigationalState.getPortletWindowNavigationalState(portlet.getContext().getId()); - - // - Mode mode = Mode.VIEW; - WindowState windowState = WindowState.NORMAL; - StateString portletNS = null; - - // - if (windowNS != null) - { - if (windowNS.getMode() != null) - { - mode = windowNS.getMode(); - } - if (windowNS.getWindowState() != null) - { - windowState = windowNS.getWindowState(); - } - if (windowNS.getPortletNavigationalState() != null) - { - portletNS = windowNS.getPortletNavigationalState(); - } - } - - // - Map<String, String[]> publicNS = pageNavigationalState.getPortletPublicNavigationalState(portlet.getContext().getId()); - - RenderInvocation render = createRenderInvocation(context, properties, pageNavigationalState, portlet, windowNS, mode, windowState, portletNS, publicNS); - - // try { - PortletInvocationResponse response = context.render(render); + PortletInvocationResponse response = context.render(properties.getCookies(), pageNavigationalState, portlet.getContext().getId()); + // if (response instanceof ContentResponse) { ContentResponse fragment = (ContentResponse)response; @@ -206,38 +162,4 @@ // Now we combine the render properties with the page properties properties.append(renderProperties); } - - protected RenderInvocation createRenderInvocation( - RendererContext context, - ResponseProperties pageProperties, - PortletPageNavigationalState pageNS, - Portlet portlet, - PortletWindowNavigationalState windowNS, - Mode mode, - WindowState windowState, - StateString portletNS, - Map<String, String[]> publicNS) - { - HttpServletRequest req = context.getClientRequest(); - HttpServletResponse resp = context.getClientResponse(); - - // - PortletInvocationContext renderContext = context.getPortletControllerContext().createPortletInvocationContext(portlet.getContext().getId(), pageNS); - - // - RenderInvocation render = new RenderInvocation(renderContext); - render.setClientContext(new AbstractClientContext(req, pageProperties.getCookies())); - render.setServerContext(new AbstractServerContext(req, resp)); - render.setInstanceContext(new AbstractInstanceContext(portlet.getContext().getId())); - render.setUserContext(new AbstractUserContext(req)); - render.setWindowContext(new AbstractWindowContext(portlet.getContext().getId())); - render.setPortalContext(AbstractPortletControllerContext.PORTAL_CONTEXT); - render.setSecurityContext(new AbstractSecurityContext(req)); - render.setTarget(portlet.getContext()); - render.setMode(mode); - render.setWindowState(windowState); - render.setNavigationalState(portletNS); - render.setPublicNavigationalState(publicNS); - return render; - } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContext.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContext.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -23,6 +23,7 @@ package org.jboss.portal.portlet.test.controller; import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; @@ -30,7 +31,9 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.Cookie; import java.util.Collection; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -47,6 +50,6 @@ Collection<Portlet> getPortlets(); - PortletInvocationResponse render(RenderInvocation render) throws PortletInvokerException; + PortletInvocationResponse render(List<Cookie> cookies, PortletPageNavigationalState pageNavigationalState, String windowId) throws PortletInvokerException; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContextImpl.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContextImpl.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContextImpl.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -39,7 +39,7 @@ public RendererContextImpl(PortletControllerContextImpl portletControllerContext) throws PortletInvokerException { - super(portletControllerContext, portletControllerContext.getPortletInvoker()); + super(portletControllerContext); // this.portlets = portletControllerContext.getPortlets(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -44,7 +44,7 @@ TCKPortletControllerContext portletControllerContext, TCKPortletPageNavigationalState tckPageNavigationalState) throws PortletInvokerException { - super(portletControllerContext, portletControllerContext.getPortletInvoker()); + super(portletControllerContext); // Collection<Portlet> involvedPortlets = new ArrayList<Portlet>(); Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java =================================================================== --- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java 2008-04-19 02:00:15 UTC (rev 10651) +++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java 2008-04-19 14:21:09 UTC (rev 10652) @@ -37,6 +37,7 @@ import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; +import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.io.IOTools; @@ -147,6 +148,11 @@ throw new NotYetImplemented(); } + public PortletInvocationResponse invoke(List<Cookie> requestCookies, RenderInvocation renderInvocation) throws PortletInvokerException + { + throw new NotYetImplemented(); + } + public EventControllerContext getEventControllerContext() { throw new NotYetImplemented();

18 years

1
0
0 / 0

JBoss Portal SVN: r10651 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-04-18 22:00:15 -0400 (Fri, 18 Apr 2008) New Revision: 10651 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml Log: 6.3.2. Portlet Debugging (jboss-portal.sar/conf/config.xml) 6.3.3. Log in to Dashboard - minor revisions, small additions... Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-19 00:41:34 UTC (rev 10650) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-19 02:00:15 UTC (rev 10651) @@ -1666,18 +1666,21 @@ </screen> </para> <para> - For these parameters, accepted values are <computeroutput>show</computeroutput> and <computeroutput>hide</computeroutput>. Depending on the setting, and the actual error, either an error message is displayed, or a full stack trace within the portlet window occurs. Additionally, the <computeroutput>core.render.window_error</computeroutput> property only supports the <computeroutput>message_only</computeroutput> value. The <computeroutput>message_only</computeroutput> value will only display an error message, whereas the <computeroutput>show</computeroutput> value will, if available, display the full stack trace. + For these parameters, accepted values are <computeroutput>show</computeroutput> and <computeroutput>hide</computeroutput>. Depending on the setting, and the actual error, either an error message is displayed, or a full stack trace within the portlet window occurs. Additionally, the <computeroutput>core.render.window_error</computeroutput> property supports the <computeroutput>message_only</computeroutput> value. The <computeroutput>message_only</computeroutput> value will only display an error message, whereas the <computeroutput>show</computeroutput> value will, if available, display the full stack trace. </para> </sect2> <sect2> - <title>Login to dashboard</title> + <title>Log in to Dashboard</title> <para> - By default, when a user logs in, she is forwarded to the default page of the default portal. In order to - forward her to her dashboard, it is possible to set in the file <emphasis>jboss-portal.sar/conf/config.xml</emphasis>: - <programlisting><![CDATA[ + By default, when a user logs in, they are forwarded to the default page of the default portal. In order to + forward a user to their Dashboard, in the <filename>jboss-portal.sar/conf/config.xml</filename> file, set the <computeroutput>core.login.namespace</computeroutput> value to <computeroutput>dashboard</computeroutput>: + </para> + <para> +<screen><![CDATA[ + <entry key="core.login.namespace">dashboard</entry> -]]></programlisting> +]]></screen> </para> </sect2> </sect1>

18 years

1
0
0 / 0

JBoss Portal SVN: r10650 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-04-18 20:41:34 -0400 (Fri, 18 Apr 2008) New Revision: 10650 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml Log: trying to fix all ./build|./run.sh to sh build and sh run Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-04-18 22:06:26 UTC (rev 10649) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-04-19 00:41:34 UTC (rev 10650) @@ -327,7 +327,7 @@ <para> Replace <replaceable>proxy-hostname</replaceable> with the proxy server's hostname, and <replaceable>proxy-port</replaceable> with the correct proxy server port number. </para> - <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, Microsoft Windows users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>./build.sh deploy</command> command. + <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, Microsoft Windows users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>sh build.sh deploy</command> command. </para> <para> At the end of the build process, the <filename>jboss-portal.sar</filename> file is copied into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory: @@ -343,7 +343,7 @@ <note> <title>Portal Modules</title> <para> - The previous steps install a bare version of JBoss Portal. In previous versions, several additional modules were deployed as well, but this has since been modularized to provide greater flexibility. To deploy additional modules, refer to the <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalModules">Portal's module list</ulink> for more information. To deploy all modules at once, change into the <filename>build</filename> directory. If you are running Linux, run the <command>./build.sh deploy-all</command> command. If you are running Microsoft Windows, run the <command>build.bat deploy-all</command> command. + The previous steps install a bare version of JBoss Portal. In previous versions, several additional modules were deployed as well, but this has since been modularized to provide greater flexibility. To deploy additional modules, refer to the <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalModules">Portal's module list</ulink> for more information. To deploy all modules at once, change into the <filename>build</filename> directory. If you are running Linux, run the <command>sh build.sh deploy-all</command> command. If you are running Microsoft Windows, run the <command>build.bat deploy-all</command> command. </para> </note> </para> @@ -358,7 +358,7 @@ </para> <para> <screen> -./build.sh main +sh build.sh main </screen> </para> </listitem> @@ -368,17 +368,17 @@ </para> <para> <screen> -./build.sh deploy-ha +sh build.sh deploy-ha </screen> </para> <para> - After the <command>./build.sh deploy-ha</command> command completes, the <filename>jboss-portal-ha.sar</filename> file is copied into the <filename>$JBOSS_HOME/server/all/deploy/</filename> directory. + After the <command>sh build.sh deploy-ha</command> command completes, the <filename>jboss-portal-ha.sar</filename> file is copied into the <filename>$JBOSS_HOME/server/all/deploy/</filename> directory. </para> </listitem> </orderedlist> </para> <para> - To build the clustered version on Microsoft Windows, repeat the previous steps, replacing <command>./build.sh</command> with <command>build.bat</command>. + To build the clustered version on Microsoft Windows, repeat the previous steps, replacing <command>sh build.sh</command> with <command>build.bat</command>. </para> </sect2> <sect2> Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-18 22:06:26 UTC (rev 10649) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-04-19 00:41:34 UTC (rev 10650) @@ -1587,7 +1587,7 @@ </listitem> <listitem> <para> - Change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory. To build the JBoss Portal source code on Linux, run the <command>./build.sh deploy</command> command, or, if you are running Microsoft Windows, run the <command>build.bat deploy</command> command. If this is the first build, third-party libraries are obtained from an online repository, so you must be connected to the Internet. After building, if the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/thirdparty/</filename> directory does not exist, it is created, and populated with the files required for later steps. For further details, refer to <xref linkend="building_deploying_from_source" />. + Change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory. To build the JBoss Portal source code on Linux, run the <command>sh build.sh deploy</command> command, or, if you are running Microsoft Windows, run the <command>build.bat deploy</command> command. If this is the first build, third-party libraries are obtained from an online repository, so you must be connected to the Internet. After building, if the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/thirdparty/</filename> directory does not exist, it is created, and populated with the files required for later steps. For further details, refer to <xref linkend="building_deploying_from_source" />. </para> </listitem> <listitem>

18 years

1
0
0 / 0

JBoss Portal SVN: r10649 - in modules/presentation/trunk: presentation/src/main/java/org/jboss/portal/presentation/impl/server and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-04-18 18:06:26 -0400 (Fri, 18 Apr 2008) New Revision: 10649 Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/ Removed: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/ Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationClientContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationInstanceContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationPortalContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationServerContext.java modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationWindowContext.java Log: move presentation server impl to presentation package so it can be reused by ajax client Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet (from rev 10632, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet) Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/PresentationPortletInvoker.java 2008-04-18 01:14:30 UTC (rev 10632) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -1,47 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.presentation.portlet; - -import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; - -/** - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class PresentationPortletInvoker -{ - - /** . */ - private StructuralStateContextImpl structuralContext; - - public PresentationPortletInvoker(StructuralStateContextImpl structuralContext) - { - this.structuralContext = structuralContext; - } - - public void render(String windowId) - { - - } - -} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java (from rev 10648, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/PresentationPortletInvoker.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/PresentationPortletInvoker.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -0,0 +1,47 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.server.portlet; + +import org.jboss.portal.presentation.impl.state.structural.StructuralStateContextImpl; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class PresentationPortletInvoker +{ + + /** . */ + private StructuralStateContextImpl structuralContext; + + public PresentationPortletInvoker(StructuralStateContextImpl structuralContext) + { + this.structuralContext = structuralContext; + } + + public void render(String windowId) + { + + } + +} Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/StructuralPortletControllerContext.java 2008-04-18 01:14:30 UTC (rev 10632) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -1,95 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2008, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.presentation.portlet; - -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.presentation.impl.state.structural.PageNode; - -import javax.servlet.http.Cookie; -import java.util.List; - -/** - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class StructuralPortletControllerContext implements PortletControllerContext -{ - - /** . */ - private final PageNode page; - - /** . */ - private final PortletInvoker invoker; - - public StructuralPortletControllerContext(PageNode page, PortletInvoker invoker) - { - this.page = page; - this.invoker = invoker; - } - - public PortletInfo getPortletInfo(String windowId) - { - return null; - } - - public PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageNavigationalState) - { - return null; - } - - public PortletInvocationResponse invoke(ActionInvocation actionInvocation) throws PortletInvokerException - { - return null; - } - - public PortletInvocationResponse invoke(List<Cookie> requestCookies, EventInvocation eventInvocation) throws PortletInvokerException - { - return null; - } - - public PortletInvocationResponse invoke(ResourceInvocation resourceInvocation) throws PortletInvokerException - { - return null; - } - - public EventControllerContext getEventControllerContext() - { - return null; - } - - public StateControllerContext getStateControllerContext() - { - return null; - } -} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java (from rev 10648, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/StructuralPortletControllerContext.java) =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java (rev 0) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/StructuralPortletControllerContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -0,0 +1,95 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.server.portlet; + +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.invocation.ActionInvocation; +import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.invocation.ResourceInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.presentation.impl.state.structural.PageNode; + +import javax.servlet.http.Cookie; +import java.util.List; + +/** + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class StructuralPortletControllerContext implements PortletControllerContext +{ + + /** . */ + private final PageNode page; + + /** . */ + private final PortletInvoker invoker; + + public StructuralPortletControllerContext(PageNode page, PortletInvoker invoker) + { + this.page = page; + this.invoker = invoker; + } + + public PortletInfo getPortletInfo(String windowId) + { + return null; + } + + public PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageNavigationalState) + { + return null; + } + + public PortletInvocationResponse invoke(ActionInvocation actionInvocation) throws PortletInvokerException + { + return null; + } + + public PortletInvocationResponse invoke(List<Cookie> requestCookies, EventInvocation eventInvocation) throws PortletInvokerException + { + return null; + } + + public PortletInvocationResponse invoke(ResourceInvocation resourceInvocation) throws PortletInvokerException + { + return null; + } + + public EventControllerContext getEventControllerContext() + { + return null; + } + + public StateControllerContext getStateControllerContext() + { + return null; + } +} Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi (from rev 10648, modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi) Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationClientContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationClientContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationClientContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.presentation.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.common.util.SimpleMultiValuedPropertyMap; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationInstanceContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationInstanceContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.presentation.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.portlet.StateEvent; import org.jboss.portal.portlet.spi.InstanceContext; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationPortalContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationPortalContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationPortalContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.presentation.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationServerContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationServerContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationServerContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.presentation.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.portlet.spi.ServerContext; import org.jboss.portal.presentation.client.PresentationClient; Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationWindowContext.java =================================================================== --- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationWindowContext.java 2008-04-18 21:20:50 UTC (rev 10648) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/server/portlet/spi/PresentationWindowContext.java 2008-04-18 22:06:26 UTC (rev 10649) @@ -20,7 +20,7 @@ * 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.presentation.portlet.spi; +package org.jboss.portal.presentation.impl.server.portlet.spi; import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.presentation.impl.state.structural.WindowNode;

18 years

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 April 2008