JBoss Portal SVN: r11502 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-07-18 12:28:33 -0400 (Fri, 18 Jul 2008)
New Revision: 11502
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml
Log:
- Added documentation on WSRP validation mode.
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml 2008-07-18 15:30:25 UTC (rev 11501)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml 2008-07-18 16:28:33 UTC (rev 11502)
@@ -956,5 +956,39 @@
</para>
</sect3>
</sect2>
+ <sect2 id="strict-mode">
+ <title>WSRP validation mode</title>
+ <para>The lack of conformance kit and the wording of the WSRP specification leaves room for differing
+ interpretations, resulting in interoperability issues. It is therefore possible to encounter issues when
+ using consumers from different vendors. We have experienced such issues and have introduced a way to relax
+ the validation that our WSRP producer performs on the data provided by consumers to help with
+ interoperability by accepting data that would normally be invalid. Note that we only relax our validation
+ algorithm on aspects of the specification that are deemed harmless such as invalid language codes.
+ </para>
+ <para>
+ By default, the WSRP producer is configured in strict mode. If you experience issues with a given consumer,
+ you might want to try to relax the validation mode. This is accomplished by editing
+ <filename>jboss-portal.sar/portal-wsrp.sar/META-INF/jboss-service.xml</filename> and setting the value of
+ the <literal>UseStrictMode</literal> attribute to <literal>false</literal> as shown below:
+
+ <programlisting><![CDATA[
+<!-- WSRP Producer implementation -->
+<mbean code="org.jboss.portal.wsrp.producer.WSRPProducerImpl"
+ name="portal.wsrp:service=WSRPProducer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="Invoker" proxy-type="attribute">portal:service=PortletInvoker,type=Producer
+ </depends>
+ <depends optional-attribute-name="RegistrationManager" proxy-type="attribute">
+ portal.wsrp:service=RegistrationManager,type=Producer
+ </depends>
+ <depends optional-attribute-name="ProducerConfigurationService" proxy-type="attribute">
+ portal.wsrp:service=ProducerConfiguration
+ </depends>
+ <attribute name="UseStrictMode">true</attribute><!-- Set to false to switch to lenient mode -->
+</mbean>]]></programlisting>
+ </para>
+ </sect2>
</sect1>
</chapter>
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11501 - in branches/JBoss_Portal_Branch_2_6_SYBASE: core-identity/src/resources/portal-identity-sar/META-INF and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-18 11:30:25 -0400 (Fri, 18 Jul 2008)
New Revision: 11501
Modified:
branches/JBoss_Portal_Branch_2_6_SYBASE/build/build.log
branches/JBoss_Portal_Branch_2_6_SYBASE/build/build.xml
branches/JBoss_Portal_Branch_2_6_SYBASE/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_6_SYBASE/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_6_SYBASE/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
Log:
Modified: branches/JBoss_Portal_Branch_2_6_SYBASE/build/build.log
===================================================================
--- branches/JBoss_Portal_Branch_2_6_SYBASE/build/build.log 2008-07-18 15:12:13 UTC (rev 11500)
+++ branches/JBoss_Portal_Branch_2_6_SYBASE/build/build.log 2008-07-18 15:30:25 UTC (rev 11501)
@@ -1619,7 +1619,7 @@
[copy] Copied 50 empty directories to 1 empty directory under /home/theute/Portal/Development/workspace_2_6_Sybase/core/output/resources
compile:
-[execmodules] [info] Total length of filenames to be compiled is greater than 1000, listing files in --SOURCEPATH: /tmp/src19404.tmp
+[execmodules] [info] Total length of filenames to be compiled is greater than 1000, listing files in --SOURCEPATH: /tmp/src31917.tmp
[aopc] [debug] Passed in instrumentor: null
[aopc] [debug] Defaulting instrumentor to: org.jboss.aop.instrument.ClassicInstrumentor
[aopc] [debug] jboss.aop.class.path is NULL
@@ -1634,13 +1634,13 @@
[aopc] [trying to transform] org.jboss.portal.core.aspects.server.TransactionInterceptor
[aopc] [debug] There are no caller pointcuts!
[aopc] [debug] javassist.CtMethod@4b7fb3a9[protected invoke (Lorg/jboss/portal/server/ServerInvocation;)V] matches pointcut: all(@transaction)
- [aopc] [debug] javassist.CtConstructor@39ab89[public TransactionInterceptor ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@e28b9[public InvocationException ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@193385d[public InvocationException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@5973ea[public InvocationException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@c9131c[public InvocationException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@105b99f[public ServerInterceptor ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@dda25b[public ServerInvocation (Lorg/jboss/portal/server/ServerInvocationContext;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@93d6bc[public TransactionInterceptor ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@5973ea[public InvocationException ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@fb56b1[public InvocationException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@f8968f[public InvocationException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@64c34e[public InvocationException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@15253d5[public ServerInterceptor ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1fddc31[public ServerInvocation (Lorg/jboss/portal/server/ServerInvocationContext;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.aspects.server.TransactionInterceptor.tm:Ljavax/transaction/TransactionManager; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.aspects.server.TransactionInterceptor.tm:Ljavax/transaction/TransactionManager; matches no pointcuts
[aopc] [debug] was org.jboss.portal.core.aspects.server.TransactionInterceptor converted: true
@@ -1652,7 +1652,7 @@
[aopc] [debug] javassist.CtMethod@61dae3ca[protected finalizeUser ()V] matches pointcut: all(@transaction)
[aopc] [debug] javassist.CtMethod@ff9b0119[static access$000 (Lorg/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer;)Ljava/lang/Object;] matches no pointcuts
[aopc] [debug] javassist.CtMethod@2400b2f3[static access$200 ()Lorg/jboss/logging/Logger;] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@9df354[public UserInterceptor$UserFinalizer (Ljava/lang/Object;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1d225a7[public UserInterceptor$UserFinalizer (Ljava/lang/Object;)V] matches no pointcuts
[aopc] [debug] org.jboss.logging.Logger.PLUGIN_CLASS_PROP:Ljava/lang/String; matches no pointcuts
[aopc] [debug] org.jboss.logging.Logger.PLUGIN_CLASS_PROP:Ljava/lang/String; matches no pointcuts
[aopc] [debug] org.jboss.logging.Logger.loggerDelegate:Lorg/jboss/logging/LoggerPlugin; matches no pointcuts
@@ -1661,16 +1661,16 @@
[aopc] [debug] org.jboss.logging.Logger.pluginClass:Ljava/lang/Class; matches no pointcuts
[aopc] [debug] org.jboss.logging.Logger.pluginClassName:Ljava/lang/String; matches no pointcuts
[aopc] [debug] org.jboss.logging.Logger.pluginClassName:Ljava/lang/String; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@ef137d[protected Logger (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1e87719[protected Logger (Ljava/lang/String;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.aspects.server.UserInterceptor.cacheUser:Z matches no pointcuts
[aopc] [debug] org.jboss.portal.core.aspects.server.UserInterceptor.cacheUser:Z matches no pointcuts
[aopc] [debug] org.jboss.portal.core.aspects.server.UserInterceptor.userModule:Lorg/jboss/portal/identity/UserModule; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.aspects.server.UserInterceptor.userModule:Lorg/jboss/portal/identity/UserModule; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.aspects.server.UserInterceptor.userProfileModule:Lorg/jboss/portal/identity/UserProfileModule; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.aspects.server.UserInterceptor.userProfileModule:Lorg/jboss/portal/identity/UserProfileModule; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@f4f44a[public UserInterceptor ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1d256fa[private UserInterceptor$UserFinalizer$FinalizeRunner (Lorg/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@4c4975[ UserInterceptor$UserFinalizer$FinalizeRunner (Lorg/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer;Lorg/jboss/portal/core/aspects/server/UserInterceptor$1;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1d256fa[public UserInterceptor ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@4c4975[private UserInterceptor$UserFinalizer$FinalizeRunner (Lorg/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@6ac461[ UserInterceptor$UserFinalizer$FinalizeRunner (Lorg/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer;Lorg/jboss/portal/core/aspects/server/UserInterceptor$1;)V] matches no pointcuts
[aopc] [debug] was org.jboss.portal.core.aspects.server.UserInterceptor$UserFinalizer converted: true
[aopc] [compiled] /home/theute/Portal/Development/workspace_2_6_Sybase/core/output/classes/org/jboss/portal/core/aspects/server/UserInterceptor$UserFinalizer.class
[aopc] [trying to transform] org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker
@@ -1678,13 +1678,13 @@
[aopc] [debug] javassist.CtMethod@d9c7a513[public createClone (Lorg/jboss/portal/portlet/PortletContext;)Lorg/jboss/portal/portlet/PortletContext;] matches pointcut: all(@transaction)
[aopc] [debug] javassist.CtMethod@50502340[public destroyClones (Ljava/util/List;)Ljava/util/List;] matches pointcut: all(@transaction)
[aopc] [debug] javassist.CtMethod@31274492[public invoke (Lorg/jboss/portal/portlet/invocation/PortletInvocation;)Lorg/jboss/portal/portlet/invocation/response/PortletInvocationResponse;] matches pointcut: all(@transaction)
- [aopc] [debug] javassist.CtConstructor@497934[public ProducerPortletInvoker ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1c0ec97[public PortletInvocationResponse ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@ecb281[public PortletInvokerException ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1bb60c3[public PortletInvokerException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@cdb06e[public PortletInvokerException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1fa1bb6[public PortletInvokerException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1315d34[public ProducerPortletInvoker ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1b48197[public ProducerPortletInvoker ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@14384c2[public PortletInvocationResponse ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1c0ec97[public PortletInvokerException ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@ecb281[public PortletInvokerException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1bb60c3[public PortletInvokerException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@cdb06e[public PortletInvokerException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1fa1bb6[public ProducerPortletInvoker ()V] matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.invocation.PortletInvocation.ctx:Lorg/jboss/portal/portlet/spi/PortletInvocationContext; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.invocation.PortletInvocation.ctx:Lorg/jboss/portal/portlet/spi/PortletInvocationContext; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.invocation.PortletInvocation.dreq:Ljavax/servlet/http/HttpServletRequest; matches no pointcuts
@@ -1709,8 +1709,8 @@
[aopc] [debug] org.jboss.portal.portlet.invocation.PortletInvocation.userContext:Lorg/jboss/portal/portlet/spi/UserContext; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.invocation.PortletInvocation.windowContext:Lorg/jboss/portal/portlet/spi/WindowContext; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.invocation.PortletInvocation.windowContext:Lorg/jboss/portal/portlet/spi/WindowContext; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@b5dac4[protected PortletInvocation (Lorg/jboss/portal/portlet/spi/PortletInvocationContext;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@12d96f2[ PortletContext (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@166afb3[protected PortletInvocation (Lorg/jboss/portal/portlet/spi/PortletInvocationContext;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@9945ce[ PortletContext (Ljava/lang/String;)V] matches no pointcuts
[aopc] [debug] was org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker converted: true
[aopc] [compiled] /home/theute/Portal/Development/workspace_2_6_Sybase/core/output/classes/org/jboss/portal/core/impl/portlet/state/ProducerPortletInvoker.class
[aopc] [trying to transform] org.jboss.portal.core.deployment.jboss.PortletAppDeployment
@@ -1728,24 +1728,24 @@
[aopc] [debug] javassist.CtMethod@1b2bf9f6[static access$200 (Lorg/jboss/portal/core/deployment/jboss/PortletAppDeployment;)Lorg/jboss/logging/Logger;] matches no pointcuts
[aopc] [debug] javassist.CtMethod@855b8215[static access$300 (Lorg/jboss/portal/core/deployment/jboss/PortletAppDeployment;)Lorg/jboss/logging/Logger;] matches no pointcuts
[aopc] [debug] javassist.CtMethod@ef8b0a34[static access$400 (Lorg/jboss/portal/core/deployment/jboss/PortletAppDeployment;)Lorg/jboss/portal/server/deployment/PortalWebApp;] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@160a26f[public PortletAppDeployment (Ljava/net/URL;Lorg/jboss/portal/server/deployment/PortalWebApp;Ljavax/management/MBeanServer;Lorg/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@f39b3a[public StringValue ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1542a75[public StringValue (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@af993e[public StringValue ([Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@75e4fc[public PortletAppDeployment$InstanceMetaDataContext (Lorg/jboss/portal/core/deployment/jboss/PortletAppDeployment;Lorg/jboss/portal/core/model/instance/metadata/InstanceMetaData;I)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@12940b3[public SecurityConstraintsMetaData ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@156b6b9[public Value ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1f66cff[public RoleSecurityBinding (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@16de49c[public RoleSecurityBinding (Ljava/util/Set;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1bbf1ca[public RoleSecurityBinding (Lorg/jboss/portal/security/RoleSecurityBinding;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1ff0dde[private XMLTools ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1e78fc6[public ServiceMetaData ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1901437[public InstanceMetaData ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@110003[public PortletAppDeployment (Ljava/net/URL;Lorg/jboss/portal/server/deployment/PortalWebApp;Ljavax/management/MBeanServer;Lorg/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1484a05[public StringValue ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@f39b3a[public StringValue (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1542a75[public StringValue ([Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@af993e[public PortletAppDeployment$InstanceMetaDataContext (Lorg/jboss/portal/core/deployment/jboss/PortletAppDeployment;Lorg/jboss/portal/core/model/instance/metadata/InstanceMetaData;I)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@c62c8[public SecurityConstraintsMetaData ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1bbf1ca[public Value ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1ff0dde[public RoleSecurityBinding (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1e78fc6[public RoleSecurityBinding (Ljava/util/Set;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1901437[public RoleSecurityBinding (Lorg/jboss/portal/security/RoleSecurityBinding;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1f6226[private XMLTools ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@158f9d3[public ServiceMetaData ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@79a2e7[public InstanceMetaData ()V] matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.metadata.JBossApplicationMetaData.portlets:Ljava/util/Map; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.metadata.JBossApplicationMetaData.portlets:Ljava/util/Map; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.metadata.JBossApplicationMetaData.remotable:Ljava/lang/Boolean; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.metadata.JBossApplicationMetaData.remotable:Ljava/lang/Boolean; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@158f9d3[public JBossApplicationMetaData ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@14a55f2[public JBossApplicationMetaData ()V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory.createInstances:Z matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory.createInstances:Z matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory.instanceContainer:Lorg/jboss/portal/core/model/instance/InstanceContainer; matches no pointcuts
@@ -1754,12 +1754,12 @@
[aopc] [debug] org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory.portalObjectEntityResolver:Lorg/xml/sax/EntityResolver; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory.portletInstancesEntityResolver:Lorg/xml/sax/EntityResolver; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory.portletInstancesEntityResolver:Lorg/xml/sax/EntityResolver; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@120bf2c[public PortletAppDeploymentFactory ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@e6f7d2[public PreferencesMetaData ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@3e0ebb[public PortletAppDeploymentFactory ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@18f1d7e[public PreferencesMetaData ()V] matches no pointcuts
[aopc] [debug] org.jboss.mx.util.MBeanProxyExt.remote:Ljavax/management/MBeanServerConnection; matches no pointcuts
[aopc] [debug] org.jboss.mx.util.MBeanProxyExt.remote:Ljavax/management/MBeanServerConnection; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@39443f[public MBeanProxyExt ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1afae45[ MBeanProxyExt (Ljavax/management/ObjectName;Ljavax/management/MBeanServer;Z)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@55e55f[public MBeanProxyExt ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@145c859[ MBeanProxyExt (Ljavax/management/ObjectName;Ljavax/management/MBeanServer;Z)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory.config:Lorg/jboss/portal/server/config/ServerConfig; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory.config:Lorg/jboss/portal/server/config/ServerConfig; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory.jbossPortletEntityResolver:Lorg/xml/sax/EntityResolver; matches no pointcuts
@@ -1780,16 +1780,16 @@
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory.standardJBossApplicationMetaData:Lorg/jboss/portal/portlet/metadata/JBossApplicationMetaData; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory.standardJBossApplicationMetaDataLocation:Ljava/lang/String; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory.standardJBossApplicationMetaDataLocation:Ljava/lang/String; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@153f67e[public PortletAppDeploymentFactory ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@15bdc50[public InvalidPortletIdException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1dd3812[public InvalidPortletIdException (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@8c436b[public InvalidPortletIdException (Ljava/lang/Throwable;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@9e5c73[public InvalidPortletIdException (Ljava/lang/String;Ljava/lang/Throwable;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@c791b9[public PreferenceMetaData ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@3020ad[public JBossApplicationMetaData ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1b15692[public JBossApplicationMetaData (Lorg/jboss/portal/portlet/metadata/JBossApplicationMetaData;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1aa9f99[public IOTools ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@7f4ec[public NullEntityResolver ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@c791b9[public PortletAppDeploymentFactory ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1b15692[public InvalidPortletIdException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1aa9f99[public InvalidPortletIdException (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@d42d08[public InvalidPortletIdException (Ljava/lang/Throwable;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1d86fd3[public InvalidPortletIdException (Ljava/lang/String;Ljava/lang/Throwable;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@958bb8[public PreferenceMetaData ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@7f4ec[public JBossApplicationMetaData ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@60e128[public JBossApplicationMetaData (Lorg/jboss/portal/portlet/metadata/JBossApplicationMetaData;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@5e1077[public IOTools ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@18b3364[public NullEntityResolver ()V] matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeployment.configurations:Ljava/util/Map; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeployment.configurations:Ljava/util/Map; matches no pointcuts
[aopc] [debug] org.jboss.portal.portlet.deployment.jboss.PortletAppDeployment.factory:Lorg/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory; matches no pointcuts
@@ -1811,15 +1811,15 @@
[aopc] [debug] javassist.CtConstructor@bc8e1e[public SecurityConfigurationException ()V] matches no pointcuts
[aopc] [debug] javassist.CtConstructor@11671b2[public SecurityConfigurationException (Ljava/lang/String;)V] matches no pointcuts
[aopc] [debug] javassist.CtConstructor@82764b[public SecurityConfigurationException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@12452e8[public NoSuchPortletException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1bf3d87[public NoSuchPortletException (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@60991f[public NoSuchPortletException (Ljava/lang/Throwable;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1e4f7c2[public NoSuchPortletException (Ljava/lang/String;Ljava/lang/Throwable;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1bf3d87[public NoSuchPortletException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@60991f[public NoSuchPortletException (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1e4f7c2[public NoSuchPortletException (Ljava/lang/Throwable;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@145f0e3[public NoSuchPortletException (Ljava/lang/String;Ljava/lang/Throwable;Ljava/lang/String;)V] matches no pointcuts
[aopc] [debug] javassist.CtConstructor@c9d92c[public DuplicateInstanceException ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1d0fafc[public DuplicateInstanceException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@10dc6b5[public DuplicateInstanceException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@170bea5[public DuplicateInstanceException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@f47396[private PropertyChange (Ljava/lang/String;Lorg/jboss/portal/common/value/Value;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@f47396[public DuplicateInstanceException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@d0af9b[public DuplicateInstanceException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@b8f8eb[public DuplicateInstanceException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1de17f4[private PropertyChange (Ljava/lang/String;Lorg/jboss/portal/common/value/Value;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.PortletAppDeployment.factory:Lorg/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.PortletAppDeployment.factory:Lorg/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory; matches no pointcuts
[aopc] [debug] was org.jboss.portal.core.deployment.jboss.PortletAppDeployment converted: true
@@ -1831,7 +1831,7 @@
[aopc] [debug] javassist.CtMethod@cad41483[public stop ()V] matches no pointcuts
[aopc] [debug] javassist.CtMethod@b0508cd5[public getFactory ()Lorg/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory;] matches no pointcuts
[aopc] [debug] javassist.CtMethod@2b271dcf[static access$100 (Lorg/jboss/portal/core/deployment/jboss/ObjectDeployment;)Lorg/jboss/portal/server/deployment/PortalWebApp;] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@f47bf5[public ObjectDeployment (Ljava/net/URL;Ljavax/management/MBeanServer;Ljavax/transaction/TransactionManager;Lorg/jboss/portal/server/deployment/PortalWebApp;Lorg/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@f6438d[public ObjectDeployment (Ljava/net/URL;Ljavax/management/MBeanServer;Ljavax/transaction/TransactionManager;Lorg/jboss/portal/server/deployment/PortalWebApp;Lorg/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeployment$Unit.ifExists:I matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeployment$Unit.ifExists:I matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeployment$Unit.metaData:Ljava/lang/Object; matches no pointcuts
@@ -1840,9 +1840,9 @@
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeployment$Unit.parentRef:Lorg/jboss/portal/core/model/portal/PortalObjectId; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeployment$Unit.ref:Lorg/jboss/portal/core/model/portal/PortalObjectId; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeployment$Unit.ref:Lorg/jboss/portal/core/model/portal/PortalObjectId; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@18825b3[private ObjectDeployment$Unit ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1632847[ ObjectDeployment$Unit (Lorg/jboss/portal/core/deployment/jboss/ObjectDeployment$1;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@e95a56[ ObjectDeployment$1 (Lorg/jboss/portal/core/deployment/jboss/ObjectDeployment;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1632847[private ObjectDeployment$Unit ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@e95a56[ ObjectDeployment$Unit (Lorg/jboss/portal/core/deployment/jboss/ObjectDeployment$1;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@29e357[ ObjectDeployment$1 (Lorg/jboss/portal/core/deployment/jboss/ObjectDeployment;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory.contentProviderRegistry:Lorg/jboss/portal/core/model/content/spi/ContentProviderRegistry; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory.contentProviderRegistry:Lorg/jboss/portal/core/model/content/spi/ContentProviderRegistry; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory.portalObjectContainer:Lorg/jboss/portal/core/model/portal/PortalObjectContainer; matches no pointcuts
@@ -1911,40 +1911,40 @@
[aopc] [debug] javassist.CtMethod@eeac67c6[public setSecurityBindings (Ljava/lang/String;Ljava/util/Set;)V] matches no pointcuts
[aopc] [debug] javassist.CtMethod@4efa6ac9[public removeSecurityBindings (Ljava/lang/String;)V] matches no pointcuts
[aopc] [debug] javassist.CtMethod@d58985f2[public getPermission (Ljava/lang/String;Ljava/lang/String;)Lorg/jboss/portal/security/PortalPermission;] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@7109c4[public InstanceContainerImpl ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1aed5f9[public DestroyCloneFailure (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@161dfb5[public DestroyCloneFailure (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@125fefa[public InstanceContainerImpl ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@19e8f17[public DestroyCloneFailure (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@c44b88[public DestroyCloneFailure (Ljava/lang/String;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.AbstractInstance.portletContext:Lorg/jboss/portal/portlet/PortletContext; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.AbstractInstance.portletContext:Lorg/jboss/portal/portlet/PortletContext; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.AbstractInstance.portletRef:Ljava/lang/String; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.AbstractInstance.portletRef:Ljava/lang/String; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.AbstractInstance.state:[B matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.AbstractInstance.state:[B matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@589e56[protected AbstractInstance ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@3411a[public NoSuchInstanceException ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1a7508a[public NoSuchInstanceException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@198cb3d[public NoSuchInstanceException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@472d48[public NoSuchInstanceException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@edf3f6[public AbstractInstanceDefinition ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@2bc3f5[public InstancePermission (Lorg/jboss/portal/security/PortalPermissionCollection;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@14e3f41[public InstancePermission (Ljava/lang/String;Ljava/util/Collection;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1acd47[public InstancePermission (Ljava/lang/String;I)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@19b04e2[public InstancePermission (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@5dcec6[public AbstractJBossService ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@b25b9d[public AbstractJBossService (Ljava/lang/Class;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@19ce060[public AbstractJBossService (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@4ecfdd[public AbstractJBossService (Lorg/jboss/logging/Logger;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@30d82d[ InstanceContainerImpl$1 (Lorg/jboss/portal/core/impl/model/instance/InstanceContainerImpl;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@c09554[public AbstractInstanceCustomization ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@18bf072[public PortalPermission (Ljava/lang/String;Lorg/jboss/portal/security/PortalPermissionCollection;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@56f631[public PortalPermission (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@13d28e3[public PortalSecurityException ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@476128[public PortalSecurityException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@3b8b49[public PortalSecurityException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1359c1b[public PortalSecurityException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1d6f122[protected AbstractInstance ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@7109c4[public NoSuchInstanceException ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1385660[public NoSuchInstanceException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1aed5f9[public NoSuchInstanceException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@161dfb5[public NoSuchInstanceException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@a613f8[public AbstractInstanceDefinition ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@16921fd[public InstancePermission (Lorg/jboss/portal/security/PortalPermissionCollection;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@136a43c[public InstancePermission (Ljava/lang/String;Ljava/util/Collection;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@589e56[public InstancePermission (Ljava/lang/String;I)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@3411a[public InstancePermission (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1a7508a[public AbstractJBossService ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@198cb3d[public AbstractJBossService (Ljava/lang/Class;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@472d48[public AbstractJBossService (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@edf3f6[public AbstractJBossService (Lorg/jboss/logging/Logger;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@2bc3f5[ InstanceContainerImpl$1 (Lorg/jboss/portal/core/impl/model/instance/InstanceContainerImpl;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@14e3f41[public AbstractInstanceCustomization ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1acd47[public PortalPermission (Ljava/lang/String;Lorg/jboss/portal/security/PortalPermissionCollection;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@19b04e2[public PortalPermission (Ljava/lang/String;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@5dcec6[public PortalSecurityException ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@b25b9d[public PortalSecurityException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@19ce060[public PortalSecurityException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@4ecfdd[public PortalSecurityException (Ljava/lang/Throwable;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.security.PortalPermissionCollection.owner:Lorg/jboss/portal/security/PortalPermission; matches no pointcuts
[aopc] [debug] org.jboss.portal.security.PortalPermissionCollection.owner:Lorg/jboss/portal/security/PortalPermission; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@18235ed[public PortalPermissionCollection (Lorg/jboss/portal/security/spi/provider/AuthorizationDomain;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@c09554[public PortalPermissionCollection (Lorg/jboss/portal/security/spi/provider/AuthorizationDomain;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.InstanceContainerImpl.authorizationDomainRegistry:Lorg/jboss/portal/security/impl/JBossAuthorizationDomainRegistry; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.InstanceContainerImpl.cloneOnCreate:Z matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.instance.InstanceContainerImpl.containerContext:Lorg/jboss/portal/core/impl/model/instance/JBossInstanceContainerContext; matches no pointcuts
@@ -1972,12 +1972,12 @@
[aopc] [debug] javassist.CtMethod@a968ee6e[protected invokeSupports (Lorg/jboss/portal/portlet/invocation/PortletInvocation;)Ljava/lang/Object;] matches pointcut: all(@transaction)
[aopc] [debug] javassist.CtMethod@b313cdb3[protected invokeRequired (Lorg/jboss/portal/portlet/invocation/PortletInvocation;)Ljava/lang/Object;] matches pointcut: all(@transaction)
[aopc] [debug] javassist.CtMethod@e2f6fd0[protected invokeRequiresNew (Lorg/jboss/portal/portlet/invocation/PortletInvocation;)Ljava/lang/Object;] matches pointcut: all(@transaction)
- [aopc] [debug] javassist.CtConstructor@f42ad0[public TransactionInterceptor ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@26dbec[private Transactions$Type (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1309e87[ Transactions$Type (Ljava/lang/String;Lorg/jboss/portal/common/transaction/Transactions$1;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@f7c31d[public Scope (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@2acc65[public Transactions ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1d10a5c[public PortletInterceptor ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1a28362[public TransactionInterceptor ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@5fcf29[private Transactions$Type (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@19b1de[ Transactions$Type (Ljava/lang/String;Lorg/jboss/portal/common/transaction/Transactions$1;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@ec6b00[public Scope (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@164dbd5[public Transactions ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@9cb0f4[public PortletInterceptor ()V] matches no pointcuts
[aopc] [debug] was org.jboss.portal.core.aspects.portlet.TransactionInterceptor converted: true
[aopc] [compiled] /home/theute/Portal/Development/workspace_2_6_Sybase/core/output/classes/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.class
[aopc] [trying to transform] org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer
@@ -2001,23 +2001,23 @@
[aopc] [debug] javassist.CtMethod@1b880530[private getObjectNodeNoCache (Lorg/hibernate/Session;Lorg/jboss/portal/core/model/portal/PortalObjectId;)Lorg/jboss/portal/core/impl/model/portal/ObjectNode;] matches no pointcuts
[aopc] [debug] javassist.CtMethod@ece9231d[private getObjectNode (Lorg/hibernate/Session;Lorg/jboss/portal/core/model/portal/PortalObjectId;)Lorg/jboss/portal/core/impl/model/portal/ObjectNode;] matches no pointcuts
[aopc] [debug] javassist.CtMethod@23e483f1[static access$000 ()Lorg/jboss/logging/Logger;] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@ff2413[public PersistentPortalObjectContainer ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@125844f[public PersistentPortalObjectContainer ()V] matches no pointcuts
[aopc] [debug] org.jboss.portal.jems.hibernate.ObjectContextualizer.context:Ljava/lang/Object; matches no pointcuts
[aopc] [debug] org.jboss.portal.jems.hibernate.ObjectContextualizer.context:Ljava/lang/Object; matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@13f7281[public ObjectContextualizer (Ljava/lang/Object;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@76ab2f[public ObjectNode ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@e0cc23[public ObjectNode (Lorg/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer$ContainerContext;Lorg/jboss/portal/core/model/portal/PortalObjectId;Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@7a1576[public DuplicatePortalObjectException ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1171b26[public DuplicatePortalObjectException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1f78040[public DuplicatePortalObjectException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@50988[public DuplicatePortalObjectException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@b4e29b[public PortalObjectImpl ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@18941f7[public PortalObjectImpl (Z)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@49d67c[public ContextImpl ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1a06e38[public ContextImpl (Z)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1a42792[ PersistentPortalObjectContainer$1 (Lorg/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@2200d5[protected AbstractPortalObjectContainer ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@64ab4d[public AbstractPortalObjectContainer$ContainerContext (Lorg/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@26dbec[public ObjectContextualizer (Ljava/lang/Object;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1309e87[public ObjectNode ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@f7c31d[public ObjectNode (Lorg/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer$ContainerContext;Lorg/jboss/portal/core/model/portal/PortalObjectId;Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@2acc65[public DuplicatePortalObjectException ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1d10a5c[public DuplicatePortalObjectException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@ff2413[public DuplicatePortalObjectException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@9980d5[public DuplicatePortalObjectException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1d95492[public PortalObjectImpl ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@13f7281[public PortalObjectImpl (Z)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@76ab2f[public ContextImpl ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@e0cc23[public ContextImpl (Z)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@7a1576[ PersistentPortalObjectContainer$1 (Lorg/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1171b26[protected AbstractPortalObjectContainer ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1f78040[public AbstractPortalObjectContainer$ContainerContext (Lorg/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer;)V] matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer.authorizationDomainRegistry:Lorg/jboss/portal/security/impl/JBossAuthorizationDomainRegistry; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer.cache:LEDU/oswego/cs/dl/util/concurrent/ConcurrentReaderHashMap; matches no pointcuts
[aopc] [debug] org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer.cacheNaturalId:Z matches no pointcuts
@@ -2040,7 +2040,7 @@
[aopc] [debug] org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer.sessionFactoryJNDIName:Ljava/lang/String; matches no pointcuts
[aopc] [debug] was org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer converted: false
[aopc] [no comp needed] /home/theute/Portal/Development/workspace_2_6_Sybase/core/output/classes/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.class
- [aopc] Build Successful: 3913 ms
+ [aopc] Build Successful: 3822 ms
artifacts:
[mkdir] Created dir: /home/theute/Portal/Development/workspace_2_6_Sybase/core/output/lib
@@ -2161,22 +2161,22 @@
[aopc] at org.jboss.aop.standalone.Compiler.compileFile(Compiler.java:345)
[aopc] at org.jboss.aop.standalone.Compiler.compile(Compiler.java:234)
[aopc] at org.jboss.aop.standalone.Compiler.main(Compiler.java:90)
- [aopc] [debug] javassist.CtConstructor@1342ba4[public ConsumerException ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1d332b[public ConsumerException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@10a6ae2[public ConsumerException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@ef2c60[public ConsumerException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@4a6cbf[public AbstractJBossService ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@29ab3e[public AbstractJBossService (Ljava/lang/Class;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1a99561[public AbstractJBossService (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@8e32e7[public AbstractJBossService (Lorg/jboss/logging/Logger;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1b000e7[public PortletInvokerException ()V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@b76fa[public PortletInvokerException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@b01d43[public PortletInvokerException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@513cf0[public PortletInvokerException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@177b3cd[public HibernateException (Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@1bd7848[public HibernateException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@23e5d1[public HibernateException (Ljava/lang/String;)V] matches no pointcuts
- [aopc] [debug] javassist.CtConstructor@5e176f[public ProducerInfo ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@10a6ae2[public ConsumerException ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@ef2c60[public ConsumerException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@4a6cbf[public ConsumerException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@29ab3e[public ConsumerException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1a99561[public AbstractJBossService ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@8e32e7[public AbstractJBossService (Ljava/lang/Class;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1b000e7[public AbstractJBossService (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@b76fa[public AbstractJBossService (Lorg/jboss/logging/Logger;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@b01d43[public PortletInvokerException ()V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@513cf0[public PortletInvokerException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@177b3cd[public PortletInvokerException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@1bd7848[public PortletInvokerException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@23e5d1[public HibernateException (Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@c4fe76[public HibernateException (Ljava/lang/String;Ljava/lang/Throwable;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@11e1e67[public HibernateException (Ljava/lang/String;)V] matches no pointcuts
+ [aopc] [debug] javassist.CtConstructor@b8c8e6[public ProducerInfo ()V] matches no pointcuts
[aopc] [debug] org.jboss.portal.wsrp.consumer.ConsumerRegistryService.consumers:Ljava/util/SortedMap; matches no pointcuts
[aopc] [debug] org.jboss.portal.wsrp.consumer.ConsumerRegistryService.federatingPortletInvoker:Lorg/jboss/portal/portlet/federation/FederatingPortletInvoker; matches no pointcuts
[aopc] [debug] org.jboss.portal.wsrp.consumer.ConsumerRegistryService.portalEventListenerRegistry:Lorg/jboss/portal/core/event/PortalEventListenerRegistry; matches no pointcuts
@@ -2189,7 +2189,7 @@
[aopc] [debug] org.jboss.portal.wsrp.consumer.ConsumerRegistryService.sessionFactoryJNDIName:Ljava/lang/String; matches no pointcuts
[aopc] [debug] was org.jboss.portal.wsrp.consumer.ConsumerRegistryService converted: true
[aopc] [compiled] /home/theute/Portal/Development/workspace_2_6_Sybase/wsrp/output/classes/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.class
- [aopc] Build Successful: 1155 ms
+ [aopc] Build Successful: 1289 ms
output:
[jar] Building jar: /home/theute/Portal/Development/workspace_2_6_Sybase/wsrp/output/lib/portal-wsrp-client.jar
@@ -2677,6 +2677,5 @@
[copy] Copying 1 file to /home/theute/Portal/Development/workspace_2_6_Sybase/build/jboss-eap-4.3/jboss-as/server/default/deploy
[copy] Copying 1 file to /home/theute/Portal/Development/workspace_2_6_Sybase/build/jboss-eap-4.3/jboss-as/server/default/deploy
[copy] Copying 1 file to /home/theute/Portal/Development/workspace_2_6_Sybase/build/jboss-eap-4.3/jboss-as/server/default/deploy
- [copy] Copying 1 file to /home/theute/Portal/Development/workspace_2_6_Sybase/build/jboss-eap-4.3/jboss-as/server/default/deploy
BUILD SUCCESSFUL
Modified: branches/JBoss_Portal_Branch_2_6_SYBASE/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6_SYBASE/build/build.xml 2008-07-18 15:12:13 UTC (rev 11500)
+++ branches/JBoss_Portal_Branch_2_6_SYBASE/build/build.xml 2008-07-18 15:30:25 UTC (rev 11501)
@@ -294,7 +294,7 @@
<copy file="../core-admin/output/lib/portal-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<!--copy file="../core-cms/output/lib/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/-->
<copy file="../core-identity/output/lib/portal-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../workflow/output/lib/portal-workflow.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <!--copy file="../workflow/output/lib/portal-workflow.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/-->
<copy file="../core-management/output/lib/portal-management.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-samples/output/lib/portal-basic-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-samples/output/lib/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
Modified: branches/JBoss_Portal_Branch_2_6_SYBASE/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6_SYBASE/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2008-07-18 15:12:13 UTC (rev 11500)
+++ branches/JBoss_Portal_Branch_2_6_SYBASE/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2008-07-18 15:30:25 UTC (rev 11501)
@@ -58,9 +58,9 @@
<depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">
portal:service=Module,type=IdentityServiceController
</depends>
- <depends optional-attribute-name="WorkflowService" proxy-type="attribute">
+ <!-- depends optional-attribute-name="WorkflowService" proxy-type="attribute">
portal:service=Workflow,type=WorkflowService
- </depends>
+ </depends-->
<attribute name="JNDIName">java:portal/IdentityUIConfigurationService</attribute>
</mbean>
Modified: branches/JBoss_Portal_Branch_2_6_SYBASE/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6_SYBASE/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-07-18 15:12:13 UTC (rev 11500)
+++ branches/JBoss_Portal_Branch_2_6_SYBASE/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-07-18 15:30:25 UTC (rev 11501)
@@ -36,7 +36,6 @@
<display-name xml:lang="it">Test</display-name>
<display-name xml:lang="es">Ejemplos</display-name>
<display-name xml:lang="fr">Test</display-name>
- <display-name xml:lang="ru">Тест</display-name>
<properties>
<property>
<name>order</name>
Modified: branches/JBoss_Portal_Branch_2_6_SYBASE/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6_SYBASE/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml 2008-07-18 15:12:13 UTC (rev 11500)
+++ branches/JBoss_Portal_Branch_2_6_SYBASE/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml 2008-07-18 15:30:25 UTC (rev 11501)
@@ -35,8 +35,6 @@
<display-name xml:lang="en">News</display-name>
<display-name xml:lang="it">Novita'</display-name>
<display-name xml:lang="es">Noticias</display-name>
- <display-name xml:lang="fr">Actualités</display-name>
- <display-name xml:lang="ru">Новости</display-name>
<properties>
<property>
<name>order</name>
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11500 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-07-18 11:12:13 -0400 (Fri, 18 Jul 2008)
New Revision: 11500
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
Log:
remove ConcurrentReaderHashMap in favor of j.u.c.ConcurrentHashMap for the natural object id bache
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2008-07-18 14:53:51 UTC (rev 11499)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2008-07-18 15:12:13 UTC (rev 11500)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.core.impl.model.portal;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -36,6 +35,7 @@
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import javax.naming.InitialContext;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -72,7 +72,7 @@
protected ObjectContextualizer contextualizer;
/** . */
- protected ConcurrentReaderHashMap cache;
+ protected ConcurrentHashMap cache;
/** . */
protected boolean cacheNaturalId;
@@ -119,7 +119,7 @@
//
contextualizer = new ObjectContextualizer(ctx);
- cache = new ConcurrentReaderHashMap();
+ cache = new ConcurrentHashMap();
}
public String getRootName()
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11498 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-18 08:48:13 -0400 (Fri, 18 Jul 2008)
New Revision: 11498
Modified:
branches/JBoss_Portal_Branch_2_7/build/build.xml
Log:
It's a war
Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-07-18 08:15:32 UTC (rev 11497)
+++ branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-07-18 12:48:13 UTC (rev 11498)
@@ -300,7 +300,7 @@
<copy file="../core-samples/output/lib/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-samples/output/lib/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-samples/output/lib/portal-users-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-coordination-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-coordination-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<!--<copy file="../core-search/output/lib/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>-->
<copy file="../widget/output/lib/portal-widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../widget/output/lib/portal-widget-netvibes.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
@@ -322,7 +322,7 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-users-samples.sar"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-coordination-samples.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-coordination-samples.war"/>
<!--<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-search.sar"/>-->
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-widget.war"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-widget-netvibes.war"/>
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11497 - branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-07-18 04:15:32 -0400 (Fri, 18 Jul 2008)
New Revision: 11497
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml
Log:
- Fix page naming issue
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-07-18 08:14:46 UTC (rev 11496)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-07-18 08:15:32 UTC (rev 11497)
@@ -34,7 +34,7 @@
<page-name>Coordination Samples</page-name>
<page>
- <page-name>Events: DISABLED</page-name>
+ <page-name>Events DISABLED</page-name>
<window>
<window-name>ShoppingCatalogPortletWindow1</window-name>
@@ -123,7 +123,7 @@
</page>
<page>
- <page-name>Events: FALLBACK</page-name>
+ <page-name>Events FALLBACK</page-name>
<window>
<window-name>ShoppingCatalogPortletWindow1</window-name>
@@ -193,7 +193,7 @@
</page>
<page>
- <page-name>Events: EXCLUSIVE</page-name>
+ <page-name>Events EXCLUSIVE</page-name>
<window>
<window-name>ShoppingCatalogPortletWindow1</window-name>
@@ -283,7 +283,7 @@
</page>
<page>
- <page-name>Parameters: DISABLED</page-name>
+ <page-name>Parameters DISABLED</page-name>
<window>
<window-name>PublicParametersPortletWindowA1</window-name>
<instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
@@ -390,7 +390,7 @@
</coordination>
</page>
<page>
- <page-name>Parameters: FALLBACK</page-name>
+ <page-name>Parameters FALLBACK</page-name>
<window>
<window-name>PublicParametersPortletWindowA1</window-name>
<instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
@@ -460,7 +460,7 @@
</coordination>
</page>
<page>
- <page-name>Parameters: EXCLUSIVE</page-name>
+ <page-name>Parameters EXCLUSIVE</page-name>
<window>
<window-name>PublicParametersPortletWindowA1</window-name>
<instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11496 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-07-18 04:14:46 -0400 (Fri, 18 Jul 2008)
New Revision: 11496
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/build/build.xml
Log:
forgot to commit build-thirdparty.xml and add coordination samples to deploy-all
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-07-18 01:02:31 UTC (rev 11495)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-07-18 08:14:46 UTC (rev 11496)
@@ -44,7 +44,7 @@
<componentref name="jboss-portal/modules/common" version="1.2.0"/>
<componentref name="jboss-portal/modules/web" version="1.2.0"/>
<componentref name="jboss-portal/modules/test" version="1.0.2"/>
- <componentref name="jboss-portal/modules/portlet" version="2.0.1"/>
+ <componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity" version="1.0.4"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
@@ -103,6 +103,7 @@
<componentref name="trove" version="1.0.2"/>
<componentref name="sleepycat" version="3.0.12"/>
<componentref name="slf4j" version="1.0.2"/>
+ <componentref name="stax-api" version="1.0"/>
<componentref name="sun-jaf" version="1.1"/>
<componentref name="sun-javacc" version="3.2-portal"/>
<componentref name="sun-javamail" version="1.3.1"/>
Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-07-18 01:02:31 UTC (rev 11495)
+++ branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-07-18 08:14:46 UTC (rev 11496)
@@ -300,6 +300,7 @@
<copy file="../core-samples/output/lib/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-samples/output/lib/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-samples/output/lib/portal-users-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-coordination-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<!--<copy file="../core-search/output/lib/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>-->
<copy file="../widget/output/lib/portal-widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../widget/output/lib/portal-widget-netvibes.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
@@ -321,6 +322,7 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-users-samples.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-coordination-samples.sar"/>
<!--<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-search.sar"/>-->
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-widget.war"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-widget-netvibes.war"/>
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11495 - branches/JBoss_Portal_Branch_2_6_SYBASE/core/src/resources/portal-core-sar/conf/data.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-17 21:02:31 -0400 (Thu, 17 Jul 2008)
New Revision: 11495
Modified:
branches/JBoss_Portal_Branch_2_6_SYBASE/core/src/resources/portal-core-sar/conf/data/default-object.xml
Log:
To be safe
Modified: branches/JBoss_Portal_Branch_2_6_SYBASE/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6_SYBASE/core/src/resources/portal-core-sar/conf/data/default-object.xml 2008-07-18 01:00:29 UTC (rev 11494)
+++ branches/JBoss_Portal_Branch_2_6_SYBASE/core/src/resources/portal-core-sar/conf/data/default-object.xml 2008-07-18 01:02:31 UTC (rev 11495)
@@ -140,7 +140,6 @@
<display-name xml:lang="it">Home</display-name>
<display-name xml:lang="es">Home</display-name>
<display-name xml:lang="fr">Accueil</display-name>
- <display-name xml:lang="ru">Домой</display-name>
<properties>
<property>
<name>order</name>
@@ -296,7 +295,6 @@
<display-name xml:lang="it">Home</display-name>
<display-name xml:lang="es">Home</display-name>
<display-name xml:lang="fr">Accueil</display-name>
- <display-name xml:lang="ru">Домой</display-name>
<properties>
<property>
<name>order</name>
@@ -353,9 +351,7 @@
<page-name>default</page-name>
<display-name xml:lang="en">Admin</display-name>
<display-name xml:lang="it">Amministrazione</display-name>
- <display-name xml:lang="es">Administración</display-name>
<display-name xml:lang="fr">Administration</display-name>
- <display-name xml:lang="ru">Администрирование</display-name>
<window>
<window-name>AdminPortletWindow</window-name>
<instance-ref>AdminPortletInstance</instance-ref>
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11493 - in branches/JBoss_Portal_Branch_2_7: cms/src/main/org/jboss/portal/cms/impl/jcr/ha and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-07-17 19:39:12 -0400 (Thu, 17 Jul 2008)
New Revision: 11493
Modified:
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
Log:
JBPORTAL-2075 - CMS failure in jboss-portal-ha when LDAP is used for authentication
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2008-07-17 23:23:05 UTC (rev 11492)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2008-07-17 23:39:12 UTC (rev 11493)
@@ -577,6 +577,11 @@
JCRCMS.turnOffWorkflow();
clusterWorkflowStatus = true;
}
+ Boolean enableUISecurityFilter = (Boolean)propagatedContext.getClusterContextInfo("enableUISecurityFilter");
+ if(enableUISecurityFilter != null)
+ {
+ JCRCMS.enableUISecurityFilter();
+ }
}
// .... add new nodes & properties and save them
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java 2008-07-17 23:23:05 UTC (rev 11492)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java 2008-07-17 23:39:12 UTC (rev 11493)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.jboss.portal.cms.impl.jcr.ha;
+import org.apache.log4j.Logger;
import org.jboss.portal.cms.CMSException;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.impl.jcr.JCRCMS;
@@ -40,6 +41,7 @@
*/
public class HAJCRCMS extends JCRCMS implements HASingletonInvoker.Callback
{
+ private static Logger log = Logger.getLogger(HAJCRCMS.class);
/** The invoker. */
private HASingletonInvoker invoker;
@@ -54,71 +56,118 @@
}
else
{
+ //Add the user Identity ThreadLocal variable to the Command Context for propagation to the Master Node
+ if (this.getUserInfo().get() != null)
+ {
+ User user = (User)this.getUserInfo().get();
+ JCRCommandContext context = this.getCommandContext((JCRCommand)cmd);
+ context.setClusterContextInfo("user", new CMSUser(user.getUserName()));
+ }
+
+ //Add the Workflow ThreadLocal variable to the Command Context for propagation to the Master Node
+ if (this.turnOffWorkflow.get() != null)
+ {
+ Boolean workflowStatus = (Boolean)this.turnOffWorkflow.get();
+ JCRCommandContext context = this.getCommandContext((JCRCommand)cmd);
+ context.setClusterContextInfo("workflowStatus", workflowStatus);
+ }
+
+ //Add the enableUISecurityFilter indicator to the Command Context for propagation to the Master Node
+ if(this.isUISecurityFilterActive())
+ {
+ JCRCommandContext context = this.getCommandContext((JCRCommand)cmd);
+ context.setClusterContextInfo("enableUISecurityFilter", Boolean.TRUE);
+ }
+
+ // Use the proxy to invoke on the singleton
+ Object returnValue = null;
try
{
- //Add the user Identity ThreadLocal variable to the Command Context for propagation to the Master Node
- if (this.getUserInfo().get() != null)
+ returnValue = invoker.invoke("execute", new Class[]{Command.class}, new Object[]{cmd});
+ if(returnValue instanceof CMSException)
{
- User user = (User)this.getUserInfo().get();
- JCRCommandContext context = (JCRCommandContext)((JCRCommand)cmd).getContext();
- if (context == null)
+ if(returnValue.toString().indexOf("Access to this resource is denied") != -1)
{
- context = new JCRCommandContext(null, null, null);
- ((JCRCommand)cmd).setContext(context);
+ throw (CMSException)returnValue;
}
- context.setClusterContextInfo("user", new CMSUser(user.getUserName()));
- }
-
- //Add the Workflow ThreadLocal variable to the Command Context for propagation to the Master Node
- if (this.turnOffWorkflow.get() != null)
- {
- Boolean workflowStatus = (Boolean)this.turnOffWorkflow.get();
- JCRCommandContext context = (JCRCommandContext)((JCRCommand)cmd).getContext();
- if (context == null)
+ else
{
- context = new JCRCommandContext(null, null, null);
- ((JCRCommand)cmd).setContext(context);
+ returnValue = null;
}
- context.setClusterContextInfo("workflowStatus", workflowStatus);
}
-
- // Use the proxy to invoke on the singleton
- return invoker.invoke("execute", new Class[]{Command.class}, new Object[]{cmd});
}
- catch (Exception e)
+ catch(Exception e)
{
- e.printStackTrace();
- throw new RuntimeException("Fixme bad contract", e);
+ if(e instanceof CMSException)
+ {
+ throw (CMSException)e;
+ }
+ else
+ {
+ throw new CMSException(e);
+ }
}
+
+ return returnValue;
}
}
+ /**
+ *
+ */
public void startService() throws Exception
{
// Do nothing
}
+ /**
+ *
+ */
public void stopService()
{
// Do nothing
}
+ /**
+ *
+ */
public void setInvoker(HASingletonInvoker invoker)
{
this.invoker = invoker;
}
+ /**
+ *
+ */
public Object invoke(String methodName, Class[] types, Object[] args) throws CMSException
{
- Command cmd = (Command)args[0];
- return super.execute(cmd);
+ Object result = null;
+ try
+ {
+ Command cmd = (Command)args[0];
+ result = super.execute(cmd);
+ }
+ catch(CMSException ce)
+ {
+ if (ce.toString().indexOf("Access to this resource is denied") != -1)
+ {
+ result = ce;
+ }
+ }
+ return result;
}
+ /**
+ *
+ */
public String getDisplayName()
{
return "HAJCRCMS";
}
+ /**
+ *
+ */
public void startSingleton()
{
try
@@ -127,12 +176,34 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ log.error(this, e);
}
}
+ /**
+ *
+ */
public void stopSingleton()
{
super.stopService();
}
+
+ /**
+ *
+ * @param command
+ * @return
+ */
+ private JCRCommandContext getCommandContext(JCRCommand command)
+ {
+ JCRCommandContext context = null;
+
+ context = (JCRCommandContext)((JCRCommand)command).getContext();
+ if (context == null)
+ {
+ context = new JCRCommandContext(null, null, null);
+ ((JCRCommand)command).setContext(context);
+ }
+
+ return context;
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-07-17 23:23:05 UTC (rev 11492)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-07-17 23:39:12 UTC (rev 11493)
@@ -381,6 +381,10 @@
<copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar/portal-cms-ha.sar" overwrite="true">
<fileset dir="${build.lib}/portal-cms-ha-exploded.sar"/>
</copy>
+ <require file="${jboss.home}/server/${portal-ha.node2.deploy.dir}"/>
+ <copy todir="${jboss.home}/server/${portal-ha.node2.deploy.dir}/jboss-portal-ha.sar/portal-cms-ha.sar" overwrite="true">
+ <fileset dir="${build.lib}/portal-cms-ha-exploded.sar"/>
+ </copy>
</target>
<!--
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11492 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/controller/coordination and 17 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-07-17 19:23:05 -0400 (Thu, 17 Jul 2008)
New Revision: 11492
Added:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/web.xml
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationManager.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventConverter.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/IllegalCoordinationException.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ImplicitStrategy.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/SimpleEventConverter.java
Removed:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationManager.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventConverter.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/IllegalCoordinationException.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ImplicitStrategy.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/SimpleEventConverter.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/build.xml
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/Controller.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationMetaData.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/coordination/persistent-jboss-beans.xml
Log:
- Move coordination package higher in core module
- A lot of small fixes for explicit coordination stuff
- initial simple coordination samples in core-samples module
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/Controller.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/Controller.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/Controller.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -36,12 +36,11 @@
import org.jboss.portal.core.model.CustomizationManager;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator;
-import org.jboss.portal.core.model.portal.coordination.CoordinationManager;
+import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
+import org.jboss.portal.core.controller.coordination.CoordinationManager;
import org.jboss.portal.core.model.portal.content.ContentRendererRegistry;
import org.jboss.portal.core.model.portal.control.page.PageControlPolicy;
import org.jboss.portal.core.impl.model.content.InternalContentProviderRegistry;
-import org.jboss.portal.core.impl.model.portal.coordination.CoordinationService;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import org.jboss.portal.server.RequestController;
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination (from rev 11461, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination)
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationConfigurator.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,177 +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.core.model.portal.coordination;
-
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.PageContainer;
-
-import javax.xml.namespace.QName;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface CoordinationConfigurator
-{
- // Management
-
- /**
- * Defines a wiring for a given even QName between multiply source and destination windows
- *
- * @param sources
- * @param targets
- * @param eventName
- * @throws IllegalCoordinationException
- */
- void setEventWiring(Map<Window, QName> sources, Map<Window, QName> targets, String eventName) throws IllegalCoordinationException;
-
- /**
- * Remove wiring
- *
- * @param eventWiringInfo
- * @throws IllegalCoordinationException
- */
- void removeEventWiring(EventWiringInfo eventWiringInfo) throws IllegalCoordinationException;
-
- /**
- * Sets implicit wiring strategy for a given page
- *
- * @param pageContainer
- * @param strategy
- * @throws IllegalCoordinationException
- */
- void setImplicitEventWiringStrategy(PageContainer pageContainer, ImplicitStrategy strategy) throws IllegalCoordinationException;
-
- /**
- * @param page
- * @return implicit wiring strategy for a given page. Can return null if no strategy is set
- */
- ImplicitStrategy getImplicitEventWiringStrategy(PageContainer page) throws IllegalCoordinationException;
-
- /**
- * @param page
- * @param eventQName
- * @return all wirings defined for a given qname
- */
- Collection<EventWiringInfo> getEventWirings(Page page, QName eventQName);
-
- /**
- * @param page
- * @return all wirings defined in the scope of a given page
- */
- Collection<EventWiringInfo> getEventWirings(Page page);
-
- /**
- * @param window
- * @return all wirings where given window is a source
- */
- Collection<EventWiringInfo> getEventSourceWirings(Window window);
-
- /**
- * @param window
- * @return all wirings where given window is a destination
- */
- Collection<EventWiringInfo> getEventDestinationWirings(Window window);
-
- /**
- * Defines shared parameter binding for a given collection of windows.
- *
- * @param name
- * @param windows
- * @throws IllegalCoordinationException
- */
- void setParameterBinding(String name, Map<Window, QName> windows) throws IllegalCoordinationException;
-
- /**
- * Removes given parameter binding
- *
- * @param parameterBinding
- * @throws IllegalCoordinationException
- */
- void removeParameterBinding(ParameterBindingInfo parameterBinding) throws IllegalCoordinationException;
-
- /**
- * Defines page scoped alias for shared parameter. All parameters with a local part equal to given name will
- * share request value
- *
- * @param page
- * @param name
- */
- void setParameterAlias(Page page, String name);
-
- /**
- * Get a collection of aliases defined for a given page
- *
- * @param page
- * @return
- */
- Collection<String> getParameterAliases(Page page);
-
- /**
- * Remove alias
- *
- * @param page
- * @param name
- * @throws IllegalCoordinationException
- */
- void removeParameterAlias(Page page, String name) throws IllegalCoordinationException;
-
- /**
- * Set implicit strategy for a given page container
- *
- * @param pageContainer
- * @param implicitStrategy
- * @throws IllegalCoordinationException
- */
- void setImplicitParameterBindingStrategy(PageContainer pageContainer, ImplicitStrategy implicitStrategy) throws IllegalCoordinationException;
-
- /**
- * @param pageContainer
- * @return implicit strategy for a given page container. Can return null if no strategy is defined
- */
- ImplicitStrategy getImplicitParameterBindingStrategy(PageContainer pageContainer) throws IllegalCoordinationException;
-
-
-
- /**
- * @param page
- * @param parameterQName
- * @return parameter bindings for a given parameter qname
- */
- Collection<ParameterBindingInfo> getParameterBindings(Page page, QName parameterQName);
-
- /**
- * @param page
- * @return parameter bindings define in the scope of a given page
- */
- Collection<ParameterBindingInfo> getParameterBindings(Page page);
-
- /**
- * @param window
- * @return parameter bindings where given window is involved
- */
- Collection<ParameterBindingInfo> getParameterBindings(Window window);
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationConfigurator.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationConfigurator.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,152 @@
+/*
+* 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.core.controller.coordination;
+
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.PageContainer;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface CoordinationConfigurator
+{
+ // Management
+
+ /**
+ * Defines a wiring for a given even QName between multiply source and destination windows
+ *
+ * @param sources
+ * @param targets
+ * @param eventName
+ * @throws IllegalCoordinationException
+ */
+ void setEventWiring(Map<Window, QName> sources, Map<Window, QName> targets, String eventName) throws IllegalCoordinationException;
+
+ /**
+ * Remove wiring
+ *
+ * @param eventWiringInfo
+ * @throws IllegalCoordinationException
+ */
+ void removeEventWiring(EventWiringInfo eventWiringInfo) throws IllegalCoordinationException;
+
+ /**
+ * Sets implicit wiring strategy for a given page
+ *
+ * @param pageContainer
+ * @param strategy
+ * @throws IllegalCoordinationException
+ */
+ void setImplicitEventWiringStrategy(PageContainer pageContainer, ImplicitStrategy strategy) throws IllegalCoordinationException;
+
+ /**
+ * @param page
+ * @return implicit wiring strategy for a given page. Can return null if no strategy is set
+ */
+ ImplicitStrategy getImplicitEventWiringStrategy(PageContainer page) throws IllegalCoordinationException;
+
+ /**
+ * @param page
+ * @param eventQName
+ * @return all wirings defined for a given qname
+ */
+ Collection<EventWiringInfo> getEventWirings(Page page, QName eventQName);
+
+ /**
+ * @param page
+ * @return all wirings defined in the scope of a given page
+ */
+ Collection<EventWiringInfo> getEventWirings(Page page);
+
+ /**
+ * @param window
+ * @return all wirings where given window is a source
+ */
+ Collection<EventWiringInfo> getEventSourceWirings(Window window);
+
+ /**
+ * @param window
+ * @return all wirings where given window is a destination
+ */
+ Collection<EventWiringInfo> getEventDestinationWirings(Window window);
+
+ /**
+ * Defines shared parameter binding for a given collection of windows.
+ *
+ * @param name
+ * @param windows
+ * @throws IllegalCoordinationException
+ */
+ void setParameterBinding(String name, Map<Window, QName> windows) throws IllegalCoordinationException;
+
+ /**
+ * Removes given parameter binding
+ *
+ * @param parameterBinding
+ * @throws IllegalCoordinationException
+ */
+ void removeParameterBinding(ParameterBindingInfo parameterBinding) throws IllegalCoordinationException;
+
+
+ /**
+ * Set implicit strategy for a given page container
+ *
+ * @param pageContainer
+ * @param implicitStrategy
+ * @throws IllegalCoordinationException
+ */
+ void setImplicitParameterBindingStrategy(PageContainer pageContainer, ImplicitStrategy implicitStrategy) throws IllegalCoordinationException;
+
+ /**
+ * @param pageContainer
+ * @return implicit strategy for a given page container. Can return null if no strategy is defined
+ */
+ ImplicitStrategy getImplicitParameterBindingStrategy(PageContainer pageContainer) throws IllegalCoordinationException;
+
+
+
+ /**
+ * @param page
+ * @param parameterQName
+ * @return parameter bindings for a given parameter qname
+ */
+ Collection<ParameterBindingInfo> getParameterBindings(Page page, QName parameterQName);
+
+ /**
+ * @param page
+ * @return parameter bindings define in the scope of a given page
+ */
+ Collection<ParameterBindingInfo> getParameterBindings(Page page);
+
+ /**
+ * @param window
+ * @return parameter bindings where given window is involved
+ */
+ Collection<ParameterBindingInfo> getParameterBindings(Window window);
+}
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationManager.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationManager.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,74 +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.core.model.portal.coordination;
-
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.PageContainer;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.controller.portlet.ControllerPortletControllerContext;
-import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
-
-import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Interface defining operations for explicit event wiring management
- *
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface CoordinationManager
-{
-
- // Event Discovery
-
- /**
- * @param event
- * @param context
- * @return all windows that given event should be delivered to with current wirings and configuration
- */
- Map<Window, PortletWindowEvent> getEventWindows(PortletWindowEvent event, ControllerPortletControllerContext context) throws IllegalCoordinationException;
-
-
- /**
- * Resolves implicit strategy. If there is no strategy defined for this page container method will browse
- * parent object to resolve inherited recursive strategies. If no strategy is set this method will return default one
- *
- * @param page
- * @return
- * @throws IllegalCoordinationException
- */
- ImplicitStrategy resolveImplicitBindingStrategy(PageContainer page);
-
- /**
- * Resolves implicit wiring strategy. If there is no strategy defined for this page container method will browse
- * parent object to resolve inherited recursive strategies. If no strategy is set this method will return default one
- *
- * @param page
- * @return
- * @throws IllegalCoordinationException
- */
- ImplicitStrategy resolveImplicitEventWiringStrategy(PageContainer page);
-
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationManager.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationManager.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationManager.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/CoordinationManager.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,79 @@
+/*
+* 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.core.controller.coordination;
+
+import org.jboss.portal.core.model.portal.PageContainer;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.controller.portlet.ControllerPortletControllerContext;
+import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Interface defining operations for explicit event wiring management
+ *
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface CoordinationManager
+{
+
+ // Event Discovery
+
+ /**
+ * @param event
+ * @param context
+ * @return all windows that given event should be delivered to with current wirings and configuration
+ */
+ Map<Window, PortletWindowEvent> getEventWindows(PortletWindowEvent event, ControllerPortletControllerContext context) throws IllegalCoordinationException;
+
+
+ /**
+ * Resolves implicit strategy. If there is no strategy defined for this page container method will browse
+ * parent object to resolve inherited recursive strategies. If no strategy is set this method will return default one
+ *
+ * @param page
+ * @return
+ * @throws IllegalCoordinationException
+ */
+ ImplicitStrategy resolveImplicitBindingStrategy(PageContainer page);
+
+ /**
+ * Resolves implicit wiring strategy. If there is no strategy defined for this page container method will browse
+ * parent object to resolve inherited recursive strategies. If no strategy is set this method will return default one
+ *
+ * @param page
+ * @return
+ * @throws IllegalCoordinationException
+ */
+ ImplicitStrategy resolveImplicitEventWiringStrategy(PageContainer page);
+
+ /**
+ * @param window
+ * @param name
+ * @return all parameter binding names with a given window/qname mapping
+ */
+ Collection<String> getBindingNames(Window window, QName name);
+}
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventConverter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventConverter.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventConverter.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,44 +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.core.model.portal.coordination;
-
-import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
-import org.jboss.portal.portlet.info.EventInfo;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface EventConverter
-{
-
- /**
- * Converts source event using information about destination event mapping. Return event will have
- * destination event QName, source event windowId and negotiated payload value.
- *
- * @param sourceEvent
- * @param destEventInfo
- * @return
- */
- PortletWindowEvent resolveEvent(PortletWindowEvent sourceEvent, EventInfo destEventInfo);
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventConverter.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventConverter.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventConverter.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventConverter.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,45 @@
+/*
+* 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.core.controller.coordination;
+
+import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
+import org.jboss.portal.portlet.info.EventInfo;
+import org.jboss.portal.core.model.portal.Window;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface EventConverter
+{
+
+ /**
+ * Converts source event using information about destination event mapping. Return event will have
+ * destination event QName, source event windowId and negotiated payload value.
+ *
+ * @param sourceEvent
+ * @param destEventInfo
+ * @return
+ */
+ PortletWindowEvent resolveEvent(PortletWindowEvent sourceEvent, EventInfo destEventInfo, Window window);
+}
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventWiringInfo.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,43 +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.core.model.portal.coordination;
-
-import org.jboss.portal.core.model.portal.Window;
-
-import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface EventWiringInfo
-{
-
- String getName();
-
- Map<Window, QName> getSources();
-
- Map<Window, QName> getDestinations();
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventWiringInfo.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/EventWiringInfo.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,42 @@
+/*
+* 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.core.controller.coordination;
+
+import org.jboss.portal.core.model.portal.Window;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface EventWiringInfo
+{
+
+ String getName();
+
+ Map<Window, QName> getSources();
+
+ Map<Window, QName> getDestinations();
+}
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/IllegalCoordinationException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/IllegalCoordinationException.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/IllegalCoordinationException.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,35 +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.core.model.portal.coordination;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public class IllegalCoordinationException extends Exception
-{
- public IllegalCoordinationException(String message)
- {
- super(message);
- }
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/IllegalCoordinationException.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/IllegalCoordinationException.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/IllegalCoordinationException.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/IllegalCoordinationException.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,35 @@
+/*
+* 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.core.controller.coordination;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class IllegalCoordinationException extends Exception
+{
+ public IllegalCoordinationException(String message)
+ {
+ super(message);
+ }
+}
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ImplicitStrategy.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ImplicitStrategy.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ImplicitStrategy.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,85 +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.core.model.portal.coordination;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
-* @version : 0.1 $
-*/
-public enum ImplicitStrategy
-{
-
- // Explicit wiring takes precedence and if none exist for a given event it will be processed with implicit wiring
- FALLBACK,
-
- // Only implicit wiring enabled
- EXCLUSIVE,
-
- // Implicit wiring disabled
- DISABLED,
-
- // All children nodes in the tree will inherit FALLBACK strategy
- RECURSIVE_FALLBACK,
-
- // All children nodes in the tree will inherit EXCLUSIVE strategy
- RECURSIVE_EXCLUSIVE,
-
- // All children nodes in the tree will inherit DISABLED strategy
- RECURSIVE_DISABLED;
-
- public static ImplicitStrategy decodeStrategy(String value)
- {
- if (value == null)
- {
- return null;
- }
- else if (value.equals(DISABLED.name()))
- {
- return ImplicitStrategy.DISABLED;
- }
- else if (value.equals(EXCLUSIVE.name()))
- {
- return ImplicitStrategy.EXCLUSIVE;
- }
- else if (value.equals(FALLBACK.name()))
- {
- return ImplicitStrategy.FALLBACK;
- }
- else if (value.equals(RECURSIVE_DISABLED.name()))
- {
- return ImplicitStrategy.RECURSIVE_DISABLED;
- }
- else if (value.equals(RECURSIVE_EXCLUSIVE.name()))
- {
- return ImplicitStrategy.RECURSIVE_EXCLUSIVE;
- }
- else if (value.equals(RECURSIVE_FALLBACK.name()))
- {
- return ImplicitStrategy.RECURSIVE_FALLBACK;
- }
-
- // Strategy unknown
- return null;
- }
-
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ImplicitStrategy.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ImplicitStrategy.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ImplicitStrategy.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ImplicitStrategy.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,85 @@
+/*
+* 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.core.controller.coordination;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+* @version : 0.1 $
+*/
+public enum ImplicitStrategy
+{
+
+ // Explicit wiring takes precedence and if none exist for a given event it will be processed with implicit wiring
+ FALLBACK,
+
+ // Only implicit wiring enabled
+ EXCLUSIVE,
+
+ // Implicit wiring disabled
+ DISABLED,
+
+ // All children nodes in the tree will inherit FALLBACK strategy
+ RECURSIVE_FALLBACK,
+
+ // All children nodes in the tree will inherit EXCLUSIVE strategy
+ RECURSIVE_EXCLUSIVE,
+
+ // All children nodes in the tree will inherit DISABLED strategy
+ RECURSIVE_DISABLED;
+
+ public static ImplicitStrategy decodeStrategy(String value)
+ {
+ if (value == null)
+ {
+ return null;
+ }
+ else if (value.equals(DISABLED.name()))
+ {
+ return ImplicitStrategy.DISABLED;
+ }
+ else if (value.equals(EXCLUSIVE.name()))
+ {
+ return ImplicitStrategy.EXCLUSIVE;
+ }
+ else if (value.equals(FALLBACK.name()))
+ {
+ return ImplicitStrategy.FALLBACK;
+ }
+ else if (value.equals(RECURSIVE_DISABLED.name()))
+ {
+ return ImplicitStrategy.RECURSIVE_DISABLED;
+ }
+ else if (value.equals(RECURSIVE_EXCLUSIVE.name()))
+ {
+ return ImplicitStrategy.RECURSIVE_EXCLUSIVE;
+ }
+ else if (value.equals(RECURSIVE_FALLBACK.name()))
+ {
+ return ImplicitStrategy.RECURSIVE_FALLBACK;
+ }
+
+ // Strategy unknown
+ return null;
+ }
+
+}
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ParameterBindingInfo.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,41 +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.core.model.portal.coordination;
-
-import org.jboss.portal.core.model.portal.Window;
-
-import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface ParameterBindingInfo
-{
- String getName();
-
- Map<Window, QName> getWindows();
-
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ParameterBindingInfo.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/coordination/ParameterBindingInfo.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,40 @@
+/*
+* 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.core.controller.coordination;
+
+import org.jboss.portal.core.model.portal.Window;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface ParameterBindingInfo
+{
+ String getName();
+
+ Map<Window, QName> getWindows();
+
+}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -31,16 +31,20 @@
import org.jboss.portal.core.CoreConstants;
import org.jboss.portal.core.navstate.NavigationalStateContext;
import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.controller.coordination.CoordinationManager;
+import org.jboss.portal.core.controller.coordination.ImplicitStrategy;
import javax.xml.namespace.QName;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import java.util.Collection;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version $Revision: 630 $
*/
public class ControllerPageNavigationalState implements PortletPageNavigationalState
@@ -65,6 +69,9 @@
private Map<QName, String[]> pageUpdates;
/** . */
+ private Map<String, String[]> explicitPageUpdates;
+
+ /** . */
private Map<String, HashMap<QName, String[]>> windowPublicNavigationalStateUpdate;
public ControllerPageNavigationalState(
@@ -109,7 +116,7 @@
String windowId = window.getId().toString();
wns = navigationalStateContext.getWindowNavigationalState(windowId);
}
-
+
Map<String, String[]> parameters = new HashMap<String, String[]>();
for (Map.Entry<QName, String[]> value : entry.getValue().entrySet())
@@ -172,12 +179,48 @@
}
}
+
//
- navigationalStateContext.setPageNavigationalState(controllerContext.getPageId(), new org.jboss.portal.core.model.portal.navstate.PageNavigationalState(parameters));
+ Map<String, String[]> explicitBindings;
+ if (storedPNS != null)
+ {
+ explicitBindings = new HashMap<String, String[]>(storedPNS.getExplicitBindings());
+ }
+ else
+ {
+ explicitBindings = new HashMap<String, String[]>();
+ }
+
+ if (explicitPageUpdates != null)
+ {
+ for (Map.Entry<String, String[]> explicitUpdate : explicitPageUpdates.entrySet())
+ {
+ String[] value = explicitUpdate.getValue();
+
+ //
+ if (value.length == 0)
+ {
+ explicitBindings.remove(explicitUpdate.getKey());
+ }
+ else
+ {
+ explicitBindings.put(explicitUpdate.getKey(), value);
+ }
+ }
+
+ //
+
+ }
+ navigationalStateContext.setPageNavigationalState(controllerContext.getPageId(), new org.jboss.portal.core.model.portal.navstate.PageNavigationalState(parameters, explicitBindings));
+
+
//
pageUpdates.clear();
}
+
+
+
}
/**
@@ -342,17 +385,52 @@
}
else
{
+
String[] parameterValue = getPublicNavigationalState(parameterInfo.getName());
- //
- if (parameterValue != null)
+
+ // Explicit binding
+ String[] explicitParameterValue = null;
+
+ // Check all bindings for this window/qname pair
+ Collection<String> bindings = getCoordinationManager().getBindingNames(getWindow(windowName), parameterInfo.getName());
+
+
+ // If this window/qname is binded several times with different updated params value will be unpredictable...
+ for (String binding : bindings)
{
- String parameterId = parameterInfo.getId();
+ explicitParameterValue = getPublicExplicitNavigationalState(binding);
+ }
+
+ ImplicitStrategy strategy = getCoordinationManager().resolveImplicitBindingStrategy(getWindow(windowName).getPage());
+
+ String parameterId = parameterInfo.getId();
+
+ if (strategy.equals(ImplicitStrategy.DISABLED) ||
+ (strategy.equals(ImplicitStrategy.FALLBACK) && explicitParameterValue != null))
+ {
+ //
// We clone the value here so we keep the internal state not potentially changed
- publicNavigationalState.put(parameterId, parameterValue.clone());
-
+ if (explicitParameterValue != null)
+ {
+ publicNavigationalState.put(parameterId, explicitParameterValue.clone());
+ }
+ else
+ {
+ //If it is DISABLED strategy check if this is not window publishing the param
+
+ }
}
+ else
+ {
+ //
+ if (parameterValue != null)
+ {
+ // We clone the value here so we keep the internal state not potentially changed
+ publicNavigationalState.put(parameterId, parameterValue.clone());
+ }
+ }
}
}
@@ -396,6 +474,8 @@
throw new IllegalStateException("The page navigational state is not modifiable");
}
+ CoordinationManager manager = getCoordinationManager();
+
//
PortletInfo info = controllerContext.getPortletInfo(windowName);
@@ -439,6 +519,19 @@
{
removePublicNavigationalState(name);
}
+
+ // Explicit bindings
+ Collection<String> bindings = manager.getBindingNames(getWindow(windowName), name);
+
+ if (bindings.size() > 0 && explicitPageUpdates == null)
+ {
+ explicitPageUpdates = new HashMap<String, String[]>();
+ }
+
+ for (String binding : bindings)
+ {
+ explicitPageUpdates.put(binding, value);
+ }
}
}
}
@@ -489,6 +582,35 @@
}
/**
+ *
+ */
+ public String[] getPublicExplicitNavigationalState(String name) throws IllegalArgumentException
+ {
+ String[] value = null;
+
+ //
+ if (explicitPageUpdates != null)
+ {
+ value = explicitPageUpdates.get(name);
+ }
+
+ //
+ if (value == null)
+ {
+ org.jboss.portal.core.model.portal.navstate.PageNavigationalState storedPNS = navigationalStateContext.getPageNavigationalState(controllerContext.getPageId());
+
+ //
+ if (storedPNS != null)
+ {
+ value = storedPNS.getExplicitBinding(name);
+ }
+ }
+
+ //
+ return value != null && value.length > 0 ? value : null;
+ }
+
+ /**
*
*/
public void setPublicNavigationalState(QName name, String[] value) throws IllegalArgumentException, IllegalStateException
@@ -532,4 +654,9 @@
{
return controllerContext.getWindow(windowName);
}
+
+ public CoordinationManager getCoordinationManager()
+ {
+ return controllerContext.getControllerContext().getController().getCoordinationManager();
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -29,14 +29,13 @@
import org.jboss.portal.portlet.controller.event.EventPhaseContext;
import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.core.impl.model.portal.coordination.CoordinationService;
-import org.jboss.portal.core.model.portal.coordination.CoordinationManager;
+import org.jboss.portal.core.controller.coordination.CoordinationManager;
import org.jboss.portal.core.model.portal.Window;
import org.apache.log4j.Logger;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version $Revision: 630 $
*/
public class CoreEventControllerContext implements EventControllerContext
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -34,7 +34,7 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.portal.PortalObjectPath;
-import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator;
+import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.core.model.portal.metadata.BuildContext;
import org.jboss.portal.core.model.portal.metadata.PortalObjectMetaData;
import org.jboss.portal.server.deployment.PortalWebApp;
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -26,7 +26,7 @@
import org.jboss.portal.common.transaction.TransactionManagerProvider;
import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator;
+import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.server.deployment.PortalWebApp;
import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory;
import org.jboss.portal.server.deployment.jboss.Deployment;
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination (from rev 11461, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination)
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/CoordinationService.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,1010 +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.core.impl.model.portal.coordination;
-
-import org.jboss.portal.core.model.portal.coordination.CoordinationManager;
-import org.jboss.portal.core.model.portal.coordination.IllegalCoordinationException;
-import org.jboss.portal.core.model.portal.coordination.EventWiringInfo;
-import org.jboss.portal.core.model.portal.coordination.ParameterBindingInfo;
-import org.jboss.portal.core.model.portal.coordination.ImplicitStrategy;
-import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator;
-import org.jboss.portal.core.model.portal.coordination.EventConverter;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.PageContainer;
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.Portal;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.controller.portlet.ControllerPortletControllerContext;
-import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.info.EventInfo;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-
-import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Collections;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public class CoordinationService extends AbstractJBossService
- implements CoordinationManager, CoordinationConfigurator
-{
- public static final String SOURCE = "source";
-
- public static final String DESTINATION = "destination";
-
- public static final String BINDING = "binding";
-
- public static final String ALIAS = "alias";
-
- public static final String PREFIX = "org.jboss.portal.core.model.portal.coordination";
-
- public static final String PREFIX_EVENT = PREFIX + ".event";
-
- public static final String PREFIX_PARAMETER = PREFIX + ".binding";
-
- public static final String PREFIX_EVENT_NAME = PREFIX_EVENT + ".name";
-
- public static final String PREFIX_EVENT_WIRING = PREFIX_EVENT + ".wiring";
-
- public static final String PREFIX_PARAMETER_NAME = PREFIX_PARAMETER + ".name";
-
- public static final String PREFIX_PARAMETER_BINDING = PREFIX_PARAMETER + ".binding";
-
- public static final String PREFIX_PARAMETER_ALIAS = PREFIX_PARAMETER + ".alias";
-
- public static final String PREFIX_EVENT_IMPLICIT_STRATEGY = PREFIX_EVENT + ".implicit_strategy";
-
- public static final String PREFIX_PARAMETER_IMPLICIT_STRATEGY = PREFIX_PARAMETER + ".implicit_strategy";
-
- public static final String STRATEGY_FALLBACK = ImplicitStrategy.FALLBACK.name();
-
- public static final String STRATEGY_EXCLUSIVE = ImplicitStrategy.EXCLUSIVE.name();
-
- public static final String STRATEGY_DISABLED = ImplicitStrategy.DISABLED.name();
-
- public static final String STRATEGY_RECURSIVE_DISABLED = ImplicitStrategy.RECURSIVE_DISABLED.name();
-
- public static final String STRATEGY_RECURSIVE_EXCLUSIVE = ImplicitStrategy.RECURSIVE_EXCLUSIVE.name();
-
- public static final String STRATEGY_RECURSIVE_FALLBACK = ImplicitStrategy.RECURSIVE_FALLBACK.name();
-
- public static final ImplicitStrategy DEFAULT_STRATEGY = ImplicitStrategy.FALLBACK;
-
-
- protected EventConverter eventConverter = new SimpleEventConverter();
-
- protected PortalObjectContainer portalObjectContainer;
-
- protected void startService() throws Exception
- {
- super.startService();
-
- if (portalObjectContainer == null)
- {
- throw new IllegalStateException("Cannot instantiate CoordinationManager: no PortalObjectContainer present");
- }
- }
-
-
- public Map<Window, PortletWindowEvent> getEventWindows(PortletWindowEvent event, ControllerPortletControllerContext context) throws IllegalCoordinationException
- {
-
- if (event == null)
- {
- throw new IllegalArgumentException("event is null");
- }
-
- if (context == null)
- {
- throw new IllegalArgumentException("context is null");
- }
-
- // Obtain page for which we scope this event
-
- Page page = context.getWindow(event.getWindowId()).getPage();
-
- ImplicitStrategy strategy = resolveImplicitEventWiringStrategy(page);
-
- Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
-
- // Only implicit wirings
-
- if (strategy.equals(ImplicitStrategy.EXCLUSIVE))
- {
- windows = getEventWindowsImplicit(page, event, context);
- }
-
- // Only explicit wirings
-
- else if(strategy.equals(ImplicitStrategy.DISABLED))
- {
- windows = getEventWindowsExplicit(page, event, context);
- }
-
- // If no explicit wirings for this event fallback to implicit
-
- else if(strategy.equals(ImplicitStrategy.FALLBACK))
- {
- windows = getEventWindowsExplicit(page, event, context);
-
- if (windows.size() == 0)
- {
- windows = getEventWindowsImplicit(page, event, context);
- }
- }
-
- return windows;
- }
-
- private Map<Window, PortletWindowEvent> getEventWindowsExplicit(Page page, PortletWindowEvent event, ControllerPortletControllerContext context)
- {
- Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
-
- Collection<EventWiringInfo> infos = getEventWirings(page);
-
- for (EventWiringInfo info : infos)
- {
- if (info.getSources().containsValue(event.getName()))
- {
- for (Window window : info.getDestinations().keySet())
- {
- PortletInfo portletInfo = context.getPortletInfo(window.getName());
- QName destEventName = info.getDestinations().get(window);
- EventInfo destEventInfo = portletInfo.getEventing().getConsumedEvents().get(destEventName);
- if (destEventInfo != null)
- {
- windows.put(window, getEventConverter().resolveEvent(event, destEventInfo));
- }
-
- }
- }
- }
-
- return windows;
- }
-
- private Map<Window, PortletWindowEvent> getEventWindowsImplicit(Page page, PortletWindowEvent event, ControllerPortletControllerContext context)
- {
- Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
-
- for (String windowName : context.getWindowNames())
- {
- PortletInfo info = context.getPortletInfo(windowName);
-
- //
- if (info.getEventing().getConsumedEvents().containsKey(event.getName()))
- {
- PortletWindowEvent distributedEvent = new PortletWindowEvent(event.getName(), event.getPayload(), windowName);
- windows.put(context.getWindow(windowName), distributedEvent);
- }
- }
-
- return windows;
- }
-
- public void setEventWiring(Map<Window, QName> sources, Map<Window, QName> destinations, String eventName) throws IllegalCoordinationException
- {
-
- if (sources == null)
- {
- throw new IllegalArgumentException("sources are null");
- }
-
- if (destinations == null)
- {
- throw new IllegalArgumentException("destinations are null");
- }
-
- if (eventName == null)
- {
- throw new IllegalArgumentException("eventName is null");
- }
-
- if (sources.isEmpty())
- {
- throw new IllegalArgumentException("empty sources map");
- }
-
- if (destinations.isEmpty())
- {
- throw new IllegalArgumentException("empty destinations map");
- }
-
- // Obtain parent page and check that all windows are in one branch...
-
- Page parentPage = null;
-
- Set<Window> sw = sources.keySet();
- Set<Window> dw = destinations.keySet();
-
- Set<Window> all = new HashSet<Window>();
- all.addAll(sw);
- all.addAll(dw);
-
-
- for (Window window : all)
- {
- if (parentPage == null)
- {
- parentPage = window.getPage();
- }
-
- if (!window.getPage().equals(parentPage))
- {
- throw new IllegalCoordinationException("Parent page is not the same for all windows");
- }
- }
-
- // Check if the same window is not both in sources and destinations map
-
- for (Window window : sw)
- {
- if (dw.contains(window))
- {
- throw new IllegalCoordinationException("The same window cannot be source and destination of the same explicit wiring");
- }
- }
-
- // Set the sources
-
- String prop_name = PREFIX_EVENT_NAME + "." + eventName;
- String prop_wiring = PREFIX_EVENT_WIRING + "." + eventName;
-
- for (Window window : sw)
- {
- window.setDeclaredProperty(prop_name, SOURCE);
- window.setDeclaredProperty(prop_wiring, sources.get(window).toString());
- }
-
- // Set the sources
-
- for (Window window : dw)
- {
- window.setDeclaredProperty(prop_name, DESTINATION);
- window.setDeclaredProperty(prop_wiring, destinations.get(window).toString());
- }
-
- }
-
- public void removeEventWiring(EventWiringInfo info) throws IllegalCoordinationException
- {
- if (info == null)
- {
- throw new IllegalArgumentException("EventWiringInfo is null");
- }
-
- // Remove all entries
-
- String prop_name = PREFIX_EVENT_NAME + "." + info.getName();
- String prop_wiring = PREFIX_EVENT_WIRING + "." + info.getName();
-
- Set<Window> all = new HashSet<Window>();
- all.addAll(info.getSources().keySet());
- all.addAll(info.getDestinations().keySet());
-
- for (Window window : all)
- {
- window.setDeclaredProperty(prop_name, null);
- window.setDeclaredProperty(prop_wiring, null);
- }
- }
-
- public void setImplicitEventWiringStrategy(PageContainer pageContainer, ImplicitStrategy strategy) throws IllegalCoordinationException
- {
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("pageContainer is null");
- }
-
-
- setStrategy(pageContainer, strategy, PREFIX_EVENT_IMPLICIT_STRATEGY);
-
- }
-
- public ImplicitStrategy getImplicitEventWiringStrategy(PageContainer page) throws IllegalCoordinationException
- {
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- return decodeStrategy(page, PREFIX_EVENT_IMPLICIT_STRATEGY);
-
- }
-
- public ImplicitStrategy resolveImplicitEventWiringStrategy(PageContainer page)
- {
-
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- return resolveStrategy(page, PREFIX_EVENT_IMPLICIT_STRATEGY);
- }
-
- public Collection<EventWiringInfo> getEventWirings(Page page, QName eventQName)
- {
-
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- if (eventQName == null)
- {
- throw new IllegalArgumentException("eventQName is null");
- }
-
- Collection<EventWiringInfo> pageEvents = getEventWirings(page);
-
- Set<EventWiringInfo> events = new HashSet<EventWiringInfo>();
-
- for (EventWiringInfo event : pageEvents)
- {
- if (event.getSources().containsValue(eventQName) || event.getDestinations().containsValue(eventQName))
- {
- pageEvents.add(event);
- }
- }
-
- return events;
- }
-
- public Collection<EventWiringInfo> getEventWirings(Page page)
- {
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- // Examine window properties and create page events
-
- Collection<Window> windows = getWindows(page);
-
- Map<String, EventInfoPOJO> events = new HashMap<String, EventInfoPOJO>();
-
-
-
- for (Window window : windows)
- {
- Set<String> propNames = window.getProperties().keySet();
-
- for (String propName : propNames)
- {
- if(propName.startsWith(PREFIX_EVENT_NAME))
- {
- String en = propName.substring(PREFIX_EVENT_NAME.length() + 1);
- EventInfoPOJO info = null;
-
- if (!events.keySet().contains(en))
- {
- info = new EventInfoPOJO(en);
- events.put(en, info);
- }
- else
- {
- info = events.get(en);
- }
-
- String prop_wiring = PREFIX_EVENT_WIRING + "." + en;
-
- String name = window.getProperty(prop_wiring);
- String role = window.getProperty(propName);
-
-
- //TODO: if the imformation from properties is not consistent should we throw exception?
-
- if (name != null)
- {
- QName qname = decodeQName(name);
-
-
- if (qname != null && role != null && role.equalsIgnoreCase("source"))
- {
- info.getSources().put(window, qname);
- }
- else if (qname != null && role != null && role.equalsIgnoreCase("destination"))
- {
- info.getDestinations().put(window, qname);
- }
- }
-
- break;
- }
- }
- }
-
- // Make immutable copy
- Collection<EventWiringInfo> immutableEvents = new HashSet<EventWiringInfo>();
-
- for (EventInfoPOJO info : events.values())
- {
- immutableEvents.add(info.getImmutableWiringInfo());
- }
-
- return immutableEvents;
- }
-
- public Collection<EventWiringInfo> getEventSourceWirings(Window window)
- {
-
- Collection<EventWiringInfo> pageEvents = getEventWirings(window.getPage());
-
- Set<EventWiringInfo> events = new HashSet<EventWiringInfo>();
-
- for (EventWiringInfo pageEvent : pageEvents)
- {
- if (pageEvent.getSources().keySet().contains(window))
- {
- events.add(pageEvent);
- }
- }
-
- return events;
- }
-
- public Collection<EventWiringInfo> getEventDestinationWirings(Window window)
- {
- Collection<EventWiringInfo> pageEvents = getEventWirings(window.getPage());
-
- Set<EventWiringInfo> events = new HashSet<EventWiringInfo>();
-
- for (EventWiringInfo pageEvent : pageEvents)
- {
- if (pageEvent.getDestinations().keySet().contains(window))
- {
- events.add(pageEvent);
- }
- }
-
- return events;
- }
-
- public void setParameterBinding(String name, Map<Window, QName> windows) throws IllegalCoordinationException
- {
- if (windows == null)
- {
- throw new IllegalArgumentException("windows are null");
- }
-
- if (name == null)
- {
- throw new IllegalArgumentException("name is null");
- }
-
- if (windows.isEmpty())
- {
- throw new IllegalArgumentException("empty windows map");
- }
-
-
- // Obtain parent page and check that all windows are in one branch...
-
- Page parentPage = null;
-
- Set<Window> dw = windows.keySet();
-
-
- for (Window window : dw)
- {
- if (parentPage == null)
- {
- parentPage = window.getPage();
- }
-
- if (!window.getPage().equals(parentPage))
- {
- throw new IllegalCoordinationException("Parent page is not the same for all windows");
- }
- }
-
-
- // Set window properties
-
- String prop_wiring = PREFIX_PARAMETER_BINDING + "." + name;
-
- for (Window window : dw)
- {
- window.setDeclaredProperty(prop_wiring, windows.get(window).toString());
- }
-
- }
-
- public void removeParameterBinding(ParameterBindingInfo info) throws IllegalCoordinationException
- {
- if (info == null)
- {
- throw new IllegalArgumentException("ParameterBindingInfo is null");
- }
-
- // Remove all entries
-
- String prop_wiring = PREFIX_PARAMETER_BINDING + "." + info.getName();
-
- for (Window window : info.getWindows().keySet())
- {
- window.setDeclaredProperty(prop_wiring, null);
- }
- }
-
- public void setParameterAlias(Page page, String name)
- {
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- if (name == null)
- {
- throw new IllegalArgumentException("name is null");
- }
-
- page.setDeclaredProperty(PREFIX_PARAMETER_ALIAS + "." + name, ALIAS);
- }
-
- public Collection<String> getParameterAliases(Page page)
- {
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- Collection<String> aliases = new HashSet<String>();
-
- for (String propName : page.getProperties().keySet())
- {
- if (propName.startsWith(PREFIX_PARAMETER_ALIAS))
- {
- String value = page.getProperty(propName);
- if (value.equalsIgnoreCase(ALIAS))
- {
- String aliasName = propName.substring(PREFIX_PARAMETER_ALIAS.length() + 1);
- aliases.add(aliasName);
- }
- }
- }
-
- return aliases;
-
- }
-
- public void removeParameterAlias(Page page, String name) throws IllegalCoordinationException
- {
-
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- if (name == null)
- {
- throw new IllegalArgumentException("name is null");
- }
-
- page.setDeclaredProperty(PREFIX_PARAMETER_ALIAS + "." + name, null);
-
- }
-
- public void setImplicitParameterBindingStrategy(PageContainer pageContainer, ImplicitStrategy strategy) throws IllegalCoordinationException
- {
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("pageContainer is null");
- }
-
-
- setStrategy(pageContainer, strategy, PREFIX_PARAMETER_IMPLICIT_STRATEGY);
- }
-
- public ImplicitStrategy getImplicitParameterBindingStrategy(PageContainer pageContainer) throws IllegalCoordinationException
- {
-
- if (pageContainer == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- return decodeStrategy(pageContainer, PREFIX_PARAMETER_IMPLICIT_STRATEGY);
-
- }
-
- public ImplicitStrategy resolveImplicitBindingStrategy(PageContainer page)
- {
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- return resolveStrategy(page, PREFIX_PARAMETER_IMPLICIT_STRATEGY);
- }
-
- public Collection<ParameterBindingInfo> getParameterBindings(Page page, QName parameterQName)
- {
-
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- if (parameterQName == null)
- {
- throw new IllegalArgumentException("QName is null");
- }
-
- Collection<ParameterBindingInfo> pageParams = getParameterBindings(page);
-
- Collection<ParameterBindingInfo> infos = new HashSet<ParameterBindingInfo>();
-
- for (ParameterBindingInfo pageParam : pageParams)
- {
- if (pageParam.getWindows().containsValue(parameterQName))
- {
- infos.add(pageParam);
- }
- }
-
- return infos;
- }
-
- public Collection<ParameterBindingInfo> getParameterBindings(Page page)
- {
- if (page == null)
- {
- throw new IllegalArgumentException("page is null");
- }
-
- // Examine window properties and create page parameters
-
- Collection<Window> windows = getWindows(page);
-
- Map<String, ParameterInfoPOJO> params = new HashMap<String, ParameterInfoPOJO>();
-
-
-
- for (Window window : windows)
- {
- Set<String> propNames = window.getProperties().keySet();
-
- for (String propName : propNames)
- {
- if(propName.startsWith(PREFIX_PARAMETER_BINDING))
- {
- String pn = propName.substring(PREFIX_PARAMETER_BINDING.length() + 1);
- ParameterInfoPOJO info = null;
-
- if (!params.keySet().contains(pn))
- {
- info = new ParameterInfoPOJO(pn);
- params.put(pn, info);
- }
- else
- {
- info = params.get(pn);
- }
-
- String binding = window.getProperty(propName);
-
-
- //TODO: if the imformation from properties is not consistent should we throw exception?
-
- if (binding != null)
- {
- QName qname = decodeQName(binding);
-
-
- if (qname != null)
- {
- info.getWindows().put(window, qname);
- }
-
- }
-
- break;
- }
- }
- }
-
- // Make immutable copy
- Collection<ParameterBindingInfo> immutableParams = new HashSet<ParameterBindingInfo>();
-
- for (ParameterInfoPOJO info : params.values())
- {
- immutableParams.add(info.getImmutableInfo());
- }
-
- return immutableParams;
- }
-
- public Collection<ParameterBindingInfo> getParameterBindings(Window window)
- {
- Collection<ParameterBindingInfo> pageParams = getParameterBindings(window.getPage());
-
- Collection<ParameterBindingInfo> infos = new HashSet<ParameterBindingInfo>();
-
- for (ParameterBindingInfo pageParam : pageParams)
- {
- if (pageParam.getWindows().keySet().contains(window))
- {
- infos.add(pageParam);
- }
- }
-
- return infos;
- }
-
- // SETTERS & GETTERS
-
- public PortalObjectContainer getPortalObjectContainer()
- {
- return portalObjectContainer;
- }
-
- public void setPortalObjectContainer(PortalObjectContainer portalObjectContainer)
- {
- this.portalObjectContainer = portalObjectContainer;
- }
-
- public EventConverter getEventConverter()
- {
- return eventConverter;
- }
-
- public void setEventConverter(EventConverter eventConverter)
- {
- this.eventConverter = eventConverter;
- }
-
- // HELPER METHODS
-
- private void setStrategy(PageContainer pageContainer, ImplicitStrategy strategy, String prefix)
- {
- if (strategy == null)
- {
- pageContainer.setDeclaredProperty(prefix, null);
- }
- else if (strategy.equals(ImplicitStrategy.DISABLED))
- {
- pageContainer.setDeclaredProperty(prefix, STRATEGY_DISABLED);
- }
- else if (strategy.equals(ImplicitStrategy.EXCLUSIVE))
- {
- pageContainer.setDeclaredProperty(prefix, STRATEGY_EXCLUSIVE);
- }
- else if (strategy.equals(ImplicitStrategy.FALLBACK))
- {
- pageContainer.setDeclaredProperty(prefix,STRATEGY_FALLBACK);
- }
- else if (strategy.equals(ImplicitStrategy.RECURSIVE_DISABLED))
- {
- pageContainer.setDeclaredProperty(prefix,STRATEGY_RECURSIVE_DISABLED);
- }
- else if (strategy.equals(ImplicitStrategy.RECURSIVE_EXCLUSIVE))
- {
- pageContainer.setDeclaredProperty(prefix,STRATEGY_RECURSIVE_EXCLUSIVE);
- }
- else if (strategy.equals(ImplicitStrategy.RECURSIVE_FALLBACK))
- {
- pageContainer.setDeclaredProperty(prefix,STRATEGY_RECURSIVE_FALLBACK);
- }
- }
-
- private ImplicitStrategy decodeStrategy(PageContainer pageContainer, String prefix)
- {
- String value = pageContainer.getDeclaredProperty(prefix);
-
- return ImplicitStrategy.decodeStrategy(value);
- }
-
-
-
- private ImplicitStrategy resolveStrategy(PageContainer pageContainer, String prefix)
- {
- String value = pageContainer.getDeclaredProperty(prefix);
-
- ImplicitStrategy strategy = null;
-
-
- // Try to obtain recursive strategy from parents
-
- if (value == null)
- {
- strategy = resolveRecursiveStrategy(pageContainer, prefix);
- }
- else
- {
- strategy = ImplicitStrategy.decodeStrategy(value);
- }
-
- if (strategy != null)
- {
- if (strategy.equals(ImplicitStrategy.RECURSIVE_DISABLED))
- {
- return ImplicitStrategy.DISABLED;
- }
- else if (strategy.equals(ImplicitStrategy.RECURSIVE_EXCLUSIVE))
- {
- return ImplicitStrategy.EXCLUSIVE;
- }
- else if (strategy.equals(ImplicitStrategy.RECURSIVE_FALLBACK))
- {
- return ImplicitStrategy.FALLBACK;
- }
-
- return strategy;
- }
- else
- {
- return DEFAULT_STRATEGY;
- }
-
- }
-
- // Search for the RECURSIVE_ type of strategy
- private ImplicitStrategy resolveRecursiveStrategy(PortalObject po, String prefix)
- {
- String value = po.getDeclaredProperty(prefix);
- ImplicitStrategy strategy = null;
-
- if (value != null)
- {
- strategy = ImplicitStrategy.decodeStrategy(value);
- }
-
- if (strategy != null &&
- (strategy.equals(ImplicitStrategy.RECURSIVE_DISABLED) ||
- strategy.equals(ImplicitStrategy.RECURSIVE_EXCLUSIVE) ||
- strategy.equals(ImplicitStrategy.RECURSIVE_FALLBACK)))
- {
- return strategy;
- }
- else if (!(po instanceof Portal))
- {
- return resolveRecursiveStrategy(po.getParent(), prefix);
- }
-
- return null;
- }
-
-
- Collection<Window> getWindows(Page page)
- {
- Set<Window> windows = new HashSet<Window>();
- for (PortalObject portalObject : page.getChildren())
- {
-
- if (portalObject instanceof Window)
- {
- windows.add((Window)portalObject);
- }
- }
- return windows;
- }
-
- private QName decodeQName(String fullString)
- {
- if (fullString.startsWith("{"))
- {
- String[] parts = fullString.split("}");
-
- if (parts.length == 2)
- {
- return new QName(parts[0].substring(1), parts[1]);
- }
- }
- else
- {
- return new QName(fullString);
- }
-
- return null;
-
- }
-
-
- private class EventInfoPOJO implements EventWiringInfo
- {
- private final String name;
- private final Map<Window,QName> sources;
- private final Map<Window,QName> destinations;
-
- private EventInfoPOJO(String name, Map<Window, QName> sources, Map<Window, QName> destinations)
- {
- this.name = name;
- this.sources = sources;
- this.destinations = destinations;
- }
-
- private EventInfoPOJO(String name)
- {
- this.name = name;
- this.sources = new HashMap<Window,QName>();
- this.destinations = new HashMap<Window,QName>();
- }
-
- public String getName()
- {
- return name;
- }
-
- public Map<Window, QName> getSources()
- {
- return sources;
- }
-
- public Map<Window, QName> getDestinations()
- {
- return destinations;
- }
-
- EventWiringInfo getImmutableWiringInfo()
- {
- return new EventInfoPOJO(name, Collections.unmodifiableMap(sources), Collections.unmodifiableMap(destinations));
- }
-
- }
-
- private class ParameterInfoPOJO implements ParameterBindingInfo
- {
-
- private final String name;
- private final Map<Window, QName> windows;
-
- private ParameterInfoPOJO(String name, Map<Window, QName> windows)
- {
- this.name = name;
- this.windows = windows;
- }
-
- private ParameterInfoPOJO(String name)
- {
- this.name = name;
- this.windows = new HashMap<Window,QName>();
- }
-
- public String getName()
- {
- return name;
- }
-
- public Map<Window, QName> getWindows()
- {
- return windows;
- }
-
- ParameterBindingInfo getImmutableInfo()
- {
- return new ParameterInfoPOJO(name, Collections.unmodifiableMap(windows));
- }
-
- }
-
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/CoordinationService.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/CoordinationService.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,975 @@
+/*
+* 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.core.impl.coordination;
+
+import org.jboss.portal.core.controller.coordination.CoordinationManager;
+import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
+import org.jboss.portal.core.controller.coordination.EventWiringInfo;
+import org.jboss.portal.core.controller.coordination.ParameterBindingInfo;
+import org.jboss.portal.core.controller.coordination.ImplicitStrategy;
+import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
+import org.jboss.portal.core.controller.coordination.EventConverter;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.PageContainer;
+import org.jboss.portal.core.model.portal.PortalObjectContainer;
+import org.jboss.portal.core.model.portal.Portal;
+import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.controller.portlet.ControllerPortletControllerContext;
+import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.EventInfo;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Collections;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class CoordinationService extends AbstractJBossService
+ implements CoordinationManager, CoordinationConfigurator
+{
+ public static final String SOURCE = "source";
+
+ public static final String DESTINATION = "destination";
+
+ public static final String BINDING = "binding";
+
+ public static final String PREFIX = "org.jboss.portal.core.controller.coordination";
+
+ public static final String PREFIX_EVENT = PREFIX + ".event";
+
+ public static final String PREFIX_PARAMETER = PREFIX + ".binding";
+
+ public static final String PREFIX_EVENT_NAME = PREFIX_EVENT + ".name";
+
+ public static final String PREFIX_EVENT_WIRING = PREFIX_EVENT + ".wiring";
+
+ public static final String PREFIX_PARAMETER_NAME = PREFIX_PARAMETER + ".name";
+
+ public static final String PREFIX_PARAMETER_BINDING = PREFIX_PARAMETER + ".binding";
+
+ public static final String PREFIX_EVENT_IMPLICIT_STRATEGY = PREFIX_EVENT + ".implicit_strategy";
+
+ public static final String PREFIX_PARAMETER_IMPLICIT_STRATEGY = PREFIX_PARAMETER + ".implicit_strategy";
+
+ public static final String STRATEGY_FALLBACK = ImplicitStrategy.FALLBACK.name();
+
+ public static final String STRATEGY_EXCLUSIVE = ImplicitStrategy.EXCLUSIVE.name();
+
+ public static final String STRATEGY_DISABLED = ImplicitStrategy.DISABLED.name();
+
+ public static final String STRATEGY_RECURSIVE_DISABLED = ImplicitStrategy.RECURSIVE_DISABLED.name();
+
+ public static final String STRATEGY_RECURSIVE_EXCLUSIVE = ImplicitStrategy.RECURSIVE_EXCLUSIVE.name();
+
+ public static final String STRATEGY_RECURSIVE_FALLBACK = ImplicitStrategy.RECURSIVE_FALLBACK.name();
+
+ public static final ImplicitStrategy DEFAULT_STRATEGY = ImplicitStrategy.FALLBACK;
+
+
+ protected EventConverter eventConverter = new SimpleEventConverter();
+
+ protected PortalObjectContainer portalObjectContainer;
+
+ protected void startService() throws Exception
+ {
+ super.startService();
+
+ if (portalObjectContainer == null)
+ {
+ throw new IllegalStateException("Cannot instantiate CoordinationManager: no PortalObjectContainer present");
+ }
+ }
+
+
+ public Map<Window, PortletWindowEvent> getEventWindows(PortletWindowEvent event, ControllerPortletControllerContext context) throws IllegalCoordinationException
+ {
+
+ if (event == null)
+ {
+ throw new IllegalArgumentException("event is null");
+ }
+
+ if (context == null)
+ {
+ throw new IllegalArgumentException("context is null");
+ }
+
+ // Obtain page for which we scope this event
+
+ Page page = context.getWindow(event.getWindowId()).getPage();
+
+ ImplicitStrategy strategy = resolveImplicitEventWiringStrategy(page);
+
+ Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
+
+ // Only implicit wirings
+
+ if (strategy.equals(ImplicitStrategy.EXCLUSIVE))
+ {
+ windows = getEventWindowsImplicit(page, event, context);
+ }
+
+ // Only explicit wirings
+
+ else if(strategy.equals(ImplicitStrategy.DISABLED))
+ {
+ windows = getEventWindowsExplicit(page, event, context);
+ }
+
+ // If no explicit wirings for this event fallback to implicit
+
+ else if(strategy.equals(ImplicitStrategy.FALLBACK))
+ {
+ windows = getEventWindowsExplicit(page, event, context);
+
+ if (windows.size() == 0)
+ {
+ windows = getEventWindowsImplicit(page, event, context);
+ }
+ }
+
+ return windows;
+ }
+
+ public Collection<String> getBindingNames(Window window, QName name)
+ {
+
+ Set<String> names = new HashSet<String>();
+
+ Collection<ParameterBindingInfo> infos = getParameterBindings(window);
+
+ for (ParameterBindingInfo info : infos)
+ {
+ for (Map.Entry<Window, QName> entry : info.getWindows().entrySet())
+ {
+ if (entry.getKey().getName().equals(window.getName()) && entry.getValue().equals(name))
+ {
+ names.add(info.getName());
+ }
+ }
+ }
+
+ return names;
+ }
+
+ private Map<Window, PortletWindowEvent> getEventWindowsExplicit(Page page, PortletWindowEvent event, ControllerPortletControllerContext context)
+ {
+ Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
+
+ Collection<EventWiringInfo> infos = getEventWirings(page);
+
+ for (EventWiringInfo info : infos)
+ {
+ for (Map.Entry<Window, QName> entry : info.getSources().entrySet())
+ {
+ if (entry.getKey().getName().equals(event.getWindowId()) &&
+ entry.getValue().equals(event.getName()))
+ {
+ for (Window window : info.getDestinations().keySet())
+ {
+ PortletInfo portletInfo = context.getPortletInfo(window.getName());
+ QName destEventName = info.getDestinations().get(window);
+ EventInfo destEventInfo = portletInfo.getEventing().getConsumedEvents().get(destEventName);
+ if (destEventInfo != null)
+ {
+ windows.put(window, getEventConverter().resolveEvent(event, destEventInfo, window));
+ }
+
+ }
+ break;
+ }
+ }
+
+ }
+
+ return windows;
+ }
+
+ private Map<Window, PortletWindowEvent> getEventWindowsImplicit(Page page, PortletWindowEvent event, ControllerPortletControllerContext context)
+ {
+ Map<Window, PortletWindowEvent> windows = new HashMap<Window, PortletWindowEvent>();
+
+ for (String windowName : context.getWindowNames())
+ {
+ PortletInfo info = context.getPortletInfo(windowName);
+
+ //
+ if (info.getEventing().getConsumedEvents().containsKey(event.getName()))
+ {
+ PortletWindowEvent distributedEvent = new PortletWindowEvent(event.getName(), event.getPayload(), windowName);
+ windows.put(context.getWindow(windowName), distributedEvent);
+ }
+ }
+
+ return windows;
+ }
+
+ public void setEventWiring(Map<Window, QName> sources, Map<Window, QName> destinations, String eventName) throws IllegalCoordinationException
+ {
+
+ if (sources == null)
+ {
+ throw new IllegalArgumentException("sources are null");
+ }
+
+ if (destinations == null)
+ {
+ throw new IllegalArgumentException("destinations are null");
+ }
+
+ if (eventName == null)
+ {
+ throw new IllegalArgumentException("eventName is null");
+ }
+
+ if (sources.isEmpty())
+ {
+ throw new IllegalArgumentException("empty sources map");
+ }
+
+ if (destinations.isEmpty())
+ {
+ throw new IllegalArgumentException("empty destinations map");
+ }
+
+ // Obtain parent page and check that all windows are in one branch...
+
+ Page parentPage = null;
+
+ Set<Window> sw = sources.keySet();
+ Set<Window> dw = destinations.keySet();
+
+ Set<Window> all = new HashSet<Window>();
+ all.addAll(sw);
+ all.addAll(dw);
+
+
+ for (Window window : all)
+ {
+ if (parentPage == null)
+ {
+ parentPage = window.getPage();
+ }
+
+ if (!window.getPage().getId().equals(parentPage.getId()))
+ {
+ throw new IllegalCoordinationException("Parent page is not the same for all windows");
+ }
+ }
+
+ // Check if the same window is not both in sources and destinations map
+
+ for (Window window : sw)
+ {
+ if (dw.contains(window))
+ {
+ throw new IllegalCoordinationException("The same window cannot be source and destination of the same explicit wiring");
+ }
+ }
+
+ // Set the sources
+
+ String prop_name = PREFIX_EVENT_NAME + "." + eventName;
+ String prop_wiring = PREFIX_EVENT_WIRING + "." + eventName;
+
+ for (Window window : sw)
+ {
+ window.setDeclaredProperty(prop_name, SOURCE);
+ window.setDeclaredProperty(prop_wiring, sources.get(window).toString());
+ }
+
+ // Set the sources
+
+ for (Window window : dw)
+ {
+ window.setDeclaredProperty(prop_name, DESTINATION);
+ window.setDeclaredProperty(prop_wiring, destinations.get(window).toString());
+ }
+
+ }
+
+ public void removeEventWiring(EventWiringInfo info) throws IllegalCoordinationException
+ {
+ if (info == null)
+ {
+ throw new IllegalArgumentException("EventWiringInfo is null");
+ }
+
+ // Remove all entries
+
+ String prop_name = PREFIX_EVENT_NAME + "." + info.getName();
+ String prop_wiring = PREFIX_EVENT_WIRING + "." + info.getName();
+
+ Set<Window> all = new HashSet<Window>();
+ all.addAll(info.getSources().keySet());
+ all.addAll(info.getDestinations().keySet());
+
+ for (Window window : all)
+ {
+ window.setDeclaredProperty(prop_name, null);
+ window.setDeclaredProperty(prop_wiring, null);
+ }
+ }
+
+ public void setImplicitEventWiringStrategy(PageContainer pageContainer, ImplicitStrategy strategy) throws IllegalCoordinationException
+ {
+ if (pageContainer == null)
+ {
+ throw new IllegalArgumentException("pageContainer is null");
+ }
+
+
+ setStrategy(pageContainer, strategy, PREFIX_EVENT_IMPLICIT_STRATEGY);
+
+ }
+
+ public ImplicitStrategy getImplicitEventWiringStrategy(PageContainer page) throws IllegalCoordinationException
+ {
+ if (page == null)
+ {
+ throw new IllegalArgumentException("page is null");
+ }
+
+ return decodeStrategy(page, PREFIX_EVENT_IMPLICIT_STRATEGY);
+
+ }
+
+ public ImplicitStrategy resolveImplicitEventWiringStrategy(PageContainer page)
+ {
+
+ if (page == null)
+ {
+ throw new IllegalArgumentException("page is null");
+ }
+
+ return resolveStrategy(page, PREFIX_EVENT_IMPLICIT_STRATEGY);
+ }
+
+ public Collection<EventWiringInfo> getEventWirings(Page page, QName eventQName)
+ {
+
+ if (page == null)
+ {
+ throw new IllegalArgumentException("page is null");
+ }
+
+ if (eventQName == null)
+ {
+ throw new IllegalArgumentException("eventQName is null");
+ }
+
+ Collection<EventWiringInfo> pageEvents = getEventWirings(page);
+
+ Set<EventWiringInfo> events = new HashSet<EventWiringInfo>();
+
+ for (EventWiringInfo event : pageEvents)
+ {
+ if (event.getSources().containsValue(eventQName) || event.getDestinations().containsValue(eventQName))
+ {
+ pageEvents.add(event);
+ }
+ }
+
+ return events;
+ }
+
+ public Collection<EventWiringInfo> getEventWirings(Page page)
+ {
+ if (page == null)
+ {
+ throw new IllegalArgumentException("page is null");
+ }
+
+ // Examine window properties and create page events
+
+ Collection<Window> windows = getWindows(page);
+
+ Map<String, EventInfoPOJO> events = new HashMap<String, EventInfoPOJO>();
+
+
+
+ for (Window window : windows)
+ {
+ Set<String> propNames = window.getProperties().keySet();
+
+ for (String propName : propNames)
+ {
+ if(propName.startsWith(PREFIX_EVENT_NAME))
+ {
+ String en = propName.substring(PREFIX_EVENT_NAME.length() + 1);
+ EventInfoPOJO info = null;
+
+ if (!events.keySet().contains(en))
+ {
+ info = new EventInfoPOJO(en);
+ events.put(en, info);
+ }
+ else
+ {
+ info = events.get(en);
+ }
+
+ String prop_wiring = PREFIX_EVENT_WIRING + "." + en;
+
+ String name = window.getProperty(prop_wiring);
+ String role = window.getProperty(propName);
+
+
+ //TODO: if the imformation from properties is not consistent should we throw exception?
+
+ if (name != null)
+ {
+ QName qname = decodeQName(name);
+
+
+ if (qname != null && role != null && role.equalsIgnoreCase("source"))
+ {
+ info.getSources().put(window, qname);
+ }
+ else if (qname != null && role != null && role.equalsIgnoreCase("destination"))
+ {
+ info.getDestinations().put(window, qname);
+ }
+ }
+
+ break;
+ }
+ }
+ }
+
+ // Make immutable copy
+ Collection<EventWiringInfo> immutableEvents = new HashSet<EventWiringInfo>();
+
+ for (EventInfoPOJO info : events.values())
+ {
+ immutableEvents.add(info.getImmutableWiringInfo());
+ }
+
+ return immutableEvents;
+ }
+
+ public Collection<EventWiringInfo> getEventSourceWirings(Window window)
+ {
+
+ Collection<EventWiringInfo> pageEvents = getEventWirings(window.getPage());
+
+ Set<EventWiringInfo> events = new HashSet<EventWiringInfo>();
+
+ for (EventWiringInfo pageEvent : pageEvents)
+ {
+ if (pageEvent.getSources().keySet().contains(window))
+ {
+ events.add(pageEvent);
+ }
+ }
+
+ return events;
+ }
+
+ public Collection<EventWiringInfo> getEventDestinationWirings(Window window)
+ {
+ Collection<EventWiringInfo> pageEvents = getEventWirings(window.getPage());
+
+ Set<EventWiringInfo> events = new HashSet<EventWiringInfo>();
+
+ for (EventWiringInfo pageEvent : pageEvents)
+ {
+ if (pageEvent.getDestinations().keySet().contains(window))
+ {
+ events.add(pageEvent);
+ }
+ }
+
+ return events;
+ }
+
+ public void setParameterBinding(String name, Map<Window, QName> windows) throws IllegalCoordinationException
+ {
+ if (windows == null)
+ {
+ throw new IllegalArgumentException("windows are null");
+ }
+
+ if (name == null)
+ {
+ throw new IllegalArgumentException("name is null");
+ }
+
+ if (windows.isEmpty())
+ {
+ throw new IllegalArgumentException("empty windows map");
+ }
+
+
+ // Obtain parent page and check that all windows are in one branch...
+
+ Page parentPage = null;
+
+ Set<Window> dw = windows.keySet();
+
+
+ for (Window window : dw)
+ {
+ if (parentPage == null)
+ {
+ parentPage = window.getPage();
+ }
+
+ if (!window.getPage().getId().equals(parentPage.getId()))
+ {
+ throw new IllegalCoordinationException("Parent page is not the same for all windows");
+ }
+ }
+
+
+ // Set window properties
+
+ String prop_wiring = PREFIX_PARAMETER_BINDING + "." + name;
+
+ for (Window window : dw)
+ {
+ window.setDeclaredProperty(prop_wiring, windows.get(window).toString());
+ }
+
+ }
+
+ public void removeParameterBinding(ParameterBindingInfo info) throws IllegalCoordinationException
+ {
+ if (info == null)
+ {
+ throw new IllegalArgumentException("ParameterBindingInfo is null");
+ }
+
+ // Remove all entries
+
+ String prop_wiring = PREFIX_PARAMETER_BINDING + "." + info.getName();
+
+ for (Window window : info.getWindows().keySet())
+ {
+ window.setDeclaredProperty(prop_wiring, null);
+ }
+ }
+
+ public void setImplicitParameterBindingStrategy(PageContainer pageContainer, ImplicitStrategy strategy) throws IllegalCoordinationException
+ {
+ if (pageContainer == null)
+ {
+ throw new IllegalArgumentException("pageContainer is null");
+ }
+
+
+ setStrategy(pageContainer, strategy, PREFIX_PARAMETER_IMPLICIT_STRATEGY);
+ }
+
+ public ImplicitStrategy getImplicitParameterBindingStrategy(PageContainer pageContainer) throws IllegalCoordinationException
+ {
+
+ if (pageContainer == null)
+ {
+ throw new IllegalArgumentException("page is null");
+ }
+
+ return decodeStrategy(pageContainer, PREFIX_PARAMETER_IMPLICIT_STRATEGY);
+
+ }
+
+ public ImplicitStrategy resolveImplicitBindingStrategy(PageContainer page)
+ {
+ if (page == null)
+ {
+ throw new IllegalArgumentException("page is null");
+ }
+
+ return resolveStrategy(page, PREFIX_PARAMETER_IMPLICIT_STRATEGY);
+ }
+
+ public Collection<ParameterBindingInfo> getParameterBindings(Page page, QName parameterQName)
+ {
+
+ if (page == null)
+ {
+ throw new IllegalArgumentException("page is null");
+ }
+
+ if (parameterQName == null)
+ {
+ throw new IllegalArgumentException("QName is null");
+ }
+
+ Collection<ParameterBindingInfo> pageParams = getParameterBindings(page);
+
+ Collection<ParameterBindingInfo> infos = new HashSet<ParameterBindingInfo>();
+
+ for (ParameterBindingInfo pageParam : pageParams)
+ {
+ if (pageParam.getWindows().containsValue(parameterQName))
+ {
+ infos.add(pageParam);
+ }
+ }
+
+ return infos;
+ }
+
+ public Collection<ParameterBindingInfo> getParameterBindings(Page page)
+ {
+ if (page == null)
+ {
+ throw new IllegalArgumentException("page is null");
+ }
+
+ // Examine window properties and create page parameters
+
+ Collection<Window> windows = getWindows(page);
+
+ Map<String, ParameterInfoPOJO> params = new HashMap<String, ParameterInfoPOJO>();
+
+
+
+ for (Window window : windows)
+ {
+ Set<String> propNames = window.getProperties().keySet();
+
+ for (String propName : propNames)
+ {
+ if(propName.startsWith(PREFIX_PARAMETER_BINDING))
+ {
+ String pn = propName.substring(PREFIX_PARAMETER_BINDING.length() + 1);
+ ParameterInfoPOJO info = null;
+
+ if (!params.keySet().contains(pn))
+ {
+ info = new ParameterInfoPOJO(pn);
+ params.put(pn, info);
+ }
+ else
+ {
+ info = params.get(pn);
+ }
+
+ String binding = window.getProperty(propName);
+
+
+ //TODO: if the imformation from properties is not consistent should we throw exception?
+
+ if (binding != null)
+ {
+ QName qname = decodeQName(binding);
+
+
+ if (qname != null)
+ {
+ info.getWindows().put(window, qname);
+ }
+
+ }
+
+
+ }
+ }
+ }
+
+ // Make immutable copy
+ Collection<ParameterBindingInfo> immutableParams = new HashSet<ParameterBindingInfo>();
+
+ for (ParameterInfoPOJO info : params.values())
+ {
+ immutableParams.add(info.getImmutableInfo());
+ }
+
+ return immutableParams;
+ }
+
+ public Collection<ParameterBindingInfo> getParameterBindings(Window window)
+ {
+ Collection<ParameterBindingInfo> pageParams = getParameterBindings(window.getPage());
+
+ Collection<ParameterBindingInfo> infos = new HashSet<ParameterBindingInfo>();
+
+ for (ParameterBindingInfo pageParam : pageParams)
+ {
+ if (pageParam.getWindows().keySet().contains(window))
+ {
+ infos.add(pageParam);
+ }
+ }
+
+ return infos;
+ }
+
+ // SETTERS & GETTERS
+
+ public PortalObjectContainer getPortalObjectContainer()
+ {
+ return portalObjectContainer;
+ }
+
+ public void setPortalObjectContainer(PortalObjectContainer portalObjectContainer)
+ {
+ this.portalObjectContainer = portalObjectContainer;
+ }
+
+ public EventConverter getEventConverter()
+ {
+ return eventConverter;
+ }
+
+ public void setEventConverter(EventConverter eventConverter)
+ {
+ this.eventConverter = eventConverter;
+ }
+
+ // HELPER METHODS
+
+ private void setStrategy(PageContainer pageContainer, ImplicitStrategy strategy, String prefix)
+ {
+ if (strategy == null)
+ {
+ pageContainer.setDeclaredProperty(prefix, null);
+ }
+ else if (strategy.equals(ImplicitStrategy.DISABLED))
+ {
+ pageContainer.setDeclaredProperty(prefix, STRATEGY_DISABLED);
+ }
+ else if (strategy.equals(ImplicitStrategy.EXCLUSIVE))
+ {
+ pageContainer.setDeclaredProperty(prefix, STRATEGY_EXCLUSIVE);
+ }
+ else if (strategy.equals(ImplicitStrategy.FALLBACK))
+ {
+ pageContainer.setDeclaredProperty(prefix,STRATEGY_FALLBACK);
+ }
+ else if (strategy.equals(ImplicitStrategy.RECURSIVE_DISABLED))
+ {
+ pageContainer.setDeclaredProperty(prefix,STRATEGY_RECURSIVE_DISABLED);
+ }
+ else if (strategy.equals(ImplicitStrategy.RECURSIVE_EXCLUSIVE))
+ {
+ pageContainer.setDeclaredProperty(prefix,STRATEGY_RECURSIVE_EXCLUSIVE);
+ }
+ else if (strategy.equals(ImplicitStrategy.RECURSIVE_FALLBACK))
+ {
+ pageContainer.setDeclaredProperty(prefix,STRATEGY_RECURSIVE_FALLBACK);
+ }
+ }
+
+ private ImplicitStrategy decodeStrategy(PageContainer pageContainer, String prefix)
+ {
+ String value = pageContainer.getDeclaredProperty(prefix);
+
+ return ImplicitStrategy.decodeStrategy(value);
+ }
+
+
+
+ private ImplicitStrategy resolveStrategy(PageContainer pageContainer, String prefix)
+ {
+ String value = pageContainer.getDeclaredProperty(prefix);
+
+ ImplicitStrategy strategy = null;
+
+
+ // Try to obtain recursive strategy from parents
+
+ if (value == null)
+ {
+ strategy = resolveRecursiveStrategy(pageContainer, prefix);
+ }
+ else
+ {
+ strategy = ImplicitStrategy.decodeStrategy(value);
+ }
+
+ if (strategy != null)
+ {
+ if (strategy.equals(ImplicitStrategy.RECURSIVE_DISABLED))
+ {
+ return ImplicitStrategy.DISABLED;
+ }
+ else if (strategy.equals(ImplicitStrategy.RECURSIVE_EXCLUSIVE))
+ {
+ return ImplicitStrategy.EXCLUSIVE;
+ }
+ else if (strategy.equals(ImplicitStrategy.RECURSIVE_FALLBACK))
+ {
+ return ImplicitStrategy.FALLBACK;
+ }
+
+ return strategy;
+ }
+ else
+ {
+ return DEFAULT_STRATEGY;
+ }
+
+ }
+
+ // Search for the RECURSIVE_ type of strategy
+ private ImplicitStrategy resolveRecursiveStrategy(PortalObject po, String prefix)
+ {
+ String value = po.getDeclaredProperty(prefix);
+ ImplicitStrategy strategy = null;
+
+ if (value != null)
+ {
+ strategy = ImplicitStrategy.decodeStrategy(value);
+ }
+
+ if (strategy != null &&
+ (strategy.equals(ImplicitStrategy.RECURSIVE_DISABLED) ||
+ strategy.equals(ImplicitStrategy.RECURSIVE_EXCLUSIVE) ||
+ strategy.equals(ImplicitStrategy.RECURSIVE_FALLBACK)))
+ {
+ return strategy;
+ }
+ else if (!(po instanceof Portal))
+ {
+ return resolveRecursiveStrategy(po.getParent(), prefix);
+ }
+
+ return null;
+ }
+
+
+ Collection<Window> getWindows(Page page)
+ {
+ Set<Window> windows = new HashSet<Window>();
+ for (PortalObject portalObject : page.getChildren())
+ {
+
+ if (portalObject instanceof Window)
+ {
+ windows.add((Window)portalObject);
+ }
+ }
+ return windows;
+ }
+
+ private QName decodeQName(String fullString)
+ {
+ if (fullString.startsWith("{"))
+ {
+ String[] parts = fullString.split("}");
+
+ if (parts.length == 2)
+ {
+ return new QName(parts[0].substring(1), parts[1]);
+ }
+ }
+ else
+ {
+ return new QName(fullString);
+ }
+
+ return null;
+
+ }
+
+
+ private class EventInfoPOJO implements EventWiringInfo
+ {
+ private final String name;
+ private final Map<Window,QName> sources;
+ private final Map<Window,QName> destinations;
+
+ private EventInfoPOJO(String name, Map<Window, QName> sources, Map<Window, QName> destinations)
+ {
+ this.name = name;
+ this.sources = sources;
+ this.destinations = destinations;
+ }
+
+ private EventInfoPOJO(String name)
+ {
+ this.name = name;
+ this.sources = new HashMap<Window,QName>();
+ this.destinations = new HashMap<Window,QName>();
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public Map<Window, QName> getSources()
+ {
+ return sources;
+ }
+
+ public Map<Window, QName> getDestinations()
+ {
+ return destinations;
+ }
+
+ EventWiringInfo getImmutableWiringInfo()
+ {
+ return new EventInfoPOJO(name, Collections.unmodifiableMap(sources), Collections.unmodifiableMap(destinations));
+ }
+
+ }
+
+ private class ParameterInfoPOJO implements ParameterBindingInfo
+ {
+
+ private final String name;
+ private final Map<Window, QName> windows;
+
+ private ParameterInfoPOJO(String name, Map<Window, QName> windows)
+ {
+ this.name = name;
+ this.windows = windows;
+ }
+
+ private ParameterInfoPOJO(String name)
+ {
+ this.name = name;
+ this.windows = new HashMap<Window,QName>();
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public Map<Window, QName> getWindows()
+ {
+ return windows;
+ }
+
+ ParameterBindingInfo getImmutableInfo()
+ {
+ return new ParameterInfoPOJO(name, Collections.unmodifiableMap(windows));
+ }
+
+ }
+
+}
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/SimpleEventConverter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/SimpleEventConverter.java 2008-07-15 23:56:13 UTC (rev 11461)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/SimpleEventConverter.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -1,84 +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.core.impl.model.portal.coordination;
-
-import org.jboss.portal.core.model.portal.coordination.EventConverter;
-import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
-import org.jboss.portal.portlet.info.EventInfo;
-
-import javax.xml.namespace.QName;
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public class SimpleEventConverter implements EventConverter
-{
-
- public PortletWindowEvent resolveEvent(PortletWindowEvent sourceEvent, EventInfo destEventInfo)
- {
-
- QName destName = destEventInfo.getName();
- String windowId = sourceEvent.getWindowId();
- Serializable payload = sourceEvent.getPayload();
-
-
- // Source and destination payload types
-
- String sourcePayloadType = sourceEvent.getPayload().getClass().getName();
- String destPayloadType = destEventInfo.getType().getName();
-
-
- // NOTE: rules below can be merged but I leave it like this to have more clear logic to follow
-
- // Same payload types
-
- if (destPayloadType != null && sourcePayloadType.equals(destPayloadType))
- {
- return new PortletWindowEvent(destName, payload, windowId);
- }
-
- // source payload == null -> null
-
- else if (sourceEvent.getPayload() == null)
- {
- return new PortletWindowEvent(destName, null, windowId);
- }
-
- // destination have no type
-
- else if (destPayloadType == null || destPayloadType.equals(""))
- {
- return new PortletWindowEvent(destName, null, windowId);
- }
-
- // DEFAULT - just pass null value
- return new PortletWindowEvent(destName, null, windowId);
-
-
- }
-
-
-
-}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/SimpleEventConverter.java (from rev 11487, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/portal/coordination/SimpleEventConverter.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/SimpleEventConverter.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/coordination/SimpleEventConverter.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,86 @@
+/*
+* 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.core.impl.coordination;
+
+import org.jboss.portal.core.controller.coordination.EventConverter;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.portlet.controller.event.PortletWindowEvent;
+import org.jboss.portal.portlet.info.EventInfo;
+import org.jboss.portal.portlet.impl.info.ContainerTypeInfo;
+
+import javax.xml.namespace.QName;
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class SimpleEventConverter implements EventConverter
+{
+
+ public PortletWindowEvent resolveEvent(PortletWindowEvent sourceEvent, EventInfo destEventInfo, Window window)
+ {
+
+ QName destName = destEventInfo.getName();
+ String windowId = window.getName();
+ Serializable payload = sourceEvent.getPayload();
+
+
+ // Source and destination payload types
+
+ String sourcePayloadType = sourceEvent.getPayload().getClass().getName();
+ String destPayloadType = ((ContainerTypeInfo)destEventInfo.getType()).getType().getName();
+
+
+ // NOTE: rules below can be merged but I leave it like this to have more clear logic to follow
+
+ // Same payload types
+
+ if (destPayloadType != null && sourcePayloadType.equals(destPayloadType))
+ {
+ return new PortletWindowEvent(destName, payload, windowId);
+ }
+
+ // source payload == null -> null
+
+ else if (sourceEvent.getPayload() == null)
+ {
+ return new PortletWindowEvent(destName, null, windowId);
+ }
+
+ // destination have no type
+
+ else if (destPayloadType == null || destPayloadType.equals(""))
+ {
+ return new PortletWindowEvent(destName, null, windowId);
+ }
+
+ // DEFAULT - just pass null value
+ return new PortletWindowEvent(destName, null, windowId);
+
+
+ }
+
+
+
+}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -25,7 +25,7 @@
import org.jboss.portal.core.model.content.ContentType;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator;
+import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
import org.jboss.portal.server.deployment.PortalWebApp;
/**
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationMetaData.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationMetaData.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/metadata/coordination/CoordinationMetaData.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -22,14 +22,13 @@
package org.jboss.portal.core.model.portal.metadata.coordination;
-import org.jboss.portal.core.model.portal.coordination.ImplicitStrategy;
-import org.jboss.portal.core.model.portal.coordination.IllegalCoordinationException;
+import org.jboss.portal.core.controller.coordination.ImplicitStrategy;
+import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
import org.jboss.portal.core.model.portal.metadata.BuildContext;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.PageContainer;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.impl.model.portal.coordination.CoordinationService;
import org.jboss.portal.common.xml.XMLTools;
import org.w3c.dom.Element;
@@ -55,8 +54,6 @@
List<CoordinationEventWiringMetaData> wirings = new LinkedList<CoordinationEventWiringMetaData>();
- List<String> parameterAliases = new LinkedList<String>();
-
public static CoordinationMetaData buildMetaData(Element coordinationElt)
{
@@ -88,16 +85,7 @@
if (bindingsElement != null)
{
- // Aliases
- Iterator aliasesIter = XMLTools.getChildrenIterator(bindingsElement, "parameter-alias");
- while (aliasesIter.hasNext())
- {
- Element alias = (Element)aliasesIter.next();
-
- coordinationMetaData.addAlias(XMLTools.asString(alias));
- }
-
// Param bindings
Iterator paramBindingsIter = XMLTools.getChildrenIterator(bindingsElement, "parameter-binding");
@@ -138,18 +126,13 @@
if (getParameterStrategy() != null)
{
- buildContext.getCoordinationConfigurator().setImplicitParameterBindingStrategy((PageContainer)object, getEventStrategy());
+ buildContext.getCoordinationConfigurator().setImplicitParameterBindingStrategy((PageContainer)object, getParameterStrategy());
}
if (object instanceof Page)
{
Page page = (Page)object;
- for (String parameterAlias : parameterAliases)
- {
- buildContext.getCoordinationConfigurator().setParameterAlias(page, parameterAlias);
- }
-
for (CoordinationParameterBindingMetaData parameterBinding : parameterBindings)
{
Map<Window, QName> bindings = new HashMap<Window, QName>();
@@ -242,20 +225,5 @@
this.parameterBindings.add(binding);
}
- public List<String> getParameterAliases()
- {
- return parameterAliases;
- }
- public void setParameterAliases(List<String> parameterAliases)
- {
- this.parameterAliases = parameterAliases;
- }
-
- public void addAlias(String alias)
- {
- this.parameterAliases.add(alias);
- }
-
-
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PageNavigationalState.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -30,6 +30,7 @@
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version $Revision: 630 $
*/
public class PageNavigationalState implements Serializable
@@ -38,11 +39,20 @@
/** . */
private final HashMap<QName, String[]> parameters;
+ private final HashMap<String, String[]> explicitBindings;
+
public PageNavigationalState(Map<QName, String[]> parameters)
{
this.parameters = new HashMap<QName, String[]>(parameters);
+ this.explicitBindings = new HashMap<String, String[]>();
}
+ public PageNavigationalState(Map<QName, String[]> parameters, Map<String, String[]> explicitBindings)
+ {
+ this.parameters = new HashMap<QName, String[]>(parameters);
+ this.explicitBindings = new HashMap<String, String[]>(explicitBindings);
+ }
+
public String[] getParameter(QName name)
{
return parameters.get(name);
@@ -52,4 +62,14 @@
{
return Collections.unmodifiableMap(parameters);
}
+
+ public String[] getExplicitBinding(String name)
+ {
+ return explicitBindings.get(name);
+ }
+
+ public Map<String, String[]> getExplicitBindings()
+ {
+ return Collections.unmodifiableMap(explicitBindings);
+ }
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/test/core/model/portal/coordination/CoordinationServiceTestCase.java 2008-07-17 23:23:05 UTC (rev 11492)
@@ -28,13 +28,11 @@
import org.jboss.portal.core.model.portal.Portal;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.coordination.CoordinationManager;
-import org.jboss.portal.core.model.portal.coordination.CoordinationConfigurator;
-import org.jboss.portal.core.model.portal.coordination.ImplicitStrategy;
-import org.jboss.portal.core.model.portal.coordination.EventWiringInfo;
-import org.jboss.portal.core.model.portal.coordination.ParameterBindingInfo;
+import org.jboss.portal.core.controller.coordination.ImplicitStrategy;
+import org.jboss.portal.core.controller.coordination.EventWiringInfo;
+import org.jboss.portal.core.controller.coordination.ParameterBindingInfo;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.impl.model.portal.coordination.CoordinationService;
+import org.jboss.portal.core.impl.coordination.CoordinationService;
import org.apache.log4j.Appender;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.SimpleLayout;
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-17 23:23:05 UTC (rev 11492)
@@ -682,7 +682,7 @@
<!-- Coordination service -->
- <mbean code="org.jboss.portal.core.impl.model.portal.coordination.CoordinationService"
+ <mbean code="org.jboss.portal.core.impl.coordination.CoordinationService"
name="portal:service=CoordinationService" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd 2008-07-17 23:23:05 UTC (rev 11492)
@@ -366,7 +366,7 @@
<!--
Shared render parameter bindings. Can be defined only for a page
-->
-<!ELEMENT bindings (parameter-alias*, parameter-binding*)>
+<!ELEMENT bindings (parameter-binding*)>
<!--
This element defines explicit event wiring
@@ -384,11 +384,6 @@
<!ELEMENT destinations (window-coordination+)>
<!--
-Defines parameter. All parameters with a local part equal to given name will share request value
--->
-<!ELEMENT parameter-alias (#PCDATA)>
-
-<!--
Shared parameter binding definition
-->
<!ELEMENT parameter-binding (name, window-coordination+)>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/coordination/persistent-jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/coordination/persistent-jboss-beans.xml 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/coordination/persistent-jboss-beans.xml 2008-07-17 23:23:05 UTC (rev 11492)
@@ -93,7 +93,7 @@
<property name="contentProviderRegistry"><inject bean="ContentProviderRegistry"/></property>
</bean>
- <bean name="CoordinationService" class="org.jboss.portal.core.impl.model.portal.coordination.CoordinationService">
+ <bean name="CoordinationService" class="org.jboss.portal.core.impl.coordination.CoordinationService">
<property name="portalObjectContainer"><inject bean="PortalObjectContainer"/></property>
</bean>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-07-17 23:18:28 UTC (rev 11491)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-07-17 23:23:05 UTC (rev 11492)
@@ -257,6 +257,17 @@
<mkdir dir="${build.resources}/portal-portlet-samples.war/WEB-INF/lib/"/>
<copy file="${jboss.portal/modules/portlet.lib}/portal-portlet-samples-lib.jar" todir="${build.resources}/portal-portlet-samples.war/WEB-INF/lib/"/>
+ <!-- portal-coordination-samples.war -->
+ <copy todir="${build.resources}/portal-coordination-samples.war">
+ <fileset dir="${build.resources}/portal-coordination-samples-war"/>
+ <fileset dir="${build.resources}/portal-coordination-samples-war"/>
+ </copy>
+ <mkdir dir="${build.resources}/portal-coordination-samples.war/WEB-INF/lib/"/>
+ <copy file="${jboss.portal/modules/portlet.lib}/portal-portlet-samples-lib.jar" todir="${build.resources}/portal-coordination-samples.war/WEB-INF/lib/"/>
+ <copy todir="${build.resources}/portal-coordination-samples.war/WEB-INF/lib/">
+ <fileset dir="${build.lib}" includes="portal-basic-samples-lib.jar"/>
+ </copy>
+
<!-- portal-users-samples-lib.jar -->
<jar jarfile="${build.lib}/portal-users-samples-lib.jar">
<fileset dir="${build.classes}" includes="org/jboss/portal/core/samples/users/**">
@@ -297,6 +308,9 @@
<implode
dir="${build.resources}/portal-portlet-samples.war"
tofile="${build.lib}/portal-portlet-samples.war"/>
+ <implode
+ dir="${build.resources}/portal-coordination-samples.war"
+ tofile="${build.lib}/portal-coordination-samples.war"/>
</target>
<!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed -->
@@ -357,6 +371,8 @@
overwrite="true"/>
<copy file="${build.lib}/portal-portlet-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}"
overwrite="true"/>
+ <copy file="${build.lib}/portal-coordination-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}"
+ overwrite="true"/>
</target>
<!--
Copied: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml (from rev 11471, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,576 @@
+<?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 deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
+<deployments>
+ <deployment>
+ <parent-ref>default</parent-ref>
+ <if-exists>overwrite</if-exists>
+ <page>
+ <page-name>Coordination Samples</page-name>
+
+ <page>
+ <page-name>Events: DISABLED</page-name>
+
+ <window>
+ <window-name>ShoppingCatalogPortletWindow1</window-name>
+ <instance-ref>CoordinationShoppingCatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>ShoppingCatalogPortletWindow2</window-name>
+ <instance-ref>CoordinationShoppingCatalogPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+
+
+ <window>
+ <window-name>ShoppingCartPortletWindow1</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow2</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow3</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>left</region>
+ <height>2</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow4</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>center</region>
+ <height>2</height>
+ </window>
+
+
+
+ <coordination>
+ <implicit-event-strategy>DISABLED</implicit-event-strategy>
+ <wirings>
+ <event-wiring>
+ <name>wiringA</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow3</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ <event-wiring>
+ <name>wiringB</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow4</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ </wirings>
+ </coordination>
+
+ </page>
+ <page>
+ <page-name>Events: FALLBACK</page-name>
+
+ <window>
+ <window-name>ShoppingCatalogPortletWindow1</window-name>
+ <instance-ref>CoordinationShoppingCatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>ShoppingCatalogPortletWindow2</window-name>
+ <instance-ref>CoordinationShoppingCatalogPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+
+
+ <window>
+ <window-name>ShoppingCartPortletWindow1</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow2</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow3</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>left</region>
+ <height>2</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow4</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>center</region>
+ <height>2</height>
+ </window>
+
+
+
+ <coordination>
+ <implicit-event-strategy>FALLBACK</implicit-event-strategy>
+ <wirings>
+ <event-wiring>
+ <name>wiringA</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow3</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ </wirings>
+ </coordination>
+
+ </page>
+ <page>
+ <page-name>Events: EXCLUSIVE</page-name>
+
+ <window>
+ <window-name>ShoppingCatalogPortletWindow1</window-name>
+ <instance-ref>CoordinationShoppingCatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>ShoppingCatalogPortletWindow2</window-name>
+ <instance-ref>CoordinationShoppingCatalogPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+
+
+ <window>
+ <window-name>ShoppingCartPortletWindow1</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow2</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow3</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>left</region>
+ <height>2</height>
+ </window>
+ <window>
+ <window-name>ShoppingCartPortletWindow4</window-name>
+ <instance-ref>CoordinationShoppingCartPortletInstance</instance-ref>
+ <region>center</region>
+ <height>2</height>
+ </window>
+
+
+
+ <coordination>
+ <implicit-event-strategy>EXCLUSIVE</implicit-event-strategy>
+ <wirings>
+ <event-wiring>
+ <name>wiringA</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow3</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ <event-wiring>
+ <name>wiringB</name>
+ <sources>
+ <window-coordination>
+ <window-name>ShoppingCatalogPortletWindow2</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </sources>
+ <destinations>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow1</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>ShoppingCartPortletWindow4</window-name>
+ <qname>{urn:jboss:portal:samples:event}CartEvent</qname>
+ </window-coordination>
+ </destinations>
+ </event-wiring>
+ </wirings>
+ </coordination>
+
+ </page>
+
+ <page>
+ <page-name>Parameters: DISABLED</page-name>
+ <window>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+
+ <window>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+
+
+
+ <coordination>
+ <implicit-parameter-strategy>DISABLED</implicit-parameter-strategy>
+ <bindings>
+ <parameter-binding>
+ <name>binding1</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>foo1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>foo2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding2</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>bar1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>bar2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding3</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>juu1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>juu2</qname>
+ </window-coordination>
+ </parameter-binding>
+
+
+ <parameter-binding>
+ <name>binding4</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <qname>foo1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <qname>foo2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding5</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <qname>bar1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <qname>bar2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding6</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <qname>juu1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <qname>juu2</qname>
+ </window-coordination>
+ </parameter-binding>
+
+
+ </bindings>
+
+ </coordination>
+ </page>
+ <page>
+ <page-name>Parameters: FALLBACK</page-name>
+ <window>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+
+ <window>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+
+
+
+ <coordination>
+ <implicit-parameter-strategy>FALLBACK</implicit-parameter-strategy>
+ <bindings>
+ <parameter-binding>
+ <name>binding1</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>foo1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>foo2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding2</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>bar1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>bar2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding3</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>juu1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>juu2</qname>
+ </window-coordination>
+ </parameter-binding>
+ </bindings>
+
+ </coordination>
+ </page>
+ <page>
+ <page-name>Parameters: EXCLUSIVE</page-name>
+ <window>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance1</instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+
+ <window>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <instance-ref>CoordinationPublicParametersPortletInstance2</instance-ref>
+ <region>center</region>
+ <height>1</height>
+ </window>
+
+
+
+ <coordination>
+ <implicit-parameter-strategy>EXCLUSIVE</implicit-parameter-strategy>
+ <bindings>
+ <parameter-binding>
+ <name>binding1</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>foo1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>foo2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding2</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>bar1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>bar2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding3</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA1</window-name>
+ <qname>juu1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB2</window-name>
+ <qname>juu2</qname>
+ </window-coordination>
+ </parameter-binding>
+
+
+ <parameter-binding>
+ <name>binding4</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <qname>foo1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <qname>foo2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding5</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <qname>bar1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <qname>bar2</qname>
+ </window-coordination>
+ </parameter-binding>
+ <parameter-binding>
+ <name>binding6</name>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowA2</window-name>
+ <qname>juu1</qname>
+ </window-coordination>
+ <window-coordination>
+ <window-name>PublicParametersPortletWindowB1</window-name>
+ <qname>juu2</qname>
+ </window-coordination>
+ </parameter-binding>
+
+
+ </bindings>
+
+ </coordination>
+ </page>
+
+
+ </page>
+ </deployment>
+
+
+
+</deployments>
Copied: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/jboss-portlet.xml (from rev 11471, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/jboss-portlet.xml)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/jboss-portlet.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/jboss-portlet.xml 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,31 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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 portlet-app PUBLIC
+ "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+
+<portlet-app>
+ <app-id>coordination-samples</app-id>
+ <remotable>false</remotable>
+</portlet-app>
Copied: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml (from rev 11471, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet-instances.xml)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet-instances.xml 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,56 @@
+<?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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 deployments PUBLIC
+ "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd">
+
+<deployments>
+ <deployment>
+ <instance>
+ <instance-id>CoordinationPublicParametersPortletInstance1</instance-id>
+ <portlet-ref>CoordinationPublicParametersPortlet1</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <instance>
+ <instance-id>CoordinationPublicParametersPortletInstance2</instance-id>
+ <portlet-ref>CoordinationPublicParametersPortlet2</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <instance>
+ <display-name xml:lang="en">Catalog Portlet</display-name>
+ <instance-id>CoordinationShoppingCatalogPortletInstance</instance-id>
+ <portlet-ref>CoordinationShoppingCatalog</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <instance>
+ <display-name xml:lang="en">Cart Portlet</display-name>
+ <instance-id>CoordinationShoppingCartPortletInstance</instance-id>
+ <portlet-ref>CoordinationShoppingCart</portlet-ref>
+ </instance>
+ </deployment>
+</deployments>
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml (from rev 11471, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/portlet.xml)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/portlet.xml 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2008, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ version="2.0">
+
+ <portlet>
+ <description>Portlet that manipulates its public render parameters</description>
+ <portlet-name>CoordinationPublicParametersPortlet1</portlet-name>
+ <display-name>Public Parameters Portlet 1</display-name>
+ <portlet-class>org.jboss.portal.core.samples.basic.PublicParametersPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Public Parameters Portlet</title>
+ <keywords>sample,test</keywords>
+ </portlet-info>
+ <supported-public-render-parameter>foo1</supported-public-render-parameter>
+ <supported-public-render-parameter>bar1</supported-public-render-parameter>
+ <supported-public-render-parameter>juu1</supported-public-render-parameter>
+
+ </portlet>
+
+ <portlet>
+ <description>Portlet that manipulates its public render parameters</description>
+ <portlet-name>CoordinationPublicParametersPortlet2</portlet-name>
+ <display-name>Public Parameters Portlet 2</display-name>
+ <portlet-class>org.jboss.portal.core.samples.basic.PublicParametersPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>Public Parameters Portlet</title>
+ <keywords>sample,test</keywords>
+ </portlet-info>
+ <supported-public-render-parameter>foo2</supported-public-render-parameter>
+ <supported-public-render-parameter>bar2</supported-public-render-parameter>
+ <supported-public-render-parameter>juu2</supported-public-render-parameter>
+ </portlet>
+
+
+ <portlet>
+ <description>Shopping Catalog Portlet</description>
+ <portlet-name>CoordinationShoppingCatalog</portlet-name>
+ <display-name>Shopping Catalog Portlet</display-name>
+ <portlet-class>org.jboss.portal.portlet.samples.shoppingcart.CatalogPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Catalog Portlet</title>
+ <keywords>sample,event,catalog</keywords>
+ </portlet-info>
+ <supported-publishing-event>
+ <qname xmlns:jbp="urn:jboss:portal:samples:event">jbp:CartEvent</qname>
+ </supported-publishing-event>
+ </portlet>
+
+ <portlet>
+ <description>Shopping Cart Portlet</description>
+ <portlet-name>CoordinationShoppingCart</portlet-name>
+ <display-name>Shopping Cart Portlet</display-name>
+ <portlet-class>org.jboss.portal.portlet.samples.shoppingcart.CartPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Cart Portlet</title>
+ <keywords>sample,event,cart</keywords>
+ </portlet-info>
+ <supported-processing-event>
+ <qname xmlns:jbp="urn:jboss:portal:samples:event">jbp:CartEvent</qname>
+ </supported-processing-event>
+ </portlet>
+
+ <event-definition>
+ <qname xmlns:jbp="urn:jboss:portal:samples:event">jbp:CartEvent</qname>
+ <value-type>org.jboss.portal.portlet.samples.shoppingcart.CartEvent</value-type>
+ </event-definition>
+
+ <public-render-parameter>
+ <name>foo1</name>
+ <identifier>foo1</identifier>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <name>bar1</name>
+ <identifier>bar1</identifier>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <name>juu1</name>
+ <identifier>juu1</identifier>
+ </public-render-parameter>
+ <public-render-parameter>
+ <name>foo2</name>
+ <identifier>foo2</identifier>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <name>bar2</name>
+ <identifier>bar2</identifier>
+ </public-render-parameter>
+
+ <public-render-parameter>
+ <name>juu2</name>
+ <identifier>juu2</identifier>
+ </public-render-parameter>
+
+</portlet-app>
Copied: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/web.xml (from rev 11471, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/web.xml)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/web.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/web.xml 2008-07-17 23:23:05 UTC (rev 11492)
@@ -0,0 +1,28 @@
+<?xml version="1.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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+</web-app>
15 years, 11 months
- 1
- 0
JBoss Portal SVN: r11491 - branches/JBoss_Portal_Branch_2_6_SYBASE/testsuite.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-17 19:18:28 -0400 (Thu, 17 Jul 2008)
New Revision: 11491
Modified:
branches/JBoss_Portal_Branch_2_6_SYBASE/testsuite/build.xml
Log:
cms only
Modified: branches/JBoss_Portal_Branch_2_6_SYBASE/testsuite/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6_SYBASE/testsuite/build.xml 2008-07-17 23:11:34 UTC (rev 11490)
+++ branches/JBoss_Portal_Branch_2_6_SYBASE/testsuite/build.xml 2008-07-17 23:18:28 UTC (rev 11491)
@@ -118,10 +118,10 @@
<server:start name="default"/>
<sequential>
<antcall target="agent-deploy"/>
+ <antcall target="internal-test-module">
+ <param name="module" value="cms"/>
+ </antcall>
<!--antcall target="internal-test-module">
- <param name="module" value="cms"/>
- </antcall-->
- <antcall target="internal-test-module">
<param name="module" value="faces"/>
</antcall>
<antcall target="internal-test-module">
@@ -132,26 +132,26 @@
</antcall>
<antcall target="internal-test-module">
<param name="module" value="server"/>
- </antcall>
+ </antcall-->
<!--
<antcall target="internal-test-module">
<param name="module" value="portlet-server"/>
</antcall>
-->
- <antcall target="internal-test-module">
+ <!--antcall target="internal-test-module">
<param name="module" value="wsrp"/>
- </antcall>
+ </antcall-->
<!--
<antcall target="internal-test-module">
<param name="module" value="theme"/>
</antcall>
-->
- <antcall target="internal-test-module">
+ <!--antcall target="internal-test-module">
<param name="module" value="core"/>
</antcall>
<antcall target="internal-test-module">
<param name="module" value="widget"/>
- </antcall>
+ </antcall-->
<antcall target="agent-undeploy"/>
</sequential>
<server:stop name="default"/>
15 years, 11 months
- 1
- 0