JBoss Portal SVN: r11845 - docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-09 11:17:47 -0400 (Tue, 09 Sep 2008)
New Revision: 11845
Modified:
docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/en/modules/tutorials.xml
Log:
Missing </para>
Modified: docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/en/modules/tutorials.xml 2008-09-09 15:01:09 UTC (rev 11844)
+++ docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/en/modules/tutorials.xml 2008-09-09 15:17:47 UTC (rev 11845)
@@ -1190,7 +1190,8 @@
<callout arearefs="tutorials.jsf.help"><para>This parameter defines which page to display on the 'help' mode.</para></callout>
</calloutlist>
</programlistingco>
+ </para>
</sect3>
</sect2>
</sect1>
-</chapter>
\ No newline at end of file
+</chapter>
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11844 - in docs/tags/JBoss_Portal_2_7_0_CR1: quickstartuser and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-09 11:01:09 -0400 (Tue, 09 Sep 2008)
New Revision: 11844
Modified:
docs/tags/JBoss_Portal_2_7_0_CR1/pom.xml
docs/tags/JBoss_Portal_2_7_0_CR1/quickstartuser/pom.xml
docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/pom.xml
docs/tags/JBoss_Portal_2_7_0_CR1/userGuide/pom.xml
Log:
Changing version number on the tag
Modified: docs/tags/JBoss_Portal_2_7_0_CR1/pom.xml
===================================================================
--- docs/tags/JBoss_Portal_2_7_0_CR1/pom.xml 2008-09-09 14:51:28 UTC (rev 11843)
+++ docs/tags/JBoss_Portal_2_7_0_CR1/pom.xml 2008-09-09 15:01:09 UTC (rev 11844)
@@ -4,8 +4,7 @@
<groupId>org.jboss.portal</groupId>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
- <name>JBoss Portal Docs Aggregator</name>
- <version>2.7.0</version>
+ <version>2.7.0-CR1</version>
<modules>
<module>userGuide</module>
Modified: docs/tags/JBoss_Portal_2_7_0_CR1/quickstartuser/pom.xml
===================================================================
--- docs/tags/JBoss_Portal_2_7_0_CR1/quickstartuser/pom.xml 2008-09-09 14:51:28 UTC (rev 11843)
+++ docs/tags/JBoss_Portal_2_7_0_CR1/quickstartuser/pom.xml 2008-09-09 15:01:09 UTC (rev 11844)
@@ -12,7 +12,7 @@
<groupId>org.jboss.portal</groupId>
<artifactId>quickstartuser-${translation}</artifactId>
- <version>2.7.0</version>
+ <version>2.7.0-CR1</version>
<packaging>jdocbook</packaging>
<name>Quick_Start_User_(${translation})</name>
Modified: docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/pom.xml
===================================================================
--- docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/pom.xml 2008-09-09 14:51:28 UTC (rev 11843)
+++ docs/tags/JBoss_Portal_2_7_0_CR1/referenceGuide/pom.xml 2008-09-09 15:01:09 UTC (rev 11844)
@@ -12,7 +12,7 @@
<groupId>org.jboss.portal</groupId>
<artifactId>referenceGuide-${translation}</artifactId>
- <version>2.7.0</version>
+ <version>2.7.0-CR1</version>
<packaging>jdocbook</packaging>
<name>Reference_Guide_(${translation})</name>
Modified: docs/tags/JBoss_Portal_2_7_0_CR1/userGuide/pom.xml
===================================================================
--- docs/tags/JBoss_Portal_2_7_0_CR1/userGuide/pom.xml 2008-09-09 14:51:28 UTC (rev 11843)
+++ docs/tags/JBoss_Portal_2_7_0_CR1/userGuide/pom.xml 2008-09-09 15:01:09 UTC (rev 11844)
@@ -12,7 +12,7 @@
<groupId>org.jboss.portal</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>2.7.0</version>
+ <version>2.7.0-CR1</version>
<packaging>jdocbook</packaging>
<name>User_Guide_(${translation})</name>
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11843 - docs/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-09 10:51:28 -0400 (Tue, 09 Sep 2008)
New Revision: 11843
Added:
docs/tags/JBoss_Portal_2_7_0_CR1/
Log:
Tagging the docs: 2.7.0.CR1
Copied: docs/tags/JBoss_Portal_2_7_0_CR1 (from rev 11842, docs/branches/JBoss_Portal_Branch_2_7)
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11842 - in branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war: jsf and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-09 09:08:40 -0400 (Tue, 09 Sep 2008)
New Revision: 11842
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml
Log:
- Removed duplicated localization keys. Ideally, a lot of this would be done better... :/
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-09 12:46:33 UTC (rev 11841)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-09-09 13:08:40 UTC (rev 11842)
@@ -32,7 +32,7 @@
CURRENT_DISPLAY_NAMES=Current Display Names
SAVE=Save
MANAGE=Manage
-PORTALS=portals
+PORTALS_NO_CAP=portals
PORTAL=portal
SUB_PORTALS=sub-portals
PAGES_WITHIN=pages within
@@ -52,7 +52,7 @@
EVENT_LISTENER_BINDING=Event Listener Binding
CHOOSE_ID_PORTALEVENTLISTENER=Choose the id of the PortalEventListener to bind to this
SET_PERMISSIONS_FOR=Please set the permissions for the
-WINDOW=window
+WINDOW_NO_CAP=window
WINDOW_THEME_PROPERTIES=Window theme properties
INSTANCE_ID=Instance id
INSTANCE_NAME=Instance name
@@ -60,7 +60,7 @@
PREFERENCES=Preferences
PORTLET_DETAILS=portlet details
ASSOCIATED_PORTLET_NOT_AVAILABLE=The associated portlet is not available
-PREFERENCES=preferences
+PREFERENCES_NO_CAP=preferences
SECURITY_SETTINGS=security settings
MAKE_DEFAULT=Make Default
MANAGE_WINDOWS_WITHIN=Manage windows within
@@ -156,7 +156,7 @@
COMMON_CANCEL=Cancel
COMMON_UPDATE=Update
COMMON_ADD=Add
-COMMON_ADD_PROPERTY=Add Property
+COMMON_ADD_PROPERTY_BUTTON=Add Property
COMMON_UP=Up
COMMON_DOWN=Down
COMMON_NEW_VALUE=New value
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties 2008-09-09 12:46:33 UTC (rev 11841)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties 2008-09-09 13:08:40 UTC (rev 11842)
@@ -52,7 +52,7 @@
EVENT_LISTENER_BINDING=Event-Listener-Verkn\u00fcpfung
CHOOSE_ID_PORTALEVENTLISTENER=W\u00e4hlen Sie die ID des zu verkn\u00fcpfenden PortalEventListener
SET_PERMISSIONS_FOR=Bitte legen Sie die Berechtigungen fest f\u00fcr
-WINDOW=Fenster
+WINDOW_NO_CAP=Fenster
WINDOW_THEME_PROPERTIES=Fenster-Design-Eigenschaften
INSTANCE_ID=Instanz-ID
INSTANCE_NAME=Instanz-Name
@@ -60,12 +60,12 @@
PREFERENCES=Eigenschaften
PORTLET_DETAILS=Portlet-Details
ASSOCIATED_PORTLET_NOT_AVAILABLE=Das zugewiesene Portlet ist nicht verf\u00fcgbar
-PREFERENCES=Eigenschaften
+PREFERENCES_NO_CAP=Eigenschaften
SECURITY_SETTINGS=Sicherheitseinstellungen
MAKE_DEFAULT=Zum Standard machen
MANAGE_WINDOWS_WITHIN=Enthaltene Fenster verwalten
PORTAL_OBJECTS=Portal-Objekte
-PORTALS=Portale
+PORTALS_NO_CAP=Portale
PORTLET_NAME=Portlet-Name
DESCRIPTION=Beschreibung
REMOTE=Remote
@@ -157,7 +157,7 @@
COMMON_CANCEL=Abbrechen
COMMON_UPDATE=Aktualisieren
COMMON_ADD=Hinzuf\u00fcgen
-COMMON_ADD_PROPERTY=Eigenschaft hinzuf\u00fcgen
+COMMON_ADD_PROPERTY_BUTTON=Eigenschaft hinzuf\u00fcgen
COMMON_UP=Nach oben
COMMON_DOWN=Nach unten
COMMON_NEW_VALUE=Neuer Wert
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-09-09 12:46:33 UTC (rev 11841)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-09-09 13:08:40 UTC (rev 11842)
@@ -23,7 +23,7 @@
PORTLET_INSTANCES=Istanze di Portlet
INSTANCE_DELETE=Cancella Istanza
-PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00F9 abilitate a visualizzarne il contenuto
+PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00f9 abilitate a visualizzarne il contenuto
ARE_YOU_SURE_DELETE=Sei sicuro di voler cancellare quest\'istanza di Portlet ?
DASHBOARD_THEME_PROPERTIES=Propriet\u00e0 del tema della Dashboard
CONFIGURE_DASHBOARD_SETTINGS=Configurazione della Dashboard
@@ -32,7 +32,7 @@
CURRENT_DISPLAY_NAMES=Nomi attualmente visualizzati
SAVE=Salva
MANAGE=Gestisci
-PORTALS=portali
+PORTALS_NO_CAP=portali
PORTAL=portale
SUB_PORTALS=sotto-portali
PAGES_WITHIN=pagine dentro
@@ -52,7 +52,7 @@
EVENT_LISTENER_BINDING=Ascoltatore di eventi
CHOOSE_ID_PORTALEVENTLISTENER=Scegli l\'id del PortalEventListener per agganciarti a questo
SET_PERMISSIONS_FOR=Configura i permessi per
-WINDOW=finestra
+WINDOW_NO_CAP=finestra
WINDOW_THEME_PROPERTIES=Propriet\u00e0 del tema della Finestra
INSTANCE_ID=Id di Istanza
INSTANCE_NAME=Nome Istanza
@@ -156,7 +156,7 @@
COMMON_CANCEL=Annulla
COMMON_UPDATE=Aggiorna
COMMON_ADD=Aggiungi
-COMMON_ADD_PROPERTY=Aggiungi Propriet\u00e0
+COMMON_ADD_PROPERTY_BUTTON=Aggiungi Propriet\u00e0
COMMON_UP=Su
COMMON_DOWN=Giu
COMMON_NEW_VALUE=Nuovo valore
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-09-09 12:46:33 UTC (rev 11841)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-09-09 13:08:40 UTC (rev 11842)
@@ -57,7 +57,7 @@
</tbody>
</table>
<!-- ends layout of property form -->
- <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY}"
+ <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY_BUTTON}"
styleClass="portlet-form-button portlet-section-buttonrow"
action="#{properties.action.updateProperty}"/></h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-09-09 12:46:33 UTC (rev 11841)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-09-09 13:08:40 UTC (rev 11842)
@@ -11,7 +11,7 @@
<h3 class="sectionTitle tenpx-top-bottom">
#{bundle.MANAGE}  
<c:choose>
- <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when>
+ <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS_NO_CAP}</c:when>
<c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{bundle.PORTAL}</c:otherwise>
</c:choose>
</h3>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-09-09 12:46:33 UTC (rev 11841)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-09-09 13:08:40 UTC (rev 11842)
@@ -7,7 +7,7 @@
<ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/>
<ui:define name="content">
<h3>#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
- #{bundle.WINDOW}</h3>
+ #{bundle.WINDOW_NO_CAP}</h3>
<ui:include src="common/editSecurity.xhtml"/>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-09-09 12:46:33 UTC (rev 11841)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-09-09 13:08:40 UTC (rev 11842)
@@ -130,7 +130,7 @@
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES}
+ <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES_NO_CAP}
</li>
</ul>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-09-09 12:46:33 UTC (rev 11841)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-09-09 13:08:40 UTC (rev 11842)
@@ -138,7 +138,7 @@
</li>
<li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
<li class="selected">
- <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.PREFERENCES}
+ <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.PREFERENCES_NO_CAP}
</li>
</ul>
</h:form>
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11841 - in branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF: jsp/cms/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-09 08:46:33 -0400 (Tue, 09 Sep 2008)
New Revision: 11841
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
- Removed duplicated localization key.
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-09 10:55:19 UTC (rev 11840)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-09 12:46:33 UTC (rev 11841)
@@ -121,7 +121,6 @@
CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window, or, in the case of binary content, outside of the portlet window altogether
CMS_TO_MODIFY=To modify how this portlet behaves, please
CMS_CLICK_HERE=click here
-CMS_SELECT_ACTION=Select Action
CMS_QUERYERROR=The query you entered is not valid
@@ -130,8 +129,8 @@
CMS_ADMIN_SET_MANAGE_PERMISSIONS=Set Manage Permissions
CMS_ADMIN_SELECT_ROLES=Select Roles that have access to this node.
CMS_ADMIN_SELECT_USERS=Select Users that have access to this node.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=You may select multiple roles by using CTRL+click on the role names.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=You may select multiple users by using CTRL+click on the usernames.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=You may select multiple roles by using CTRL+click (CMD+click on a Mac) on the role names.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=You may select multiple users by using CTRL+click (CMD+click on a Mac) on the usernames.
CMS_ACCESS_DENIED=Access Denied
CMS_ACCESS_DENIED_DESCRIPTION=You are not allowed to access this resource
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-09-09 10:55:19 UTC (rev 11840)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-09-09 12:46:33 UTC (rev 11841)
@@ -114,14 +114,13 @@
CMS_ERROR=Errore
CMS_PENDING_APPROVAL_QUEUE=Coda in attesa di approvazione
CMS_CONFIGURE_RESTRICTION=Configura le restrizioni di sicurezza sul nodo
-CMS_SELECT_ACTION=Seleziona l\'azione...
+CMS_SELECT_ACTION=Seleziona un\'azione...
CMS_BROWSING=Navigazione
CMS_CONTENT_NOT_FOUND=Non ci sono contenuti per il file selezionato
CMS_INTRODUCTION=Introduzione
CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra
CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet,
CMS_CLICK_HERE=clicca qui
-CMS_SELECT_ACTION=Seleziona un\'azione
CMS_QUERYERROR=The query you entered is not valid
@@ -130,5 +129,5 @@
CMS_ADMIN_SET_MANAGE_PERMISSIONS=Configura i permessi in modalit\u00e0 amministrativa
CMS_ADMIN_SELECT_ROLES=Seleziona i ruoli che hanno accesso a questo nodo.
CMS_ADMIN_SELECT_USERS=Seleziona gli utenti che hanno accesso a questo nodo.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=Puoi selezionare pi\u00F9 ruoli usando il CTRL+click sui nomi dei ruoli.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Puoi selezionare pi\u00F9 utenti usando il CTRL+click sui nomi degli utenti.
\ No newline at end of file
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=Puoi selezionare pi\u00f9 ruoli usando il CTRL+click sui nomi dei ruoli.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=Puoi selezionare pi\u00f9 utenti usando il CTRL+click sui nomi degli utenti.
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-09 10:55:19 UTC (rev 11840)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-09-09 12:46:33 UTC (rev 11841)
@@ -3,10 +3,8 @@
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ page isELIgnored="false" %>
-<%@ page import="org.jboss.portal.cms.model.Content,
- org.jboss.portal.cms.util.NodeUtil" %>
-<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
-<%@ page import="java.text.Format" %>
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants,
+ java.text.Format" %>
<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.Collection" %>
<%@ page import="java.util.Iterator" %>
@@ -109,7 +107,7 @@
<div class="menu">
<select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
- <option value="">${n:i18n("CMS_SELECT_ACTION")}...</option>
+ <option value="">${n:i18n("CMS_SELECT_ACTION")}</option>
<%
if (sType.equals("text/html") || sType.equals("text/plain"))
{
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11840 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-09 06:55:19 -0400 (Tue, 09 Sep 2008)
New Revision: 11840
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
Log:
Minor
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-09 10:52:03 UTC (rev 11839)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-09 10:55:19 UTC (rev 11840)
@@ -131,7 +131,7 @@
CMS_ADMIN_SELECT_ROLES=Select Roles that have access to this node.
CMS_ADMIN_SELECT_USERS=Select Users that have access to this node.
CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=You may select multiple roles by using CTRL+click on the role names.
-CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=You may select multiple users by using CTRL+click on the user names.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=You may select multiple users by using CTRL+click on the usernames.
CMS_ACCESS_DENIED=Access Denied
CMS_ACCESS_DENIED_DESCRIPTION=You are not allowed to access this resource
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11839 - modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-09 06:52:03 -0400 (Tue, 09 Sep 2008)
New Revision: 11839
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
Log:
JBPORTAL-2153: Secure rights are not properly checked when creating new files/folders
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-09 10:49:03 UTC (rev 11838)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-09 10:52:03 UTC (rev 11839)
@@ -28,6 +28,7 @@
import org.jboss.portal.cms.security.Criteria;
import org.jboss.portal.cms.security.Permission;
import org.jboss.portal.cms.security.PortalCMSSecurityContext;
+import org.jboss.portal.cms.util.NodeUtil;
import org.jboss.portal.cms.workflow.ApprovePublish;
import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.User;
@@ -268,7 +269,14 @@
}
else if (command instanceof FolderCreateCommand)
{
- path = ((FolderCreateCommand)command).mFolder.getBasePath();
+ try
+ {
+ path = NodeUtil.getParentPath(((FolderCreateCommand)command).mFolder.getBasePath());
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
else if (command instanceof FileUpdateCommand)
{
@@ -280,7 +288,14 @@
}
else if (command instanceof NewFileCommand)
{
- path = ((NewFileCommand)command).getPath();
+ try
+ {
+ path = NodeUtil.getParentPath(((NewFileCommand)command).getPath());
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
else if (command instanceof UpdateFileCommand)
{
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11838 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-09 06:49:03 -0400 (Tue, 09 Sep 2008)
New Revision: 11838
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
Log:
Minor
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-09 10:47:23 UTC (rev 11837)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-09-09 10:49:03 UTC (rev 11838)
@@ -131,6 +131,7 @@
CMS_ADMIN_SELECT_ROLES=Select Roles that have access to this node.
CMS_ADMIN_SELECT_USERS=Select Users that have access to this node.
CMS_ADMIN_YOU_CAN_SELECT_CTRL_ROLES=You may select multiple roles by using CTRL+click on the role names.
+CMS_ADMIN_YOU_CAN_SELECT_CTRL_USERS=You may select multiple users by using CTRL+click on the usernames.
CMS_ACCESS_DENIED=Access Denied
CMS_ACCESS_DENIED_DESCRIPTION=You are not allowed to access this resource
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11837 - branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-09 06:47:23 -0400 (Tue, 09 Sep 2008)
New Revision: 11837
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
Log:
JBPORTAL-2153: Secure rights are not properly checked when creating new files/folders
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-09 04:26:13 UTC (rev 11836)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-09 10:47:23 UTC (rev 11837)
@@ -28,6 +28,7 @@
import org.jboss.portal.cms.security.Criteria;
import org.jboss.portal.cms.security.Permission;
import org.jboss.portal.cms.security.PortalCMSSecurityContext;
+import org.jboss.portal.cms.util.NodeUtil;
import org.jboss.portal.cms.workflow.ApprovePublish;
import org.jboss.portal.identity.Role;
import org.jboss.portal.identity.User;
@@ -268,7 +269,14 @@
}
else if (command instanceof FolderCreateCommand)
{
- path = ((FolderCreateCommand)command).mFolder.getBasePath();
+ try
+ {
+ path = NodeUtil.getParentPath(((FolderCreateCommand)command).mFolder.getBasePath());
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
else if (command instanceof FileUpdateCommand)
{
@@ -280,7 +288,14 @@
}
else if (command instanceof NewFileCommand)
{
- path = ((NewFileCommand)command).getPath();
+ try
+ {
+ path = NodeUtil.getParentPath(((NewFileCommand)command).getPath());
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
}
else if (command instanceof UpdateFileCommand)
{
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11836 - in modules/portlet/trunk: test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF and 3 other directories.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2008-09-09 00:26:13 -0400 (Tue, 09 Sep 2008)
New Revision: 11836
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
Removed:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml
Modified:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
Log:
Change jboss-beans-portal.xml files to jboss-portal-beans.xml.
Deleted: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -1,106 +0,0 @@
-<?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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.mc.PortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/jboss-portal-beans.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -0,0 +1,106 @@
+<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.mc.PortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
+ <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
version="2.5">
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<filter>
<filter-name>ErrorHandlingFilter</filter-name>
Modified: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
<web-app>
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
Modified: modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
<web-app>
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
Deleted: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -1,118 +0,0 @@
-<?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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
-
- <bean name="TestDriverServerExporter"
- class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Added: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/jboss-portal-beans.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -0,0 +1,118 @@
+<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+
+ <bean name="TestDriverServerExporter"
+ class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject bean="TestDriverServer"/></parameter>
+ <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="driver"><inject bean="TestDriverServer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
+ <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Modified: modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
<web-app>
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
Deleted: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans-portal.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -1,118 +0,0 @@
-<?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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
-
- <bean name="TestDriverServerExporter"
- class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
- <constructor>
- <parameter>socket://localhost:5400</parameter>
- <parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
- </constructor>
- </bean>
-
- <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
- <alias>PortletApplicationRegistry</alias>
- <property name="servletContainer"><inject bean="ServletContainer"/></property>
- <property name="driver"><inject bean="TestDriverServer"/></property>
- <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
- </bean>
-
- <!-- The ServletContainerFactory -->
- <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
- <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
- </bean>
-
- <!-- The servlet container obtained from the ServletContainerFactory -->
- <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
- <constructor factoryMethod="getServletContainer">
- <factory bean="ServletContainerFactory"/>
- </constructor>
- </bean>
-
- <!-- The producer persistence manager -->
- <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
-
- <!-- The producer state management policy -->
- <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
- <property name="persistLocally"><value>true</value></property>
- </bean>
-
- <!-- The producer state converter -->
- <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
-
- <!-- The consumer portlet invoker -->
- <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
- <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
- </bean>
- <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
- <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
- </bean>
- <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
- <property name="next"><inject bean="ProducerPortletInvoker"/></property>
- </bean>
-
- <!-- The producer portlet invoker -->
- <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
- <property name="next"><inject bean="ContainerPortletInvoker"/></property>
- <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
- <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
- <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
- </bean>
-
- <!-- The portlet container invoker -->
- <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
- <property name="next"><inject bean="ValveInterceptor"/></property>
- </bean>
-
- <!-- Container stack -->
- <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
- <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
- <property name="next"><inject bean="SecureTransportInterceptor"/></property>
- </bean>
- <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
- <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
- </bean>
- <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
- <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
- <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
- </bean>
- <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
- <property name="next"><inject bean="CCPPInterceptor"/></property>
- </bean>
- <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
- <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
- </bean>
- <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
- <property name="next"><inject bean="EventPayloadInterceptor"/></property>
- </bean>
- <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
- <property name="next"><inject bean="PortletContainerDispatcher"/></property>
- </bean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
-
-</deployment>
Added: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-portal-beans.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -0,0 +1,118 @@
+<?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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"/>
+
+ <bean name="TestDriverServerExporter"
+ class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject bean="TestDriverServer"/></parameter>
+ <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.TestPortletApplicationDeployer">
+ <alias>PortletApplicationRegistry</alias>
+ <property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <property name="driver"><inject bean="TestDriverServer"/></property>
+ <property name="containerPortletInvoker"><inject bean="ContainerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The ServletContainerFactory -->
+ <bean name="ServletContainerFactory" class="org.jboss.portal.web.impl.DefaultServletContainerFactory">
+ <constructor factoryClass="org.jboss.portal.web.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/>
+ </bean>
+
+ <!-- The servlet container obtained from the ServletContainerFactory -->
+ <bean name="ServletContainer" class="org.jboss.portal.web.ServletContainer">
+ <constructor factoryMethod="getServletContainer">
+ <factory bean="ServletContainerFactory"/>
+ </constructor>
+ </bean>
+
+ <!-- The producer persistence manager -->
+ <bean name="ProducerPersistenceManager" class="org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
+
+ <!-- The producer state management policy -->
+ <bean name="ProducerStateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally"><value>true</value></property>
+ </bean>
+
+ <!-- The producer state converter -->
+ <bean name="ProducerStateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0"/>
+
+ <!-- The consumer portlet invoker -->
+ <bean name="ConsumerPortletInvoker" class="org.jboss.portal.portlet.PortletInvokerInterceptor">
+ <property name="next"><inject bean="ConsumerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ConsumerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor">
+ <property name="next"><inject bean="PortletCustomizationInterceptor"/></property>
+ </bean>
+ <bean name="PortletCustomizationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.PortletCustomizationInterceptor">
+ <property name="next"><inject bean="ProducerPortletInvoker"/></property>
+ </bean>
+
+ <!-- The producer portlet invoker -->
+ <bean name="ProducerPortletInvoker" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="next"><inject bean="ContainerPortletInvoker"/></property>
+ <property name="persistenceManager"><inject bean="ProducerPersistenceManager"/></property>
+ <property name="stateManagementPolicy"><inject bean="ProducerStateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="ProducerStateConverter"/></property>
+ </bean>
+
+ <!-- The portlet container invoker -->
+ <bean name="ContainerPortletInvoker" class="org.jboss.portal.portlet.container.ContainerPortletInvoker">
+ <property name="next"><inject bean="ValveInterceptor"/></property>
+ </bean>
+
+ <!-- Container stack -->
+ <bean name="ValveInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ValveInterceptor">
+ <property name="portletApplicationRegistry"><inject bean="PortletApplicationRegistry" state="Instantiated"/></property>
+ <property name="next"><inject bean="SecureTransportInterceptor"/></property>
+ </bean>
+ <bean name="SecureTransportInterceptor" class="org.jboss.portal.portlet.aspects.portlet.SecureTransportInterceptor">
+ <property name="next"><inject bean="ContextDispatcherInterceptor"/></property>
+ </bean>
+ <bean name="ContextDispatcherInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor">
+ <property name="servletContainerFactory"><inject bean="ServletContainerFactory"/></property>
+ <property name="next"><inject bean="ProducerCacheInterceptor"/></property>
+ </bean>
+ <bean name="ProducerCacheInterceptor" class="org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterceptor">
+ <property name="next"><inject bean="CCPPInterceptor"/></property>
+ </bean>
+ <bean name="CCPPInterceptor" class="org.jboss.portal.portlet.aspects.portlet.CCPPInterceptor">
+ <property name="next"><inject bean="RequestAttributeConversationInterceptor"/></property>
+ </bean>
+ <bean name="RequestAttributeConversationInterceptor" class="org.jboss.portal.portlet.aspects.portlet.RequestAttributeConversationInterceptor">
+ <property name="next"><inject bean="EventPayloadInterceptor"/></property>
+ </bean>
+ <bean name="EventPayloadInterceptor" class="org.jboss.portal.portlet.aspects.portlet.EventPayloadInterceptor">
+ <property name="next"><inject bean="PortletContainerDispatcher"/></property>
+ </bean>
+ <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+
+</deployment>
Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2008-09-09 04:14:55 UTC (rev 11835)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2008-09-09 04:26:13 UTC (rev 11836)
@@ -28,7 +28,7 @@
<web-app>
<context-param>
<param-name>jboss.portal.mc.beans_resource_location</param-name>
- <param-value>/WEB-INF/jboss-beans-portal.xml</param-value>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
<listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
17 years, 8 months
- 1
- 0