[jboss-svn-commits] JBL Code SVN: r13019 - in labs/jbosslabs/trunk/portal-extensions: binaries/portal/to-copy/jboss-portal.sar/META-INF and 39 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 2 18:13:46 EDT 2007
Author: adamw
Date: 2007-07-02 18:13:45 -0400 (Mon, 02 Jul 2007)
New Revision: 13019
Added:
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-backport-concurrent.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-portlet.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboards.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboardsTemplate.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/content/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/content/portlet_editor.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/page.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/portal.jsp
Removed:
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-samples-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/
Modified:
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_es.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/data/default-object.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/user/setup.txt
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-federation-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-server-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-registration-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-search-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-web-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-facelets.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-core-admin-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-faces-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editTheme.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editContext.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPage.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageLayout.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageTheme.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalTheme.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowSecurity.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowTheme.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instancesTemplate.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectTemplate.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objects.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portletsTemplate.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-aop.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-cms-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-core-cms-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_es.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_it.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_pt_BR.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/images/cms/admin/style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-workflow.sar/portal-workflow-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_it.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_pt_BR.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/register.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-layouts.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-management.sar/lib/portal-core-management-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/MANIFEST.MF
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/conf/consumer/hibernate/domain.hbm.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/jsp/edit.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/lib/widget-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/portlet.xml
labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/config.xml
labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/lib/portal-identity-lib.jar
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java
labs/jbosslabs/trunk/portal-extensions/portal-default/
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
Updating to portal 2.6.GA
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -163,6 +163,23 @@
<!-- Command stack -->
<mbean
+ code="org.jboss.portal.core.aspects.controller.ControlInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Control"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalControlPolicy"
+ proxy-type="attribute">portal:service=ControlPolicy,type=Portal</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor"
+ name="portal:service=Interceptor,type=Command,name=ResourceAcquisition"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
name="portal:service=Interceptor,type=Command,name=Ajax"
xmbean-dd=""
@@ -228,11 +245,13 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
+ <depends-list-element>portal:service=Interceptor,type=Command,name=ResourceAcquisition</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=NavigationalState</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
</depends-list>
</mbean>
@@ -1009,6 +1028,28 @@
proxy-type="attribute">portal:service=ResponseHandler,type=Ajax</depends>
</mbean>
+ <!-- -->
+ <mbean
+ code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy"
+ name="portal:service=ControlPolicy,type=Page"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy"
+ name="portal:service=ControlPolicy,type=Portal"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+
<!-- The controller -->
<mbean
code="org.jboss.portal.core.controller.Controller"
@@ -1046,6 +1087,9 @@
<depends
optional-attribute-name="ResponseHandler"
proxy-type="attribute">portal:service=ResponseHandler,type=Selector</depends>
+ <depends
+ optional-attribute-name="PageControlPolicy"
+ proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends>
</mbean>
<!-- The controller factory -->
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_es.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_es.properties 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_es.properties 2007-07-02 22:13:45 UTC (rev 13019)
@@ -23,6 +23,6 @@
# Navigation Portlet
PAGENAME_default=Home
-PAGENAME_Admin=Administración
+PAGENAME_Admin=Administraci�n
PAGENAME_Test=Ejemplos
PAGENAME_News=Noticias
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/data/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/data/default-object.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/data/default-object.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -30,23 +30,6 @@
<deployment>
<context>
<context-name/>
- </context>
- </deployment>
- <deployment>
- <parent-ref/>
- <if-exists>keep</if-exists>
- <portal>
- <portal-name>default</portal-name>
- <supported-modes>
- <mode>view</mode>
- <mode>edit</mode>
- <mode>help</mode>
- </supported-modes>
- <supported-window-states>
- <window-state>normal</window-state>
- <window-state>minimized</window-state>
- <window-state>maximized</window-state>
- </supported-window-states>
<properties>
<!--
| Set the layout for the default portal, see also portal-layouts.xml.
@@ -76,7 +59,74 @@
<name>portal.defaultObjectName</name>
<value>default</value>
</property>
+
+ <!-- Control policy config -->
+ <property>
+ <name>control.portal.access_denied</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.unavailable</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.not_found</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.internal_error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.portal.error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.portal.resource_uri</name>
+ <value>/WEB-INF/jsp/error/portal.jsp</value>
+ </property>
+ <property>
+ <name>control.page.access_denied</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.unavailable</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.not_found</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.internal_error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.page.error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.page.resource_uri</name>
+ <value>/WEB-INF/jsp/error/page.jsp</value>
+ </property>
</properties>
+ </context>
+ </deployment>
+ <deployment>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>default</portal-name>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
<security-constraint>
<policy-permission>
<action-name>viewrecursive</action-name>
@@ -159,9 +209,58 @@
-->
<property>
<name>theme.dyna.partial_refresh_enabled</name>
- <value>true</value>
+ <value>false</value>
</property>
+ <!-- Control policy config -->
+ <property>
+ <name>control.portal.access_denied</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.unavailable</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.not_found</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.internal_error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.portal.error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.portal.resource_uri</name>
+ <value>/WEB-INF/jsp/error/portal.jsp</value>
+ </property>
+ <property>
+ <name>control.page.access_denied</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.unavailable</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.not_found</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.internal_error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.page.error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.page.resource_uri</name>
+ <value>/WEB-INF/jsp/error/page.jsp</value>
+ </property>
</properties>
</context>
</deployment>
@@ -180,36 +279,6 @@
<window-state>minimized</window-state>
<window-state>maximized</window-state>
</supported-window-states>
- <properties>
- <!--
- | Set the layout for the default portal, see also portal-layouts.xml.
- -->
- <property>
- <name>layout.id</name>
- <value>generic</value>
- </property>
- <!--
- | Set the theme for the default portal, see also portal-themes.xml.
- -->
- <property>
- <name>theme.id</name>
- <value>renaissance</value>
- </property>
- <!--
- | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
- -->
- <property>
- <name>theme.renderSetId</name>
- <value>divRenderer</value>
- </property>
- <!--
- | The default page name, if the property is not explicited then the default page name is "default"
- -->
- <property>
- <name>portal.defaultObjectName</name>
- <value>default</value>
- </property>
- </properties>
<page>
<page-name>default</page-name>
<properties>
@@ -257,36 +326,6 @@
<window-state>minimized</window-state>
<window-state>maximized</window-state>
</supported-window-states>
- <properties>
- <!--
- | Set the layout for the default portal, see also portal-layouts.xml.
- -->
- <property>
- <name>layout.id</name>
- <value>generic</value>
- </property>
- <!--
- | Set the theme for the default portal, see also portal-themes.xml.
- -->
- <property>
- <name>theme.id</name>
- <value>renaissance</value>
- </property>
- <!--
- | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
- -->
- <property>
- <name>theme.renderSetId</name>
- <value>divRenderer</value>
- </property>
- <!--
- | The default page name, if the property is not explicited then the default page name is "default"
- -->
- <property>
- <name>portal.defaultObjectName</name>
- <value>default</value>
- </property>
- </properties>
<security-constraint>
<policy-permission>
<action-name>viewrecursive</action-name>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/user/setup.txt
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/user/setup.txt 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/user/setup.txt 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,5 +1,6 @@
// This bsh script setup the default content of the portal.
// It is called when the SessionFactoryBinder service has created a schema and needs to populate it
+import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.identity.db.HibernateUserImpl;
import org.jboss.portal.identity.db.HibernateRoleImpl;
@@ -44,5 +45,5 @@
}
finally
{
- Tools.safeClose(session);
+ IOTools.safeClose(session);
}
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-backport-concurrent.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-backport-concurrent.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/jboss-portlet-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-identity-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-jems-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-federation-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-portlet-server-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-registration-lib.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-samples-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-search-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-web-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-facelets.jar
===================================================================
(Binary files differ)
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-portlet.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/jsf-portlet.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-core-admin-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/lib/portal-faces-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -34,12 +34,12 @@
<converter>
<converter-for-class>org.jboss.portal.core.model.content.ContentType</converter-for-class>
- <converter-class>org.jboss.portal.core.admin.ui.ContentTypeConverter</converter-class>
+ <converter-class>org.jboss.portal.core.admin.ui.conversion.ContentTypeConverter</converter-class>
</converter>
<converter>
<converter-for-class>org.jboss.portal.core.model.portal.PortalObjectId</converter-for-class>
- <converter-class>org.jboss.portal.core.admin.ui.PortalObjectIdConverter</converter-class>
+ <converter-class>org.jboss.portal.core.admin.ui.conversion.PortalObjectIdConverter</converter-class>
</converter>
<!-- The portal object manager bean -->
@@ -48,6 +48,10 @@
<managed-bean-class>org.jboss.portal.core.admin.ui.PortalObjectManagerBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
<managed-property>
+ <property-name>namespace</property-name>
+ <value></value>
+ </managed-property>
+ <managed-property>
<property-name>roleModule</property-name>
<value>#{applicationScope.RoleModule}</value>
</managed-property>
@@ -99,15 +103,6 @@
</managed-property>
</managed-bean>
<managed-bean>
- <managed-bean-name>themePropertyAction</managed-bean-name>
- <managed-bean-class>org.jboss.portal.core.admin.ui.actions.ThemePropertyAction</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>portalObject</property-name>
- <value>#{sessionScope.portalobjectmgr.selectedObject}</value>
- </managed-property>
- </managed-bean>
- <managed-bean>
<managed-bean-name>assignContentToWindowAction</managed-bean-name>
<managed-bean-class>org.jboss.portal.core.admin.ui.actions.AssignContentToWindowAction</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
@@ -117,6 +112,40 @@
</managed-property>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>dashboardmgr</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.core.admin.ui.PortalObjectManagerBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ <managed-property>
+ <property-name>namespace</property-name>
+ <value>dashboard</value>
+ </managed-property>
+ <managed-property>
+ <property-name>roleModule</property-name>
+ <value>#{applicationScope.RoleModule}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>portalObjectContainer</property-name>
+ <value>#{applicationScope.PortalObjectContainer}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>instanceContainer</property-name>
+ <value>#{applicationScope.InstanceContainer}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>layoutService</property-name>
+ <value>#{applicationScope.LayoutService}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>themeService</property-name>
+ <value>#{applicationScope.ThemeService}</value>
+ </managed-property>
+ <managed-property>
+ <property-name>domainConfigurator</property-name>
+ <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value>
+ </managed-property>
+ </managed-bean>
+
<!-- The instance manager managed bean -->
<managed-bean>
<managed-bean-name>instancemgr</managed-bean-name>
@@ -134,6 +163,10 @@
<property-name>domainConfigurator</property-name>
<value>#{applicationScope.AuthorizationDomainRegistry.instance.configurator}</value>
</managed-property>
+ <managed-property>
+ <property-name>paginationSize</property-name>
+ <value>20</value>
+ </managed-property>
</managed-bean>
<!-- The portlet manager managed bean -->
@@ -161,6 +194,10 @@
<property-name>selectedPortletInvokerId</property-name>
<value>local</value>
</managed-property>
+ <managed-property>
+ <property-name>paginationSize</property-name>
+ <value>20</value>
+ </managed-property>
</managed-bean>
<managed-bean>
@@ -203,16 +240,6 @@
</managed-property>
</managed-bean>
- <managed-bean>
- <managed-bean-name>propertyAction</managed-bean-name>
- <managed-bean-class>org.jboss.portal.core.admin.ui.actions.PropertyAction</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>portalObjectManager</property-name>
- <value>#{sessionScope.portalobjectmgr}</value>
- </managed-property>
- </managed-bean>
-
<!--
| Dashboard beans
-->
@@ -268,9 +295,47 @@
<property-name>domainConfigurator</property-name>
<value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value>
</managed-property>
-
</managed-bean>
+ <!-- Constants -->
+ <managed-bean>
+ <managed-bean-name>PortalObject</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.faces.el.ClassConstantPublisherBean</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ <managed-property>
+ <property-name>className</property-name>
+ <value>org.jboss.portal.core.model.portal.PortalObject</value>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>ControlConstants</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.faces.el.ClassConstantPublisherBean</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ <managed-property>
+ <property-name>className</property-name>
+ <value>org.jboss.portal.core.model.portal.control.ControlConstants</value>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>PropertiesInfo</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.faces.el.ClassConstantPublisherBean</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ <managed-property>
+ <property-name>className</property-name>
+ <value>org.jboss.portal.core.admin.ui.PropertiesInfo</value>
+ </managed-property>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>ControlPropertiesBean</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.faces.el.ClassConstantPublisherBean</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ <managed-property>
+ <property-name>className</property-name>
+ <value>org.jboss.portal.core.admin.ui.ControlPropertiesBean</value>
+ </managed-property>
+ </managed-bean>
+
+
<navigation-rule>
<navigation-case>
<from-outcome>index</from-outcome>
@@ -355,6 +420,11 @@
</navigation-case>
<navigation-case>
+ <from-outcome>dashboards</from-outcome>
+ <to-view-id>/WEB-INF/jsf/dashboards.xhtml</to-view-id>
+ </navigation-case>
+
+ <navigation-case>
<from-outcome>dashboard</from-outcome>
<to-view-id>/WEB-INF/jsf/dashboard/dashboard.xhtml</to-view-id>
</navigation-case>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -28,6 +28,9 @@
<portlet-app>
<portlet>
<portlet-name>AdminPortlet</portlet-name>
+ <ajax>
+ <partial-refresh>false</partial-refresh>
+ </ajax>
<transaction>
<trans-attribute>Required</trans-attribute>
</transaction>
@@ -37,6 +40,9 @@
</portlet>
<portlet>
<portlet-name>DashboardConfigPortlet</portlet-name>
+ <ajax>
+ <partial-refresh>false</partial-refresh>
+ </ajax>
<transaction>
<trans-attribute>Required</trans-attribute>
</transaction>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/confirm.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -9,6 +9,7 @@
<ui:composition template="../objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Delete"/>
<ui:define name="content">
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageErrorHandling.xhtml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -0,0 +1,148 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+<p class="portlet-area-header">Page Error Handling</p>
+
+<div class="portlet-area-body">
+<!-- defines error handeling section -->
+<table cellpadding="0" cellspacing="0" width="100%">
+<tr>
+ <th class="portlet-section-title">Configure how the system handles errors on page level.</th>
+</tr>
+<tr>
+<td valign="top" class="portlet-section-body">
+
+
+<h:form>
+<table width="100%">
+<thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Case</th>
+ <th>Inheritance</th>
+ <th>Action</th>
+ </tr>
+</thead>
+<tbody>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.pageControlAccessDenied.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.pageControlAccessDenied.inherit}"
+ value="#{properties.pageControlAccessDenied.inherited}"/>inherit action
+ from parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.pageControlAccessDenied.value}"
+ disabled="#{properties.pageControlAccessDenied.inherited}" onchange="submit();">
+ <f:selectItems value="#{properties.pageSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.pageControlUnavailable.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.pageControlUnavailable.inherit}"
+ value="#{properties.pageControlUnavailable.inherited}"/>inherit action
+ from parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.pageControlUnavailable.value}"
+ disabled="#{properties.pageControlUnavailable.inherited}" onchange="submit();">
+ <f:selectItems value="#{properties.pageSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.pageControlError.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.pageControlError.inherit}"
+ value="#{properties.pageControlError.inherited}"/>inherit action from
+ parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.pageControlError.value}"
+ disabled="#{properties.pageControlError.inherited}" onchange="submit();">
+ <f:selectItems value="#{properties.pageSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.pageControlInternalError.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.pageControlInternalError.inherit}"
+ value="#{properties.pageControlInternalError.inherited}"/>inherit action
+ from parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.pageControlInternalError.value}"
+ disabled="#{properties.pageControlInternalError.inherited}" onchange="submit();">
+ <f:selectItems value="#{properties.pageSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.pageControlNotFound.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.pageControlNotFound.inherit}"
+ value="#{properties.pageControlNotFound.inherited}"/>inherit action from
+ parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.pageControlNotFound.value}"
+ disabled="#{properties.pageControlNotFound.inherited}" onchange="submit();">
+ <f:selectItems value="#{properties.pageSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.pageControlResourceURI.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.pageControlResourceURI.inherit}"
+ value="#{properties.pageControlResourceURI.inherited}"/>inherit action
+ from parent
+ </td>
+ <td>
+ <h:inputText value="#{properties.pageControlResourceURI.value}" size="60"
+ disabled="#{properties.pageControlResourceURI.inherited}"/>
+ </td>
+</tr>
+</tbody>
+</table>
+<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/>
+</h:form>
+
+
+</td>
+</tr>
+</table>
+
+</div>
+
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -6,149 +6,166 @@
xmlns:jbp="http://www.jboss.org/portal"
xmlns:c="http://java.sun.com/jstl/core">
-<div style="float:left; padding:0 2em 0 2em">
- <h:form id="layoutForm">
+<table width="100%">
+<tr>
+<td valign="top" width="50%">
+
+ <p class="portlet-area-header">Content Definition</p>
+
+ <div class="portlet-area-body">
+
<table>
- <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status">
- <tbody>
- <tr>
- <td colspan="2" class="portlet-form-field-label"><hr/> #{regionName} Region </td>
- </tr>
- <tr>
- <td>
- <div>
+ <tr>
+ <td colspan="2">Define a name for the window of content (optional):
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <span class="portlet-form-field-label">Window Name:</span>
+ </td>
+ <td width="100%">
+ <h:form id="windowForm">
+ <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/>
+ <h:message for="windowName" errorClass="portlet-msg-error"/>
+ </h:form>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ Select the type of content that will be added to the page:
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <span class="portlet-form-field-label">Content Type:</span>
+ </td>
+ <td>
+ <h:form id="abc">
+ <h:selectOneMenu
+ id="instanceId"
+ value="#{pageManager.selectedContentType}"
+ styleClass="portlet-form-field contentType"
+ onchange="document.getElementById('abc').submit()">
+ <f:selectItems value="#{pageManager.contentTypeItems}"/>
+ </h:selectOneMenu>
+ <h:message for="instanceId" errorClass="portlet-msg-error"/>
+ </h:form>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ Select content that will be added to the page:
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" valign="top">
+ <div>
+ <jbp:portlet
+ portletId="#{pageManager.selectedEditorPortletId}"
+ portletInvoker="#{pageManager.portletInvoker}"
+ actionListener="#{pageManager.assignWindow}"
+ supportedModes="edit_content"
+ supportedWindowStates="normal"
+ initialMode="edit_content"
+ initialWindowState="normal"
+ renderParameters="#{pageManager.selectedRenderParameters}"
+ onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ </div>
+
+</td>
+<td valign="top" width="50%">
+
+ <p class="portlet-area-header">Page Layout</p>
+
+ <div class="portlet-area-body">
+
+ <h:form id="layoutForm">
+ <h:message for="layoutForm" errorClass="portlet-msg-error"/>
+ <input id="blah" type="hidden" name="blah" value=""/>
+ <table width="100%">
+ <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status">
+ <tbody>
+ <tr>
+ <td colspan="3" class="portlet-form-field-label">
+ <hr/>
+ #{regionName} Region
+ </td>
+ </tr>
+ <tr>
+ <td valign="top">
<h:commandButton
+ onclick="document.getElementById('blah').value=document.getElementById('windowForm:windowName').value"
+ value="Add" id="a_#{regionName}"
+ actionListener="#{pageManager.assignWindows}"
+ styleClass="portlet-form-button layout-button"/>
+ </td>
+ <td width="100%">
+ <h:selectManyListbox
+ value="#{pageManager.assignedWindows[regionName]}"
+ size="7" styleClass="windowList portlet-form-field">
+ <f:selectItems
+ value="#{pageManager.windowItemsMap[regionName]}"/>
+ </h:selectManyListbox>
+ </td>
+ <td valign="top">
+ <h:commandButton
value="Up" id="u_#{regionName}"
actionListener="#{pageManager.assignWindows}"
- styleClass="portlet-form-button"/>
- </div>
- <div>
+ styleClass="portlet-form-button layout-button"/>
<h:commandButton
value="Down" id="d_#{regionName}"
actionListener="#{pageManager.assignWindows}"
- styleClass="portlet-form-button"/>
- </div>
- <div style="margin-top: 1em">
+ styleClass="portlet-form-button layout-button"/>
+ <hr/>
<h:commandButton
value="Delete" id="l_#{regionName}"
actionListener="#{pageManager.assignWindows}"
- styleClass="portlet-form-button"/>
- </div>
- </td>
- <td>
- <h:selectManyListbox
- value="#{pageManager.assignedWindows[regionName]}"
- size="7" styleClass="windowList portlet-form-field">
- <f:selectItems
- value="#{pageManager.windowItemsMap[regionName]}"/>
- </h:selectManyListbox>
- </td>
- </tr>
- </tbody>
- </c:forEach>
- <tbody>
- <tr>
- <td colspan="2" class="portlet-form-field-label"
- style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned
- windows
- </td>
- </tr>
- <tr>
- <td>
- <div style="margin-top: 1em">
- <h:commandButton value="Delete"
- id="l_unknown" actionListener="#{pageManager.assignWindows}"
- styleClass="portlet-form-button"/>
- </div>
- </td>
- <td>
- <h:selectManyListbox
- value="#{pageManager.assignedWindows['unknown']}"
- size="7" styleClass="windowList portlet-form-field">
- <f:selectItems
- value="#{pageManager.windowItemsMap['unknown']}"/>
- </h:selectManyListbox>
- </td>
- </tr>
- </tbody>
- </table>
- </h:form>
-</div>
-<div style="float:left">
- <table class="form">
- <tr>
- <td colspan="2"><hr/>You can choose among several types of content to assign on the page:
- </td>
- </tr>
- <tr>
- <td class="label">
- <span class="portlet-form-field-label">Content type:</span>
- </td>
- <td class="widget">
- <h:form id="abc">
- <h:selectOneMenu
- id="instanceId"
- value="#{pageManager.selectedContentType}"
- styleClass="portlet-form-field contentType">
- <f:selectItems value="#{pageManager.contentTypeItems}"/>
- </h:selectOneMenu>
- <h:commandButton value="Change" styleClass="portlet-form-button"/>
- <h:message for="instanceId" errorClass="portlet-msg-error"/>
- </h:form>
- </td>
- </tr>
- <tr>
- <td colspan="2"><hr/>You can enter a window name used during content selection (optional):
- </td>
- </tr>
- <tr>
- <td class="label">
- <span class="portlet-form-field-label">Window Name:</span>
- </td>
- <td class="widget">
- <h:form id="windowForm">
- <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/>
- <h:message for="windowName" errorClass="portlet-msg-error"/>
- </h:form>
- </td>
- </tr>
- <tr>
- <td colspan="2"><hr/>The page region will contain the selected content:
- </td>
- </tr>
- <tr>
- <td class="label">
- <span class="portlet-form-field-label">Target Region:</span>
- </td>
- <td class="widget">
- <h:form id="regionForm">
- <h:selectOneMenu id="targetRegion" value="#{pageManager.targetRegion}" styleClass="portlet-form-input-field">
- <f:selectItems value="#{pageManager.regionItems}"/>
- </h:selectOneMenu>
- <h:message for="targetRegion" errorClass="portlet-msg-error"/>
- </h:form>
- </td>
- </tr>
- <tr>
- <td colspan="2"><hr/>Select content that will be added to the page:
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <div style="margin:3em;">
- <jbp:portlet
- portletId="#{pageManager.selectedEditorPortletId}"
- portletInvoker="#{pageManager.portletInvoker}"
- actionListener="#{pageManager.assignWindow}"
- supportedModes="select_content"
- supportedWindowStates="normal"
- initialMode="select_content"
- initialWindowState="normal"
- onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value).setParameter('targetRegion', document.getElementById('regionForm:targetRegion').value);"/>
- </div>
- </td>
- </tr>
- </table>
-</div>
+ styleClass="portlet-form-button layout-button"/>
+ </td>
+ </tr>
+ </tbody>
+ </c:forEach>
+ <c:if test="#{!(empty pageManager.assignedWindows['unknown'])}">
+ <tbody>
+ <tr>
+ <td colspan="2" class="portlet-form-field-label"
+ style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned
+ windows
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div style="margin-top: 1em">
+ <h:commandButton value="Delete"
+ id="l_unknown" actionListener="#{pageManager.assignWindows}"
+ styleClass="portlet-form-button"/>
+ </div>
+ </td>
+ <td>
+ <h:selectManyListbox
+ value="#{pageManager.assignedWindows['unknown']}"
+ size="7" styleClass="windowList portlet-form-field">
+ <f:selectItems
+ value="#{pageManager.windowItemsMap['unknown']}"/>
+ </h:selectManyListbox>
+ </td>
+ </tr>
+ </tbody>
+ </c:if>
+ </table>
+ </h:form>
+ </div>
+
+</td>
+</tr>
+</table>
+
</div>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -0,0 +1,149 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+<p class="portlet-area-header">Portal Error Handling</p>
+
+<div class="portlet-area-body">
+
+<!-- defines error handeling section -->
+<table cellpadding="0" cellspacing="0" width="100%">
+<tr>
+ <th class="portlet-section-title">Configure how the system handles errors on portal level.</th>
+</tr>
+<tr>
+<td valign="top" class="portlet-section-body">
+
+<h:form>
+<table width="100%">
+<thead class="portlet-section-header" style="text-align:left;">
+ <tr>
+ <th>Case</th>
+ <th>Inheritance</th>
+ <th>Action</th>
+ </tr>
+</thead>
+<tbody>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.portalControlAccessDenied.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.portalControlAccessDenied.inherit}"
+ value="#{properties.portalControlAccessDenied.inherited}"/>inherit
+ action from parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.portalControlAccessDenied.value}"
+ disabled="#{properties.portalControlAccessDenied.inherited}"
+ onchange="submit();">
+ <f:selectItems value="#{properties.portalSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.portalControlUnavailable.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.portalControlUnavailable.inherit}"
+ value="#{properties.portalControlUnavailable.inherited}"/>inherit
+ action from parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.portalControlUnavailable.value}"
+ disabled="#{properties.portalControlUnavailable.inherited}"
+ onchange="submit();">
+ <f:selectItems value="#{properties.portalSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.portalControlError.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.portalControlError.inherit}"
+ value="#{properties.portalControlError.inherited}"/>inherit action from
+ parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.portalControlError.value}"
+ disabled="#{properties.portalControlError.inherited}" onchange="submit();">
+ <f:selectItems value="#{properties.portalSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.portalControlInternalError.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.portalControlInternalError.inherit}"
+ value="#{properties.portalControlInternalError.inherited}"/>inherit
+ action from parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.portalControlInternalError.value}"
+ disabled="#{properties.portalControlInternalError.inherited}"
+ onchange="submit();">
+ <f:selectItems value="#{properties.portalSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.portalControlNotFound.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.portalControlNotFound.inherit}"
+ value="#{properties.portalControlNotFound.inherited}"/>inherit action
+ from parent
+ </td>
+ <td>
+ <h:selectOneMenu value="#{properties.portalControlNotFound.value}"
+ disabled="#{properties.portalControlNotFound.inherited}" onchange="submit();">
+ <f:selectItems value="#{properties.portalSelectItems}"/>
+ </h:selectOneMenu>
+ </td>
+</tr>
+<tr class="portlet-section-body">
+ <td>
+ <h:outputText value="#{properties.portalControlResourceURI.displayName}"/>
+ </td>
+ <td>
+ <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}"
+ styleClass="portlet-form-button" onchange="submit();"
+ valueChangeListener="#{properties.portalControlResourceURI.inherit}"
+ value="#{properties.portalControlResourceURI.inherited}"/>inherit
+ action from parent
+ </td>
+ <td>
+ <h:inputText value="#{properties.portalControlResourceURI.value}" size="60"
+ disabled="#{properties.portalControlResourceURI.inherited}"/>
+ </td>
+</tr>
+</tbody>
+</table>
+<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/>
+</h:form>
+</td>
+</tr>
+</table>
+
+</div>
+
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editProperties.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,93 +1,143 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
- <h:form>
- <table width="100%">
- <thead class="portlet-section-header" style="text-align:left;">
- <tr>
- <th>Name</th>
- <th>Description</th>
- <th>Value</th>
- <th>Inherited</th>
- <th>Delete</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{properties.entries}" var="prop" varStatus="status">
- <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
- <td>
- <h:outputText title="#{prop.name}" value="#{prop.displayName}"/>
- </td>
- <td>
- <h:outputText>#{prop.description}</h:outputText>
- </td>
- <td>
- <c:choose>
- <c:when test="#{prop.type=='java.lang.Boolean'}">
- <h:selectBooleanCheckbox styleClass="portlet-form-button" value="#{prop.value}" readonly="#{prop.readOnly}"/>
- </c:when>
- <c:otherwise>
- <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}" readonly="#{prop.readOnly}"/>
- </c:otherwise>
- </c:choose>
- </td>
- <td>#{prop.inherited ? 'Yes' : 'No'}</td>
- <td>
- <h:commandLink action="#{propertyAction.removeProperty}">
- <h:outputText value="Delete"/>
- <f:param name="name" value="#{prop.name}"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </tbody>
- </table>
- <h:commandButton value="Update" styleClass="portlet-form-button"/>
- </h:form>
+<div class="portlet-area-header">Properties</div>
+<div class="portlet-area-body">
- <!-- Separation -->
- <hr/>
+<!-- divide the area body into two panes -->
+<table cellpadding="0" cellspacing="0" width="100%">
+<tr>
+<td>
- <h3>Add a new property</h3>
+ <!-- defines property creation section -->
+ <table cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <th class="portlet-section-title">Add a property.</th>
+ </tr>
+ <tr>
+ <td valign="top" class="portlet-section-body">
- <p>You can either create a predefined property or create one with the name of your choice</p>
+ <h:form>
- <h:form>
- <table>
- <tbody>
- <tr>
- <td class="portlet-form-field-label">
- <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select a predefined property: </h:outputLabel>
- </td>
- <td>
- <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-field" value="#{propertyAction.selectedProperty}">
- <f:selectItems value="#{properties.propertyItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr>
- <td class="portlet-form-field-label">
- <h:outputLabel for="property" styleClass="portlet-form-field-label">Or enter a property name: </h:outputLabel>
- </td>
- <td>
- <h:inputText id="property" styleClass="portlet-form-input-field" value="#{propertyAction.otherPropertyName}" />
- </td>
- </tr>
- </tbody>
+ <!-- defines layout of property form -->
+ <table>
+ <tbody>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select
+ predefined property:</h:outputLabel>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-field"
+ value="#{properties.action.selectedProperty}">
+ <f:selectItems value="#{properties.propertyItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">or</td>
+ </tr>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="property" styleClass="portlet-form-field-label">Enter property
+ name:</h:outputLabel>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:inputText id="property" styleClass="portlet-form-input-field"
+ value="#{properties.action.otherPropertyName}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!-- ends layout of property form -->
+ <h:commandButton value="Add Property" styleClass="portlet-form-button portlet-section-buttonrow"
+ action="#{properties.action.updateProperty}"/></h:form>
+
+ </td>
+ </tr>
+ </table>
+ <!-- ends property creation section -->
+
+</td>
+<td valign="top" width="100%" style="padding-left:5px;"><!-- creates division of 2 pane area -->
+
+
+ <!-- defines property list section -->
+ <c:if test="#{!empty properties.entries}">
+ <table cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <th class="portlet-section-title">Manage currently defined properties.</th>
+ </tr>
+ <tr>
+ <td class="portlet-section-body" valign="top">
+
+ <h:form>
+ <!-- defines layout of property table -->
+ <table width="100%">
+ <thead class="portlet-section-header">
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ <th>Inherited</th>
+ <th>Value</th>
+ <th>Delete</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{properties.entries}" var="prop" varStatus="status">
+ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
+ <td>
+ <h:outputText title="#{prop.name}" value="#{prop.displayName}"/>
+ </td>
+ <td>
+ <h:outputText>#{prop.description}</h:outputText>
+ </td>
+ <td>#{prop.inherited ? 'Yes' : 'No'}</td>
+ <td>
+ <c:choose>
+ <c:when test="#{prop.type == 'java.lang.Boolean'}">
+ <h:selectBooleanCheckbox styleClass="portlet-form-button" value="#{prop.value}"
+ readonly="#{prop.readOnly}"/>
+ </c:when>
+ <c:otherwise>
+ <h:inputText styleClass="portlet-form-input-field" value="#{prop.value}"
+ readonly="#{prop.readOnly}"/>
+ </c:otherwise>
+ </c:choose>
+ </td>
+ <td>
+ <h:commandLink action="#{properties.action.removeProperty}"
+ rendered="#{!prop.inherited}">
+ <h:outputText value="Delete"/>
+ <f:param name="name" value="#{prop.name}"/>
+ </h:commandLink>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ <!-- ends property list -->
+ <h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form>
+
+ </td>
+ </tr>
</table>
+ </c:if>
+ <!-- ends property list section -->
- <h:commandButton value="Add property" styleClass="portlet-form-button" action="#{propertyAction.updateProperty}"/>
- </h:form>
+</td>
+</tr>
+</table>
+<!-- ends area body -->
- <!-- Separation -->
- <hr/>
-
- <h:form>
- <h:commandButton value="Cancel" styleClass="portlet-form-button" action="objects" immediate="true"/>
- </h:form>
-
</div>
+
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editTheme.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editTheme.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -13,7 +13,7 @@
<h:outputLabel for="layout">Layout:</h:outputLabel>
</td>
<td>
- <h:selectOneMenu id="layout" styleClass="portlet-form-field" value="#{themePropertyAction.layoutName}">
+ <h:selectOneMenu id="layout" styleClass="portlet-form-field" value="#{theme.layoutName}">
<f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/>
</h:selectOneMenu>
</td>
@@ -23,7 +23,7 @@
<h:outputLabel for="theme">Theme:</h:outputLabel>
</td>
<td>
- <h:selectOneMenu id="theme" styleClass="portlet-form-field" value="#{themePropertyAction.themeName}">
+ <h:selectOneMenu id="theme" styleClass="portlet-form-field" value="#{theme.themeName}">
<f:selectItems value="#{applicationScope.ThemeService.themeItems}"/>
</h:selectOneMenu>
</td>
@@ -33,17 +33,17 @@
<h:outputLabel for="renderSet">RenderSet:</h:outputLabel>
</td>
<td>
- <h:selectOneMenu id="renderSet" styleClass="portlet-form-field" value="#{themePropertyAction.renderSetName}">
+ <h:selectOneMenu id="renderSet" styleClass="portlet-form-field" value="#{theme.renderSetName}">
<f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
</h:selectOneMenu>
</td>
</tr>
</tbody>
</table>
-
+
<br />
<ui:insert name="form_submit"/>
</h:form>
-</h:panelGroup>
+ </h:panelGroup>
</div>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -14,7 +14,7 @@
<td class="portlet-form-field-label"><label class="portlet-form-field-label">Window Renderer:</label>
</td>
<td>
- <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.windowRendererName}">
+ <h:selectOneMenu styleClass="portlet-form-field" value="#{theme.windowRendererName}">
<f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
</h:selectOneMenu>
</td>
@@ -23,7 +23,7 @@
<td class="portlet-form-field-label"><label class="portlet-form-field-label">Decoration Renderer:</label>
</td>
<td>
- <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.decorationRendererName}">
+ <h:selectOneMenu styleClass="portlet-form-field" value="#{theme.decorationRendererName}">
<f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
</h:selectOneMenu>
</td>
@@ -32,7 +32,7 @@
<td class="portlet-form-field-label"><label class="portlet-form-field-label">Portlet Renderer:</label>
</td>
<td>
- <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.portletRendererName}">
+ <h:selectOneMenu styleClass="portlet-form-field" value="#{theme.portletRendererName}">
<f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/>
</h:selectOneMenu>
</td>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -48,14 +48,14 @@
</tr>
<tr>
<td class="portlet-section-body" align="center">
- <h:form style="padding:0;margin:0">
+ <h:form id="page_selector_form" style="padding:0;margin:0">
Select: <h:selectOneMenu
id="pageNameSelector"
value="#{dashboard.selectedPageName}"
- styleClass="portlet-form-field">
+ styleClass="portlet-form-field"
+ onclick="document.getElementById('page_selector_form').submit()">
<f:selectItems value="#{dashboard.pageItems}"/>
</h:selectOneMenu>
- <h:commandButton value="Go" styleClass="portlet-form-button"/>
</h:form>
<br/>
</td>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboards.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboards.xhtml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboards.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -0,0 +1,43 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <ui:composition template="dashboardsTemplate.xhtml">
+
+ <ui:define name="content">
+
+ <!-- -->
+ <ui:include src="common/editProperties.xhtml">
+ <ui:param name="properties" value="#{dashboardmgr.selectedProperties}"/>
+ </ui:include>
+
+ <!-- -->
+ <br/>
+ <ui:include src="common/editPortalErrorHandling.xhtml">
+ <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/>
+ </ui:include>
+
+ <!-- -->
+ <br/>
+ <ui:include src="common/editPageErrorHandling.xhtml">
+ <ui:param name="properties" value="#{dashboardmgr.controlProperties}"/>
+ </ui:include>
+
+ <!-- Separation -->
+ <br/>
+ <h3>Dashboard theme properties:</h3>
+ <p>The settings defined here will be applied to the dashboards including all the pages and windows unless they have been assigned with different settings</p>
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:param name="theme" value="#{dashboardmgr.theme}"/>
+ <ui:define name="form_submit">
+ <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" styleClass="portlet-form-button"/>
+ </ui:define>
+ </ui:decorate>
+
+ </ui:define>
+
+ </ui:composition>
+
+</div>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboardsTemplate.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboardsTemplate.xhtml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -0,0 +1,31 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ class="admin-ui">
+
+ <!-- Common nav -->
+ <h:form>
+ <ul class="topnav">
+ <li>
+ <h:commandLink value="Portal Objects" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/>
+ </li>
+ <li>
+ <h:commandLink value="Portlet Instances" action="instances"/>
+ </li>
+ <li>
+ <h:commandLink value="Portlet Definitions" action="portlets"/>
+ </li>
+ <li id="currentTab">Dashboards</li>
+ </ul>
+ </h:form>
+
+ <!-- Status message -->
+ <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+
+ <!-- Content -->
+ <ui:insert name="content">Content</ui:insert>
+
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editContext.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editContext.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,5 +1,6 @@
<div
xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
@@ -7,6 +8,13 @@
<ui:define name="content">
+ <h:form>
+ <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Properties"/>
+ <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+ </h:commandLink>
+ </h:form>
+
<!-- Sub page addition -->
<div style="padding:1em 0 0 0">
<h:form id="portal_form">
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPage.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPage.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -9,7 +9,7 @@
<ui:define name="content">
<h:form>
- <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == 2}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
+ <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Page layout"/>
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
</h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}">
@@ -21,7 +21,7 @@
</h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Theme"/>
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
- </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == 1) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
+ </h:commandLink> | <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}">
<h:outputText value="Rename"/>
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
</h:commandLink> | </h:panelGroup><h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}">
@@ -30,8 +30,6 @@
</h:commandLink>
</h:form>
-
-
<!-- Sub page addition -->
<div style="padding:1em 0 0 0">
<table>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageLayout.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageLayout.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageLayout.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,27 +1,17 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ct="http://www.julien.com"
- xmlns:jbp="http://www.jboss.org/portal"
- xmlns:c="http://java.sun.com/jstl/core">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>You are editing the page layout</h3>
-
- <ui:include src="common/editPageLayout.xhtml">
- <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/>
- </ui:include>
-
- </ui:define>
-
-</ui:composition>
-
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ct="http://www.julien.com"
+ xmlns:jbp="http://www.jboss.org/portal"
+ xmlns:c="http://java.sun.com/jstl/core">
+ <ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Layout"/>
+ <ui:define name="content">
+ <ui:include src="common/editPageLayout.xhtml">
+ <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/>
+ </ui:include>
+ </ui:define>
+ </ui:composition>
</div>
-
-
-
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -4,6 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Security"/>
<ui:define name="content">
<h3>Please set the page permissions</h3>
<ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageTheme.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageTheme.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageTheme.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -4,11 +4,13 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Theme"/>
<ui:define name="content">
<h3>Page theme properties:</h3>
<ui:decorate template="common/editTheme.xhtml">
+ <ui:param name="theme" value="#{portalobjectmgr.theme}"/>
<ui:define name="form_submit">
- <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/>
<h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
<f:param name="id" value="#{node.id}"/>
</h:commandButton>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -4,6 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Security"/>
<ui:define name="content">
<h3>Please set the portal permissions</h3>
<ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalTheme.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalTheme.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalTheme.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -3,25 +3,22 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
- <h3>Portal theme properties:</h3>
- <p>The settings defined here will be applied to the whole portal including all the pages and windows unless they have been assigned with different settings</p>
- <br/>
- <ui:decorate template="common/editTheme.xhtml">
- <ui:define name="form_submit">
- <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/>
- <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
- <f:param name="id" value="#{node.id}"/>
- </h:commandButton>
- </ui:define>
- </ui:decorate>
-
- </ui:define>
-
-</ui:composition>
-
+ <ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Theme"/>
+ <ui:define name="content">
+ <h3>Portal theme properties:</h3>
+ <p>The settings defined here will be applied to the whole portal including all the pages and windows unless they have been assigned with different settings</p>
+ <br/>
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:param name="theme" value="#{portalobjectmgr.theme}"/>
+ <ui:define name="form_submit">
+ <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </ui:define>
+ </ui:decorate>
+ </ui:define>
+ </ui:composition>
</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editProperties.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -2,16 +2,39 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:c="http://java.sun.com/jstl/core">
<ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Properties"/>
+
<ui:define name="content">
<ui:include src="common/editProperties.xhtml">
<ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/>
- </ui:include>
-
+ </ui:include>
+
+ <br/>
+ <c:if test="#{portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_CONTEXT or portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_PORTAL}">
+
+ <!-- -->
+ <ui:include src="common/editPortalErrorHandling.xhtml">
+ <ui:param name="properties" value="#{portalobjectmgr.controlProperties}"/>
+ </ui:include>
+
+ </c:if>
+
+ <br/>
+ <c:if test="#{!(portalobjectmgr.selectedProperties.relatedObject.type == PortalObject.TYPE_WINDOW)}">
+
+ <!-- Separation -->
+ <ui:include src="common/editPageErrorHandling.xhtml">
+ <ui:param name="properties" value="#{portalobjectmgr.controlProperties}"/>
+ </ui:include>
+
+ </c:if>
+
</ui:define>
</ui:composition>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowSecurity.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,18 +1,12 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>Please set the permissions for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
-
- <ui:include src="common/editSecurity.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html">
+ <ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Security"/>
+ <ui:define name="content">
+ <h3>Please set the permissions for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
+ <ui:include src="common/editSecurity.xhtml"/>
+ </ui:define>
+ </ui:composition>
</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowTheme.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowTheme.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editWindowTheme.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -4,11 +4,13 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Theme"/>
<ui:define name="content">
<h3>Window theme properties:</h3>
<ui:decorate template="common/editWindowTheme.xhtml">
+ <ui:param name="theme" value="#{portalobjectmgr.theme}"/>
<ui:define name="form_submit">
- <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/>
<h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
<f:param name="id" value="#{node.id}"/>
</h:commandButton>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -48,13 +48,15 @@
</tbody>
</table>
<ul class="pagination">
- <c:forEach begin="0" end="#{instancemgr.instanceCount - 1}" step="#{instancemgr.paginationSize}"
- var="index">
- <li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}">
- <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText
- value="#{index}"/></h:commandLink>
- </li>
- </c:forEach>
+ <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}">
+ <c:forEach begin="0" end="#{instancemgr.instanceCount - 1}" step="#{instancemgr.paginationSize}"
+ var="index">
+ <li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}">
+ <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText
+ value="#{index}"/></h:commandLink>
+ </li>
+ </c:forEach>
+ </c:if>
</ul>
</h:form>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instancesTemplate.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instancesTemplate.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instancesTemplate.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -14,6 +14,9 @@
<li>
<h:commandLink value="Portlet Definitions" action="portlets"/>
</li>
+ <li>
+ <h:commandLink value="Dashboards" action="dashboards"/>
+ </li>
</ul>
</h:form>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectTemplate.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objectTemplate.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -16,6 +16,9 @@
<li>
<h:commandLink value="Portlet Definitions" action="portlets"/>
</li>
+ <li>
+ <h:commandLink value="Dashboards" action="dashboards"/>
+ </li>
</ul>
</h:form>
@@ -29,16 +32,40 @@
<c:choose>
<c:when test="#{node.id == portalobjectmgr.selectedObject.id}">
<li class="selected">
- <c:if test="#{node.name == ''}">root</c:if>
- <c:if test="#{node.name != ''}">#{node.name}</c:if>
+ <c:choose>
+ <c:when test="#{portalObjectScreen != null}">
+ <h:commandLink action="#{portalobjectmgr.selectObject}">
+ <f:param name="id" value="#{node.id}"/>
+ <c:choose>
+ <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PORTAL}">#{node.name} Portal</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PAGE}">#{node.name} Page</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_WINDOW}">#{node.name} Window</c:when>
+ </c:choose>
+ </h:commandLink>
+ <h:outputText value=" #{portalObjectScreen}"/>
+ </c:when>
+ <c:otherwise>
+ <c:choose>
+ <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PORTAL}">#{node.name} Portal</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PAGE}">#{node.name} Page</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_WINDOW}">#{node.name} Window</c:when>
+ </c:choose>
+ </c:otherwise>
+ </c:choose>
</li>
</c:when>
<c:otherwise>
<li>
<h:commandLink action="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{node.id}"/>
- <c:if test="#{node.name == ''}">root</c:if>
- <c:if test="#{node.name != ''}">#{node.name}</c:if>
+ <c:choose>
+ <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PORTAL}">#{node.name} Portal</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_PAGE}">#{node.name} Page</c:when>
+ <c:when test="#{node.type == PortalObject.TYPE_WINDOW}">#{node.name} Window</c:when>
+ </c:choose>
</h:commandLink>
</li>
</c:otherwise>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objects.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objects.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/objects.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -5,16 +5,16 @@
xmlns:c="http://java.sun.com/jstl/core">
<c:choose>
- <c:when test="#{portalobjectmgr.selectedObject.type == 0}">
+ <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">
<ui:include src="editContext.xhtml"/>
</c:when>
- <c:when test="#{portalobjectmgr.selectedObject.type == 1}">
+ <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL}">
<ui:include src="editPage.xhtml"/>
</c:when>
- <c:when test="#{portalobjectmgr.selectedObject.type == 2}">
+ <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}">
<ui:include src="editPage.xhtml"/>
</c:when>
- <c:when test="#{portalobjectmgr.selectedObject.type == 3}">
+ <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_WINDOW}">
<ui:include src="editWindow.xhtml"/>
</c:when>
<c:otherwise>FIXME</c:otherwise>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portlets.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -63,14 +63,16 @@
</tbody>
</table>
<ul class="pagination">
- <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}"
- var="index">
- <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
- <h:commandLink action="#{portletmgr.selectFrom}"><f:param name="from"
- value="#{index}"/><h:outputText
- value="#{index}"/></h:commandLink>
- </li>
- </c:forEach>
+ <c:if test="#{portletmgr.portletCount > portletmgr.paginationSize}">
+ <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}"
+ var="index">
+ <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
+ <h:commandLink action="#{portletmgr.selectFrom}"><f:param name="from"
+ value="#{index}"/><h:outputText
+ value="#{index}"/></h:commandLink>
+ </li>
+ </c:forEach>
+ </c:if>
</ul>
</h:form>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portletsTemplate.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portletsTemplate.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/portletsTemplate.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -14,6 +14,9 @@
<h:commandLink value="Portlet Instances" action="instances"/>
</li>
<li id="currentTab">Portlet Definitions</li>
+ <li>
+ <h:commandLink value="Dashboards" action="dashboards"/>
+ </li>
</ul>
</h:form>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/renameObject.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -5,6 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
<ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Rename"/>
<ui:define name="content">
<h3>Renaming:</h3>
<h:form id="renameForm">
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -17,7 +17,7 @@
</tbody>
<tbody>
<h:form>
- <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != 1}">
+ <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}">
<h:outputText value="Up"/>
<f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/>
</h:commandLink>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,18 +1,19 @@
/* Redefine spacing for tables. */
.admin-ui table {
- border: 0px;
- border-collapse: separate;
+ border: 0;
}
.admin-ui th {
text-align: left;
- border: 0px;
+ border: 0;
border-bottom: 1px solid;
+ padding-bottom: 2px;
+ padding-top: 2px;
+ font-size: 11px;
}
.admin-ui td {
- border: 0px;
padding-bottom: 2px;
padding-top: 2px;
}
@@ -48,7 +49,7 @@
.admin-ui ul.topnav {
margin-left: 0;
padding: 4px 0px 3px;
- border-bottom: 1px solid;
+ border-bottom: 1px solid #dfe8ed;
}
.admin-ui ul.topnav li {
@@ -57,13 +58,13 @@
margin: 0;
padding: 3px 0.5em;
margin-left: 5px;
- border: 1px solid #777;
+ border: 1px solid #dfe8ed;
border-bottom: none;
- background-color: #eef;
+ background-color: #f2f4f5;
}
.admin-ui ul.topnav li:hover {
- background-color: #ccf;
+ background-color: #fff;
}
.admin-ui ul.topnav li#currentTab {
@@ -91,7 +92,10 @@
font-weight: bold;
}
-/* */
+/* Resize combo lists */
+.admin-ui select {
+ padding: 2px 4px;
+}
.admin-ui select.contentType {
width: 8em;
@@ -102,7 +106,8 @@
}
.admin-ui select.windowList {
- width: 11em;
+ width: 95%;
+ overflow: auto;
}
/* Style a table for form layout */
@@ -120,6 +125,68 @@
text-align: left;
}
+/* Area header. */
+
+.admin-ui .portlet-area-header {
+ border: 1px solid #54708c;
+ font-weight: bold;
+ color: #fff;
+ font-size: 11px;
+ background-color: #5986b3;
+ padding: 2px;
+ padding-left: 4px;
+ margin: 0;
+}
+
+.admin-ui .portlet-area-body {
+ border: 1px solid #d5d5d5;
+ border-top: 0;
+ background-color: #fff;
+ padding: 4px;
+ margin: 0;
+}
+
+/* Styles updated and enhanced from the main portal css */
+
+.admin-ui th.portlet-section-title {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border: 1px solid #999;
+ background-color: #ebf2f5;
+ padding-left: 6px;
+}
+
+.admin-ui .portlet-content-center {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-body {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-content-right {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-footer-left {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-table-header {
+ background-color: #eef;
+}
+
+.admin-ui .portlet-section-buttonrow {
+ margin-top: 6px;
+ margin-bottom: 6px;
+ float: right;
+}
+
/* Change dashed line to solid. */
.admin-ui hr {
@@ -154,9 +221,15 @@
font-size: 2em;
text-align: center;
margin-top: 5px;
- margin-bottom: 0px;
+ margin-bottom: 0;
}
.admin-ui .stepText {
text-align: center;
}
+
+.admin-ui .layout-button {
+ width: 50px;
+ margin: 2px;
+ padding: 2px;
+}
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-aop.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-aop.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-aop.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -81,7 +81,7 @@
<metadata
tag="transaction"
class="org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer">
- <method name="createContext">
+ <method name="createRootIfNotExist">
<trans-attribute>Required</trans-attribute>
</method>
</metadata>
@@ -127,4 +127,4 @@
<application-exceptions>org.jboss.portal.portlet.InvalidPortletIdException</application-exceptions>
</method>
</metadata>
-</aop>
+</aop>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-cms-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/lib/portal-core-cms-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_es.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_es.properties 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_es.properties 2007-07-02 22:13:45 UTC (rev 13019)
@@ -22,10 +22,10 @@
################################################################################
# CMS ADMIN PORTLET
-TITLE_HEAD=Administración de CMS
+TITLE_HEAD=Administraci�n de CMS
TITLE_BROWSE=Explorador de directorios
TITLE_DELETECONFIRM=Confirmar el borrado
-TITLE_CREATECOLLCONFIRM=Confirmar la creación de directorio
+TITLE_CREATECOLLCONFIRM=Confirmar la creaci�n de directorio
TITLE_COPYCONFIRM=Confirmar la copia del recurso
TITLE_MOVECONFIRM=Confirmar el movimiento del recurso
TITLE_VIEWFILE=Viendo las propiedades del fichero
@@ -33,4 +33,4 @@
TITLE_CREATE=Crear fichero
TITLE_UPLOAD=Subir fichero
-CMS_SEARCH=Búsqueda
+CMS_SEARCH=B�squeda
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_it.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_it.properties 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_it.properties 2007-07-02 22:13:45 UTC (rev 13019)
@@ -77,6 +77,7 @@
CMS_EDITING=Editaggio del File
CMS_LIVE=Rendi \"Dal Vivo\"
CMS_VERSION=Versione
+CMS_WYSIWYG=Editor WYSIWYG
CMS_LIVEVERSION=Versione dal vivo
CMS_SIZE=Grandezza
@@ -90,4 +91,4 @@
CMS_DENY=Nega
CMS_APPROVAL=Oggetti in sospeso
CMS_PATH=Localita\'
-
+
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_pt_BR.properties 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_pt_BR.properties 2007-07-02 22:13:45 UTC (rev 13019)
@@ -23,10 +23,10 @@
## CMS ADMIN PORTLET
TITLE_HEAD=CMS Admin
-TITLE_BROWSE=Navegador de Diretórios
+TITLE_BROWSE=Navegador de Diret�rios
TITLE_FILEBROWSE=Navegador de Arquivos
-TITLE_DELETECONFIRM=Confirmar remoção
-TITLE_CREATECOLLCONFIRM=Confirmar criação de diretório
+TITLE_DELETECONFIRM=Confirmar remo��o
+TITLE_CREATECOLLCONFIRM=Confirmar cria��o de diret�rio
TITLE_COPYCONFIRM=Confirm Resource Copy
TITLE_MOVECONFIRM=Confirm Resource Move
TITLE_VIEWFILE=Visualizando Propriedades de Arquivo
@@ -35,13 +35,13 @@
TITLE_UPLOAD=Enviar Arquivo
CMS_SEARCH=Pesquisar
-CMS_MENU=Menu de Ações
-CMS_ACTION=Ação
+CMS_MENU=Menu de A��es
+CMS_ACTION=A��o
CMS_NAME=Nome
CMS_TYPE=Tipo
CMS_CREATED=Criado
CMS_MODIFIED=Modificado
-CMS_DESCRIPTION=Descrição
+CMS_DESCRIPTION=Descri��o
CMS_VIEW=Visualizar
CMS_COPY=Copiar
CMS_MOVE=Mover
@@ -54,27 +54,27 @@
CMS_UPLOAD=Enviar
CMS_MODIFY=Modificar
CMS_CREATEFOLDER=Criar Pasta
-CMS_CREATEFILE=Criar Diretório
+CMS_CREATEFILE=Criar Diret�rio
CMS_UPLOADARCHIVE=Enviar Arquivo
-CMS_BACKTOBROWSER=Voltar ao Navegador de Diretórios
+CMS_BACKTOBROWSER=Voltar ao Navegador de Diret�rios
-CMS_CREATEFILEINDIR=Criando Arquivo em Diretório
+CMS_CREATEFILEINDIR=Criando Arquivo em Diret�rio
CMS_FILENAME=Nome do Arquivo
-CMS_TITLE=Título
-CMS_LANGUAGE=Língua
+CMS_TITLE=T�tulo
+CMS_LANGUAGE=L�ngua
-CMS_DELETEPATH=Confirmar remoção de
-CMS_DELETEWARN1=ATENÇÃO\! Você não poderar desfazer estas alterações\!
-CMS_DELETEWARN2=Você tem certeza que deseja remover\?
+CMS_DELETEPATH=Confirmar remo��o de
+CMS_DELETEWARN1=ATEN��O\! Voc� n�o poderar desfazer estas altera��es\!
+CMS_DELETEWARN2=Voc� tem certeza que deseja remover\?
CMS_DESTINATION=Destino
CMS_SOURCE=Fonte
CMS_EDITING=Editando Arquivo
CMS_LIVE=Tornar \"Ativo\"
-CMS_VERSION=Versão
+CMS_VERSION=Vers�o
-CMS_LIVEVERSION=Versão \"Ativa\"
+CMS_LIVEVERSION=Vers�o \"Ativa\"
CMS_SIZE=Tamanho
CMS_CONTENT_DIR=Content Directory
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/editor/main.jsp 2007-07-02 22:13:45 UTC (rev 13019)
@@ -90,7 +90,8 @@
{
File file = (File)files.get(j);
- PortletURL metaURL = renderResponse.createRenderURL();
+ PortletURL metaURL = renderResponse.createActionURL();
+ metaURL.setParameter("content.action.select", "select");
metaURL.setParameter("content.uri", file.getBasePath());
metaURL.setParameter("path", sCurrPath);
@@ -103,6 +104,7 @@
out.println("<tr onmouseover=\"this.className='portlet-section-alternate';\" onmouseout=\"this.className='portlet-section-body';\">");
}
%>
+<tr>
<td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif"
alt="${n:i18n("CMS_FILE")}"
border="0"> <a href="<%= metaURL %>"><%=
@@ -134,12 +136,6 @@
%>
</p>
<%
- PortletURL submitURL = renderResponse.createActionURL();
- submitURL.setParameter("content.uri", uri);
- submitURL.setParameter("content.action.select", "select");
-%>
-<a href="<%= submitURL.toString() %>">Confirm</a>
-<%
}
}
-%>
+%>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/portlet.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -36,6 +36,7 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT_CONTENT</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
<supported-locale>fr</supported-locale>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/images/cms/admin/style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/images/cms/admin/style.css 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/images/cms/admin/style.css 2007-07-02 22:13:45 UTC (rev 13019)
@@ -22,6 +22,7 @@
float: left;
width: 150px;
position: relative;
+ list-style: none;
}
/* style the links for the top level */
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-workflow.sar/portal-workflow-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_es.properties 2007-07-02 22:13:45 UTC (rev 13019)
@@ -21,35 +21,35 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-_ASREGISTERED=¿No tiene una cuenta todavía? Puede crear <a href\="">una</a>.
+_ASREGISTERED=�No tiene una cuenta todav�a? Puede crear <a href\="">una</a>.
_BLOCKNICKNAME=Usuario
_BLOCKPASSWORD=Clave
-MessageOrder=Órden de Mensajes
+MessageOrder=�rden de Mensajes
Ascending=Ascendente
Descending=Descendente
-AIM=AIM Dirección
-ICQ=ICQ Número
-YIM=YIM Número
+AIM=AIM Direcci�n
+ICQ=ICQ N�mero
+YIM=YIM N�mero
MSNM=MSN Messenger
-YourAIM=Su dirección AIM
-YourICQ=Su número ICQ
-YourYIM=Su número YIM
+YourAIM=Su direcci�n AIM
+YourICQ=Su n�mero ICQ
+YourYIM=Su n�mero YIM
YourMSNM=Su Messenger MSN
MyEmail=Mi e-mail
-MyHomePage=Mi página de inicio
+MyHomePage=Mi p�gina de inicio
Question=Pregunta secreta
Answer=Respuesta secreta
Location=Residencia
Occupation=Puesto
Interests=Intereses
-ExtraInfo=Información extra
+ExtraInfo=Informaci�n extra
YourLocation=Su residencia
YourOccupation=Su puesto
YourInterests=Sus intereses
@@ -59,63 +59,63 @@
Register=Registro.
UserExist=Ese usuario ya existe
-ToChangeInfo=para cambiar tu información
-EmailVerify=¡Enlace de activación enviado! Comprueba tu correo y pincha en en enlace de activación para activar tu cuenta.
-AccountActivated=¡Cuenta activada!
+ToChangeInfo=para cambiar tu informaci�n
+EmailVerify=�Enlace de activaci�n enviado! Comprueba tu correo y pincha en en enlace de activaci�n para activar tu cuenta.
+AccountActivated=�Cuenta activada!
UnableActivate=Imposible validar el nuevo usuario.
-LoggingYou=Autenticando, \¡espere\!
-YouAreLoggedOut=\¡Ahora ya estás autenticado\!
-PassDifferent=Las claves son diferentes. Tienen que ser idénticas.
+LoggingYou=Autenticando, \�espere\!
+YouAreLoggedOut=\�Ahora ya est�s autenticado\!
+PassDifferent=Las claves son diferentes. Tienen que ser id�nticas.
YourPassMustBe=Lo sentimos, su clave debe ser por lo menos de
CharLong=caracteres
-UserNotExist=\¡El usuario no existe\!
-UserRegLogin=Registro de usuario/autenticación
-SelectOption=por favor, elija una opción del menú siguiente\:
+UserNotExist=\�El usuario no existe\!
+UserRegLogin=Registro de usuario/autenticaci�n
+SelectOption=por favor, elija una opci�n del men� siguiente\:
RetrievePass=Recuperar la clave perdida.
RegNewUser=Registro de un nuevo usuario
PasswordAgain=Confirme su clave
Email=E-mail
Options=Opciones
-AllowEmailView=Permitir a otros usuarios ver mi dirección de e-mail
-AsRegUser=Como usuario registrado, usted podrá\:
+AllowEmailView=Permitir a otros usuarios ver mi direcci�n de e-mail
+AsRegUser=Como usuario registrado, usted podr�\:
AsReg6=Elegir diferentes estilos
AsReg5=Personalizar los comentarios
-AsReg4=Elegir cuántos objetos nuevos mostrar en la página de inicio
-AsReg3=Tener un buzón personal en la página de inicio
+AsReg4=Elegir cu�ntos objetos nuevos mostrar en la p�gina de inicio
+AsReg3=Tener un buz�n personal en la p�gina de inicio
AsReg2=Enviar noticias con su usuario
AsReg1=Responder con su usuario.
-RegisterNow=\¡Regístrese ahora\! \¡Es gratis\!
-WeDontGive=No venderemos o daremos a otros su información personal.
+RegisterNow=\�Reg�strese ahora\! \�Es gratis\!
+WeDontGive=No venderemos o daremos a otros su informaci�n personal.
WelcomeTo=Bienvenido a
Registration=la zona de registro.
Over13_1=Tengo
-Over13_2=o más años o tengo consentimiento paterno
+Over13_2=o m�s a�os o tengo consentimiento paterno
MustBe_1=Debe tener
-MustBe_2=o más años, o tener permiso paterno para registrarse.
+MustBe_2=o m�s a�os, o tener permiso paterno para registrarse.
Consent_1=(Pinchando en el enlace superior usted certifica que tiene<br>
-Consent_2=o más años, o que tiene permiso paterno para registrarse.)
+Consent_2=o m�s a�os, o que tiene permiso paterno para registrarse.)
Under13_1=Tengo menos de
-Under13_2=años y no tengo consentimiento paterno.
+Under13_2=a�os y no tengo consentimiento paterno.
Sorry=Lo sentimos.
Click=Por favor, pinche
-Here=aquí
-Return=para volver a la página principal.
+Here=aqu�
+Return=para volver a la p�gina principal.
UserName=Usuario
-GoBack=Atrás
+GoBack=Atr�s
Finish=Finalizar
-PersonalInfo=Información personal
+PersonalInfo=Informaci�n personal
RealName=Nombre real
Optional=(opcional)
CanKnowAbout=(255 caracteres max. Introduzca lo que quiera que otros conozcan de usted)
Language=Lenguaje
-255CharMax=(255 caracteres max. Introduzca su firma en código HTML)
+255CharMax=(255 caracteres max. Introduzca su firma en c�digo HTML)
YourAvatar=Su avatar
-YourHomePage=Su página de inicio
+YourHomePage=Su p�gina de inicio
TimeZoneOffset=Zona horaria
-EmailNotPublic=(Este correo no será público pero es necesario. Se usará para enviarle su clave en caso de pérdida)
-EmailPublic=(Este correo será público. Escriba lo que quiera. Prueba de Spam)
+EmailNotPublic=(Este correo no ser� p�blico pero es necesario. Se usar� para enviarle su clave en caso de p�rdida)
+EmailPublic=(Este correo ser� p�blico. Escriba lo que quiera. Prueba de Spam)
RealEmail=E-mail real
FakeEmail=E-mail de pega
NewUser=Nuevo usuario
@@ -125,35 +125,35 @@
Search=Buscar
All=Todos
UsersFoundFor=usuarios encontrados para
-Pages=páginas
+Pages=p�ginas
UsersShown=usuarios mostrados
Delete=Borrar
Edit=Editar
Ok=Aceptar
Cancel=Cancelar
-AreYouSureToDeleteUser=¿De verdad quiere borrar el usuario?
+AreYouSureToDeleteUser=�De verdad quiere borrar el usuario?
UserDeleted=Usuario borrado
ReturnToMemberList=Volver a la lista de miembros
Avatar=Avatar
AdminFunctions=Tareas administrativas
URL=URL
-UpdateUser=Actualización de usuario
+UpdateUser=Actualizaci�n de usuario
UserID=ID de usuario
-ForChanges=(Sólo para cambios)
+ForChanges=(S�lo para cambios)
MemberList=Lista de miembros
SearchTip=Sugerencia: escoja una letra, muestre todos o busque un usuario si conoce su nombre
-ThemeText1=Esta opción cambia la apariencia de todo el sitio.
-ThemeText2=Estos cambios sólo le afectarán a usted.
+ThemeText1=Esta opci�n cambia la apariencia de todo el sitio.
+ThemeText2=Estos cambios s�lo le afectar�n a usted.
ThemeText3=Cada usuario puede ver el sitio con una apariencia diferente.
SelectTheme=Elegir un estilo
-ThemeSelection=Elección de estilo
+ThemeSelection=Elecci�n de estilo
CannotLogin=No se puede autenticar
-LoginInvalidName=El nombre de usuario no es válido
+LoginInvalidName=El nombre de usuario no es v�lido
LoginNoSuchUser=el nombre de usuario no existe
-LoginBadPassword=su contraseña no coincide
+LoginBadPassword=su contrase�a no coincide
LoginUnexpectedError=error inesperado
LoginUserDisabled=su cuenta ha sido bloqueada. Por favor, contacte con un administrador.
@@ -161,7 +161,7 @@
Disable=Desactivar
StatusChanged=El estado del usuario ha sido cambiado
-NotAuth=Usted no está autorizado para realizar esta operación
+NotAuth=Usted no est� autorizado para realizar esta operaci�n
REMEMBERME=Recordarme
LOGIN=Login
@@ -172,7 +172,7 @@
OPTIONAL=Opcional
REQUIRED=Obligatorio
-255MAX=(Firma de 255 caractéres max)
+255MAX=(Firma de 255 caract�res max)
NAMENOTAVAILABLE=N/A
@@ -183,28 +183,28 @@
REGISTER_NEWUSER=Registro de nuevo usuario
REGISTER_PASSWORDAGAIN=Confirme su clave
REGISTER_REALEMAIL=E-mail real
-REGISTER_EMAILNOTPUBLIC=(Este correo no será público pero es necesario. Se usará para enviarle su clave en caso de pérdida)
+REGISTER_EMAILNOTPUBLIC=(Este correo no ser� p�blico pero es necesario. Se usar� para enviarle su clave en caso de p�rdida)
REGISTER_FAKEEMAIL=E-mail de pega
-REGISTER_EMAILPUBLIC=(Este correo será público. Escriba lo que quiera. Prueba de Spam)
-REGISTER_FAKEEMAIL_EXPLAIN= Si este campo no está vacío, el e-mail real sólo se usará para enviarle notificaciones
+REGISTER_EMAILPUBLIC=(Este correo ser� p�blico. Escriba lo que quiera. Prueba de Spam)
+REGISTER_FAKEEMAIL_EXPLAIN= Si este campo no est� vac�o, el e-mail real s�lo se usar� para enviarle notificaciones
REGISTER_QUESTION=Pregunta secreta
REGISTER_ANSWER=Respuesta secreta
-REGISTER_ASREGUSER=Como usuario registrado, usted podrá:
+REGISTER_ASREGUSER=Como usuario registrado, usted podr�:
REGISTER_ASREG6=Elegir diferentes estilos
REGISTER_ASREG5=Personalizar los comentarios
-REGISTER_ASREG4=Elegir cuántos objetos nuevos mostrar en la página de inicio
-REGISTER_ASREG3=Tener un buzón personal en la página de inicio
+REGISTER_ASREG4=Elegir cu�ntos objetos nuevos mostrar en la p�gina de inicio
+REGISTER_ASREG3=Tener un buz�n personal en la p�gina de inicio
REGISTER_ASREG2=Enviar noticias con su usuario
REGISTER_ASREG1=Responder con su usuario.
-REGISTER_REGISTERNOW=¡Regístrese ahora! ¡Es gratis!
-REGISTER_WEDONTGIVE=No venderemos o daremos a otros su información personal.
+REGISTER_REGISTERNOW=�Reg�strese ahora! �Es gratis!
+REGISTER_WEDONTGIVE=No venderemos o daremos a otros su informaci�n personal.
REGISTER_ALREADYHAVEACCOUNT=Usted ya tiene una cuenta:
REGISTER_SIGNIN=Entrar
REGISTER_GIVENNAME=Nombre
REGISTER_FAMILYNAME=Apellido
-REGISTER_PERSONALINFO=Información personal
-REGISTER_VIEWREALEMAIL=Permitir a otros usuarios ver mi dirección de e-mail real
-REGISTER_HOMEPAGE=Dirección de su pagina personal
+REGISTER_PERSONALINFO=Informaci�n personal
+REGISTER_VIEWREALEMAIL=Permitir a otros usuarios ver mi direcci�n de e-mail real
+REGISTER_HOMEPAGE=Direcci�n de su pagina personal
REGISTER_TIMEZONEOFFSET=Zona horaria
REGISTER_THEME=Estilo
REGISTER_DEFAULT_THEME=Site Default
@@ -218,26 +218,26 @@
REGISTER_OCCUPATION=Puesto
REGISTER_INTERESTS=Intereses
REGISTER_SIGNATURE=Firma
-REGISTER_EXTRAINFO=Información adicional
+REGISTER_EXTRAINFO=Informaci�n adicional
REGISTER_CANKNOWABOUT=(255 caracteres max. Introduzca lo que quiera que otros conozcan de usted)
REGISTER_SAVECHANGES=Guardar cambios
-REGISTER_CONFIRMATIONEMAIL=email de confirmación
+REGISTER_CONFIRMATIONEMAIL=email de confirmaci�n
-REGISTER_SHOWMENU=Volver al menú de usuario
+REGISTER_SHOWMENU=Volver al men� de usuario
-REGISTER_ERROR_INVALIDUSERNAME=El usuario no es válido
+REGISTER_ERROR_INVALIDUSERNAME=El usuario no es v�lido
REGISTER_ERROR_EXISTINGUSERNAME=Este usuario ya existe
-REGISTER_ERROR_INVALIDPASSWORD1=La clave no es válida
-REGISTER_ERROR_INVALIDPASSWORD2=La clave no es válida
+REGISTER_ERROR_INVALIDPASSWORD1=La clave no es v�lida
+REGISTER_ERROR_INVALIDPASSWORD2=La clave no es v�lida
REGISTER_ERROR_PASSWORDMISMATCH=Las Claves no coincide
-REGISTER_ERROR_INVALIDREALEMAIL=La dirección de E-mail no es válida
+REGISTER_ERROR_INVALIDREALEMAIL=La direcci�n de E-mail no es v�lida
MENU_LOGOUT=Desconectarse
MENU_EDITPROFILE=Editar su perfil
MENU_LISTUSERS=Listar todos los usuarios
LIST_FILTERS=Aplicar filtros a la lista
-LIST_USERSPERPAGE=Número de usuarios por página
+LIST_USERSPERPAGE=N�mero de usuarios por p�gina
LIST_USERNAMECONTAINS=Usuario contiene
LIST_FULLNAME=Nombre completo
LIST_USERNAME=Nombre de usuario
@@ -249,8 +249,8 @@
LIST_ACTIONDELETEUSER=Borrar el usario
FILTER=Filtro
-NEXTPAGE=Página siguiente
-PREVIOUSPAGE=Página anterior
+NEXTPAGE=P�gina siguiente
+PREVIOUSPAGE=P�gina anterior
ASSIGNROLES=Asignar roles
ROLESAVAILABLE=Roles disponibles
@@ -273,7 +273,7 @@
ROLE_DELETE=Borrar el rol elegido
ROLE_DELETED=El rol ha sido borrado
ROLE_EDIT_MEMBERS=Editar miembros del rol
-ROLE_MAINLIST=Volver a edición de roles
+ROLE_MAINLIST=Volver a edici�n de roles
ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Ya existe un rol con ese nombre para mostrar
ROLE_ERROR_NAMEALREADYEXISTS=Ya existe un rol con ese nombre
@@ -286,11 +286,11 @@
MENU_EDITROLE=Editar un rol existente
MENU_EDITROLEMEMBERS=Editar los miembros de un rol
-PERMISSION_PICKPORTLET=Permisos de administración de portlets
-PERMISSION_PERMISSIONS=Permisos para modificación
+PERMISSION_PICKPORTLET=Permisos de administraci�n de portlets
+PERMISSION_PERMISSIONS=Permisos para modificaci�n
PERMISSION_TOP=Elegir un componente para modificar
PERMISSION_FINERGRAIN=Elegir un sub-componente para definir sus permisos
-PERMISSION_MODIFYROLES=Añadir/Borrar roles
+PERMISSION_MODIFYROLES=A�adir/Borrar roles
PERMISSION_MODIFYINGROLES=Modificar roles para
PERMISSION_DOMAIN=Dominio
PERMISSION_DOMAIN_MOD=Modificar el dominio
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_it.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_it.properties 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_it.properties 2007-07-02 22:13:45 UTC (rev 13019)
@@ -261,6 +261,7 @@
LIST_ACTIONADDROLESTOUSER=Ruoli
LIST_ACTIONEDITROLES=Modifica i ruoli
LIST_ACTIONDELETEUSER=Cancella l'utente
+LIST_CONFIRMDELETEUSER=Stai per cancellare un utente
LIST_SEARCHRESULTS=Cerca i risultati per
LIST_MATCHING=Utenti trovati
FILTER=Filtro
@@ -287,6 +288,7 @@
ROLE_UPDATE=Aggiorna il ruolo utente
ROLE_EDIT=Modifica il ruolo utente
ROLE_DELETE=Cancella il ruolo selezionato
+ROLE_CONFIRM_DELETE=Stai per cancellare un ruolo
ROLE_DELETED=Il ruolo e'stato cancellato
ROLE_EDIT_MEMBERS=Modifica il ruolo dei membri
ROLE_MAINLIST=Torna alla modifica del ruolo
@@ -315,4 +317,4 @@
PERMISSION_DOMAIN_MOD=Modifica Dominio
PERMISSION_DEFINEDROLES=Ruoli definiti
PERMISSION_IMPLIEDROLES=Ruoli impliciti
-
+
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_pt_BR.properties 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_pt_BR.properties 2007-07-02 22:13:45 UTC (rev 13019)
@@ -21,8 +21,8 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-_ASREGISTERED=Ainda não possuí uma conta? Você pode <a href\="">criar uma</a>.
-_BLOCKNICKNAME=Usuário
+_ASREGISTERED=Ainda n�o possu� uma conta? Voc� pode <a href\="">criar uma</a>.
+_BLOCKNICKNAME=Usu�rio
_BLOCKPASSWORD=Senha
MessageOrder=Ordem
@@ -45,214 +45,214 @@
Question=Pergunta secreta
Answer=Resposta secreta
Location=Localidade
-Occupation=Profissão
+Occupation=Profiss�o
Interests=Interesses
-ExtraInfo=Informação Extra
+ExtraInfo=Informa��o Extra
YourLocation=Sua localidade
-YourOccupation=Sua profissão
+YourOccupation=Sua profiss�o
YourInterests=Seus interesses
Signature=Assinatura
LoginSite=Entrar.
Register=Registrar.
-UserExist=Usuário já existe
+UserExist=Usu�rio j� existe
ToChangeInfo=para mudar seus dados
-EmailVerify=Endereço de ativação enviado! Verifique seu email e clique no link de ativação para ativar sua conta.
+EmailVerify=Endere�o de ativa��o enviado! Verifique seu email e clique no link de ativa��o para ativar sua conta.
AccountActivated=Conta ativada com sucesso!
-UnableActivate=Não foi possivel válidar usuário.
+UnableActivate=N�o foi possivel v�lidar usu�rio.
LoggingYou=Entrando, aguarde\!
-YouAreLoggedOut=Você não está deslogado\!
-PassDifferent=As senhas são diferentes. Devem ser idênticas.
+YouAreLoggedOut=Voc� n�o est� deslogado\!
+PassDifferent=As senhas s�o diferentes. Devem ser id�nticas.
YourPassMustBe=Desculpe, sua senha deve ter pelo menos
-CharLong=dígitos
-UserNotExist=Usuário não encontrado\!
+CharLong=d�gitos
+UserNotExist=Usu�rio n�o encontrado\!
UserRegLogin=User registration/login
-SelectOption=Selecione uma opção do menu abaixo\:
+SelectOption=Selecione uma op��o do menu abaixo\:
RetrievePass=Recuperar senha.
RegNewUser=New user registration
PasswordAgain=Confirme sua senha
Email=E-mail
-Options=Opções
-AllowEmailView=Permitir outros usuários visualizarem meu endereço e-mail
-AsRegUser=Como usuário registrado você pode\:
+Options=Op��es
+AllowEmailView=Permitir outros usu�rios visualizarem meu endere�o e-mail
+AsRegUser=Como usu�rio registrado voc� pode\:
AsReg6=Selecionar temas diferentes
-AsReg5=Personalizar os comentários
-AsReg4=Seleciona quantos items devem ser mostrados na página principal
+AsReg5=Personalizar os coment�rios
+AsReg4=Seleciona quantos items devem ser mostrados na p�gina principal
AsReg3=
-AsReg2=Enviar notícias com seu nome de usuário
-AsReg1=Postar comentários com seu nome de usuário
-RegisterNow=Registre agora\! É de graça\!
-WeDontGive=Nós não vendemos/distribuímos suas informações pessoais.
-WelcomeTo=Bem-vido à
-Registration=área de registro.
+AsReg2=Enviar not�cias com seu nome de usu�rio
+AsReg1=Postar coment�rios com seu nome de usu�rio
+RegisterNow=Registre agora\! � de gra�a\!
+WeDontGive=N�s n�o vendemos/distribu�mos suas informa��es pessoais.
+WelcomeTo=Bem-vido �
+Registration=�rea de registro.
Over13_1=Eu sou
-Over13_2=de maior ou tenho consentimento de responsáveis
-MustBe_1=Você deve ser
-MustBe_2=de maior, ou permissão de responsáveis para me registrar aqui.
-Consent_1=(Ao clicar no link acima você garante que você é<br>
-Consent_2=de maior, ou possuí permissão de responsáveis para se registrar.)
+Over13_2=de maior ou tenho consentimento de respons�veis
+MustBe_1=Voc� deve ser
+MustBe_2=de maior, ou permiss�o de respons�veis para me registrar aqui.
+Consent_1=(Ao clicar no link acima voc� garante que voc� �<br>
+Consent_2=de maior, ou possu� permiss�o de respons�veis para se registrar.)
Under13_1=Eu sou de menor
-Under13_2=e não tenho permissão de responsáveis.
+Under13_2=e n�o tenho permiss�o de respons�veis.
Sorry=Desculpe.
Click=Por favor, clique
Here=aqui
-Return=para retornar à página principal.
-UserName=Usuário
+Return=para retornar � p�gina principal.
+UserName=Usu�rio
GoBack=Voltar
Finish=Terminar
-PersonalInfo=Informação Pessoal
+PersonalInfo=Informa��o Pessoal
RealName=Nome Real
Optional=(opcional)
-CanKnowAbout=(255 letras no máx. Digite o que você gostaria que os outros soubessem sobre você)
-Language=Língua
-255CharMax=(255 letras no máx. Digite sua assinatura com códigos HMTL)
+CanKnowAbout=(255 letras no m�x. Digite o que voc� gostaria que os outros soubessem sobre voc�)
+Language=L�ngua
+255CharMax=(255 letras no m�x. Digite sua assinatura com c�digos HMTL)
YourAvatar=Seu avatar
YourHomePage=Seu website
-TimeZoneOffset=Fuso horário
-EmailNotPublic=(Esse email não será mostrado, mas é necessário. Será usado para enviar sua senha em caso de perda.)
-EmailPublic=(Esse email será mostrado. Entre o que desejar.)
+TimeZoneOffset=Fuso hor�rio
+EmailNotPublic=(Esse email n�o ser� mostrado, mas � necess�rio. Ser� usado para enviar sua senha em caso de perda.)
+EmailPublic=(Esse email ser� mostrado. Entre o que desejar.)
RealEmail=E-mail real
FakeEmail=E-mail falso
-Required=(necessário)
-NewUser=Novo usuário
-SaveChanges=Salvar Mudanças
-SaveChange=Salvar Mudança
-TypeNewPassword=(digite uma senha nova duas vezes para alterá-la)
+Required=(necess�rio)
+NewUser=Novo usu�rio
+SaveChanges=Salvar Mudan�as
+SaveChange=Salvar Mudan�a
+TypeNewPassword=(digite uma senha nova duas vezes para alter�-la)
Search=Procurar
All=Todos
-UsersFoundFor=usuários encontrados para
-Pages=páginas
-UsersShown=usuários mostrados
+UsersFoundFor=usu�rios encontrados para
+Pages=p�ginas
+UsersShown=usu�rios mostrados
Delete=Remover
Edit=Editar
Ok=Ok
Cancel=Cancelar
-AreYouSureToDeleteUser=Você tem certeza que deseja remover o usuário?
-UserDeleted=Usuário removido
-ReturnToMemberList=Voltar à lista de usuários
+AreYouSureToDeleteUser=Voc� tem certeza que deseja remover o usu�rio?
+UserDeleted=Usu�rio removido
+ReturnToMemberList=Voltar � lista de usu�rios
Avatar=Avatar
-AdminFunctions=Operações Admin
+AdminFunctions=Opera��es Admin
URL=URL
-UpdateUser=Atualizar usuário
-UserID=ID do Usuário
-ForChanges=(Para alterações apenas)
+UpdateUser=Atualizar usu�rio
+UserID=ID do Usu�rio
+ForChanges=(Para altera��es apenas)
MemberList=Lista de membros
-SearchTip=Dica: escolha uma letra, mostre todos ou procure por um usuário se você sabe seu nome.
+SearchTip=Dica: escolha uma letra, mostre todos ou procure por um usu�rio se voc� sabe seu nome.
-ThemeText1=Essa opção vai alterar o visual de todo o site.
-ThemeText2=Essas mudanças serão válidas apenas para você.
-ThemeText3=Cada usuário pode ver o site com um tema diferente.
+ThemeText1=Essa op��o vai alterar o visual de todo o site.
+ThemeText2=Essas mudan�as ser�o v�lidas apenas para voc�.
+ThemeText3=Cada usu�rio pode ver o site com um tema diferente.
SelectTheme=Selecione um tema
-ThemeSelection=Seleção de Tema
+ThemeSelection=Sele��o de Tema
-CannotLogin=Não foi possível efetuar o login
+CannotLogin=N�o foi poss�vel efetuar o login
-LoginInvalidName=o nome do usuário não é válido
-LoginNoSuchUser=o nome do usuário não existe
-LoginBadPassword=sua senha não está correta
+LoginInvalidName=o nome do usu�rio n�o � v�lido
+LoginNoSuchUser=o nome do usu�rio n�o existe
+LoginBadPassword=sua senha n�o est� correta
LoginUnexpectedError=unexpected error
LoginUserDisabled=sua conta foi bloqueada. Favor entrar em contato com o administrador.
Enable=Habilitar
Disable=Desabilitar
-StatusChanged=O estatus do usuário foi alterado com sucesso
+StatusChanged=O estatus do usu�rio foi alterado com sucesso
-NotAuth=Você não tem permissão para realizar essa operação
+NotAuth=Voc� n�o tem permiss�o para realizar essa opera��o
# Used by JBoss Portal
REMEMBERME=Lembre-me
LOGIN=Login
-USERNAME=Usuário
+USERNAME=Usu�rio
PASSWORD=Senha
-USERLOGIN=Login de Usuário
+USERLOGIN=Login de Usu�rio
OPTIONAL=Opcional
REQUIRED=Requerido
-255MAX=(Máximo de 255 caracteres)
+255MAX=(M�ximo de 255 caracteres)
NAMENOTAVAILABLE=N/A
#Registration
-REGISTER_REGISTER=Não possuí conta ainda? Você pode
+REGISTER_REGISTER=N�o possu� conta ainda? Voc� pode
REGISTER_REGISTER_LINK=criar uma\!
-REGISTER_NEWUSER=Registro de novo usuário
+REGISTER_NEWUSER=Registro de novo usu�rio
REGISTER_PASSWORDAGAIN=Confirme sua senha
REGISTER_REALEMAIL=E-mail real
-REGISTER_EMAILNOTPUBLIC=(Esse email não será mostrado, mas é necessário. Será usado para enviar sua senha em caso de perda.)
+REGISTER_EMAILNOTPUBLIC=(Esse email n�o ser� mostrado, mas � necess�rio. Ser� usado para enviar sua senha em caso de perda.)
REGISTER_FAKEEMAIL=E-mail falso
-REGISTER_EMAILPUBLIC=(Esse email será mostrado. Entre o que desejar.)
-REGISTER_FAKEEMAIL_EXPLAIN=Se este campo não estiver vazio, o email real será utilizado apenas para enviar notificações
+REGISTER_EMAILPUBLIC=(Esse email ser� mostrado. Entre o que desejar.)
+REGISTER_FAKEEMAIL_EXPLAIN=Se este campo n�o estiver vazio, o email real ser� utilizado apenas para enviar notifica��es
REGISTER_QUESTION=Pergunta secreta
REGISTER_ANSWER=Resposta secreta
-REGISTER_ASREGUSER=Como usuário registrado você pode:
+REGISTER_ASREGUSER=Como usu�rio registrado voc� pode:
REGISTER_ASREG6=Selecione temas diferentes
-REGISTER_ASREG5=Personalizar os comentários
-REGISTER_ASREG4=Selecionar quantos items serão mostrados na página inicial
-REGISTER_ASREG3=Possuir uma janela pessoal na página inicial
-REGISTER_ASREG2=Enviar notícias com o seu nome
-REGISTER_ASREG1=Postar comentários com o seu nome
-REGISTER_REGISTERNOW=Registre agora, é grátis!
-REGISTER_WEDONTGIVE=Nós não vendemos/distribuimos suas informações pessoais.
-REGISTER_ALREADYHAVEACCOUNT=Se voce já possuí uma conta:
+REGISTER_ASREG5=Personalizar os coment�rios
+REGISTER_ASREG4=Selecionar quantos items ser�o mostrados na p�gina inicial
+REGISTER_ASREG3=Possuir uma janela pessoal na p�gina inicial
+REGISTER_ASREG2=Enviar not�cias com o seu nome
+REGISTER_ASREG1=Postar coment�rios com o seu nome
+REGISTER_REGISTERNOW=Registre agora, � gr�tis!
+REGISTER_WEDONTGIVE=N�s n�o vendemos/distribuimos suas informa��es pessoais.
+REGISTER_ALREADYHAVEACCOUNT=Se voce j� possu� uma conta:
REGISTER_SIGNIN=Entrar
REGISTER_GIVENNAME=Primeiro nome
-REGISTER_FAMILYNAME=Último nome
-REGISTER_PERSONALINFO=Informações Pessoais
-REGISTER_VIEWREALEMAIL=Permitir que outros usuários vejam meu email verdadeiro
-REGISTER_HOMEPAGE=Endereço de seu site pessoal
-REGISTER_TIMEZONEOFFSET=Fuso horário
+REGISTER_FAMILYNAME=�ltimo nome
+REGISTER_PERSONALINFO=Informa��es Pessoais
+REGISTER_VIEWREALEMAIL=Permitir que outros usu�rios vejam meu email verdadeiro
+REGISTER_HOMEPAGE=Endere�o de seu site pessoal
+REGISTER_TIMEZONEOFFSET=Fuso hor�rio
REGISTER_ICQ=ICQ
REGISTER_AIM=AIM
REGISTER_YIM=Yahoo
REGISTER_MSNM=MSN
REGISTER_SKYPE=Skype
REGISTER_LOCATION=Localidade
-REGISTER_LANGUAGE=Língua preferida
+REGISTER_LANGUAGE=L�ngua preferida
REGISTER_OCCUPATION=Trabalho
REGISTER_INTERESTS=Interesses
REGISTER_SIGNATURE=Assinatura
-REGISTER_EXTRAINFO=Informações extras
-REGISTER_CANKNOWABOUT=(255 letras no máx. Digite o que você gostaria que os outros soubessem sobre você)
-REGISTER_SAVECHANGES=Salvar atualizações
-REGISTER_CONFIRMATIONEMAIL=Email de confirmação
+REGISTER_EXTRAINFO=Informa��es extras
+REGISTER_CANKNOWABOUT=(255 letras no m�x. Digite o que voc� gostaria que os outros soubessem sobre voc�)
+REGISTER_SAVECHANGES=Salvar atualiza��es
+REGISTER_CONFIRMATIONEMAIL=Email de confirma��o
-REGISTER_SHOWMENU=Voltar ao menu de usuário
+REGISTER_SHOWMENU=Voltar ao menu de usu�rio
-REGISTER_ERROR_INVALIDUSERNAME=Usuário inválido
-REGISTER_ERROR_EXISTINGUSERNAME=Esse usuário já está em uso
-REGISTER_ERROR_INVALIDPASSWORD1=Senha inválida
-REGISTER_ERROR_INVALIDPASSWORD2=Senha inválida
-REGISTER_ERROR_PASSWORDMISMATCH=Senhas não conferem
-REGISTER_ERROR_INVALIDREALEMAIL=Email inválido
+REGISTER_ERROR_INVALIDUSERNAME=Usu�rio inv�lido
+REGISTER_ERROR_EXISTINGUSERNAME=Esse usu�rio j� est� em uso
+REGISTER_ERROR_INVALIDPASSWORD1=Senha inv�lida
+REGISTER_ERROR_INVALIDPASSWORD2=Senha inv�lida
+REGISTER_ERROR_PASSWORDMISMATCH=Senhas n�o conferem
+REGISTER_ERROR_INVALIDREALEMAIL=Email inv�lido
MENU_LOGOUT=Sair
MENU_EDITPROFILE=Editar seu perfil
-MENU_LISTUSERS=Listar todos os usuários
+MENU_LISTUSERS=Listar todos os usu�rios
LIST_FILTERS=Aplicar filtro
-LIST_USERSPERPAGE=Usuários por página
-LIST_USERNAMECONTAINS=Nome contém
+LIST_USERSPERPAGE=Usu�rios por p�gina
+LIST_USERNAMECONTAINS=Nome cont�m
LIST_FULLNAME=Nome completo
-LIST_USERNAME=Usuário
+LIST_USERNAME=Usu�rio
LIST_ROLES=Grupos
-LIST_ACTIONS=Ações
+LIST_ACTIONS=A��es
LIST_ACTIONSSHOWPROFILE=Perfil
LIST_ACTIONADDROLESTOUSER=Grupos
LIST_ACTIONEDITROLES=Editar Grupos
FILTER=Filtro
-NEXTPAGE=Próxima página
-PREVIOUSPAGE=Página anterior
+NEXTPAGE=Pr�xima p�gina
+PREVIOUSPAGE=P�gina anterior
ASSIGNROLES=Atribuir grupo
-ROLESAVAILABLE=Grupos disponíveis
-EDITROLESFORUSER=Editar grupos do usuário
+ROLESAVAILABLE=Grupos dispon�veis
+EDITROLESFORUSER=Editar grupos do usu�rio
ROLE_THEREARE=Existem
@@ -261,8 +261,8 @@
ROLE_ROLEDEFINED=grupo definido
ROLE_NAME=Nome do novo grupo
-ROLE_DISPLAYNAME=Nome visível do grupo
-ROLE_NEWDISPLAYNAME=Novo nome visível do grupo
+ROLE_DISPLAYNAME=Nome vis�vel do grupo
+ROLE_NEWDISPLAYNAME=Novo nome vis�vel do grupo
ROLE_SELECTONETOMODIFY= Selecione o grupo para alterar
ROLE_SELECTONETODELETE= Selecione o grupo para remover
ROLE_CREATE=Criar grupo
@@ -273,21 +273,21 @@
ROLE_EDIT_MEMBERS=Editar membros do grupo
ROLE_MAINLIST=Voltar
-ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Já existe um grupo com esse nome (visível)
-ROLE_ERROR_NAMEALREADYEXISTS=Já existe um grupo com esse nome
-ROLE_ERROR_NAMEEMPTY=O nome não pode ser vazio
-ROLE_ERROR_DISPLAYNAMEEMPTY=O nome visível nao pode ser vazio
-ROLE_ERROR_DELETE_FAILED=Não é possível remover o grupo
-ROLE_EDIT_USER=Editando usuários do grupo
+ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=J� existe um grupo com esse nome (vis�vel)
+ROLE_ERROR_NAMEALREADYEXISTS=J� existe um grupo com esse nome
+ROLE_ERROR_NAMEEMPTY=O nome n�o pode ser vazio
+ROLE_ERROR_DISPLAYNAMEEMPTY=O nome vis�vel nao pode ser vazio
+ROLE_ERROR_DELETE_FAILED=N�o � poss�vel remover o grupo
+ROLE_EDIT_USER=Editando usu�rios do grupo
MENU_CREATEROLE=Criar novo grupo
MENU_EDITROLE=Editar grupo
MENU_EDITROLEMEMBERS=Editar membros do grupo
-PERMISSION_PICKPORTLET=Administração de Permissões de Portlet
-PERMISSION_PERMISSIONS=Permissões para modificar
+PERMISSION_PICKPORTLET=Administra��o de Permiss�es de Portlet
+PERMISSION_PERMISSIONS=Permiss�es para modificar
PERMISSION_TOP=Selecione um Componente para Modificar
-PERMISSION_FINERGRAIN=Selecione um sub-componente para definir suar permissões
+PERMISSION_FINERGRAIN=Selecione um sub-componente para definir suar permiss�es
PERMISSION_MODIFYROLES=Adicionar/Remover roles
PERMISSION_MODIFYINGROLES=Modificando roles para
PERMISSION_DOMAIN=Dominio
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/content/portlet_editor.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/content/portlet_editor.jsp 2007-07-02 22:13:45 UTC (rev 13019)
@@ -0,0 +1,105 @@
+<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
+<%@ page import="org.jboss.portal.core.model.instance.Instance" %>
+<%@ page import="org.jboss.portal.portlet.Portlet" %>
+<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %>
+<%@ page import="org.jboss.portal.portlet.info.MetaInfo" %>
+<%@ page import="java.util.Collection" %>
+<%@ page language="java" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+
+<%
+ Collection instances = (Collection)request.getAttribute("INSTANCES");
+ Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
+ boolean newContent = Boolean.TRUE == request.getAttribute("NEW_CONTENT");
+%>
+
+<%
+ if (newContent)
+ {
+%>
+<span class="portlet-font">Portlet instance associated to this window:</span>
+<%
+}
+else
+{
+%>
+<span class="portlet-font">Portlet instance associated to this window:</span>
+<%
+ }
+%>
+
+<div style="height:300px; width:300px; overflow: auto; overflow-x: hidden; border: 1px solid #333;">
+ <table style="width:100%;" cellspacing="0" cellpadding="0">
+ <%
+ for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
+ {
+ Instance instance = (Instance)i.next();
+ String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
+ %>
+ <portlet:actionURL var="url">
+ <portlet:param name="content.action.select" value="true"/>
+ <portlet:param name="content.uri" value="<%= instance.getId() %>"/>
+ </portlet:actionURL>
+ <tr class="<%= rowClass %>">
+ <td><a href="<%= url %>"><%= instance.getId() %>
+ </a></td>
+ </tr>
+ <%
+ }
+ %>
+ </table>
+</div>
+
+<%
+ if (selectedInstance != null)
+ {
+%>
+<div class="portlet-font">
+ <div><span class="portlet-form-field-label">Portlet instance:</span><%= selectedInstance.getId() %>
+ </div>
+ <%
+
+
+
+
+ Portlet portlet = null;
+ try
+ {
+ portlet = selectedInstance.getPortlet();
+ }
+ catch (PortletInvokerException e)
+ {
+ e.printStackTrace();
+ }
+ if (portlet != null)
+ {
+ MetaInfo metaInfo = portlet.getInfo().getMeta();
+
+
+
+
+ %>
+ <div><span
+ class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %>
+ </div>
+ <div><span
+ class="portlet-form-field-label">Portlet description:</span><%= metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
+ </div>
+ <div><span
+ class="portlet-form-field-label">Portlet title:</span><%= metaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %>
+ </div>
+ <div><span
+ class="portlet-form-field-label">Portlet keywords:</span><%= metaInfo.getMetaValue(MetaInfo.KEYWORDS).getDefaultString() %>
+ </div>
+ <%
+
+
+
+
+ }
+ }
+
+
+
+
+ %>
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/page.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/page.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/page.jsp 2007-07-02 22:13:45 UTC (rev 13019)
@@ -0,0 +1,14 @@
+<%@page import="java.lang.Throwable"%>
+<%@page import="org.jboss.portal.common.util.Exceptions"%>
+
+<h2 class="portlet-msg-error"><%= request.getAttribute("org.jboss.portal.control.ERROR_TYPE") %></h2>
+<div class="portlet-font">Cause: <%= request.getAttribute("org.jboss.portal.control.CAUSE") %></div>
+<%
+ if (request.getAttribute("org.jboss.portal.control.MESSAGE") != null)
+ {
+%>
+<div class="portlet-font">Message: <%= request.getAttribute("org.jboss.portal.control.MESSAGE") %></div>
+<%
+ }
+%>
+<div class="portlet-font">StackTrace: <%= Exceptions.toHTML((Throwable)request.getAttribute("org.jboss.portal.control.CAUSE")) %></div>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/portal.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/portal.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/error/portal.jsp 2007-07-02 22:13:45 UTC (rev 13019)
@@ -0,0 +1,14 @@
+<%@page import="java.lang.Throwable"%>
+<%@page import="org.jboss.portal.common.util.Exceptions"%>
+
+<h2 class="portlet-msg-error"><%= request.getAttribute("org.jboss.portal.control.ERROR_TYPE") %></h2>
+<div class="portlet-font">Cause: <%= request.getAttribute("org.jboss.portal.control.CAUSE") %></div>
+<%
+ if (request.getAttribute("org.jboss.portal.control.MESSAGE") != null)
+ {
+%>
+<div class="portlet-font">Message: <%= request.getAttribute("org.jboss.portal.control.MESSAGE") %></div>
+<%
+ }
+%>
+<div class="portlet-font">StackTrace: <%= Exceptions.toHTML((Throwable)request.getAttribute("org.jboss.portal.control.CAUSE")) %></div>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/register.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/register.jsp 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user/register.jsp 2007-07-02 22:13:45 UTC (rev 13019)
@@ -60,26 +60,14 @@
<td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100">
</td>
</tr>
- <%--<tr>
- <td colspan="3" class="bottombuttonbar">
- <input name="register" type="submit" class="portlet-form-button"
- value="${n:i18n("REGISTER_NEWUSER")}"/>
- </td>
- </tr>--%>
+ <tr>
+ <td colspan="3" class="bottombuttonbar">
+ <input name="Save" class="portlet-form-button" id="register" type="submit"
+ value="${n:i18n("REGISTER_NEWUSER")}"/>
+
+ <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit"
+ value="${n:i18n("Cancel")}"/>
+ </td>
+ </tr>
</form>
- <form
- name="<portlet:namespace/>cancel"
- method="post"
- action="<portlet:renderURL windowState="normal"/>"/>
- <tr>
- <td colspan="3" class="bottombuttonbar">
- <input name="Save" class="portlet-form-button" id="register" type="submit"
- onclick="document.forms['<portlet:namespace/>register'].submit();"
- value="${n:i18n("REGISTER_NEWUSER")}"/>
-
- <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit"
- onclick="document.forms['<portlet:namespace/>cancel'].submit();"
- value="${n:i18n("Cancel")}"/>
- </td>
- </tr>
</table>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-layouts.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-layouts.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portal-layouts.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -48,7 +48,6 @@
<regions>
<region name="left"/>
<region name="center"/>
- <region name="navigation"/>
</regions>
</layout>
<layout>
@@ -59,7 +58,6 @@
<region name="left"/>
<region name="center"/>
<region name="right"/>
- <region name="navigation"/>
</regions>
</layout>
</layouts>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -31,7 +31,7 @@
<description>Portlet providing user login/logout and profile management</description>
<portlet-name>UserPortlet</portlet-name>
<display-name>User Portlet</display-name>
- <portlet-class>org.jboss.portal.core.portlet.user.UserPortlet</portlet-class>
+ <portlet-class>org.jboss.portal.core.ui.portlet.user.UserPortlet</portlet-class>
<init-param>
<description>Whether we should use ssl on login and throughout the Portal. 1=yes;0=no</description>
<name>useSSL</name>
@@ -80,7 +80,7 @@
<description>Portlet for managing user roles</description>
<portlet-name>RolePortlet</portlet-name>
<display-name>User Roles Portlet</display-name>
- <portlet-class>org.jboss.portal.core.portlet.role.RolePortlet</portlet-class>
+ <portlet-class>org.jboss.portal.core.ui.portlet.role.RolePortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -101,7 +101,7 @@
<description>Portlet providing navigable list of portal pages</description>
<portlet-name>CatalogPortlet</portlet-name>
<display-name>Portal Pages Catalog Portlet</display-name>
- <portlet-class>org.jboss.portal.core.portlet.catalog.CatalogPortlet</portlet-class>
+ <portlet-class>org.jboss.portal.core.ui.portlet.catalog.CatalogPortlet</portlet-class>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -118,6 +118,7 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT_CONTENT</portlet-mode>
</supports>
<portlet-info>
<title>Portlet Content Portlet</title>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css 2007-07-02 22:13:45 UTC (rev 13019)
@@ -221,7 +221,7 @@
* Primary Navigation (Tabbed Nav) *
*****************************/
-UL#tabsHeader {
+ul#tabsHeader {
margin: 0;
padding-left: 0px;
margin-top: 39px;
@@ -230,7 +230,7 @@
/*position: relative; added for submenu hover */
}
-UL#tabsHeader li {
+ul#tabsHeader li {
display: inline;
list-style: none;
float: left;
@@ -245,7 +245,7 @@
white-space: nowrap;
}
-UL#tabsHeader li:hover {
+ul#tabsHeader li:hover {
background-image: url( images/tab_right_hover2.gif );
background-repeat: no-repeat;
background-position: right top;
@@ -253,21 +253,21 @@
}
/* hover selectors for main header tabs */
-UL#tabsHeader li.hoverOn {
+ul#tabsHeader li.hoverOn {
background-image: url( images/tab_right_hover2.gif );
background-repeat: no-repeat;
background-position: right top;
white-space: nowrap;
}
-UL#tabsHeader li.hoverOff {
+ul#tabsHeader li.hoverOff {
background-image: url( images/tab_right.gif );
background-repeat: no-repeat;
background-position: top right;
white-space: nowrap;
}
-UL#tabsHeader a {
+ul#tabsHeader a {
display: inline;
float: left;
text-decoration: none;
@@ -282,7 +282,7 @@
white-space: nowrap;
}
-UL#tabsHeader a:hover {
+ul#tabsHeader a:hover {
text-decoration: underline;
color: #000000; /*background-image: url(../images/tab_left_hover2.gif);*/
background-repeat: no-repeat;
@@ -290,7 +290,7 @@
white-space: nowrap;
}
-UL#tabsHeader #current {
+ul#tabsHeader #current {
line-height: 22px;
background-color: #fff;
background-image: url( images/tab_right_current.gif );
@@ -299,7 +299,7 @@
padding-top: -3px; /*border-bottom: 2px solid #fff;*/
}
-UL#tabsHeader #current a, #current a:hover {
+ul#tabsHeader #current a, #current a:hover {
font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: bold;
color: #000; /* background-image: url(../images/tab_left_current.gif); */
@@ -308,7 +308,7 @@
}
/* Begin Submenu selectors */
-UL#tabsHeader ul {
+ul#tabsHeader ul {
visibility: hidden;
position: absolute;
height: 0;
@@ -321,7 +321,7 @@
margin-top: 22px;
}
-UL#tabsHeader ul a {
+ul#tabsHeader ul a {
font: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
@@ -329,26 +329,26 @@
}
-UL#tabsHeader ul a:hover {
+ul#tabsHeader ul a:hover {
font: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
}
-UL#tabsHeader #current ul a {
+ul#tabsHeader #current ul a {
font: 11px;
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
}
-UL#tabsHeader li:hover ul,
- UL#tabsHeader a:hover ul {
+ul#tabsHeader li:hover ul,
+ ul#tabsHeader a:hover ul {
visibility: visible;
}
-UL#tabsHeader ul li {
+ul#tabsHeader ul li {
background: #DFE8ED;
color: #5078aa;
padding: 3px;
@@ -362,7 +362,7 @@
margin-right: 0px;
}
-UL#tabsHeader ul li:hover {
+ul#tabsHeader ul li:hover {
background: #C0D3DC;
}
@@ -370,7 +370,7 @@
/* -------- These are new selectors for the admin and add page styles ------- */
-UL#tabsHeader #admin {
+ul#tabsHeader #admin {
display: inline;
background-image: url( images/tab_right_admin.gif );
background-repeat: no-repeat;
@@ -379,7 +379,7 @@
line-height: 22px;
}
-UL#tabsHeader #admin a {
+ul#tabsHeader #admin a {
text-decoration: none;
color: #4386b5; /* background-image: url(../images/tab_left_admin.gif);*/
background-repeat: no-repeat;
@@ -389,11 +389,11 @@
line-height: 22px;
}
-UL#tabsHeader #admin a:hover {
+ul#tabsHeader #admin a:hover {
text-decoration: underline;
}
-UL#tabsHeader #addpage {
+ul#tabsHeader #addpage {
display: inline;
background-color: none;
background-image: none;
@@ -401,7 +401,7 @@
padding-top: 1px;
}
-UL#tabsHeader #addpage a, #addpage a:hover {
+ul#tabsHeader #addpage a, #addpage a:hover {
font: 11px / normal Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: bold;
color: white;
@@ -410,7 +410,7 @@
white-space: nowrap;
}
-UL#tabsHeader #addpage a:hover {
+ul#tabsHeader #addpage a:hover {
text-decoration: underline;
}
@@ -420,12 +420,12 @@
}
/* backslash hack for IE5-Mac \*/
-UL#tabsHeader a {
+ul#tabsHeader a {
float: none;
}
/* End Mac Hack */
-html>body UL#tabsHeader a {
+html>body ul#tabsHeader a {
width: auto;
}
@@ -439,12 +439,12 @@
float: right;
font-size: 10px;
padding: 6px 12px 0px 0px;
- color: #FFFFFF;
+ color: #fff;
z-index: 20;
}
#dashboardnav a {
- color: #FFFFFF;
+ color: #fff;
}
#dashboardnav .addcontent {
@@ -527,10 +527,14 @@
.portlet-content-center {
vertical-align: top;
+ padding: 0;
+ margin: 0;
}
.portlet-body {
- background-color: #ffffff;
+ background-color: #FFFFFF;
+ padding: 0;
+ margin: 0;
}
.portlet-content-right {
@@ -540,6 +544,8 @@
background-position: left;
width: 5px;
min-width: 5px;
+ padding: 0;
+ margin: 0;
/*
width:5px;
background-color:#FFFFFF;
@@ -554,7 +560,8 @@
background-repeat: no-repeat;
background-position: top right;
min-width: 9px;
-
+ padding: 0;
+ margin: 0;
/*
background-color:#FFFFFF;
border-bottom: 1px solid #98b7c6;
@@ -816,19 +823,19 @@
*********/
input {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 11px;
+ font-size: 10px;
margin-right: 6px;
}
.portlet-form-label {
- font-size: 11px;
+ font-size: 10px;
color: #656565;
}
/* Text of the user-input in an input field. not sure if we need this guy? */
.portlet-form-input-field {
color: #000000;
- font-size: 11px;
+ font-size: 10px;
}
/* Form Button Style */
@@ -857,15 +864,16 @@
/* Text for form field labels */
.portlet-form-field-label {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
+ font-size: 10px;
color: #000;
vertical-align: bottom;
+ white-space: nowrap
}
/* Text for a form field */
.portlet-form-field {
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
+ font-size: 10px;
color: #000; /*margin-top: 10px;*/
}
@@ -969,7 +977,7 @@
}
.portlet-section-alternate {
- background-color: #E6E8E5;
+ background-color: #F2F2F2;
}
.portlet-section-selected {
@@ -978,7 +986,7 @@
.portlet-section-subheader {
font-weight: bold;
- font-size: 12px;
+ font-size: 10px;
}
.portlet-section-footer {
@@ -997,7 +1005,8 @@
********************/
/* Table header */
.portlet-table-header {
- padding: 0px 5px 5px 5px;
+ background-color: #eef;
+ padding: 0 5px 5px 5px;
font-weight: bold;
color: #656565;
font-size: 12px;
@@ -1006,7 +1015,7 @@
/* Table footer */
.portlet-table-footer {
- padding: 5px 5px 0px 5px;
+ padding: 5px 5px 0 5px;
font-weight: bold;
color: #656565;
font-size: 12px;
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-management.sar/lib/portal-core-management-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/MANIFEST.MF 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/META-INF/MANIFEST.MF 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.5
-Created-By: 1.5.0_07-87 ("Apple Computer, Inc.")
+Ant-Version: Apache Ant 1.7.0
+Created-By: 1.4.2_13-b06 (Sun Microsystems Inc.)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/conf/consumer/hibernate/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/conf/consumer/hibernate/domain.hbm.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/conf/consumer/hibernate/domain.hbm.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -48,8 +48,9 @@
cascade="all"
lazy="false"/>
<property name="expirationCacheSeconds" column="EXPIRATION_CACHE_SECONDS" type="java.lang.Integer"/>
- <property name="active" not-null="true" type="boolean"/>
- <property name="persistentId" not-null="true" unique="true" type="java.lang.String" access="field"/>
+ <property name="active" not-null="true" column="ACTIVE" type="boolean"/>
+ <property name="persistentId" column="PRODUCER_ID" not-null="true" unique="true" type="java.lang.String"
+ access="field"/>
</class>
<class name="org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo" table="JBP_ENDPOINT_INFO">
@@ -91,10 +92,10 @@
<param name="sequence">wsrpconsumer_seq</param>
</generator>
</id>
- <property name="name" type="java.lang.String" not-null="true"/>
- <property name="value" type="java.lang.String"/>
- <property name="invalid" type="boolean"/>
- <property name="lang" type="java.lang.String" not-null="true"/>
+ <property name="name" column="NAME" type="java.lang.String" not-null="true"/>
+ <property name="value" column="VALUE" type="java.lang.String"/>
+ <property name="invalid" column="INVALID" type="java.lang.Boolean"/>
+ <property name="lang" column="LANG" type="java.lang.String" not-null="true"/>
<many-to-one
name="description"
column="DESC_PK"
@@ -110,9 +111,9 @@
<param name="sequence">portlet_seq</param>
</generator>
</id>
- <property name="name" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/>
- <property name="type" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/>
- <property name="schemaLocation" column="SCHEMA" type="java.lang.String"/>
+ <property name="name" column="NAME" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/>
+ <property name="type" column="TYPE" type="org.jboss.portal.jems.hibernate.QNameUserType" not-null="true"/>
+ <property name="schemaLocation" column="SCHEMA_LOCATION" type="java.lang.String"/>
<component name="description" class="org.jboss.portal.wsrp.registration.LocalizedString">
<property name="value" column="DESC_VALUE"/>
<property name="locale" column="DESC_LOCALE"/>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/default-wsrp.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -28,7 +28,7 @@
<deployments>
<deployment>
- <wsrp-producer id="self" expiration-cache="120">
+ <wsrp-producer id="self" expiration-cache="300">
<!--
we need to use the individual endpoint configuration because the configuration via wsdl forces an
immediate attempt to access the web service description which is not available yet at this point of deployment
@@ -43,13 +43,13 @@
</wsrp-producer>
</deployment>
<!--<deployment>
- <wsrp-producer id="NetUnity" expiration-cache="120">
+ <wsrp-producer id="NetUnity" expiration-cache="300">
<endpoint-wsdl-url>http://wsrp.netunitysoftware.com/WSRPTestService/WSRPTestService.asmx?Operation=WSDL</endpoint-wsdl-url>
<registration-data/>
</wsrp-producer>
</deployment>-->
<!--<deployment>
- <wsrp-producer id="vignette" expiration-cache="120">
+ <wsrp-producer id="vignette" expiration-cache="300">
<endpoint-wsdl-url>http://wsrpdemo.vignette.com:8080/producer/wsdl</endpoint-wsdl-url>
<registration-data>
<property>
@@ -66,7 +66,7 @@
</wsrp-producer>
</deployment>-->
<!--<deployment>
- <wsrp-producer id="bea" expiration-cache="120">
+ <wsrp-producer id="bea" expiration-cache="300">
<endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
<registration-data>
<property>
@@ -78,7 +78,7 @@
</wsrp-producer>
</deployment>-->
<!--<deployment>
- <wsrp-producer id="oracle" expiration-cache="120">
+ <wsrp-producer id="oracle" expiration-cache="300">
<endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlets?WSDL</endpoint-wsdl-url>
<registration-data/>
</wsrp-producer>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-client.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-wsrp.sar/portal-wsrp.jse
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/jsp/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/jsp/edit.jsp 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/jsp/edit.jsp 2007-07-02 22:13:45 UTC (rev 13019)
@@ -7,18 +7,27 @@
<%@ page import="org.jboss.portal.widget.google.GGWidgetCategoryInfo" %>
<%@ page import="org.jboss.portal.widget.google.provider.GGQuery" %>
<%@ page import="org.jboss.portal.widget.google.type.EnumType" %>
+<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
<%@ page language="java"%>
<%@ taglib uri="http://java.sun.com/portlet" prefix="p" %>
<%@ page isELIgnored="false" %>
-<portlet:defineObjects/>
+<p:defineObjects/>
<div>
<%
// Get useful request attributes
- GGWidget selWidget = (GGWidget)request.getAttribute("selectedWidget");
GGProvider provider = (GGProvider)request.getAttribute("provider");
+ // Get the selected widget if any
+ GGWidget selWidget = null;
+ String uri = request.getParameter("content.uri");
+ if (uri != null)
+ {
+ selWidget = provider.getWidget(uri);
+ }
+
// Get query term
String queryTerm = request.getParameter("query");
if (queryTerm == null)
@@ -57,13 +66,59 @@
<input type="submit" value="Search Gadgets" class="portlet-form-button"/>
</form>
+<p>
+<table style="width:100%;border:1px solid" cellspacing="0" cellpadding="0">
+ <%
+ for (IteratorStatus i = new IteratorStatus(result.getWidgetIterator()); i.hasNext();)
+ {
+ GGWidget widget = (GGWidget)i.next();
+ boolean selected = selWidget != null && selWidget.getId().equals(widget.getId());
+ PortletURL selectURL = renderResponse.createActionURL();
+
+ // Set parameters for selection
+ selectURL.setParameter("content.action.select", "content.action.select");
+ selectURL.setParameter("content.uri", widget.getId());
+
+ // Set default parametrization state
+ for (Iterator j = widget.getPreferencesInfo().getPreferencesInfo().iterator(); j.hasNext();)
+ {
+ GGPreferenceInfo prefInfo = (GGPreferenceInfo)j.next();
+ String paramName = "content.param." + prefInfo.getName();
+ String defaultValue = prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : "";
+ selectURL.setParameter(paramName, defaultValue);
+ }
+
+ // Propagage search nav state
+ selectURL.setParameter("cat", catTerm);
+ selectURL.setParameter("query", queryTerm);
+
+ //
+ String rowClass = selected ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
+ %>
+ <tr class="<%= rowClass %>">
+ <td><a href="<%= selectURL %>"><%= widget.getTitle().getDefaultString() %></a></td>
+ </tr>
+ <%
+ }
+ %>
+</table>
+</p>
+
<%
- if (selWidget != null)
+ if (selWidget != null && !selWidget.getPreferencesInfo().getPreferencesInfo().isEmpty())
{
+ PortletURL selectURL = renderResponse.createActionURL();
+
+ // Set parameters for selection
+ selectURL.setParameter("content.action.select", "content.action.select");
+ selectURL.setParameter("content.uri", selWidget.getId());
+
+ // Propagage search nav state
+ selectURL.setParameter("cat", catTerm);
+ selectURL.setParameter("query", queryTerm);
%>
-<p>You have selected the widget <%= selWidget.getTitle().getDefaultString() %></p>
<p>
- <form action="<p:actionURL><p:param name="content.action.select" value="select"/><p:param name="content.uri" value="<%= selWidget.getId() %>"/></p:actionURL>" method="post">
+ <form action="<%= selectURL %>" method="post">
<%
for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();)
{
@@ -83,6 +138,17 @@
for (Iterator i = selWidget.getPreferencesInfo().getPreferencesInfo().iterator(); i.hasNext();)
{
GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next();
+
+ // Get param value from nav state otherwise we use the default value
+ String prefValue = request.getParameter("content.param." + prefInfo.getName());
+ if (prefValue == null)
+ {
+ prefInfo.getDefaultValue();
+ }
+ if (prefValue == null)
+ {
+ prefValue = "";
+ }
%>
<tr>
<td><%= prefInfo.getName() %>:</td>
@@ -99,7 +165,7 @@
for (int j = 0;j < e.getSize();j++)
{
EnumType.Value value = e.getValue(j);
- boolean selected = value.getValue().equals(prefInfo.getDefaultValue());
+ boolean selected = value.getValue().equals(prefValue);
%>
<option <%= selected ? "selected=\"selected\"" : "" %> value="<%= value.getValue() %>"><%= value.getDisplayValue() != null ? value.getDisplayValue() : value.getValue() %></option>
<%
@@ -110,7 +176,7 @@
break;
default:
%>
- <td><input type="text" name="content.param.<%= prefInfo.getName() %>" class="portlet-form-field" value="<%= prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : "" %>"/></td>
+ <td><input type="text" name="content.param.<%= prefInfo.getName() %>" class="portlet-form-field" value="<%= prefValue %>"/></td>
<%
break;
}
@@ -120,7 +186,7 @@
}
%>
<tr>
- <td colspan="2"><input type="submit" value="Select" class="portlet-form-button"/></td>
+ <td colspan="2"><input type="submit" value="Update" class="portlet-form-button"/></td>
</tr>
</tbody>
</table>
@@ -129,18 +195,6 @@
<%
}
%>
-
-<ul>
- <%
- for (Iterator i = result.getWidgetIterator();i.hasNext();)
- {
- GGWidget widget = (GGWidget)i.next();
- %>
- <li><a href="<p:renderURL><p:param name="op" value="select"/><p:param name="uri" value="<%= widget.getId() %>"/><p:param name="cat" value="<%= catTerm %>"/></p:renderURL>"><%= widget.getTitle().getDefaultString() %></a></li>
- <%
- }
- %>
-</ul>
-
+
</div>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/lib/widget-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/portlet.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/widget.war/WEB-INF/portlet.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -35,6 +35,7 @@
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>EDIT_CONTENT</portlet-mode>
</supports>
<portlet-info>
<title>Google Widget</title>
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/maven.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -30,6 +30,8 @@
<ant:delete file="${local.deploy.dir}/jboss-portal.sar/conf/data/default-object.xml" />
<ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-samples.sar" />
+ <ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-wsrp.sar" />
+
<ant:delete dir="${local.deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
<ant:delete dir="${local.deploy.dir}/jboss-hibernate.deployer" />
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -163,6 +163,23 @@
<!-- Command stack -->
<mbean
+ code="org.jboss.portal.core.aspects.controller.ControlInterceptor"
+ name="portal:service=Interceptor,type=Command,name=Control"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalControlPolicy"
+ proxy-type="attribute">portal:service=ControlPolicy,type=Portal</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.aspects.controller.ResourceAcquisitionInterceptor"
+ name="portal:service=Interceptor,type=Command,name=ResourceAcquisition"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
code="org.jboss.portal.core.controller.ajax.AjaxInterceptor"
name="portal:service=Interceptor,type=Command,name=Ajax"
xmbean-dd=""
@@ -228,11 +245,13 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
+ <depends-list-element>portal:service=Interceptor,type=Command,name=ResourceAcquisition</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=Ajax</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=NavigationalState</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PortalNode</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PolicyEnforcement</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=PageCustomizer</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Command,name=Control</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Command,name=EventBroadcaster</depends-list-element>
</depends-list>
</mbean>
@@ -695,32 +714,31 @@
</mbean>
<!-- Command factories -->
- <mbean
- code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
- name="portal:commandFactory=Delegating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
+ name="portal:commandFactory=Delegating"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
<!-- LABS -->
<depends
optional-attribute-name="NextFactory"
proxy-type="attribute">portal:commandFactory=LabsMain</depends>
- </mbean>
- <mbean
- code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
- name="portal:commandFactory=DefaultPortal"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="NextFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- </mbean>
-
- <mbean
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.model.portal.DefaultPortalCommandFactory"
+ name="portal:commandFactory=DefaultPortal"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="NextFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+ <mbean
code="org.jboss.portal.core.model.portal.command.mapping.DefaultPortalObjectPathMapper"
name="portal:service=PortalObjectPathMapper,type=Default"
xmbean-dd=""
@@ -741,44 +759,44 @@
optional-attribute-name="Mapper"
proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
</mbean>
-
- <!-- LABS <mbean
- code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=portal"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">/portal</attribute>
- <depends
- optional-attribute-name="DelegatingFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="DelegateFactory"
- proxy-type="attribute">portal:commandFactory=PortalObject</depends>
- </mbean>-->
- <mbean
- code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
- name="portal:commandFactory=SignOut"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
- </mbean>
- <mbean
- code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
- name="portal:commandFactory=Delegate,path=signout"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">/signout</attribute>
- <depends
- optional-attribute-name="DelegatingFactory"
- proxy-type="attribute">portal:commandFactory=Delegating</depends>
- <depends
- optional-attribute-name="DelegateFactory"
- proxy-type="attribute">portal:commandFactory=SignOut</depends>
- </mbean>
- <mbean
+ <!-- LABS
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=portal"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/portal</attribute>
+ <depends
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="DelegateFactory"
+ proxy-type="attribute">portal:commandFactory=PortalObject</depends>
+ </mbean> -->
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleCommandFactory"
+ name="portal:commandFactory=SignOut"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="CommandClassName">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
+ name="portal:commandFactory=Delegate,path=signout"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/signout</attribute>
+ <depends
+ optional-attribute-name="DelegatingFactory"
+ proxy-type="attribute">portal:commandFactory=Delegating</depends>
+ <depends
+ optional-attribute-name="DelegateFactory"
+ proxy-type="attribute">portal:commandFactory=SignOut</depends>
+ </mbean>
+ <mbean
code="org.jboss.portal.core.model.portal.command.mapping.DashboardPortalObjectPathMapper"
name="portal:service=PortalObjectPathMapper,type=Dashboard"
xmbean-dd=""
@@ -801,7 +819,6 @@
optional-attribute-name="Mapper"
proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
</mbean>
-
<mbean
code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
name="portal:commandFactory=Delegate,path=dashboard"
@@ -838,6 +855,245 @@
proxy-type="attribute">portal:commandFactory=Ajax</depends>
</mbean>
+ <!-- LABS command factories -->
+
+ <mbean
+ code="org.jboss.labs.mapper.command.MainCF"
+ name="portal:commandFactory=LabsMain"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="PageDelegatingCF"
+ proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+ <depends
+ optional-attribute-name="PortalObjectCF"
+ proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+ </mbean>
+
+ <mbean
+ code="org.jboss.labs.mapper.command.delegating.page.PageDelegatingCFImpl"
+ name="portal:commandFactory=LabsPageDelegating"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.labs.mapper.command.delegating.page.WikiCF"
+ name="portal:commandFactory=Wiki"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">wiki</attribute>
+ <attribute name="PageName">labswiki</attribute>
+ <attribute name="WindowName">WikiPortletWindow</attribute>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="PageDelegatingCF"
+ proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+ <depends
+ optional-attribute-name="PortalObjectCF"
+ proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.labs.mapper.command.delegating.page.DownloadCF"
+ name="portal:commandFactory=Download"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">downloads</attribute>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="PageDelegatingCF"
+ proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+ <depends
+ optional-attribute-name="PortalObjectCF"
+ proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.labs.mapper.command.delegating.page.BlogCF"
+ name="portal:commandFactory=Blog"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">blog</attribute>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="PageDelegatingCF"
+ proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+ <depends
+ optional-attribute-name="PortalObjectCF"
+ proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+ </mbean>
+
+ <mbean
+ code="org.jboss.labs.mapper.command.delegating.page.MetricsCF"
+ name="portal:commandFactory=Metrics"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">metrics</attribute>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="PageDelegatingCF"
+ proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
+ <depends
+ optional-attribute-name="PortalObjectCF"
+ proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
+ </mbean>
+
+ <mbean
+ code="org.jboss.labs.mapper.command.PortalObjectCFImpl"
+ name="portal:commandFactory=LabsPortalObject"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends>shotoku:service=svn</depends>
+ </mbean>
+
+ <!-- URL factories -->
+ <!-- LABS -->
+ <mbean
+ code="org.jboss.labs.mapper.url.LabsDelegatingURLFactoryService"
+ name="portal:urlFactory=Delegating"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <!-- LABS -->
+ <depends
+ optional-attribute-name="NextFactory"
+ proxy-type="attribute">portal:urlFactory=LabsMain</depends>
+ </mbean>
+
+ <!-- URL factories -->
+ <!--<mbean
+ code="org.jboss.portal.core.controller.command.mapper.DelegatingURLFactoryService"
+ name="portal:urlFactory=Delegating"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>-->
+ <!-- LABS
+ <mbean
+ code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
+ name="portal:urlFactory=PortalObject"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/portal</attribute>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean> -->
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+ name="portal:urlFactory=SignOut"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/signout</attribute>
+ <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
+ name="portal:urlFactory=Dashboard"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="Path">/dashboard</attribute>
+ <attribute name="ClassNames">org.jboss.portal.core.model.portal.command.ViewDashboardCommand</attribute>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+
+ <!-- LABS URL factories -->
+
+ <mbean
+ code="org.jboss.labs.mapper.url.LabsMainUrlFactory"
+ name="portal:urlFactory=LabsMain"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.labs.mapper.url.WikiUrlFactory"
+ name="portal:urlFactory=Wiki"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <attribute name="Path">wiki</attribute>
+ <attribute name="PageName">labswiki</attribute>
+ <xmbean/>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.labs.mapper.url.DownloadUrlFactory"
+ name="portal:urlFactory=Download"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <attribute name="Path">downloads</attribute>
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.labs.mapper.url.BlogUrlFactory"
+ name="portal:urlFactory=Blog"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <attribute name="Path">blog</attribute>
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.labs.mapper.url.MetricsUrlFactory"
+ name="portal:urlFactory=Metrics"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <attribute name="Path">metrics</attribute>
+ <xmbean/>
+ <depends
+ optional-attribute-name="Container"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="Factory"
+ proxy-type="attribute">portal:urlFactory=Delegating</depends>
+ </mbean>
+
<!-- The federating portlet invoker -->
<mbean
code="org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService"
@@ -962,6 +1218,28 @@
proxy-type="attribute">portal:service=ResponseHandler,type=Ajax</depends>
</mbean>
+ <!-- -->
+ <mbean
+ code="org.jboss.portal.core.model.portal.control.page.DefaultPageControlPolicy"
+ name="portal:service=ControlPolicy,type=Page"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy"
+ name="portal:service=ControlPolicy,type=Portal"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="PortalObjectContainer"
+ proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+
<!-- The controller -->
<mbean
code="org.jboss.portal.core.controller.Controller"
@@ -999,6 +1277,9 @@
<depends
optional-attribute-name="ResponseHandler"
proxy-type="attribute">portal:service=ResponseHandler,type=Selector</depends>
+ <depends
+ optional-attribute-name="PageControlPolicy"
+ proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends>
</mbean>
<!-- The controller factory -->
@@ -1196,248 +1477,4 @@
proxy-type="attribute">portal:service=EntityResolver</depends>
</mbean>
-
-
-
-
-
-
-
- <!-- LABS command factories -->
-
- <mbean
- code="org.jboss.labs.mapper.command.MainCF"
- name="portal:commandFactory=LabsMain"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="PageDelegatingCF"
- proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
- <depends
- optional-attribute-name="PortalObjectCF"
- proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
- </mbean>
-
- <mbean
- code="org.jboss.labs.mapper.command.delegating.page.PageDelegatingCFImpl"
- name="portal:commandFactory=LabsPageDelegating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- </mbean>
- <mbean
- code="org.jboss.labs.mapper.command.delegating.page.WikiCF"
- name="portal:commandFactory=Wiki"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">wiki</attribute>
- <attribute name="PageName">labswiki</attribute>
- <attribute name="WindowName">WikiPortletWindow</attribute>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="PageDelegatingCF"
- proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
- <depends
- optional-attribute-name="PortalObjectCF"
- proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
- </mbean>
- <mbean
- code="org.jboss.labs.mapper.command.delegating.page.DownloadCF"
- name="portal:commandFactory=Download"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">downloads</attribute>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="PageDelegatingCF"
- proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
- <depends
- optional-attribute-name="PortalObjectCF"
- proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
- </mbean>
- <mbean
- code="org.jboss.labs.mapper.command.delegating.page.BlogCF"
- name="portal:commandFactory=Blog"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">blog</attribute>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="PageDelegatingCF"
- proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
- <depends
- optional-attribute-name="PortalObjectCF"
- proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
- </mbean>
- <mbean
- code="org.jboss.labs.mapper.command.delegating.page.MetricsCF"
- name="portal:commandFactory=Metrics"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">metrics</attribute>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="PageDelegatingCF"
- proxy-type="attribute">portal:commandFactory=LabsPageDelegating</depends>
- <depends
- optional-attribute-name="PortalObjectCF"
- proxy-type="attribute">portal:commandFactory=LabsPortalObject</depends>
- </mbean>
-
- <mbean
- code="org.jboss.labs.mapper.command.PortalObjectCFImpl"
- name="portal:commandFactory=LabsPortalObject"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends>shotoku:service=svn</depends>
- </mbean>
-
- <!-- URL factories -->
- <!-- LABS
- <mbean
- code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
- name="portal:urlFactory=PortalObject,type=Default"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Namespace"><![CDATA[]]></attribute>
- <attribute name="Path">/portal</attribute>
- <depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- <depends
- optional-attribute-name="Mapper"
- proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Default</depends>
- </mbean>-->
- <mbean
- code="org.jboss.portal.core.controller.command.mapper.SimpleURLFactory"
- name="portal:urlFactory=SignOut"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Path">/signout</attribute>
- <attribute name="ClassNames">org.jboss.portal.core.controller.command.SignOutCommand</attribute>
- <depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- </mbean>
- <!-- LABS <mbean
- code="org.jboss.portal.core.model.portal.PortalObjectURLFactory"
- name="portal:urlFactory=PortalObject,type=Dashboard"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <attribute name="Namespace">dashboard</attribute>
- <attribute name="Path">/dashboard</attribute>
- <depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- <depends
- optional-attribute-name="Mapper"
- proxy-type="attribute">portal:service=PortalObjectPathMapper,type=Dashboard</depends>
- </mbean> -->
-
- <!-- LABS -->
- <mbean
- code="org.jboss.labs.mapper.url.LabsDelegatingURLFactoryService"
- name="portal:urlFactory=Delegating"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <!-- LABS -->
- <depends
- optional-attribute-name="NextFactory"
- proxy-type="attribute">portal:urlFactory=LabsMain</depends>
- </mbean>
-
- <!-- LABS URL factories -->
-
- <mbean
- code="org.jboss.labs.mapper.url.LabsMainUrlFactory"
- name="portal:urlFactory=LabsMain"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- </mbean>
- <mbean
- code="org.jboss.labs.mapper.url.WikiUrlFactory"
- name="portal:urlFactory=Wiki"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <attribute name="Path">wiki</attribute>
- <attribute name="PageName">labswiki</attribute>
- <xmbean/>
- <depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- </mbean>
- <mbean
- code="org.jboss.labs.mapper.url.DownloadUrlFactory"
- name="portal:urlFactory=Download"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <attribute name="Path">downloads</attribute>
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- </mbean>
- <mbean
- code="org.jboss.labs.mapper.url.BlogUrlFactory"
- name="portal:urlFactory=Blog"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <attribute name="Path">blog</attribute>
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- </mbean>
- <mbean
- code="org.jboss.labs.mapper.url.MetricsUrlFactory"
- name="portal:urlFactory=Metrics"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <attribute name="Path">metrics</attribute>
- <xmbean/>
- <depends
- optional-attribute-name="Container"
- proxy-type="attribute">portal:container=PortalObject</depends>
- <depends
- optional-attribute-name="Factory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- </mbean>
-
</server>
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/config.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/config.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<properties>
<!-- When a window has restrictedaccess : show or hide values are permitted -->
<entry key="core.render.window_access_denied">show</entry>
@@ -9,4 +32,6 @@
<entry key="core.render.window_internal_error">show</entry>
<!-- When a window is not found : show or hide values are permitted -->
<entry key="core.render.window_not_found">show</entry>
+ <!-- Namespace to use when logging-in, use "dashboard" to directly log-in the dashboard otherwise use "default" -->
+ <entry key="core.login.namespace">default</entry>
</properties>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/binaries/jboss-blog.sar/lib/portal-identity-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2007-07-02 22:13:45 UTC (rev 13019)
@@ -68,7 +68,7 @@
if (!parser.hasFirstToken()) {
return o;
}
- log.info("o= " + o);
+
PortalObject child = o.getChild(parser.getFirstToken());
if (child == null) {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java 2007-07-02 22:13:45 UTC (rev 13019)
@@ -155,7 +155,7 @@
if (WindowState.MAXIMIZED.equals(windowNavState.getWindowState())) {
MapperTools.setWindowNavState(controllerContext, window,
new WindowNavigationalState(WindowState.NORMAL, windowNavState.getMode(),
- windowNavState.getState()));
+ windowNavState.getContentState()));
}
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java 2007-07-02 22:13:45 UTC (rev 13019)
@@ -132,7 +132,7 @@
path = getFreezonePathFromStateString(((WindowNavigationalState)
context.getAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE,
new NavigationalStateKey(WindowNavigationalState.class,
- renderCmd.getTargetId()))).getState());
+ renderCmd.getTargetId()))).getContentState());
}
addToPath(sb, poc.getTargetId(), false);
Property changes on: labs/jbosslabs/trunk/portal-extensions/portal-default
___________________________________________________________________
Name: svn:ignore
- .project
.classpath
.settings
target
+ bin
.project
.classpath
.settings
target
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-07-02 21:38:56 UTC (rev 13018)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-07-02 22:13:45 UTC (rev 13019)
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
<deployments>
<deployment>
<context>
@@ -575,87 +580,7 @@
</page>
</portal>
</deployment> -->
- <deployment>
- <parent-ref />
- <if-exists>keep</if-exists>
- <portal>
- <portal-name>template</portal-name>
- <properties>
- <!-- Set the layout for the default portal, see also portal-layouts.xml. -->
- <property>
- <name>layout.id</name>
- <value>org</value>
- </property>
- <!-- Set the theme for the default portal, see also portal-themes.xml. -->
- <property>
- <name>theme.id</name>
- <!--value>jboss-forge</value-->
- <value>org</value>
- </property>
- <!-- Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml -->
- <property>
- <name>theme.renderSetId</name>
- <!--value>emptyRenderer</value-->
- <value>divRenderer</value>
- </property>
- <!-- Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml -->
- <property>
- <name>layout.strategyId</name>
- <!--<value>jbfStrategy</value>-->
- <value>maximizedRegion</value>
- </property>
- <!--
- | The default page name, if the property is not explicited then the default page name is "default"
- -->
- <property>
- <name>portal.defaultObjectName</name>
- <value>default</value>
- </property>
- </properties>
- <supported-modes>
- <mode>view</mode>
- <mode>edit</mode>
- <mode>help</mode>
- </supported-modes>
- <supported-window-states>
- <window-state>normal</window-state>
- <window-state>minimized</window-state>
- <window-state>maximized</window-state>
- </supported-window-states>
- <page>
- <page-name>default</page-name>
- <properties>
- <property>
- <name>order</name>
- <value>1</value>
- </property>
- </properties>
- <window>
- <window-name>JSPPortletWindow</window-name>
- <instance-ref>JSPPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- </window>
- <window>
- <window-name>CMSWindow</window-name>
- <content>
- <content-type>cms</content-type>
- <content-uri>/default/index.html</content-uri>
- </content>
- <region>center</region>
- <height>0</height>
- </window>
- <window>
- <window-name>UserPortletWindow</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
- <region>left</region>
- <height>1</height>
- </window>
- </page>
- </portal>
- </deployment>
- <deployment>
- <parent-ref/>
+ <deployment>
<if-exists>keep</if-exists>
<context>
<context-name>dashboard</context-name>
@@ -686,14 +611,6 @@
</property>
<!--
- | Set the dashboard property
- -->
- <property>
- <name>dashboard</name>
- <value>true</value>
- </property>
-
- <!--
| Set the dnd property
-->
<property>
@@ -706,9 +623,58 @@
-->
<property>
<name>theme.dyna.partial_refresh_enabled</name>
- <value>true</value>
+ <value>false</value>
</property>
+ <!-- Control policy config -->
+ <property>
+ <name>control.portal.access_denied</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.unavailable</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.not_found</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.internal_error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.portal.error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.portal.resource_uri</name>
+ <value>/WEB-INF/jsp/error/portal.jsp</value>
+ </property>
+ <property>
+ <name>control.page.access_denied</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.unavailable</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.not_found</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.internal_error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.page.error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.page.resource_uri</name>
+ <value>/WEB-INF/jsp/error/page.jsp</value>
+ </property>
</properties>
</context>
</deployment>
@@ -727,36 +693,6 @@
<window-state>minimized</window-state>
<window-state>maximized</window-state>
</supported-window-states>
- <properties>
- <!--
- | Set the layout for the default portal, see also portal-layouts.xml.
- -->
- <property>
- <name>layout.id</name>
- <value>generic</value>
- </property>
- <!--
- | Set the theme for the default portal, see also portal-themes.xml.
- -->
- <property>
- <name>theme.id</name>
- <value>renaissance</value>
- </property>
- <!--
- | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
- -->
- <property>
- <name>theme.renderSetId</name>
- <value>divRenderer</value>
- </property>
- <!--
- | The default page name, if the property is not explicited then the default page name is "default"
- -->
- <property>
- <name>portal.defaultObjectName</name>
- <value>default</value>
- </property>
- </properties>
<page>
<page-name>default</page-name>
<properties>
More information about the jboss-svn-commits
mailing list