JBoss Portal SVN: r11117 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-23 11:15:14 -0400 (Mon, 23 Jun 2008)
New Revision: 11117
Removed:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationManager.java
Log:
bobo
Modified: 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/model/portal/coordination/CoordinationManager.java 2008-06-23 15:00:59 UTC (rev 11116)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationManager.java 2008-06-23 15:15:14 UTC (rev 11117)
@@ -65,8 +65,9 @@
}
- // Event Discovery
+ // Event Discovery
+
/**
* @param event
* @return all windows that given event should be delivered to with current wirings and configuration
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java 2008-06-23 15:00:59 UTC (rev 11116)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java 2008-06-23 15:15:14 UTC (rev 11117)
@@ -1,235 +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 org.jboss.portal.core.controller.portlet.IllegalCoordinationException;
-import org.jboss.portal.core.model.portal.coordination.EventWiringInfo;
-import org.jboss.portal.core.model.portal.coordination.ParameterBindingInfo;
-import org.jboss.portal.portlet.controller.event.Event;
-
-import javax.xml.namespace.QName;
-import java.util.Set;
-import java.util.Collection;
-
-/**
- * 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 EventCoordinationManager
-{
-
- enum ImplicitStrategy
- {
- // Explicit wiring takes precedence
- FALLBACK,
-
- // Only implicit wiring enabled
- EXCLUSIVE,
-
- // Implicit wiring disabled
- DISABLED,
-
- // Inherited by children nodes in the tree
- RECURSIVE_FALLBACK,
-
- // .
- RECURSIVE_EXCLUSIVE,
-
- // .
- RECURSIVE_DISABLED
-
- }
-
- // Event Discovery
-
- /**
- * @param event
- * @return all windows that given event should be delivered to with current wirings and configuration
- */
- Collection<Window> getEventWindows(Event event);
-
- // Management
-
- /**
- * Defines a wiring for a given even QName between multiply source and destination windows
- *
- * @param sources
- * @param targets
- * @param eventQName
- * @throws org.jboss.portal.core.controller.portlet.IllegalCoordinationException
- */
- void setEventWiring(Set<Window> sources, Set<Window> targets, QName eventQName) throws IllegalCoordinationException;
-
- /**
- * Remove wiring
- *
- * @param eventWiringInfo
- * @throws IllegalCoordinationException
- */
- void removeEventWiring(EventWiringInfo eventWiringInfo) throws IllegalCoordinationException;
-
- /**
- * Defines a wiring between qnames at the page level. Event with given qname will be delivered
- * to all windows being destination of destination qnames. All qnames need to be compatible - have no or the same
- * payload - otherwise IllegalCoordinationException will be thrown.
- * This method overrites any previous wiring for this qname in the page. Empty destinations collection removes the
- * wiring.
- *
- * @param source
- * @param destinations
- * @param page
- * @throws IllegalCoordinationException
- */
- void setQNameEventWiring(QName source, Collection<QName> destinations, Page page) 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
- */
- ImplicitStrategy getImplicitEventWiringStrategy(Page page);
-
- /**
- * @param page
- * @param source
- * @return a collection of qnames that are wired with a given gname in scope of given page
- * @throws IllegalCoordinationException
- */
- Collection<QName> getQNameEventWiring(Page page, QName source) throws IllegalCoordinationException;
-
-
- /**
- * @param eventQName
- * @return all wirings defined for a given qname
- */
- Collection<EventWiringInfo> getEventWirings(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 qname
- * @param windows
- * @throws IllegalCoordinationException
- */
- void setParameterBinding(QName qname, Collection<Window> 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
- */
- ImplicitStrategy getImplicitParameterBindingStrategy(PageContainer pageContainer);
-
- /**
- * @param parameterQName
- * @return parameter bindings for a given parameter qname
- */
- Collection<ParameterBindingInfo> getParameterBindings(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);
-
-}
17 years, 10 months
JBoss Portal SVN: r11116 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-23 11:00:59 -0400 (Mon, 23 Jun 2008)
New Revision: 11116
Added:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationManager.java
Log:
bobo
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationManager.java (from rev 11115, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationManager.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/CoordinationManager.java 2008-06-23 15:00:59 UTC (rev 11116)
@@ -0,0 +1,235 @@
+/*
+* 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 org.jboss.portal.core.controller.portlet.IllegalCoordinationException;
+import org.jboss.portal.core.model.portal.coordination.EventWiringInfo;
+import org.jboss.portal.core.model.portal.coordination.ParameterBindingInfo;
+import org.jboss.portal.portlet.controller.event.Event;
+
+import javax.xml.namespace.QName;
+import java.util.Set;
+import java.util.Collection;
+
+/**
+ * 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
+{
+
+ enum ImplicitStrategy
+ {
+ // Explicit wiring takes precedence
+ FALLBACK,
+
+ // Only implicit wiring enabled
+ EXCLUSIVE,
+
+ // Implicit wiring disabled
+ DISABLED,
+
+ // Inherited by children nodes in the tree
+ RECURSIVE_FALLBACK,
+
+ // .
+ RECURSIVE_EXCLUSIVE,
+
+ // .
+ RECURSIVE_DISABLED
+
+ }
+
+ // Event Discovery
+
+ /**
+ * @param event
+ * @return all windows that given event should be delivered to with current wirings and configuration
+ */
+ Collection<Window> getEventWindows(Event event);
+
+ // Management
+
+ /**
+ * Defines a wiring for a given even QName between multiply source and destination windows
+ *
+ * @param sources
+ * @param targets
+ * @param eventQName
+ * @throws org.jboss.portal.core.controller.portlet.IllegalCoordinationException
+ */
+ void setEventWiring(Set<Window> sources, Set<Window> targets, QName eventQName) throws IllegalCoordinationException;
+
+ /**
+ * Remove wiring
+ *
+ * @param eventWiringInfo
+ * @throws IllegalCoordinationException
+ */
+ void removeEventWiring(EventWiringInfo eventWiringInfo) throws IllegalCoordinationException;
+
+ /**
+ * Defines a wiring between qnames at the page level. Event with given qname will be delivered
+ * to all windows being destination of destination qnames. All qnames need to be compatible - have no or the same
+ * payload - otherwise IllegalCoordinationException will be thrown.
+ * This method overrites any previous wiring for this qname in the page. Empty destinations collection removes the
+ * wiring.
+ *
+ * @param source
+ * @param destinations
+ * @param page
+ * @throws IllegalCoordinationException
+ */
+ void setQNameEventWiring(QName source, Collection<QName> destinations, Page page) 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
+ */
+ ImplicitStrategy getImplicitEventWiringStrategy(Page page);
+
+ /**
+ * @param page
+ * @param source
+ * @return a collection of qnames that are wired with a given gname in scope of given page
+ * @throws IllegalCoordinationException
+ */
+ Collection<QName> getQNameEventWiring(Page page, QName source) throws IllegalCoordinationException;
+
+
+ /**
+ * @param eventQName
+ * @return all wirings defined for a given qname
+ */
+ Collection<EventWiringInfo> getEventWirings(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 qname
+ * @param windows
+ * @throws IllegalCoordinationException
+ */
+ void setParameterBinding(QName qname, Collection<Window> 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
+ */
+ ImplicitStrategy getImplicitParameterBindingStrategy(PageContainer pageContainer);
+
+ /**
+ * @param parameterQName
+ * @return parameter bindings for a given parameter qname
+ */
+ Collection<ParameterBindingInfo> getParameterBindings(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);
+
+}
17 years, 10 months
JBoss Portal SVN: r11115 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal: coordination and 1 other directory.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-23 10:59:13 -0400 (Mon, 23 Jun 2008)
New Revision: 11115
Added:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java
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/model/portal/coordination/ParameterBindingInfo.java
Log:
move to proper place
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java (from rev 11114, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventCoordinationManager.java 2008-06-23 14:59:13 UTC (rev 11115)
@@ -0,0 +1,235 @@
+/*
+* 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 org.jboss.portal.core.controller.portlet.IllegalCoordinationException;
+import org.jboss.portal.core.model.portal.coordination.EventWiringInfo;
+import org.jboss.portal.core.model.portal.coordination.ParameterBindingInfo;
+import org.jboss.portal.portlet.controller.event.Event;
+
+import javax.xml.namespace.QName;
+import java.util.Set;
+import java.util.Collection;
+
+/**
+ * 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 EventCoordinationManager
+{
+
+ enum ImplicitStrategy
+ {
+ // Explicit wiring takes precedence
+ FALLBACK,
+
+ // Only implicit wiring enabled
+ EXCLUSIVE,
+
+ // Implicit wiring disabled
+ DISABLED,
+
+ // Inherited by children nodes in the tree
+ RECURSIVE_FALLBACK,
+
+ // .
+ RECURSIVE_EXCLUSIVE,
+
+ // .
+ RECURSIVE_DISABLED
+
+ }
+
+ // Event Discovery
+
+ /**
+ * @param event
+ * @return all windows that given event should be delivered to with current wirings and configuration
+ */
+ Collection<Window> getEventWindows(Event event);
+
+ // Management
+
+ /**
+ * Defines a wiring for a given even QName between multiply source and destination windows
+ *
+ * @param sources
+ * @param targets
+ * @param eventQName
+ * @throws org.jboss.portal.core.controller.portlet.IllegalCoordinationException
+ */
+ void setEventWiring(Set<Window> sources, Set<Window> targets, QName eventQName) throws IllegalCoordinationException;
+
+ /**
+ * Remove wiring
+ *
+ * @param eventWiringInfo
+ * @throws IllegalCoordinationException
+ */
+ void removeEventWiring(EventWiringInfo eventWiringInfo) throws IllegalCoordinationException;
+
+ /**
+ * Defines a wiring between qnames at the page level. Event with given qname will be delivered
+ * to all windows being destination of destination qnames. All qnames need to be compatible - have no or the same
+ * payload - otherwise IllegalCoordinationException will be thrown.
+ * This method overrites any previous wiring for this qname in the page. Empty destinations collection removes the
+ * wiring.
+ *
+ * @param source
+ * @param destinations
+ * @param page
+ * @throws IllegalCoordinationException
+ */
+ void setQNameEventWiring(QName source, Collection<QName> destinations, Page page) 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
+ */
+ ImplicitStrategy getImplicitEventWiringStrategy(Page page);
+
+ /**
+ * @param page
+ * @param source
+ * @return a collection of qnames that are wired with a given gname in scope of given page
+ * @throws IllegalCoordinationException
+ */
+ Collection<QName> getQNameEventWiring(Page page, QName source) throws IllegalCoordinationException;
+
+
+ /**
+ * @param eventQName
+ * @return all wirings defined for a given qname
+ */
+ Collection<EventWiringInfo> getEventWirings(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 qname
+ * @param windows
+ * @throws IllegalCoordinationException
+ */
+ void setParameterBinding(QName qname, Collection<Window> 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
+ */
+ ImplicitStrategy getImplicitParameterBindingStrategy(PageContainer pageContainer);
+
+ /**
+ * @param parameterQName
+ * @return parameter bindings for a given parameter qname
+ */
+ Collection<ParameterBindingInfo> getParameterBindings(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/model/portal/coordination/EventWiringInfo.java (from rev 11113, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventWiringInfo.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventWiringInfo.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/EventWiringInfo.java 2008-06-23 14:59:13 UTC (rev 11115)
@@ -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.model.portal.coordination;
+
+import org.jboss.portal.core.model.portal.Window;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface EventWiringInfo
+{
+
+ QName getName();
+
+ Collection<Window> getSources();
+
+ Collection<Window> getDestinations();
+}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ParameterBindingInfo.java (from rev 11113, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ParameterBindingInfo.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ParameterBindingInfo.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/coordination/ParameterBindingInfo.java 2008-06-23 14:59:13 UTC (rev 11115)
@@ -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.model.portal.coordination;
+
+import org.jboss.portal.core.model.portal.Window;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface ParameterBindingInfo
+{
+ QName getName();
+
+ Collection<Window> getWindows();
+
+}
17 years, 10 months
JBoss Portal SVN: r11114 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-23 10:57:25 -0400 (Mon, 23 Jun 2008)
New Revision: 11114
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java
Log:
small typos
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java 2008-06-23 14:45:48 UTC (rev 11113)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java 2008-06-23 14:57:25 UTC (rev 11114)
@@ -40,7 +40,7 @@
public interface EventCoordinationManager
{
- public enum ImplicitStrategy
+ enum ImplicitStrategy
{
// Explicit wiring takes precedence
FALLBACK,
@@ -62,11 +62,8 @@
}
- public
-
+ // Event Discovery
- // Event Discovery
-
/**
* @param event
* @return all windows that given event should be delivered to with current wirings and configuration
17 years, 10 months
JBoss Portal SVN: r11113 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-23 10:45:48 -0400 (Mon, 23 Jun 2008)
New Revision: 11113
Added:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventWiringInfo.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/IllegalCoordinationException.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ParameterBindingInfo.java
Log:
Interfaces for explicit event wiring and shared parameters binding
Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventCoordinationManager.java 2008-06-23 14:45:48 UTC (rev 11113)
@@ -0,0 +1,235 @@
+/*
+* 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.portlet;
+
+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.portlet.controller.event.Event;
+
+import javax.xml.namespace.QName;
+import java.util.Set;
+import java.util.Collection;
+
+/**
+ * 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 EventCoordinationManager
+{
+
+ public enum ImplicitStrategy
+ {
+ // Explicit wiring takes precedence
+ FALLBACK,
+
+ // Only implicit wiring enabled
+ EXCLUSIVE,
+
+ // Implicit wiring disabled
+ DISABLED,
+
+ // Inherited by children nodes in the tree
+ RECURSIVE_FALLBACK,
+
+ // .
+ RECURSIVE_EXCLUSIVE,
+
+ // .
+ RECURSIVE_DISABLED
+
+ }
+
+ public
+
+
+ // Event Discovery
+
+ /**
+ * @param event
+ * @return all windows that given event should be delivered to with current wirings and configuration
+ */
+ Collection<Window> getEventWindows(Event event);
+
+ // Management
+
+ /**
+ * Defines a wiring for a given even QName between multiply source and destination windows
+ *
+ * @param sources
+ * @param targets
+ * @param eventQName
+ * @throws IllegalCoordinationException
+ */
+ void setEventWiring(Set<Window> sources, Set<Window> targets, QName eventQName) throws IllegalCoordinationException;
+
+ /**
+ * Remove wiring
+ *
+ * @param eventWiringInfo
+ * @throws IllegalCoordinationException
+ */
+ void removeEventWiring(EventWiringInfo eventWiringInfo) throws IllegalCoordinationException;
+
+ /**
+ * Defines a wiring between qnames at the page level. Event with given qname will be delivered
+ * to all windows being destination of destination qnames. All qnames need to be compatible - have no or the same
+ * payload - otherwise IllegalCoordinationException will be thrown.
+ * This method overrites any previous wiring for this qname in the page. Empty destinations collection removes the
+ * wiring.
+ *
+ * @param source
+ * @param destinations
+ * @param page
+ * @throws IllegalCoordinationException
+ */
+ void setQNameEventWiring(QName source, Collection<QName> destinations, Page page) 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
+ */
+ ImplicitStrategy getImplicitEventWiringStrategy(Page page);
+
+ /**
+ * @param page
+ * @param source
+ * @return a collection of qnames that are wired with a given gname in scope of given page
+ * @throws IllegalCoordinationException
+ */
+ Collection<QName> getQNameEventWiring(Page page, QName source) throws IllegalCoordinationException;
+
+
+ /**
+ * @param eventQName
+ * @return all wirings defined for a given qname
+ */
+ Collection<EventWiringInfo> getEventWirings(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 qname
+ * @param windows
+ * @throws IllegalCoordinationException
+ */
+ void setParameterBinding(QName qname, Collection<Window> 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
+ */
+ ImplicitStrategy getImplicitParameterBindingStrategy(PageContainer pageContainer);
+
+ /**
+ * @param parameterQName
+ * @return parameter bindings for a given parameter qname
+ */
+ Collection<ParameterBindingInfo> getParameterBindings(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);
+
+}
Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventWiringInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventWiringInfo.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/EventWiringInfo.java 2008-06-23 14:45:48 UTC (rev 11113)
@@ -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.portlet;
+
+import org.jboss.portal.core.model.portal.Window;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface EventWiringInfo
+{
+
+ QName getName();
+
+ Collection<Window> getSources();
+
+ Collection<Window> getDestinations();
+}
Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/IllegalCoordinationException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/IllegalCoordinationException.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/IllegalCoordinationException.java 2008-06-23 14:45:48 UTC (rev 11113)
@@ -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.
+*/
+
+package org.jboss.portal.core.controller.portlet;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class IllegalCoordinationException extends Exception
+{
+}
Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ParameterBindingInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ParameterBindingInfo.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ParameterBindingInfo.java 2008-06-23 14:45:48 UTC (rev 11113)
@@ -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.portlet;
+
+import org.jboss.portal.core.model.portal.Window;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface ParameterBindingInfo
+{
+ QName getName();
+
+ Collection<Window> getWindows();
+
+}
17 years, 10 months
JBoss Portal SVN: r11112 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-23 10:43:55 -0400 (Mon, 23 Jun 2008)
New Revision: 11112
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml
Log:
- Switching page wasn't working
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-06-23 14:36:35 UTC (rev 11111)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-06-23 14:43:55 UTC (rev 11112)
@@ -66,7 +66,7 @@
id="pageNameSelector"
value="#{dashboard.selectedPageName}"
styleClass="portlet-form-field"
- onchange="document.getElementsByClassName('page_selector_form')[0].submit()">
+ onchange="document.getElementsByClassName('id_page_selector_form')[0].submit()">
<f:selectItems value="#{dashboard.pageItems}"/>
</h:selectOneMenu>
</h:form>
17 years, 10 months
JBoss Portal SVN: r11111 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-23 10:36:35 -0400 (Mon, 23 Jun 2008)
New Revision: 11111
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java
Log:
- Couldn't create a page on the dashboard
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2008-06-23 13:37:53 UTC (rev 11110)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2008-06-23 14:36:35 UTC (rev 11111)
@@ -48,7 +48,7 @@
private DomainConfigurator domainConfigurator;
- public Object bean;
+ private Object bean;
public void setNewName(String newName)
{
@@ -138,5 +138,15 @@
return null;
}
+ public Object getBean()
+ {
+ return bean;
+ }
+ public void setBean(Object bean)
+ {
+ this.bean = bean;
+ }
+
+
}
17 years, 10 months
JBoss Portal SVN: r11110 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-23 09:37:53 -0400 (Mon, 23 Jun 2008)
New Revision: 11110
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
Log:
JBPORTAL-2050: NPE in CMS Admin Portlet when canceling File Upload
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2008-06-23 13:31:39 UTC (rev 11109)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2008-06-23 13:37:53 UTC (rev 11110)
@@ -59,7 +59,7 @@
class="portlet-form-button"/>
<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}"
name="cancel"
- onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
17 years, 10 months
JBoss Portal SVN: r11109 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-23 09:31:39 -0400 (Mon, 23 Jun 2008)
New Revision: 11109
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
Log:
JBPORTAL-2050: NPE in CMS Admin Portlet when canceling File Upload
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2008-06-23 11:56:21 UTC (rev 11108)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2008-06-23 13:31:39 UTC (rev 11109)
@@ -59,7 +59,7 @@
class="portlet-form-button"/>
<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}"
name="cancel"
- onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
17 years, 10 months
JBoss Portal SVN: r11108 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: portlet and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-23 07:56:21 -0400 (Mon, 23 Jun 2008)
New Revision: 11108
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java
Log:
Navigational state in held in session
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java 2008-06-23 11:53:31 UTC (rev 11107)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java 2008-06-23 11:56:21 UTC (rev 11108)
@@ -49,7 +49,7 @@
{
return new InvokePortletInstanceActionCommand(
instanceId,
- portletURL.getNavigationalState(),
+ null,
portletURL.getInteractionState(),
null);
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java 2008-06-23 11:53:31 UTC (rev 11107)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java 2008-06-23 11:56:21 UTC (rev 11108)
@@ -125,8 +125,6 @@
{
if (interactionState instanceof ParametersStateString)
{
- // We don't encode navigational state in portlet URL we can interpret as we store the nav state in the portal session
- /**
if (navigationalState != null)
{
throw new IllegalArgumentException("Cannot handle case with both non opaque interaction and navigational state");
@@ -135,7 +133,6 @@
// Add the parameters
Map<String, String[]> parameters = ((ParametersStateString)interactionState).getParameters();
configure(parameters);
- */
}
else
{
17 years, 10 months