Author: julien(a)jboss.com Date: 2007-09-10 19:11:14 -0400 (Mon, 10 Sep 2007) New Revision: 8209 Added: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/JBossApplicationMetaDataFactory.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/ValueTrimmingFilter.java modules/portlet/trunk/test/src/resources/jboss-4.2/ modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/ modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/ modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/context.xml modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml modules/portlet/trunk/test/src/resources/test/ modules/portlet/trunk/test/src/resources/test/servers.xml modules/portlet/trunk/test/src/resources/tomcat-6.0/ modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/ modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/META-INF/ modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/META-INF/context.xml modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/ modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/ modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/log4j.properties modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/logging.properties Removed: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/ValueTrimmingFilter.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/classes/logging.properties Modified: modules/portlet/trunk/build/build-thirdparty.xml modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml modules/portlet/trunk/jboss-portal-portlet.iws modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java modules/portlet/trunk/test/build.xml modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/web.xml Log: portlet container update for the latest spi change + test cases pass on JBoss 4.2 Modified: modules/portlet/trunk/build/build-thirdparty.xml =================================================================== --- modules/portlet/trunk/build/build-thirdparty.xml 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/build/build-thirdparty.xml 2007-09-10 23:11:14 UTC (rev 8209) @@ -51,13 +51,25 @@ <componentref name="jboss-portal/modules/web" version="1.0.0-SNAPSHOT"/> <componentref name="jboss-portal/modules/test" version="1.0.0-SNAPSHOT"/> <componentref name="sun-servlet" version="2.4"/> + <componentref name="sun-jaf" version="1.1"/> + <componentref name="jboss/remoting" version="2.2.0.SP4"/> + <componentref name="apache-codec" version="1.3.0"/> <componentref name="apache-httpclient" version="3.0.1"/> <componentref name="apache-logging" version="1.1"/> - <componentref name="jboss/remoting" version="2.2.1.GA"/> - <!-- Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... --> + <!-- MC 1.0.2 --> +<!-- + <componentref name="jboss/common" version="1.2.0.GA-brew"/> + <componentref name="jboss/microcontainer" version="1.0.2"/> + <componentref name="apache-log4j" version="1.2.14"/> + <componentref name="oswego-concurrent" version="1.3.4"/> + <componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/> + <componentref name="junit" version="3.8.1"/> +--> + + <!-- MC 2.0 Beta 3 Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... --> <componentref name="jboss/microcontainer" version="2.0.0.Beta3"/> <componentref name="jboss/aop" version="2.0.0.alpha4"/> <componentref name="jboss/jbossxb" version="2.0.0.CR2"/> Modified: modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml =================================================================== --- modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-09-10 23:11:14 UTC (rev 8209) @@ -92,6 +92,15 @@ </library> </orderEntry> <orderEntry type="module" module-name="jsr168api" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/common/lib/portal-common-mc-lib.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="VcsManagerConfiguration"> Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-10 23:11:14 UTC (rev 8209) @@ -17,66 +17,52 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/url/ParameterEncoder.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java" afterPath="" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/url/DecoderTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletSupport.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestInstanceContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestActionContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/build.xml" afterPath="$PROJECT_DIR$/portlet/build.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/url/CodecBuilder.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/test/UserContextImpl.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/log4j.properties" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/logging.properties" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties" afterPath="" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/META-INF/context.xml" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/ValueTrimmingFilter.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/context.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/ValueTrimmingFilter.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/test/servers.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment/JBossApplicationMetaDataFactory.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalNavigationalState.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/test/ActionContextImpl.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/test" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/META-INF" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes/logging.properties" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/web.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletURLRenderer.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractWindowContext.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestPortletInvocationContext.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestRenderContext.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestRenderContext.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/url/ParameterDecoder.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletControllerContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/test/InstanceContextImpl.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletControllerContextImpl.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java" afterPath="$PROJECT_DIR$/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/url" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java" afterPath="" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/WindowNavigationalState.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java" afterPath="" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java" afterPath="$PROJECT_DIR$/federation/src/main/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/StringCodec.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/TestPortletInvoker.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletController.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/url/EncoderTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java" afterPath="" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -853,62 +839,96 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/federation/build.xml"> + <file leaf-file-name="UserContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="100" column="33" selection-start="5547" selection-end="5547" vertical-scroll-proportion="0.3403206"> + <state line="34" column="0" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.16276202"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <file leaf-file-name="AbstractUserContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="162" column="72" selection-start="8398" selection-end="8398" vertical-scroll-proportion="0.46609125"> + <state line="70" column="0" selection-start="2962" selection-end="2962" vertical-scroll-proportion="0.4401973"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="modules.ent" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/modules.ent"> + <file leaf-file-name="AbstractActionContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="17" column="89" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.25154132"> + <state line="39" column="22" selection-start="2276" selection-end="2276" vertical-scroll-proportion="0.08508015"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="FederatingPortletInvokerTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java"> + <file leaf-file-name="ActionContextImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="49" selection-start="2112" selection-end="2112" vertical-scroll-proportion="0.10357583"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="58" column="0" selection-start="2609" selection-end="2609" vertical-scroll-proportion="0.50308263"> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="PortletInvokerSupport.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> + <file leaf-file-name="ValueMapAssert.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="13" selection-start="2838" selection-end="2838" vertical-scroll-proportion="-1.1155779"> + <state line="65" column="0" selection-start="2889" selection-end="2889" vertical-scroll-proportion="0.57706535"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="PortletSupport.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletSupport.java"> + <file leaf-file-name="InstanceContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="2233" selection-end="2233" vertical-scroll-proportion="0.13316892"> + <state line="31" column="0" selection-start="1994" selection-end="1994" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="AbstractInstanceContext.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="33" column="36" selection-start="2112" selection-end="2135" vertical-scroll-proportion="0.014796548"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TestInstanceContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestInstanceContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="36" column="13" selection-start="2194" selection-end="2194" vertical-scroll-proportion="0.014796548"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="UserContextSupport.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="35" column="13" selection-start="2071" selection-end="2071" vertical-scroll-proportion="0.13316892"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SecurityContextSupport.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="35" column="13" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.17755857"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -1130,13 +1150,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1160,6 +1188,66 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/tomcat-6.0/portlet-test-war/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1167,10 +1255,40 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes" /> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1204,6 +1322,36 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/deployment" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jboss-portal-portlet.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> @@ -1239,6 +1387,10 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1258,21 +1410,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1292,17 +1436,29 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar/org" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar/org/jboss/portal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/portal-portlet-lib-jar/org/jboss/portal/portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1336,23 +1492,29 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jsr168api" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jsr168api" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jsr168api" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1360,9 +1522,37 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="federation" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1370,13 +1560,33 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="federation" /> + <option name="myItemId" value="portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/federation" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> </subPane> </component> @@ -1391,7 +1601,7 @@ <showLibraryContents /> <hideEmptyPackages /> <abbreviatePackageNames /> - <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" /> + <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -1417,13 +1627,33 @@ <recent name="org.jboss.portal.portlet.registry" /> </key> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.portal.portlet.test.deployment" /> <recent name="org.jboss.portal.test.portlet.state" /> <recent name="org.jboss.portal.portlet.test.url" /> <recent name="org.jboss.portal.portlet.impl" /> </key> </component> <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.Tomcat"> + <component name="RunManager" selected="Remote.Runner"> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -1453,25 +1683,6 @@ <option name="Make" value="true" /> </method> </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> <configuration default="false" name="Tomcat" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1585,14 +1796,14 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="6" y="37" width="1680" height="958" extended-state="0" /> - <editor active="true" /> + <frame x="11" y="28" width="1680" height="958" extended-state="0" /> + <editor active="false" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329859" order="0" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329859" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="8" /> @@ -1698,115 +1909,113 @@ </component> <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="federation" /> + <option name="myLastEditedConfigurable" value="portlet" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletController.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="316" column="0" selection-start="12030" selection-end="12030" vertical-scroll-proportion="0.19346733"> + <state line="65" column="64" selection-start="2869" selection-end="2869" vertical-scroll-proportion="0.5918619"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="186" column="25" selection-start="7092" selection-end="7092" vertical-scroll-proportion="0.015075377"> + <state line="36" column="13" selection-start="2156" selection-end="2156" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="0" selection-start="3270" selection-end="3270" vertical-scroll-proportion="0.3517588"> + <state line="32" column="13" selection-start="2068" selection-end="2068" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="130" column="0" selection-start="5733" selection-end="5733" vertical-scroll-proportion="0.19346733"> + <state line="36" column="13" selection-start="2256" selection-end="2256" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/resources/test/jsr168/ext/expiringcache-war/WEB-INF/portlet.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="136" column="66" selection-start="5317" selection-end="5319" vertical-scroll-proportion="0.57788944"> + <state line="30" column="13" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="62" column="21" selection-start="3543" selection-end="3561" vertical-scroll-proportion="-2.1105528"> + <state line="34" column="0" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.16276202"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="350" column="0" selection-start="14169" selection-end="14169" vertical-scroll-proportion="0.30904523"> + <state line="70" column="0" selection-start="2962" selection-end="2962" vertical-scroll-proportion="0.4401973"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractActionContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="315" column="4" selection-start="16440" selection-end="16440" vertical-scroll-proportion="0.8581998"> + <state line="39" column="22" selection-start="2276" selection-end="2276" vertical-scroll-proportion="0.08508015"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/neverexpiringcache/NeverExpiringCacheSequenceBuilder.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="0" selection-start="3652" selection-end="3652" vertical-scroll-proportion="0.48241207"> + <state line="58" column="0" selection-start="2609" selection-end="2609" vertical-scroll-proportion="0.50308263"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ValueMapAssert.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="2233" selection-end="2233" vertical-scroll-proportion="0.13316892"> + <state line="65" column="0" selection-start="2889" selection-end="2889" vertical-scroll-proportion="0.57706535"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/federation/src/main/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="49" selection-start="2112" selection-end="2112" vertical-scroll-proportion="0.10357583"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="31" column="0" selection-start="1994" selection-end="1994" vertical-scroll-proportion="0.13316892"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> + <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestInstanceContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="13" selection-start="2838" selection-end="2838" vertical-scroll-proportion="-1.1155779"> + <state line="36" column="13" selection-start="2194" selection-end="2194" vertical-scroll-proportion="0.014796548"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/federation/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="100" column="33" selection-start="5547" selection-end="5547" vertical-scroll-proportion="0.3403206"> + <state line="35" column="13" selection-start="2071" selection-end="2071" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="162" column="72" selection-start="8398" selection-end="8398" vertical-scroll-proportion="0.46609125"> + <state line="35" column="13" selection-start="2108" selection-end="2108" vertical-scroll-proportion="0.17755857"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/modules.ent"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="17" column="89" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.25154132"> + <state line="33" column="36" selection-start="2112" selection-end="2135" vertical-scroll-proportion="0.014796548"> <folding /> </state> </provider> Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -26,8 +26,9 @@ import org.jboss.portal.portlet.container.PortletApplication; import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.container.PortletContainerInvoker; -import org.jboss.portal.web.spi.ServletContainerContext; import org.jboss.portal.web.RequestDispatchCallback; +import org.jboss.portal.web.ServletContainer; +import org.jboss.portal.web.ServletContainerFactory; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.spi.RequestContext; @@ -35,6 +36,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import java.io.IOException; /** * This interceptor dispatch the call to the target web application. @@ -49,16 +52,16 @@ public static final String REQ_ATT_COMPONENT_INVOCATION = "org.jboss.portal.attribute.component_invocation"; /** . */ - private ServletContainerContext servletContainerContext; + private ServletContainerFactory servletContainerFactory; - public ServletContainerContext getServletContainerContext() + public ServletContainerFactory getServletContainerFactory() { - return servletContainerContext; + return servletContainerFactory; } - public void setServletContainerContext(ServletContainerContext servletContainerContext) + public void setServletContainerFactory(ServletContainerFactory servletContainerFactory) { - this.servletContainerContext = servletContainerContext; + this.servletContainerFactory = servletContainerFactory; } protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException @@ -67,12 +70,24 @@ PortletApplication portletApplication = container.getApplication(); RequestContext reqCtx = invocation.getRequestContext(); ServletContext targetCtx = portletApplication.getContext().getServletContext(); - return reqCtx.dispatch(servletContainerContext, targetCtx, callback, invocation); + ServletContainer servletContainer = servletContainerFactory.getServletContainer(); + try + { + return reqCtx.dispatch(servletContainer, targetCtx, callback, invocation); + } + catch (ServletException e) + { + if (e.getRootCause() != null && e.getRootCause() instanceof Exception) + { + throw (Exception)e.getRootCause(); + } + throw e; + } } private static final RequestDispatchCallback callback = new RequestDispatchCallback() { - public Object doCallback(ServletContext dispatchedServletContext, HttpServletRequest req, HttpServletResponse resp, Object handback) throws Exception + public Object doCallback(ServletContext dispatchedServletContext, HttpServletRequest req, HttpServletResponse resp, Object handback) throws ServletException, IOException { PortletInvocation invocation = (PortletInvocation)handback; @@ -88,6 +103,10 @@ // return invocation.invokeNext(); } + catch (Exception e) + { + throw new ServletException(e); + } finally { // Clear dispatched request and response Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -1,263 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.deployment; - -import org.jboss.portal.common.transaction.Transactions; -import org.jboss.portal.portlet.impl.jsr168.info.ContainerCacheInfo; -import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; -import org.jboss.portal.portlet.metadata.JBossPortletMetaData; -import org.jboss.portal.portlet.metadata.PolicyPermissionMetaData; -import org.jboss.xb.binding.GenericObjectModelFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6720 $ - */ -public class JBossApplicationMetaDataFactory implements GenericObjectModelFactory -{ - - public Object newRoot(Object root, - UnmarshallingContext nav, - String nsURI, - String localName, - Attributes attrs) - { - if (root == null) - { - root = new JBossApplicationMetaData(); - } - return root; - } - - public Object completeRoot(Object root, UnmarshallingContext nav, String uri, String name) - { - return root; - } - - public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) - { - if (object instanceof JBossApplicationMetaData) - { - if ("portlet".equals(localName)) - { - return createJBossPortlet(); - } - } -// else if (object instanceof JBossPortletMetaData) -// { -// if ("security-constraint".equals(localName)) -// { -// return new SecurityConstraintMetaData(); -// } -// } -// else if (object instanceof SecurityConstraintMetaData) -// { -// if ("policy-permission".equals(localName)) -// { -// return new PolicyPermissionMetaData(); -// } -// } - else if (object instanceof PolicyPermissionMetaData) - { - if ("unchecked".equals(localName)) - { - return "unchecked"; - } - } - return null; - } - - public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName) - { - if (parent instanceof JBossApplicationMetaData) - { - JBossApplicationMetaData app = (JBossApplicationMetaData)parent; - if (child instanceof JBossPortletMetaData) - { - JBossPortletMetaData portlet = (JBossPortletMetaData)child; - app.getPortlets().put(portlet.getName(), portlet); - portlet.merge(app); - } - } -// else if (parent instanceof JBossPortletMetaData) -// { -// JBossPortletMetaData portlet = (JBossPortletMetaData)parent; -// if (child instanceof SecurityConstraintMetaData) -// { -// portlet.setSecurityConstraint((SecurityConstraintMetaData)child); -// } -// } -// else if (parent instanceof SecurityConstraintMetaData) -// { -// SecurityConstraintMetaData securityConstraint = (SecurityConstraintMetaData)parent; -// if (child instanceof PolicyPermissionMetaData) -// { -// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)child; -// PolicyPermissionMetaData other = (PolicyPermissionMetaData)securityConstraint.getPolicyPermissions().get(policyPermission.getRoleName()); -// if (other != null) -// { -// other.getActions().addAll(policyPermission.getActions()); -// } -// else -// { -// securityConstraint.getPolicyPermissions().put(policyPermission.getRoleName(), policyPermission); -// } -// } -// } -// else if (parent instanceof PolicyPermissionMetaData) -// { -// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)parent; -// if ("unchecked".equals(child)) -// { -// policyPermission.setRoleName(SecurityConstants.UNCHECKED_ROLE_NAME); -// } -// } - } - - public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value) - { - if (object instanceof JBossApplicationMetaData) - { - JBossApplicationMetaData app = (JBossApplicationMetaData)object; - if ("remotable".equals(localName)) - { - if ("true".equalsIgnoreCase(value)) - { - app.setRemotable(Boolean.TRUE); - } - else if ("false".equalsIgnoreCase(value)) - { - app.setRemotable(Boolean.FALSE); - } - else - { - throw new RuntimeException(); - } - } - } - else if (object instanceof JBossPortletMetaData) - { - JBossPortletMetaData portlet = (JBossPortletMetaData)object; - if ("portlet-name".equals(localName)) - { - portlet.setName(value); - } - else if ("remotable".equals(localName)) - { - if ("true".equalsIgnoreCase(value)) - { - portlet.setRemotable(Boolean.TRUE); - } - else if ("false".equalsIgnoreCase(value)) - { - portlet.setRemotable(Boolean.FALSE); - } - else - { - throw new RuntimeException(); - } - } - else if ("distributed".equals(localName)) - { - if ("true".equalsIgnoreCase(value)) - { - portlet.setDistributed(Boolean.TRUE); - } - else if ("false".equalsIgnoreCase(value)) - { - portlet.setDistributed(Boolean.FALSE); - } - else - { - throw new RuntimeException(); - } - } - else if ("ref-type".equals(localName)) - { - if ("strong".equals(localName)) - { - portlet.setCacheRefType(new Integer(ContainerCacheInfo.REF_STRONG)); - } - else if ("soft".equals(localName)) - { - portlet.setCacheRefType(new Integer(ContainerCacheInfo.REF_SOFT)); - } - else - { - // log.warn("Unrecognized reference type " + refType); - } - } - else if ("trans-attribute".equals(localName)) - { - if ("Required".equalsIgnoreCase(value)) - { - portlet.setTxType(Transactions.TYPE_REQUIRED); - } - else if ("Mandatory".equals(value)) - { - portlet.setTxType(Transactions.TYPE_MANDATORY); - } - else if ("Never".equals(value)) - { - portlet.setTxType(Transactions.TYPE_NEVER); - } - else if ("Supports".equals(value)) - { - portlet.setTxType(Transactions.TYPE_SUPPORTS); - } - else if ("NotSupported".equals(value)) - { - portlet.setTxType(Transactions.TYPE_NOT_SUPPORTED); - } - else if ("RequiresNew".equals(value)) - { - portlet.setTxType(Transactions.TYPE_REQUIRES_NEW); - } - else - { - throw new RuntimeException(); - } - } - } - else if (object instanceof PolicyPermissionMetaData) - { - PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)object; - if ("role-name".equals(localName)) - { - policyPermission.setRoleName(value); - } - else if ("action-name".equals(localName)) - { - policyPermission.getActions().add(value); - } - } - } - - /** Can be subclasses to allow sub class. */ - protected JBossPortletMetaData createJBossPortlet() - { - return new JBossPortletMetaData(); - } -} Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -1,405 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.deployment; - -import org.jboss.portal.Mode; -import org.jboss.portal.common.i18n.LocaleFormat; -import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.portlet.TransportGuarantee; -import org.jboss.portal.portlet.impl.jsr168.metadata.CacheConfigMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.ContentTypeMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.DescribableObjectMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.DescriptionMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.DisplayNameMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityConstraintMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.TransportGuaranteesMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.UserAttributeMetaData; -import org.jboss.xb.binding.GenericObjectModelFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; -import org.apache.log4j.Logger; - -import java.util.Iterator; -import java.util.List; -import java.util.Locale; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 7200 $ - */ -public class PortletApplicationMetaDataFactory implements GenericObjectModelFactory -{ - - /** . */ - private static final Logger log = Logger.getLogger(PortletApplicationMetaDataFactory.class); - - public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) - { - return new PortletApplicationMetaData(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String nsURI, String name) - { - return root; - } - - public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) - { - if (object instanceof DescribableObjectMetaData) - { - if ("description".equals(localName)) - { - String lang = attrs.getValue("xml:lang"); - DescriptionMetaData value = new DescriptionMetaData(); - if (lang != null) - { - try - { - Locale locale = LocaleFormat.DEFAULT.getLocale(lang); - value.setLocale(locale); - } - catch (ConversionException e) - { - log.error("Cannot obtain language value", e); - return null; - } - } - return value; - } - } - if (object instanceof PortletApplicationMetaData) - { - if ("portlet".equals(localName)) - { - return new PortletMetaData(); - } - else if ("user-attribute".equals(localName)) - { - return new UserAttributeMetaData(); - } - else if ("security-constraint".equals(localName)) - { - return new SecurityConstraintMetaData(); - } - } - if (object instanceof PortletMetaData) - { - if ("init-param".equals(localName)) - { - return new ParameterMetaData(); - } - else if ("supports".equals(localName)) - { - return new ContentTypeMetaData(); - } - else if ("portlet-info".equals(localName)) - { - return new LanguagesMetaData.InfoMetaData(); - } - else if ("security-role-ref".equals(localName)) - { - return new SecurityRoleRefMetaData(); - } - else if ("preference".equals(localName)) - { - return new PreferenceMetaData(); - } - else if ("display-name".equals(localName)) - { - String lang = attrs.getValue("xml:lang"); - DisplayNameMetaData value = new DisplayNameMetaData(); - if (lang != null) - { - try - { - Locale locale = LocaleFormat.DEFAULT.getLocale(lang); - value.setLocale(locale); - } - catch (ConversionException e) - { - log.error("Cannot obtain language value", e); - return null; - } - } - return value; - } - } - return null; - } - - public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName) - { - if (parent instanceof DescribableObjectMetaData) - { - DescribableObjectMetaData describable = (DescribableObjectMetaData)parent; - if (child instanceof DescriptionMetaData) - { - describable.getDescription().getValues().add(child); - } - } - if (parent instanceof PortletApplicationMetaData) - { - PortletApplicationMetaData pa = (PortletApplicationMetaData)parent; - if (child instanceof PortletMetaData) - { - pa.addPortlet((PortletMetaData)child); - } - else if (child instanceof UserAttributeMetaData) - { - UserAttributeMetaData userAttribute = (UserAttributeMetaData)child; - pa.getUserAttributes().put(userAttribute.getName(), userAttribute); - } - else if (child instanceof SecurityConstraintMetaData) - { - SecurityConstraintMetaData security = (SecurityConstraintMetaData)child; - for (Iterator i = security.getPortlets().iterator(); i.hasNext();) - { - String portletName = (String)i.next(); - PortletMetaData portlet = pa.getPortlet(portletName); - if (portlet.getTransportGuarantees() == null) - { - portlet.setTransportGuarantees(new TransportGuaranteesMetaData()); - } - portlet.getTransportGuarantees().add(security.getTransportGuarantee()); - } - - } - } - if (parent instanceof PortletMetaData) - { - PortletMetaData portlet = (PortletMetaData)parent; - if (child instanceof ParameterMetaData) - { - ParameterMetaData parameter = (ParameterMetaData)child; - portlet.getParameters().put(parameter.getName(), parameter); - } - else if (child instanceof ContentTypeMetaData) - { - portlet.getContentTypes().addContentType((ContentTypeMetaData)child); - } - else if (child instanceof LanguagesMetaData.InfoMetaData) - { - - LanguagesMetaData.InfoMetaData info = (LanguagesMetaData.InfoMetaData)child; - if (info.getTitle() == null) - { - // JBossXB won't populate <title></title> - info.setTitle(""); - } - portlet.getLanguages().setInfo(info); - } - else if (child instanceof SecurityRoleRefMetaData) - { - portlet.getSecurityRoleRefs().add(child); - } - else if (child instanceof DisplayNameMetaData) - { - portlet.getDisplayName().getValues().add(child); - } - } - if (parent instanceof PortletMetaData) - { - PortletMetaData preferences = (PortletMetaData)parent; - if (child instanceof PreferenceMetaData) - { - preferences.getPreferences().addPreference((PreferenceMetaData)child); - } - } - } - - public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value) - { - if (object instanceof PortletApplicationMetaData) - { - PortletApplicationMetaData app = (PortletApplicationMetaData)object; - if ("version".equals(localName)) - { - app.setVersion(value); - } - } - if (object instanceof LocalizedValueMetaData) - { - LocalizedValueMetaData localizedValue = (LocalizedValueMetaData)object; - if ("description".equals(localName)) - { - localizedValue.setValue(value); - } - else if ("display-name".equals(localName)) - { - localizedValue.setValue(value); - } - } - if (object instanceof PortletMetaData) - { - PortletMetaData portlet = (PortletMetaData)object; - if ("portlet-name".equals(localName)) - { - portlet.setName(value); - } - else if ("portlet-class".equals(localName)) - { - portlet.setClassName(value); - } - else if ("expiration-cache".equals(localName)) - { - CacheConfigMetaData cacheConfig = portlet.getCacheConfig(); - if (cacheConfig == null) - { - cacheConfig = new CacheConfigMetaData(); - portlet.setCacheConfig(cacheConfig); - } - int timeMillis = Integer.parseInt(value); - cacheConfig.setExpirationTime(timeMillis); - } - else if ("resource-bundle".equals(localName)) - { - portlet.getLanguages().setResourceBundle(value); - } - else if ("supported-locale".equals(localName)) - { - try - { - Locale locale = LocaleFormat.DEFAULT.getLocale(value); - portlet.getLanguages().getSupportedLocales().add(locale); - } - catch (ConversionException e) - { - log.error("Cannot obtain language value", e); - } - } - else if ("preferences-validator".equals(localName)) - { - portlet.getPreferences().setValidator(value); - } - } - if (object instanceof ParameterMetaData) - { - ParameterMetaData parameter = (ParameterMetaData)object; - if ("name".equals(localName)) - { - parameter.setName(value); - } - else if ("value".equals(localName)) - { - parameter.setValue(value); - } - } - if (object instanceof ContentTypeMetaData) - { - ContentTypeMetaData contentType = (ContentTypeMetaData)object; - if ("mime-type".equals(localName)) - { - contentType.setContentType(value); - } - else if ("portlet-mode".equals(localName)) - { - contentType.getModes().add(Mode.create(value)); - } - } - if (object instanceof LanguagesMetaData.InfoMetaData) - { - LanguagesMetaData.InfoMetaData info = (LanguagesMetaData.InfoMetaData)object; - if ("title".equals(localName)) - { - info.setTitle(value); - } - else if ("short-title".equals(localName)) - { - info.setShortTitle(value); - } - else if ("keywords".equals(localName)) - { - info.setKeywords(value); - } - } - if (object instanceof PreferenceMetaData) - { - PreferenceMetaData preference = (PreferenceMetaData)object; - if ("name".equals(localName)) - { - preference.setName(value); - } - else if ("value".equals(localName)) - { - List tmp = Tools.toList(preference.getValues()); - tmp.add(value); - preference.setValues((String[])tmp.toArray(new String[tmp.size()])); - } - else if ("read-only".equals(localName)) - { - if ("true".equalsIgnoreCase(value)) - { - preference.setReadOnly(true); - } - else if ("false".equalsIgnoreCase(value)) - { - preference.setReadOnly(false); - } - else - { - throw new RuntimeException("Unrecognized read only value" + value); - } - } - } - if (object instanceof SecurityRoleRefMetaData) - { - SecurityRoleRefMetaData srr = (SecurityRoleRefMetaData)object; - if ("role-name".equals(localName)) - { - srr.setRoleName(value); - } - else if ("role-link".equals(localName)) - { - srr.setRoleLink(value); - } - } - if (object instanceof UserAttributeMetaData) - { - UserAttributeMetaData userAttribute = (UserAttributeMetaData)object; - if ("name".equals(localName)) - { - userAttribute.setName(value); - } - } - else if (object instanceof SecurityConstraintMetaData) - { - SecurityConstraintMetaData security = (SecurityConstraintMetaData)object; - if ("portlet-name".equals(localName)) - { - security.addPortlet(value); - } - if ("transport-guarantee".equals(localName)) - { - security.setTransportGuarantee(TransportGuarantee.decode(value)); - } - } - } -} Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/ValueTrimmingFilter.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/ValueTrimmingFilter.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/ValueTrimmingFilter.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -1,75 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.deployment; - -import org.jboss.xb.binding.GenericObjectModelFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * Filter <code>setValue</code> method by doing a trimming before calling the next model. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6713 $ - */ -public class ValueTrimmingFilter implements GenericObjectModelFactory -{ - - private final GenericObjectModelFactory next; - - public ValueTrimmingFilter(GenericObjectModelFactory next) throws IllegalArgumentException - { - if (next == null) - { - throw new IllegalArgumentException("Cannot be null"); - } - this.next = next; - } - - public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) - { - return next.newChild(object, nav, nsURI, localName, attrs); - } - - public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName) - { - next.addChild(parent, child, nav, nsURI, localName); - } - - public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value) - { - value = value.trim(); - next.setValue(object, nav, nsURI, localName, value); - } - - public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) - { - return next.newRoot(root, nav, nsURI, localName, attrs); - } - - public Object completeRoot(Object root, UnmarshallingContext nav, String nsURI, String localName) - { - return next.completeRoot(root, nav, nsURI, localName); - } - -} Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.impl.spi; import org.jboss.portal.portlet.spi.RequestContext; -import org.jboss.portal.web.spi.ServletContainerContext; import org.jboss.portal.web.RequestDispatchCallback; +import org.jboss.portal.web.ServletContainer; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -76,8 +76,8 @@ return serverPort; } - public Object dispatch(ServletContainerContext scc, ServletContext targetCtx, RequestDispatchCallback callback, Object handback) throws Exception + public Object dispatch(ServletContainer servletContainer, ServletContext targetServletContext, RequestDispatchCallback callback, Object handback) throws Exception { - return scc.include(targetCtx, req, resp, callback, handback); + return servletContainer.include(targetServletContext, req, resp, callback, handback); } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -39,27 +39,47 @@ { /** . */ - private HttpServletRequest clientRequest; + private final String id; - public AbstractUserContext(HttpServletRequest clientRequest) + /** . */ + private final HttpServletRequest clientRequest; + + public AbstractUserContext(HttpServletRequest clientRequest) throws IllegalArgumentException { if (clientRequest == null) { throw new IllegalArgumentException("No client request provided"); } + this.id = clientRequest.getRemoteUser(); this.clientRequest = clientRequest; } + public AbstractUserContext(String id) throws IllegalArgumentException + { + if (id == null) + { + throw new IllegalArgumentException("No user id provided"); + } + this.id = id; + this.clientRequest = null; + } + + public AbstractUserContext() + { + this.id = null; + this.clientRequest = null; + } + /** - * Returns null. + * Returns the user id or null if none was provided. */ public String getId() { - return clientRequest.getRemoteUser(); + return id; } /** - * Returns <code>Collections.EMPTY_MAP</code>. + * Returns an immutable empty map. */ public Map getInformations() { @@ -67,18 +87,18 @@ } /** - * Returns <code>Locale.ENGLISH</code>. + * Returns the client request locale or <code>Locale.ENGLISH</code> if no request was provided. */ public Locale getLocale() { - return clientRequest.getLocale(); + return clientRequest != null ? clientRequest.getLocale() : Locale.ENGLISH; } /** - * Returns <code>Collections.EMPTY_LIST</code>. + * Returns the client request locales or an empty list if no request was provided. */ public List getLocales() { - return Tools.toList(clientRequest.getLocales()); + return clientRequest != null ? Tools.toList(clientRequest.getLocales()) : Collections.EMPTY_LIST; } } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.spi; -import org.jboss.portal.web.spi.ServletContainerContext; import org.jboss.portal.web.RequestDispatchCallback; +import org.jboss.portal.web.ServletContainer; import javax.servlet.ServletContext; @@ -54,13 +54,13 @@ /** * Delegate to the request context the dispatching to the target servlet context using the specified spi elements. * - * @param servletContainerContext the servlet container spi + * @param servletContainer the servlet container spi * @param targetServletContext the target servlet context * @param callback the call back to be done after dispatch * @param handback the hand back object to provide after dispatch to the call back * @return the call back returned object * @throws Exception any exception */ - Object dispatch(ServletContainerContext servletContainerContext, ServletContext targetServletContext, RequestDispatchCallback callback, Object handback) throws Exception; + Object dispatch(ServletContainer servletContainer, ServletContext targetServletContext, RequestDispatchCallback callback, Object handback) throws Exception; } Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -23,7 +23,6 @@ package org.jboss.portal.test.framework.portlet; import org.jboss.portal.test.framework.driver.DriverResponse; -import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.test.framework.server.NodeId; import org.jboss.portal.test.framework.TestParameterValue; @@ -40,7 +39,7 @@ final String testName; /** . */ - final HTTPTestContext testContext; + final TestContext testContext; public PortletTestContext(String testName, TestContext httpTestContext) { @@ -48,12 +47,8 @@ { throw new IllegalArgumentException("No HTTP test context to wrap"); } - if (!(httpTestContext instanceof HTTPTestContext)) - { - throw new IllegalArgumentException("Test context is not an HTTP test context"); - } this.testName = testName; - this.testContext = (HTTPTestContext)httpTestContext; + this.testContext = httpTestContext; } public String getTestName() Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -187,7 +187,7 @@ public DriverResponse invoke(String string, DriverCommand driverCommand) throws TestDriverException { - return new InvokeGetResponse(context.testContext.getInitialPath()); + return new InvokeGetResponse("/portlet-test"); } } } Deleted: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -1,208 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.test.portlet.deployment; - -import junit.framework.TestCase; -import org.jboss.portal.common.transaction.Transactions; -import org.jboss.portal.common.net.URLTools; -import org.jboss.portal.portlet.TransportGuarantee; -import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory; -import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory; -import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData; -import org.jboss.portal.portlet.impl.jsr168.metadata.UserAttributeMetaData; -import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; -import org.jboss.portal.portlet.metadata.JBossPortletMetaData; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; - -import java.net.URL; -import java.util.Locale; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 7379 $ - */ -public class UnmarshallerTestCase extends TestCase -{ - - public void testJBossPortletXML() throws Exception - { - URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml"); - assertTrue(URLTools.exists(jbossPortletXML)); - - // - JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory(); - - // - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - - // - Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null); - assertNotNull(o); - assertTrue(o instanceof JBossApplicationMetaData); - JBossApplicationMetaData app = (JBossApplicationMetaData)o; - - // - assertNotNull(app.getPortlets()); - assertEquals(2, app.getPortlets().size()); - - // - JBossPortletMetaData portlet1 = (JBossPortletMetaData)app.getPortlets().get("Portlet1"); - assertNotNull(portlet1); - assertEquals("Portlet1", portlet1.getName()); - assertEquals(Boolean.FALSE, portlet1.getRemotable()); - assertEquals(Transactions.TYPE_REQUIRED, portlet1.getTxType()); -// assertNotNull(portlet1.getSecurityConstraint()); -// assertNotNull(portlet1.getSecurityConstraint().getPolicyPermissions()); -// assertEquals(2, portlet1.getSecurityConstraint().getPolicyPermissions().size()); -// assertNotNull(portlet1.getSecurityConstraint().getPolicyPermissions().get("Admin")); -// assertEquals("Admin", ((PolicyPermissionMetaData)portlet1.getSecurityConstraint().getPolicyPermissions().get("Admin")).getRoleName()); -// assertEquals(new CollectionBuilder().add("view").add("create").toHashSet(), ((PolicyPermissionMetaData)portlet1.getSecurityConstraint().getPolicyPermissions().get("Admin")).getActions()); -// assertEquals("User", ((PolicyPermissionMetaData)portlet1.getSecurityConstraint().getPolicyPermissions().get("User")).getRoleName()); -// assertEquals(new CollectionBuilder().add("view").add("destroy").toHashSet(), ((PolicyPermissionMetaData)portlet1.getSecurityConstraint().getPolicyPermissions().get("User")).getActions()); - - JBossPortletMetaData portlet2 = (JBossPortletMetaData)app.getPortlets().get("Portlet2"); - assertNotNull(portlet2); - assertEquals("Portlet2", portlet2.getName()); - Boolean remotable = portlet2.getRemotable(); - assertNotNull(remotable); - assertTrue(remotable.booleanValue()); - } - - public void testPortletXML() throws Exception - { - URL portletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/portlet.xml"); - assertTrue(URLTools.exists(portletXML)); - - // -// URL portletXSD = Thread.currentThread().getContextClassLoader().getResource("portlet-app_1_0.xsd"); -// assertTrue(Tools.exists(portletXSD)); - - // - PortletApplicationMetaDataFactory factory = new PortletApplicationMetaDataFactory(); - - // - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - - // - Object o = unmarshaller.unmarshal(portletXML.openStream(), factory, null); - assertNotNull(o); - assertTrue(o instanceof PortletApplicationMetaData); - PortletApplicationMetaData app = (PortletApplicationMetaData)o; - - // - assertEquals(2, app.getPortlets().size()); - - // - PortletMetaData portlet1 = app.getPortlet("Portlet1"); - assertNotNull(portlet1); - - // - assertEquals("Portlet1", portlet1.getName()); - assertEquals("org.jboss.portal.test.portlet.TestPortlet", portlet1.getClassName()); - -// <display-name>display</display-name> -// <display-name xml:lang="fr">affichage</display-name> - - assertNotNull(portlet1.getDescription()); - assertNotNull(portlet1.getDescription().getValues()); - assertEquals(2, portlet1.getDescription().getValues().size()); - assertEquals(null, ((LocalizedValueMetaData)portlet1.getDescription().getValues().get(0)).getLocale()); - assertEquals("default", ((LocalizedValueMetaData)portlet1.getDescription().getValues().get(0)).getValue()); - assertEquals(Locale.FRENCH, ((LocalizedValueMetaData)portlet1.getDescription().getValues().get(1)).getLocale()); - assertEquals("defaut", ((LocalizedValueMetaData)portlet1.getDescription().getValues().get(1)).getValue()); - assertNotNull(portlet1.getDisplayName()); - assertNotNull(portlet1.getDisplayName().getValues()); - assertEquals(2, portlet1.getDisplayName().getValues().size()); - assertEquals(null, ((LocalizedValueMetaData)portlet1.getDisplayName().getValues().get(0)).getLocale()); - assertEquals("display", ((LocalizedValueMetaData)portlet1.getDisplayName().getValues().get(0)).getValue()); - assertEquals(Locale.FRENCH, ((LocalizedValueMetaData)portlet1.getDisplayName().getValues().get(1)).getLocale()); - assertEquals("affichage", ((LocalizedValueMetaData)portlet1.getDisplayName().getValues().get(1)).getValue()); - assertNotNull(portlet1.getParameters()); - assertEquals(2, portlet1.getParameters().size()); - assertNotNull(portlet1.getParameters().get("one")); - assertNotNull(portlet1.getCacheConfig()); - assertEquals(0, portlet1.getCacheConfig().getExpirationTime()); - assertEquals("one", ((ParameterMetaData)portlet1.getParameters().get("one")).getName()); - assertEquals("1", ((ParameterMetaData)portlet1.getParameters().get("one")).getValue()); - assertEquals("two", ((ParameterMetaData)portlet1.getParameters().get("two")).getName()); - assertEquals("2", ((ParameterMetaData)portlet1.getParameters().get("two")).getValue()); - assertNotNull(portlet1.getLanguages()); - assertNotNull(portlet1.getLanguages().getInfo()); - assertEquals("very long portlet title", portlet1.getLanguages().getInfo().getTitle()); - assertEquals("short portlet title", portlet1.getLanguages().getInfo().getShortTitle()); - assertEquals("a,b,c,d,e,f", portlet1.getLanguages().getInfo().getKeywords()); - assertEquals("MyResourceBundle", portlet1.getLanguages().getResourceBundle()); - assertNotNull(portlet1.getLanguages().getSupportedLocales()); - assertEquals(2, portlet1.getLanguages().getSupportedLocales().size()); - assertEquals(Locale.ENGLISH, portlet1.getLanguages().getSupportedLocales().get(0)); - assertEquals(Locale.FRENCH, portlet1.getLanguages().getSupportedLocales().get(1)); - assertNotNull(portlet1.getPreferences()); - assertEquals(4, portlet1.getPreferences().size()); - assertNotNull(portlet1.getPreferences().getPreference("one")); - assertNotNull(portlet1.getPreferences().getPreference("two")); - assertNotNull(portlet1.getPreferences().getPreference("three")); - assertNotNull(portlet1.getPreferences().getPreference("all")); - assertEquals("one", portlet1.getPreferences().getPreference("one").getName()); - assertEquals("two", portlet1.getPreferences().getPreference("two").getName()); - assertEquals("three", portlet1.getPreferences().getPreference("three").getName()); - assertEquals("all", portlet1.getPreferences().getPreference("all").getName()); - assertNotNull(portlet1.getPreferences().getPreference("one").getValues()); - assertNotNull(portlet1.getPreferences().getPreference("two").getValues()); - assertNotNull(portlet1.getPreferences().getPreference("three").getValues()); - assertNotNull(portlet1.getPreferences().getPreference("all").getValues()); - assertEquals(1, portlet1.getPreferences().getPreference("one").getValues().length); - assertEquals(1, portlet1.getPreferences().getPreference("two").getValues().length); - assertEquals(1, portlet1.getPreferences().getPreference("three").getValues().length); - assertEquals(3, portlet1.getPreferences().getPreference("all").getValues().length); - assertFalse(portlet1.getPreferences().getPreference("one").isReadOnly()); - assertFalse(portlet1.getPreferences().getPreference("two").isReadOnly()); - assertTrue(portlet1.getPreferences().getPreference("three").isReadOnly()); - assertFalse(portlet1.getPreferences().getPreference("all").isReadOnly()); - assertEquals("MyValidator", portlet1.getPreferences().getValidator()); - assertNotNull(portlet1.getSecurityRoleRefs()); - assertEquals(2, portlet1.getSecurityRoleRefs().size()); - assertNotNull(portlet1.getSecurityRoleRefs().get(0)); - assertNotNull(portlet1.getSecurityRoleRefs().get(1)); - assertEquals("ROLE_NAME_WITHOUT_LINK", ((SecurityRoleRefMetaData)portlet1.getSecurityRoleRefs().get(0)).getRoleName()); - assertEquals(null, ((SecurityRoleRefMetaData)portlet1.getSecurityRoleRefs().get(0)).getRoleLink()); - assertEquals("ROLE_NAME_WITH_LINK", ((SecurityRoleRefMetaData)portlet1.getSecurityRoleRefs().get(1)).getRoleName()); - assertEquals("ROLE_LINK", ((SecurityRoleRefMetaData)portlet1.getSecurityRoleRefs().get(1)).getRoleLink()); - - assertTrue(portlet1.getTransportGuarantees().contains(TransportGuarantee.CONFIDENTIAL)); - assertTrue(portlet1.getTransportGuarantees().contains(TransportGuarantee.INTEGRAL)); - - // - assertNotNull(app.getUserAttributes()); - assertEquals(2, app.getUserAttributes().size()); - assertNotNull(app.getUserAttributes().get("att1")); - assertEquals("att1", ((UserAttributeMetaData)app.getUserAttributes().get("att1")).getName()); - assertNotNull(app.getUserAttributes().get("att2")); - assertEquals("att2", ((UserAttributeMetaData)app.getUserAttributes().get("att2")).getName()); - } - -} Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -32,14 +32,14 @@ import org.jboss.portal.test.framework.driver.command.StartTestCommand; import org.jboss.portal.test.framework.info.TestItemInfo; import org.jboss.portal.test.framework.info.TestInfo; -import org.jboss.portal.test.framework.driver.http.HTTPTestDriver; import org.jboss.portal.test.framework.driver.remote.TestContext; +import org.jboss.portal.test.framework.driver.remote.RemoteTestDriver; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ -public abstract class AbstractInfoTest implements HTTPTestDriver +public abstract class AbstractInfoTest implements RemoteTestDriver { /** The test id. */ Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -27,7 +27,6 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.SecurityInfo; import org.jboss.portal.common.junit.ExtendedAssert; -import org.jboss.portal.test.framework.driver.http.HTTPTestContext; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.remote.TestContext; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; @@ -59,7 +59,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, PortletSecurityException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, PortletSecurityException, IOException { if (context.getRequestCount() == 0) { @@ -88,7 +88,7 @@ PortletURL url = resp.createRenderURL(); return new InvokeGetResponse(url.toString()); } - else if (HTTPTestContext.isCurrentRequestCount(5)) + else if (context.getRequestCount() == 5) { //portlets that shouldn't render itself after Exception in Action Phase ExtendedAssert.assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered); Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.remote.TestContext; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -57,7 +57,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, TestContext context) throws PortletException, IOException { if (context.isRequestCount(2)) { @@ -66,7 +66,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.remote.TestContext; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -59,7 +59,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, TestContext context) throws PortletException, IOException { if (context.isRequestCount(3)) { @@ -68,7 +68,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.remote.TestContext; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -57,7 +57,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException + protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, TestContext context) throws PortletException, IOException { if (context.isRequestCount(4)) { @@ -66,7 +66,7 @@ return null; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec; -import org.jboss.portal.test.framework.driver.http.HTTPTestContext; import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet; import org.jboss.portal.test.framework.driver.DriverResponse; +import org.jboss.portal.test.framework.driver.remote.TestContext; import javax.portlet.PortletException; import javax.portlet.RenderRequest; @@ -52,7 +52,7 @@ return "ExceptionsDuringRequestHandlingPortlet"; } - protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException + protected DriverResponse doRender(RenderRequest req, RenderResponse resp, TestContext context) throws PortletException, IOException { if (context.isRequestCount(0)) { Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ActionContextImpl.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -40,6 +40,8 @@ public ActionContextImpl(Mode mode) { this.mode = mode; + + // addResolver(PortletInvocation.REQUEST_SCOPE, new MapAttributeResolver()); addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeResolver()); } Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/test/build.xml 2007-09-10 23:11:14 UTC (rev 8209) @@ -158,14 +158,40 @@ <fileset dir="${build.classes}"/> </jar> - <!-- Portlet test lib jar --> - <copy todir="${build.resources}/portlet-test-war/WEB-INF/lib"> + <!-- JBoss 4.2 portlet-test.war --> + <copy todir="${build.resources}/jboss-4.2/portlet-test-war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="portlet-test-lib.jar"/> - <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar,portal-common-mc-lib.jar"/> + <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/> + + <fileset dir="${jboss.microcontainer.lib}" includes="*.jar"/> + <fileset dir="${jboss/common.core.lib}" includes="*.jar"/> + <fileset dir="${jboss/common.logging.log4j.lib}" includes="*.jar"/> + <fileset dir="${jboss/common.logging.spi.lib}" includes="*.jar"/> + <fileset dir="${jboss.aop.lib}" includes="*.jar"/> + <fileset dir="${jboss.jbossxb.lib}" includes="*.jar"/> + <fileset dir="${jboss/jboss.vfs.lib}" includes="*.jar"/> + <fileset dir="${javassist.javassist.lib}" includes="*.jar"/> + <fileset dir="${apache.xerces.lib}" includes="*.jar"/> + <fileset dir="${wutka.dtdparser.lib}" includes="*.jar"/> + <fileset dir="${oswego.concurrent.lib}" includes="*.jar"/> + <fileset dir="${trove.trove.lib}" includes="*.jar"/> + + </copy> + <mkdir dir="${build.lib}/jboss-4.2"/> + <jar jarfile="${build.lib}/jboss-4.2/portlet-test.war"> + <fileset dir="${build.resources}/jboss-4.2/portlet-test-war"/> + <fileset dir="${build.resources}/portlet-test-war"/> + </jar> + + <!-- Tomcat 6.0 portlet-test.war --> + <copy todir="${build.resources}/tomcat-6.0/portlet-test-war/WEB-INF/lib"> + <fileset dir="${build.lib}" includes="portlet-test-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar,portal-common-mc-lib.jar"/> <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> - <fileset dir="${jboss.portal-portlet.lib}" includes="*.jar"/> + <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/> - <fileset dir="${jboss.remoting.lib}" includes="jboss-remoting.jar"/> + <fileset dir="${jboss.remoting.lib}" includes="*.jar"/> <fileset dir="${jboss.microcontainer.lib}" includes="*.jar"/> <fileset dir="${jboss/common.core.lib}" includes="*.jar"/> @@ -175,15 +201,18 @@ <fileset dir="${jboss.jbossxb.lib}" includes="*.jar"/> <fileset dir="${jboss/jboss.vfs.lib}" includes="*.jar"/> <fileset dir="${javassist.javassist.lib}" includes="*.jar"/> - <!--<fileset dir="${apache.log4j.lib}" includes="*.jar"/>--> <fileset dir="${apache.xerces.lib}" includes="*.jar"/> <fileset dir="${wutka.dtdparser.lib}" includes="*.jar"/> <fileset dir="${oswego.concurrent.lib}" includes="*.jar"/> <fileset dir="${trove.trove.lib}" includes="*.jar"/> + </copy> - <jar jarfile="${build.lib}/portlet-test.war"> + <mkdir dir="${build.lib}/tomcat-6.0"/> + <jar jarfile="${build.lib}/tomcat-6.0/portlet-test.war"> + <fileset dir="${build.resources}/tomcat-6.0/portlet-test-war"/> <fileset dir="${build.resources}/portlet-test-war"/> </jar> + </target> <!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed --> @@ -237,8 +266,6 @@ <test todir="${test.reports}" name="org.jboss.portal.portlet.test.StringCodecTestCase"/> </x-test> <x-sysproperty> - <sysproperty key="test.root" value="${jboss.portal-portlet.root}/lib"/> - <sysproperty key="test.uri" value="/portlet-test/"/> <!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> @@ -269,6 +296,10 @@ </target> <target name="bilto" depends="init"> + + <!--<property name="ServerName" value="RemoteJBoss-4.2"/>--> + <property name="ServerName" value="RemoteTomcat-6.0"/> + <execute-tests> <x-test> @@ -278,222 +309,264 @@ outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase"> <parameter name="archive" value="test-jsr168-dispatcher.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> +<!-- <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase"> <parameter name="archive" value="test-jsr168-portletconfig.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase"> <parameter name="archive" value="test-jsr168-portletcontext.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase"> <parameter name="archive" value="test-jsr168-portletinterface.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase"> <parameter name="archive" value="test-jsr168-portletmode.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase"> <parameter name="archive" value="test-jsr168-portletrequests.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase"> <parameter name="archive" value="test-jsr168-portletresponses.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase"> <parameter name="archive" value="test-jsr168-portletsession.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase"> <parameter name="archive" value="test-jsr168-portleturl.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase"> <parameter name="archive" value="test-jsr168-preferences.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase"> <parameter name="archive" value="test-jsr168-windowstates.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> +--> <!--API Tests--> +<!-- <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase"> <parameter name="archive" value="test-jsr168-api-actionrequest.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase"> <parameter name="archive" value="test-jsr168-api-actionresponse.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase"> <parameter name="archive" value="test-jsr168-api-portalcontext.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase"> <parameter name="archive" value="test-jsr168-api-portletconfig.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase"> <parameter name="archive" value="test-jsr168-api-portletcontext.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase"> <parameter name="archive" value="test-jsr168-api-portletmode.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase"> <parameter name="archive" value="test-jsr168-api-portletpreferences.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase"> <parameter name="archive" value="test-jsr168-api-portletsession.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase"> <parameter name="archive" value="test-jsr168-api-portletsessionutil.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase"> <parameter name="archive" value="test-jsr168-api-portleturl.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase"> <parameter name="archive" value="test-jsr168-api-renderrequest.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase"> <parameter name="archive" value="test-jsr168-api-renderresponse.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase"> <parameter name="archive" value="test-jsr168-api-windowstate.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> +--> <!--Ext Tests--> +<!-- <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase"> <parameter name="archive" value="test-jsr168-ext-dispatcher.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase"> <parameter name="archive" value="test-jsr168-ext-portletconfig.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase"> <parameter name="archive" value="test-jsr168-ext-portletmode.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase"> <parameter name="archive" value="test-jsr168-ext-portletrequests.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase"> <parameter name="archive" value="test-jsr168-ext-portletresponses.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase"> <parameter name="archive" value="test-jsr168-ext-preferences.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase"> <parameter name="archive" value="test-jsr168-ext-session.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase"> <parameter name="archive" value="test-jsr168-ext-expiringcache.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase"> <parameter name="archive" value="test-jsr168-ext-neverexpiringcache.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase"> <parameter name="archive" value="test-jsr168-ext-nocache.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> +--> <!--Misc Tests--> +<!-- <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" outfile="TEST-org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase" id="org.jboss.portal.test.portlet.jsr168.misc.Log4jTestCase"> <parameter name="archive" value="test-jsr168-misc-log4j.war"/> + <parameter name="serverName" value="${ServerName}"/> </zest> +--> </x-test> <x-sysproperty> <sysproperty key="test.root" value="${jboss.portal-portlet.root}/lib"/> - <sysproperty key="test.uri" value="/portlet-test/"/> <!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> @@ -509,13 +582,11 @@ <path refid="apache.httpclient.classpath"/> <path refid="apache.logging.classpath"/> <path refid="apache.codec.classpath"/> + <pathelement location="${build.resources}/test"/> <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/> <path refid="jboss.jbossxb.classpath"/> <path refid="apache.xerces.classpath"/> - <!--<path refid="jbossas/core.libs.classpath"/>--> <pathelement location="${source.java}"/> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> <pathelement location="${jboss.portal-portlet.root}/classes"/> <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/> <path refid="library.classpath"/> Deleted: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -1,154 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.test; - -import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; -import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer; -import org.jboss.kernel.spi.deployment.KernelDeployment; -import org.jboss.kernel.spi.event.KernelEventListener; -import org.jboss.kernel.spi.event.KernelEvent; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.kernel.spi.registry.KernelRegistry; -import org.apache.log4j.Logger; - -import javax.servlet.ServletContext; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletContextEvent; -import java.net.URL; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class PortalKernelBootstrap extends BasicBootstrap implements ServletContextListener, KernelEventListener -{ - - /** . */ - private final static Logger log = Logger.getLogger(PortalKernelBootstrap.class); - - /** . */ - private ServletContext servletContext; - - /** . */ - private BeanXMLDeployer deployer; - - /** . */ - private KernelDeployment deployment; - - /** . */ - private boolean registered; - - protected void bootstrap() throws Throwable - { - super.bootstrap(); - - // - getKernel().getRegistry().registerListener(this, null, "ABC"); - registered = true; - - // - deployer = new BeanXMLDeployer(getKernel()); - - // - URL url = servletContext.getResource("/WEB-INF/jboss-beans.xml"); - deployment = deployer.deploy(url); - } - - public void contextInitialized(ServletContextEvent event) - { - servletContext = event.getServletContext(); - - try - { - Class c = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"); - System.out.println("Loaded " + c.getName()); - System.out.println("Loaded " + c.getName()); - System.out.println("Loaded " + c.getName()); - System.out.println("Loaded " + c.getName()); - System.out.println("Loaded " + c.getName()); - System.out.println("Loaded " + c.getName()); - System.out.println("Loaded " + c.getName()); - System.out.println("Loaded " + c.getName()); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - - // For now we do it here - System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logging.log4j.Log4jLoggerPlugin"); - - // - run(); - log.info("Test Portal started"); - } - - public void contextDestroyed(ServletContextEvent event) - { - if (deployment != null) - { - deployer.undeploy(deployment); - } - - // - if (registered) - { - registered = false; - try - { - KernelRegistry registry = getKernel().getRegistry(); - registry.unregisterListener(this, null, "ABC"); - } - catch (Throwable throwable) - { - log.error("Cannot unregister kernel registry listener", throwable); - } - } - - // - servletContext = null; - - // - log.info("Test Portal stopped"); - } - - public void onEvent(KernelEvent event, Object object) - { - Object context = event.getContext(); - if (context instanceof String) - { - String key = (String)context; - String type = event.getType(); - if ("KERNEL_REGISTRY_REGISTERED".equals(type)) - { - KernelRegistryEntry entry = getKernel().getRegistry().getEntry(context); - Object target = entry.getTarget(); - servletContext.setAttribute(key, target); - } - else if ("KERNEL_REGISTRY_UNREGISTERED".equals(type)) - { - servletContext.removeAttribute(key); - } - } - } -} Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -27,10 +27,9 @@ import org.jboss.portal.web.WebAppLifeCycleEvent; import org.jboss.portal.web.WebApp; import org.jboss.portal.web.ServletContainer; -import org.jboss.portal.web.spi.ServletContainerContext; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData; -import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory; -import org.jboss.portal.portlet.deployment.ValueTrimmingFilter; +import org.jboss.portal.portlet.test.deployment.PortletApplicationMetaDataFactory; +import org.jboss.portal.portlet.test.deployment.ValueTrimmingFilter; import org.jboss.portal.portlet.container.PortletApplication; import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.container.PortletApplicationRegistry; @@ -64,7 +63,7 @@ private PortletApplicationRegistry registry; /** . */ - private ServletContainerContext containerContext; + private ServletContainer servletContainer; /** . */ private KernelControllerContext controllerContext; @@ -88,6 +87,16 @@ this.registry = registry; } + public ServletContainer getServletContainer() + { + return servletContainer; + } + + public void setServletContainer(ServletContainer servletContainer) + { + this.servletContainer = servletContainer; + } + public void onEvent(WebAppEvent event) { if (event instanceof WebAppLifeCycleEvent) @@ -116,7 +125,7 @@ Thread.currentThread().setContextClassLoader(classLoader); Kernel kernel = controllerContext.getKernel(); PortletApplicationDeployment deployment = new PortletApplicationDeployment(kernel, webApp, metaData); - deploymentMap.put(webApp.getId(), deployment); + deploymentMap.put(webApp.getContextPath(), deployment); deployment.start(); } finally @@ -128,7 +137,7 @@ private void remove(WebApp webApp) { - PortletApplicationDeployment deployment = (PortletApplicationDeployment)deploymentMap.remove(webApp.getId()); + PortletApplicationDeployment deployment = (PortletApplicationDeployment)deploymentMap.remove(webApp.getContextPath()); if (deployment != null) { ClassLoader oldCL = Thread.currentThread().getContextClassLoader(); @@ -162,25 +171,17 @@ public void start() { - containerContext = ServletContainer.getContext(); classLoader = Thread.currentThread().getContextClassLoader(); // - if (containerContext != null) - { - containerContext.addWebAppListener(this); - } + servletContainer.addWebAppListener(this); } public void stop() { - if (containerContext != null) - { - containerContext.removeWebAppListener(this); - } + servletContainer.removeWebAppListener(this); // - containerContext = null; classLoader = null; } @@ -198,7 +199,7 @@ PortletApplicationMetaDataFactory factory = new PortletApplicationMetaDataFactory(); Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); PortletApplicationMetaData portletAppMD = (PortletApplicationMetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory), null); - portletAppMD.setId(webApp.getId()); + portletAppMD.setId(webApp.getContextPath()); return portletAppMD; } finally Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -83,13 +83,13 @@ this.kernel = kernel; this.webApp = webApp; this.metaData = metaData; - this.log = Logger.getLogger(PortletApplicationDeployment.class + "." + webApp.getId().replace('.', '_')); + this.log = Logger.getLogger(PortletApplicationDeployment.class + "." + webApp.getContextPath().replace('.', '_')); } void start() { - String id = "PortletApplication[" + webApp.getId() + "]"; + String id = "PortletApplication[" + webApp.getContextPath() + "]"; log.debug("Starting installation"); // @@ -99,7 +99,7 @@ for (Iterator i = metaData.getPortlets().iterator(); i.hasNext();) { PortletMetaData portletMetaData = (PortletMetaData)i.next(); - String portletContainerId = "PortletContainer[" + webApp.getId() + "," + portletMetaData.getName() + "]"; + String portletContainerId = "PortletContainer[" + webApp.getContextPath() + "," + portletMetaData.getName() + "]"; AbstractBeanMetaData bmd = new AbstractBeanMetaData(portletContainerId, PortletContainerImpl.class.getName()); AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData(); ctormd.setParameters(new CollectionBuilder(). Copied: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/JBossApplicationMetaDataFactory.java (from rev 7982, modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java) =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/JBossApplicationMetaDataFactory.java (rev 0) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/JBossApplicationMetaDataFactory.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,263 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.test.deployment; + +import org.jboss.portal.common.transaction.Transactions; +import org.jboss.portal.portlet.impl.jsr168.info.ContainerCacheInfo; +import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; +import org.jboss.portal.portlet.metadata.JBossPortletMetaData; +import org.jboss.portal.portlet.metadata.PolicyPermissionMetaData; +import org.jboss.xb.binding.GenericObjectModelFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6720 $ + */ +public class JBossApplicationMetaDataFactory implements GenericObjectModelFactory +{ + + public Object newRoot(Object root, + UnmarshallingContext nav, + String nsURI, + String localName, + Attributes attrs) + { + if (root == null) + { + root = new JBossApplicationMetaData(); + } + return root; + } + + public Object completeRoot(Object root, UnmarshallingContext nav, String uri, String name) + { + return root; + } + + public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + if (object instanceof JBossApplicationMetaData) + { + if ("portlet".equals(localName)) + { + return createJBossPortlet(); + } + } +// else if (object instanceof JBossPortletMetaData) +// { +// if ("security-constraint".equals(localName)) +// { +// return new SecurityConstraintMetaData(); +// } +// } +// else if (object instanceof SecurityConstraintMetaData) +// { +// if ("policy-permission".equals(localName)) +// { +// return new PolicyPermissionMetaData(); +// } +// } + else if (object instanceof PolicyPermissionMetaData) + { + if ("unchecked".equals(localName)) + { + return "unchecked"; + } + } + return null; + } + + public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName) + { + if (parent instanceof JBossApplicationMetaData) + { + JBossApplicationMetaData app = (JBossApplicationMetaData)parent; + if (child instanceof JBossPortletMetaData) + { + JBossPortletMetaData portlet = (JBossPortletMetaData)child; + app.getPortlets().put(portlet.getName(), portlet); + portlet.merge(app); + } + } +// else if (parent instanceof JBossPortletMetaData) +// { +// JBossPortletMetaData portlet = (JBossPortletMetaData)parent; +// if (child instanceof SecurityConstraintMetaData) +// { +// portlet.setSecurityConstraint((SecurityConstraintMetaData)child); +// } +// } +// else if (parent instanceof SecurityConstraintMetaData) +// { +// SecurityConstraintMetaData securityConstraint = (SecurityConstraintMetaData)parent; +// if (child instanceof PolicyPermissionMetaData) +// { +// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)child; +// PolicyPermissionMetaData other = (PolicyPermissionMetaData)securityConstraint.getPolicyPermissions().get(policyPermission.getRoleName()); +// if (other != null) +// { +// other.getActions().addAll(policyPermission.getActions()); +// } +// else +// { +// securityConstraint.getPolicyPermissions().put(policyPermission.getRoleName(), policyPermission); +// } +// } +// } +// else if (parent instanceof PolicyPermissionMetaData) +// { +// PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)parent; +// if ("unchecked".equals(child)) +// { +// policyPermission.setRoleName(SecurityConstants.UNCHECKED_ROLE_NAME); +// } +// } + } + + public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value) + { + if (object instanceof JBossApplicationMetaData) + { + JBossApplicationMetaData app = (JBossApplicationMetaData)object; + if ("remotable".equals(localName)) + { + if ("true".equalsIgnoreCase(value)) + { + app.setRemotable(Boolean.TRUE); + } + else if ("false".equalsIgnoreCase(value)) + { + app.setRemotable(Boolean.FALSE); + } + else + { + throw new RuntimeException(); + } + } + } + else if (object instanceof JBossPortletMetaData) + { + JBossPortletMetaData portlet = (JBossPortletMetaData)object; + if ("portlet-name".equals(localName)) + { + portlet.setName(value); + } + else if ("remotable".equals(localName)) + { + if ("true".equalsIgnoreCase(value)) + { + portlet.setRemotable(Boolean.TRUE); + } + else if ("false".equalsIgnoreCase(value)) + { + portlet.setRemotable(Boolean.FALSE); + } + else + { + throw new RuntimeException(); + } + } + else if ("distributed".equals(localName)) + { + if ("true".equalsIgnoreCase(value)) + { + portlet.setDistributed(Boolean.TRUE); + } + else if ("false".equalsIgnoreCase(value)) + { + portlet.setDistributed(Boolean.FALSE); + } + else + { + throw new RuntimeException(); + } + } + else if ("ref-type".equals(localName)) + { + if ("strong".equals(localName)) + { + portlet.setCacheRefType(new Integer(ContainerCacheInfo.REF_STRONG)); + } + else if ("soft".equals(localName)) + { + portlet.setCacheRefType(new Integer(ContainerCacheInfo.REF_SOFT)); + } + else + { + // log.warn("Unrecognized reference type " + refType); + } + } + else if ("trans-attribute".equals(localName)) + { + if ("Required".equalsIgnoreCase(value)) + { + portlet.setTxType(Transactions.TYPE_REQUIRED); + } + else if ("Mandatory".equals(value)) + { + portlet.setTxType(Transactions.TYPE_MANDATORY); + } + else if ("Never".equals(value)) + { + portlet.setTxType(Transactions.TYPE_NEVER); + } + else if ("Supports".equals(value)) + { + portlet.setTxType(Transactions.TYPE_SUPPORTS); + } + else if ("NotSupported".equals(value)) + { + portlet.setTxType(Transactions.TYPE_NOT_SUPPORTED); + } + else if ("RequiresNew".equals(value)) + { + portlet.setTxType(Transactions.TYPE_REQUIRES_NEW); + } + else + { + throw new RuntimeException(); + } + } + } + else if (object instanceof PolicyPermissionMetaData) + { + PolicyPermissionMetaData policyPermission = (PolicyPermissionMetaData)object; + if ("role-name".equals(localName)) + { + policyPermission.setRoleName(value); + } + else if ("action-name".equals(localName)) + { + policyPermission.getActions().add(value); + } + } + } + + /** Can be subclasses to allow sub class. */ + protected JBossPortletMetaData createJBossPortlet() + { + return new JBossPortletMetaData(); + } +} Property changes on: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/JBossApplicationMetaDataFactory.java ___________________________________________________________________ Name: svn:executable + Copied: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java (from rev 7982, modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java) =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java (rev 0) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,405 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.test.deployment; + +import org.jboss.portal.Mode; +import org.jboss.portal.common.i18n.LocaleFormat; +import org.jboss.portal.common.util.Tools; +import org.jboss.portal.common.util.ConversionException; +import org.jboss.portal.portlet.TransportGuarantee; +import org.jboss.portal.portlet.impl.jsr168.metadata.CacheConfigMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.ContentTypeMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.DescribableObjectMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.DescriptionMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.DisplayNameMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityConstraintMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.TransportGuaranteesMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.UserAttributeMetaData; +import org.jboss.xb.binding.GenericObjectModelFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; +import org.apache.log4j.Logger; + +import java.util.Iterator; +import java.util.List; +import java.util.Locale; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7200 $ + */ +public class PortletApplicationMetaDataFactory implements GenericObjectModelFactory +{ + + /** . */ + private static final Logger log = Logger.getLogger(PortletApplicationMetaDataFactory.class); + + public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + return new PortletApplicationMetaData(); + } + + public Object completeRoot(Object root, UnmarshallingContext ctx, String nsURI, String name) + { + return root; + } + + public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + if (object instanceof DescribableObjectMetaData) + { + if ("description".equals(localName)) + { + String lang = attrs.getValue("xml:lang"); + DescriptionMetaData value = new DescriptionMetaData(); + if (lang != null) + { + try + { + Locale locale = LocaleFormat.DEFAULT.getLocale(lang); + value.setLocale(locale); + } + catch (ConversionException e) + { + log.error("Cannot obtain language value", e); + return null; + } + } + return value; + } + } + if (object instanceof PortletApplicationMetaData) + { + if ("portlet".equals(localName)) + { + return new PortletMetaData(); + } + else if ("user-attribute".equals(localName)) + { + return new UserAttributeMetaData(); + } + else if ("security-constraint".equals(localName)) + { + return new SecurityConstraintMetaData(); + } + } + if (object instanceof PortletMetaData) + { + if ("init-param".equals(localName)) + { + return new ParameterMetaData(); + } + else if ("supports".equals(localName)) + { + return new ContentTypeMetaData(); + } + else if ("portlet-info".equals(localName)) + { + return new LanguagesMetaData.InfoMetaData(); + } + else if ("security-role-ref".equals(localName)) + { + return new SecurityRoleRefMetaData(); + } + else if ("preference".equals(localName)) + { + return new PreferenceMetaData(); + } + else if ("display-name".equals(localName)) + { + String lang = attrs.getValue("xml:lang"); + DisplayNameMetaData value = new DisplayNameMetaData(); + if (lang != null) + { + try + { + Locale locale = LocaleFormat.DEFAULT.getLocale(lang); + value.setLocale(locale); + } + catch (ConversionException e) + { + log.error("Cannot obtain language value", e); + return null; + } + } + return value; + } + } + return null; + } + + public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName) + { + if (parent instanceof DescribableObjectMetaData) + { + DescribableObjectMetaData describable = (DescribableObjectMetaData)parent; + if (child instanceof DescriptionMetaData) + { + describable.getDescription().getValues().add(child); + } + } + if (parent instanceof PortletApplicationMetaData) + { + PortletApplicationMetaData pa = (PortletApplicationMetaData)parent; + if (child instanceof PortletMetaData) + { + pa.addPortlet((PortletMetaData)child); + } + else if (child instanceof UserAttributeMetaData) + { + UserAttributeMetaData userAttribute = (UserAttributeMetaData)child; + pa.getUserAttributes().put(userAttribute.getName(), userAttribute); + } + else if (child instanceof SecurityConstraintMetaData) + { + SecurityConstraintMetaData security = (SecurityConstraintMetaData)child; + for (Iterator i = security.getPortlets().iterator(); i.hasNext();) + { + String portletName = (String)i.next(); + PortletMetaData portlet = pa.getPortlet(portletName); + if (portlet.getTransportGuarantees() == null) + { + portlet.setTransportGuarantees(new TransportGuaranteesMetaData()); + } + portlet.getTransportGuarantees().add(security.getTransportGuarantee()); + } + + } + } + if (parent instanceof PortletMetaData) + { + PortletMetaData portlet = (PortletMetaData)parent; + if (child instanceof ParameterMetaData) + { + ParameterMetaData parameter = (ParameterMetaData)child; + portlet.getParameters().put(parameter.getName(), parameter); + } + else if (child instanceof ContentTypeMetaData) + { + portlet.getContentTypes().addContentType((ContentTypeMetaData)child); + } + else if (child instanceof LanguagesMetaData.InfoMetaData) + { + + LanguagesMetaData.InfoMetaData info = (LanguagesMetaData.InfoMetaData)child; + if (info.getTitle() == null) + { + // JBossXB won't populate <title></title> + info.setTitle(""); + } + portlet.getLanguages().setInfo(info); + } + else if (child instanceof SecurityRoleRefMetaData) + { + portlet.getSecurityRoleRefs().add(child); + } + else if (child instanceof DisplayNameMetaData) + { + portlet.getDisplayName().getValues().add(child); + } + } + if (parent instanceof PortletMetaData) + { + PortletMetaData preferences = (PortletMetaData)parent; + if (child instanceof PreferenceMetaData) + { + preferences.getPreferences().addPreference((PreferenceMetaData)child); + } + } + } + + public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value) + { + if (object instanceof PortletApplicationMetaData) + { + PortletApplicationMetaData app = (PortletApplicationMetaData)object; + if ("version".equals(localName)) + { + app.setVersion(value); + } + } + if (object instanceof LocalizedValueMetaData) + { + LocalizedValueMetaData localizedValue = (LocalizedValueMetaData)object; + if ("description".equals(localName)) + { + localizedValue.setValue(value); + } + else if ("display-name".equals(localName)) + { + localizedValue.setValue(value); + } + } + if (object instanceof PortletMetaData) + { + PortletMetaData portlet = (PortletMetaData)object; + if ("portlet-name".equals(localName)) + { + portlet.setName(value); + } + else if ("portlet-class".equals(localName)) + { + portlet.setClassName(value); + } + else if ("expiration-cache".equals(localName)) + { + CacheConfigMetaData cacheConfig = portlet.getCacheConfig(); + if (cacheConfig == null) + { + cacheConfig = new CacheConfigMetaData(); + portlet.setCacheConfig(cacheConfig); + } + int timeMillis = Integer.parseInt(value); + cacheConfig.setExpirationTime(timeMillis); + } + else if ("resource-bundle".equals(localName)) + { + portlet.getLanguages().setResourceBundle(value); + } + else if ("supported-locale".equals(localName)) + { + try + { + Locale locale = LocaleFormat.DEFAULT.getLocale(value); + portlet.getLanguages().getSupportedLocales().add(locale); + } + catch (ConversionException e) + { + log.error("Cannot obtain language value", e); + } + } + else if ("preferences-validator".equals(localName)) + { + portlet.getPreferences().setValidator(value); + } + } + if (object instanceof ParameterMetaData) + { + ParameterMetaData parameter = (ParameterMetaData)object; + if ("name".equals(localName)) + { + parameter.setName(value); + } + else if ("value".equals(localName)) + { + parameter.setValue(value); + } + } + if (object instanceof ContentTypeMetaData) + { + ContentTypeMetaData contentType = (ContentTypeMetaData)object; + if ("mime-type".equals(localName)) + { + contentType.setContentType(value); + } + else if ("portlet-mode".equals(localName)) + { + contentType.getModes().add(Mode.create(value)); + } + } + if (object instanceof LanguagesMetaData.InfoMetaData) + { + LanguagesMetaData.InfoMetaData info = (LanguagesMetaData.InfoMetaData)object; + if ("title".equals(localName)) + { + info.setTitle(value); + } + else if ("short-title".equals(localName)) + { + info.setShortTitle(value); + } + else if ("keywords".equals(localName)) + { + info.setKeywords(value); + } + } + if (object instanceof PreferenceMetaData) + { + PreferenceMetaData preference = (PreferenceMetaData)object; + if ("name".equals(localName)) + { + preference.setName(value); + } + else if ("value".equals(localName)) + { + List tmp = Tools.toList(preference.getValues()); + tmp.add(value); + preference.setValues((String[])tmp.toArray(new String[tmp.size()])); + } + else if ("read-only".equals(localName)) + { + if ("true".equalsIgnoreCase(value)) + { + preference.setReadOnly(true); + } + else if ("false".equalsIgnoreCase(value)) + { + preference.setReadOnly(false); + } + else + { + throw new RuntimeException("Unrecognized read only value" + value); + } + } + } + if (object instanceof SecurityRoleRefMetaData) + { + SecurityRoleRefMetaData srr = (SecurityRoleRefMetaData)object; + if ("role-name".equals(localName)) + { + srr.setRoleName(value); + } + else if ("role-link".equals(localName)) + { + srr.setRoleLink(value); + } + } + if (object instanceof UserAttributeMetaData) + { + UserAttributeMetaData userAttribute = (UserAttributeMetaData)object; + if ("name".equals(localName)) + { + userAttribute.setName(value); + } + } + else if (object instanceof SecurityConstraintMetaData) + { + SecurityConstraintMetaData security = (SecurityConstraintMetaData)object; + if ("portlet-name".equals(localName)) + { + security.addPortlet(value); + } + if ("transport-guarantee".equals(localName)) + { + security.setTransportGuarantee(TransportGuarantee.decode(value)); + } + } + } +} Property changes on: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/PortletApplicationMetaDataFactory.java ___________________________________________________________________ Name: svn:executable + Copied: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java (from rev 7982, modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java) =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java (rev 0) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,208 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.test.deployment; + +import junit.framework.TestCase; +import org.jboss.portal.common.transaction.Transactions; +import org.jboss.portal.common.net.URLTools; +import org.jboss.portal.portlet.TransportGuarantee; +import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory; +import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory; +import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData; +import org.jboss.portal.portlet.impl.jsr168.metadata.UserAttributeMetaData; +import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; +import org.jboss.portal.portlet.metadata.JBossPortletMetaData; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; + +import java.net.URL; +import java.util.Locale; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7379 $ + */ +public class UnmarshallerTestCase extends TestCase +{ + + public void testJBossPortletXML() throws Exception + { + URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml"); + assertTrue(URLTools.exists(jbossPortletXML)); + + // + JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory(); + + // + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + + // + Object o = unmarshaller.unmarshal(jbossPortletXML.openStream(), factory, null); + assertNotNull(o); + assertTrue(o instanceof JBossApplicationMetaData); + JBossApplicationMetaData app = (JBossApplicationMetaData)o; + + // + assertNotNull(app.getPortlets()); + assertEquals(2, app.getPortlets().size()); + + // + JBossPortletMetaData portlet1 = (JBossPortletMetaData)app.getPortlets().get("Portlet1"); + assertNotNull(portlet1); + assertEquals("Portlet1", portlet1.getName()); + assertEquals(Boolean.FALSE, portlet1.getRemotable()); + assertEquals(Transactions.TYPE_REQUIRED, portlet1.getTxType()); +// assertNotNull(portlet1.getSecurityConstraint()); +// assertNotNull(portlet1.getSecurityConstraint().getPolicyPermissions()); +// assertEquals(2, portlet1.getSecurityConstraint().getPolicyPermissions().size()); +// assertNotNull(portlet1.getSecurityConstraint().getPolicyPermissions().get("Admin")); +// assertEquals("Admin", ((PolicyPermissionMetaData)portlet1.getSecurityConstraint().getPolicyPermissions().get("Admin")).getRoleName()); +// assertEquals(new CollectionBuilder().add("view").add("create").toHashSet(), ((PolicyPermissionMetaData)portlet1.getSecurityConstraint().getPolicyPermissions().get("Admin")).getActions()); +// assertEquals("User", ((PolicyPermissionMetaData)portlet1.getSecurityConstraint().getPolicyPermissions().get("User")).getRoleName()); +// assertEquals(new CollectionBuilder().add("view").add("destroy").toHashSet(), ((PolicyPermissionMetaData)portlet1.getSecurityConstraint().getPolicyPermissions().get("User")).getActions()); + + JBossPortletMetaData portlet2 = (JBossPortletMetaData)app.getPortlets().get("Portlet2"); + assertNotNull(portlet2); + assertEquals("Portlet2", portlet2.getName()); + Boolean remotable = portlet2.getRemotable(); + assertNotNull(remotable); + assertTrue(remotable.booleanValue()); + } + + public void testPortletXML() throws Exception + { + URL portletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/portlet.xml"); + assertTrue(URLTools.exists(portletXML)); + + // +// URL portletXSD = Thread.currentThread().getContextClassLoader().getResource("portlet-app_1_0.xsd"); +// assertTrue(Tools.exists(portletXSD)); + + // + PortletApplicationMetaDataFactory factory = new PortletApplicationMetaDataFactory(); + + // + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + + // + Object o = unmarshaller.unmarshal(portletXML.openStream(), factory, null); + assertNotNull(o); + assertTrue(o instanceof PortletApplicationMetaData); + PortletApplicationMetaData app = (PortletApplicationMetaData)o; + + // + assertEquals(2, app.getPortlets().size()); + + // + PortletMetaData portlet1 = app.getPortlet("Portlet1"); + assertNotNull(portlet1); + + // + assertEquals("Portlet1", portlet1.getName()); + assertEquals("org.jboss.portal.test.portlet.TestPortlet", portlet1.getClassName()); + +// <display-name>display</display-name> +// <display-name xml:lang="fr">affichage</display-name> + + assertNotNull(portlet1.getDescription()); + assertNotNull(portlet1.getDescription().getValues()); + assertEquals(2, portlet1.getDescription().getValues().size()); + assertEquals(null, ((LocalizedValueMetaData)portlet1.getDescription().getValues().get(0)).getLocale()); + assertEquals("default", ((LocalizedValueMetaData)portlet1.getDescription().getValues().get(0)).getValue()); + assertEquals(Locale.FRENCH, ((LocalizedValueMetaData)portlet1.getDescription().getValues().get(1)).getLocale()); + assertEquals("defaut", ((LocalizedValueMetaData)portlet1.getDescription().getValues().get(1)).getValue()); + assertNotNull(portlet1.getDisplayName()); + assertNotNull(portlet1.getDisplayName().getValues()); + assertEquals(2, portlet1.getDisplayName().getValues().size()); + assertEquals(null, ((LocalizedValueMetaData)portlet1.getDisplayName().getValues().get(0)).getLocale()); + assertEquals("display", ((LocalizedValueMetaData)portlet1.getDisplayName().getValues().get(0)).getValue()); + assertEquals(Locale.FRENCH, ((LocalizedValueMetaData)portlet1.getDisplayName().getValues().get(1)).getLocale()); + assertEquals("affichage", ((LocalizedValueMetaData)portlet1.getDisplayName().getValues().get(1)).getValue()); + assertNotNull(portlet1.getParameters()); + assertEquals(2, portlet1.getParameters().size()); + assertNotNull(portlet1.getParameters().get("one")); + assertNotNull(portlet1.getCacheConfig()); + assertEquals(0, portlet1.getCacheConfig().getExpirationTime()); + assertEquals("one", ((ParameterMetaData)portlet1.getParameters().get("one")).getName()); + assertEquals("1", ((ParameterMetaData)portlet1.getParameters().get("one")).getValue()); + assertEquals("two", ((ParameterMetaData)portlet1.getParameters().get("two")).getName()); + assertEquals("2", ((ParameterMetaData)portlet1.getParameters().get("two")).getValue()); + assertNotNull(portlet1.getLanguages()); + assertNotNull(portlet1.getLanguages().getInfo()); + assertEquals("very long portlet title", portlet1.getLanguages().getInfo().getTitle()); + assertEquals("short portlet title", portlet1.getLanguages().getInfo().getShortTitle()); + assertEquals("a,b,c,d,e,f", portlet1.getLanguages().getInfo().getKeywords()); + assertEquals("MyResourceBundle", portlet1.getLanguages().getResourceBundle()); + assertNotNull(portlet1.getLanguages().getSupportedLocales()); + assertEquals(2, portlet1.getLanguages().getSupportedLocales().size()); + assertEquals(Locale.ENGLISH, portlet1.getLanguages().getSupportedLocales().get(0)); + assertEquals(Locale.FRENCH, portlet1.getLanguages().getSupportedLocales().get(1)); + assertNotNull(portlet1.getPreferences()); + assertEquals(4, portlet1.getPreferences().size()); + assertNotNull(portlet1.getPreferences().getPreference("one")); + assertNotNull(portlet1.getPreferences().getPreference("two")); + assertNotNull(portlet1.getPreferences().getPreference("three")); + assertNotNull(portlet1.getPreferences().getPreference("all")); + assertEquals("one", portlet1.getPreferences().getPreference("one").getName()); + assertEquals("two", portlet1.getPreferences().getPreference("two").getName()); + assertEquals("three", portlet1.getPreferences().getPreference("three").getName()); + assertEquals("all", portlet1.getPreferences().getPreference("all").getName()); + assertNotNull(portlet1.getPreferences().getPreference("one").getValues()); + assertNotNull(portlet1.getPreferences().getPreference("two").getValues()); + assertNotNull(portlet1.getPreferences().getPreference("three").getValues()); + assertNotNull(portlet1.getPreferences().getPreference("all").getValues()); + assertEquals(1, portlet1.getPreferences().getPreference("one").getValues().length); + assertEquals(1, portlet1.getPreferences().getPreference("two").getValues().length); + assertEquals(1, portlet1.getPreferences().getPreference("three").getValues().length); + assertEquals(3, portlet1.getPreferences().getPreference("all").getValues().length); + assertFalse(portlet1.getPreferences().getPreference("one").isReadOnly()); + assertFalse(portlet1.getPreferences().getPreference("two").isReadOnly()); + assertTrue(portlet1.getPreferences().getPreference("three").isReadOnly()); + assertFalse(portlet1.getPreferences().getPreference("all").isReadOnly()); + assertEquals("MyValidator", portlet1.getPreferences().getValidator()); + assertNotNull(portlet1.getSecurityRoleRefs()); + assertEquals(2, portlet1.getSecurityRoleRefs().size()); + assertNotNull(portlet1.getSecurityRoleRefs().get(0)); + assertNotNull(portlet1.getSecurityRoleRefs().get(1)); + assertEquals("ROLE_NAME_WITHOUT_LINK", ((SecurityRoleRefMetaData)portlet1.getSecurityRoleRefs().get(0)).getRoleName()); + assertEquals(null, ((SecurityRoleRefMetaData)portlet1.getSecurityRoleRefs().get(0)).getRoleLink()); + assertEquals("ROLE_NAME_WITH_LINK", ((SecurityRoleRefMetaData)portlet1.getSecurityRoleRefs().get(1)).getRoleName()); + assertEquals("ROLE_LINK", ((SecurityRoleRefMetaData)portlet1.getSecurityRoleRefs().get(1)).getRoleLink()); + + assertTrue(portlet1.getTransportGuarantees().contains(TransportGuarantee.CONFIDENTIAL)); + assertTrue(portlet1.getTransportGuarantees().contains(TransportGuarantee.INTEGRAL)); + + // + assertNotNull(app.getUserAttributes()); + assertEquals(2, app.getUserAttributes().size()); + assertNotNull(app.getUserAttributes().get("att1")); + assertEquals("att1", ((UserAttributeMetaData)app.getUserAttributes().get("att1")).getName()); + assertNotNull(app.getUserAttributes().get("att2")); + assertEquals("att2", ((UserAttributeMetaData)app.getUserAttributes().get("att2")).getName()); + } + +} Property changes on: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/UnmarshallerTestCase.java ___________________________________________________________________ Name: svn:executable + Copied: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/ValueTrimmingFilter.java (from rev 7982, modules/portlet/trunk/portlet/src/main/org/jboss/portal/portlet/deployment/ValueTrimmingFilter.java) =================================================================== --- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/ValueTrimmingFilter.java (rev 0) +++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/ValueTrimmingFilter.java 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,75 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.test.deployment; + +import org.jboss.xb.binding.GenericObjectModelFactory; +import org.jboss.xb.binding.UnmarshallingContext; +import org.xml.sax.Attributes; + +/** + * Filter <code>setValue</code> method by doing a trimming before calling the next model. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6713 $ + */ +public class ValueTrimmingFilter implements GenericObjectModelFactory +{ + + private final GenericObjectModelFactory next; + + public ValueTrimmingFilter(GenericObjectModelFactory next) throws IllegalArgumentException + { + if (next == null) + { + throw new IllegalArgumentException("Cannot be null"); + } + this.next = next; + } + + public Object newChild(Object object, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + return next.newChild(object, nav, nsURI, localName, attrs); + } + + public void addChild(Object parent, Object child, UnmarshallingContext nav, String nsURI, String localName) + { + next.addChild(parent, child, nav, nsURI, localName); + } + + public void setValue(Object object, UnmarshallingContext nav, String nsURI, String localName, String value) + { + value = value.trim(); + next.setValue(object, nav, nsURI, localName, value); + } + + public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) + { + return next.newRoot(root, nav, nsURI, localName, attrs); + } + + public Object completeRoot(Object root, UnmarshallingContext nav, String nsURI, String localName) + { + return next.completeRoot(root, nav, nsURI, localName); + } + +} Property changes on: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/deployment/ValueTrimmingFilter.java ___________________________________________________________________ Name: svn:executable + Added: modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/context.xml 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,24 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<Context privileged="true"> +</Context> \ No newline at end of file Added: modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml =================================================================== --- modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml (rev 0) +++ modules/portlet/trunk/test/src/resources/jboss-4.2/portlet-test-war/WEB-INF/jboss-context.xml 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Deleted: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties 2007-09-10 23:11:14 UTC (rev 8209) @@ -1,13 +0,0 @@ -### ====================================================================== ### -## ## -## JBoss Bootstrap Log4j Configuration ## -## ## -### ====================================================================== ### - -log4j.rootCategory=ALL, CONSOLE - -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.Threshold=DEBUG -log4j.appender.CONSOLE.Target=System.out -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Deleted: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/classes/logging.properties =================================================================== --- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/classes/logging.properties 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/classes/logging.properties 2007-09-10 23:11:14 UTC (rev 8209) @@ -1,13 +0,0 @@ -handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -org.apache.juli.FileHandler.level = FINE -org.apache.juli.FileHandler.directory = ${catalina.base}/logs -org.apache.juli.FileHandler.prefix = servlet-examples. - -java.util.logging.ConsoleHandler.level = FINE -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Modified: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml =================================================================== --- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-09-10 23:11:14 UTC (rev 8209) @@ -1,18 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Deployment holds beans --> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" - xmlns="urn:jboss:bean-deployer:2.0"> + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> - <bean name="TestDriverServer" class="org.jboss.portal.test.framework.driver.http.HTTPTestDriverServer"> - <property name="initialPath">/portlet-test</property> + <bean name="TestDriverServer" class="org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer"> </bean> <bean name="TestDriverServerExporter" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> <constructor> <parameter>socket://localhost:5400</parameter> <parameter><inject bean="TestDriverServer"/></parameter> - <parameter>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</parameter> + <parameter>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</parameter> </constructor> </bean> @@ -22,6 +42,7 @@ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.PortletApplicationDeployer"> <property name="registry"><inject bean="PortletApplicationRegistry"/></property> + <property name="servletContainer"><inject bean="ServletContainer"/></property> </bean> <bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"> @@ -30,9 +51,9 @@ <bean name="PortletInfoFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletInfoFactoryImpl"> </bean> - <!-- The servlet container context obtained from the ServletContainer registry --> - <bean name="ServletContainerContext" class="org.jboss.portal.web.spi.ServletContainerContext"> - <constructor factoryClass="org.jboss.portal.web.ServletContainer" factoryMethod="getContext"/> + <!-- The servlet container obtained from the ServletContainer factory --> + <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer"> + <constructor factoryClass="org.jboss.portal.web.ServletContainer" factoryMethod="getInstance"/> </bean> <!-- Consumer stack --> @@ -58,7 +79,7 @@ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor"> </bean> <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor"> - <property name="servletContainerContext"><inject bean="ServletContainerContext"/></property> + <property name="servletContainer"><inject bean="ServletContainer"/></property> </bean> <bean name="WindowStatesInterceptor" class="org.jboss.portal.portlet.aspects.portlet.WindowStatesInterceptor"> </bean> Modified: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/web.xml =================================================================== --- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/web.xml 2007-09-10 23:06:44 UTC (rev 8208) +++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/web.xml 2007-09-10 23:11:14 UTC (rev 8209) @@ -27,9 +27,14 @@ "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> <listener> - <listener-class>org.jboss.portal.portlet.test.PortalKernelBootstrap</listener-class> + <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> </listener> <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> <servlet-name>PortalServlet</servlet-name> <servlet-class>org.jboss.portal.portlet.test.PortalServlet</servlet-class> </servlet> Added: modules/portlet/trunk/test/src/resources/test/servers.xml =================================================================== --- modules/portlet/trunk/test/src/resources/test/servers.xml (rev 0) +++ modules/portlet/trunk/test/src/resources/test/servers.xml 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,42 @@ +<servers> + <server> + <server-name>RemoteTomcat-6.0</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>tomcat5x</name> + <host>localhost</host> + <port>8080</port> + </remote> + <authentication> + <username>admin</username> + <password>admin</password> + </authentication> + </deployer> + </node> + </server> + <server> + <server-name>RemoteJBoss-4.2</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>jboss4x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> +</servers> Added: modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/META-INF/context.xml =================================================================== --- modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/META-INF/context.xml (rev 0) +++ modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/META-INF/context.xml 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,2 @@ +<Context privileged="true"> +</Context> \ No newline at end of file Added: modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/log4j.properties =================================================================== --- modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/log4j.properties (rev 0) +++ modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/log4j.properties 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/logging.properties =================================================================== --- modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/logging.properties (rev 0) +++ modules/portlet/trunk/test/src/resources/tomcat-6.0/portlet-test-war/WEB-INF/classes/logging.properties 2007-09-10 23:11:14 UTC (rev 8209) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = servlet-examples. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter