[jboss-svn-commits] JBL Code SVN: r11431 - in labs/jbosslabs/trunk/portal-extensions: binaries/portal/to-copy/jboss-portal.sar/conf and 45 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Apr 28 13:52:44 EDT 2007
Author: adamw
Date: 2007-04-28 13:52:44 -0400 (Sat, 28 Apr 2007)
New Revision: 11431
Added:
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/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
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/jsp/header/
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_it.properties
Removed:
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/images/catalog/T.gif
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/images/catalog/minus.gif
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/images/catalog/plus.gif
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/conf/hibernate/
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java-portal/
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/data/default-object.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/jboss-portlet_2_6.dtd
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-admin-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-cms-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-core-management-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-samples-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-samples-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/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/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/editSecurity.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/editPageSecurity.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/instances.xhtml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.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-ajax.war/dyna/dyna.js
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/style.css
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.properties
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/create.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/edit.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
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/jsp/catalog/index.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/createRole.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRole.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/menu.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.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/images/catalog/bullet.gif
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/index.jsp
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/industrial/portal_style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/maple/portal_style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/mission-critical/portal_style.css
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/phalanx/portal_style.css
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-samples.sar/lib/portal-core-samples-lib.jar
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.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/portal-server.war/WEB-INF/web.old.xml
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/MapperTools.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/AbstractBaseCF.java
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/PortalObjectCF.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/command/delegating/page/AbstractProjectPortletDelegateCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegateCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegatingCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegatingCFImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsDelegatingURLFactoryService.java
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/WikiUrlFactory.java
Log:
Upgrading portal
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/META-INF/jboss-service.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -108,7 +108,7 @@
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.event.user.UserEventInterceptor"
+ code="org.jboss.portal.core.impl.api.user.UserEventInterceptor"
name="portal:service=Interceptor,type=Server,name=UserEvent"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -182,6 +182,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <depends
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
@@ -196,6 +199,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <attribute name="TargetContextPath">/portal-core</attribute>
+ <attribute name="HeaderPath">/WEB-INF/jsp/header/header.jsp</attribute>
+ <attribute name="TabsPath">/WEB-INF/jsp/header/tabs.jsp</attribute>
<depends
optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
@@ -938,7 +944,7 @@
<!-- The response handler selector -->
<mbean
- code="org.jboss.portal.core.controller.ResponseHandlerSelector"
+ code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector"
name="portal:service=ResponseHandler,type=Selector"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_it.properties (from rev 11430, labs/jbosslabs/trunk/portal-extensions-newportal/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_it.properties)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_it.properties (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/bundles/Resource_it.properties 2007-04-28 17:52:44 UTC (rev 11431)
@@ -0,0 +1,28 @@
+################################################################################
+# 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. #
+################################################################################
+
+# Navigation Portlet
+PAGENAME_default=Home
+PAGENAME_Admin=Amministrazione
+PAGENAME_Test=Test
+PAGENAME_News=Novita'
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/data/default-object.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -117,6 +117,7 @@
<context>
<context-name>dashboard</context-name>
<properties>
+
<!--
| Set the layout for the default portal, see also portal-layouts.xml.
-->
@@ -124,6 +125,7 @@
<name>layout.id</name>
<value>generic</value>
</property>
+
<!--
| Set the theme for the default portal, see also portal-themes.xml.
-->
@@ -131,6 +133,7 @@
<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
-->
@@ -138,6 +141,7 @@
<name>theme.renderSetId</name>
<value>divRenderer</value>
</property>
+
<!--
| Set the dashboard property
-->
@@ -145,6 +149,23 @@
<name>dashboard</name>
<value>true</value>
</property>
+
+ <!--
+ | Set the dnd property
+ -->
+ <property>
+ <name>theme.dyna.dnd_enabled</name>
+ <value>true</value>
+ </property>
+
+ <!--
+ | Set the partial refresh property
+ -->
+ <property>
+ <name>theme.dyna.partial_refresh_enabled</name>
+ <value>true</value>
+ </property>
+
</properties>
</context>
</deployment>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/hibernate/instance/domain.hbm.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -115,7 +115,7 @@
name="customizationId"
column="USER_ID"
not-null="true"
- length="170"/>
+ length="160"/>
<property
name="portletRef"
column="PORTLET_REF"
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/conf/standardjboss-portlet.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -21,21 +21,19 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE portlet-app PUBLIC
+ "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+
<portlet-app>
<portlet>
<portlet-name>DefaultPortlet</portlet-name>
<remotable>false</remotable>
<ajax>
- <asynchronous>true</asynchronous>
+ <partial-refresh>true</partial-refresh>
</ajax>
<transaction>
<trans-attribute>NotSupported</trans-attribute>
</transaction>
- <security-constraint>
- <policy-permission>
- <unchecked/>
- <action-name>view</action-name>
- </policy-permission>
- </security-constraint>
</portlet>
</portlet-app>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/jboss-portlet_2_6.dtd
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/jboss-portlet_2_6.dtd 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/dtd/jboss-portlet_2_6.dtd 2007-04-28 17:52:44 UTC (rev 11431)
@@ -78,16 +78,16 @@
<!ELEMENT remotable (#PCDATA)>
<!--
-The ajax tag allows to configure the ajax capabilities of the portlet. If the portlet is tagged as asynchronous
-then the portal may use partial page refreshing and render only that portlet. If the portlet asynchronous value
+The ajax tag allows to configure the ajax capabilities of the portlet. If the portlet is tagged as partial-refresh
+then the portal may use partial page refreshing and render only that portlet. If the portlet partial-refresh value
is false, then the portal will perform a full page refresh when the portlet is refreshed.
-->
-<!ELEMENT ajax (asynchronous)>
+<!ELEMENT ajax (partial-refresh)>
<!--
-The authorized values for the asynchronous element are true or false.
+The authorized values for the partial-refresh element are true or false.
-->
-<!ELEMENT asynchronous (#PCDATA)>
+<!ELEMENT partial-refresh (#PCDATA)>
<!--
This element configure the portlet session of the portlet.
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-admin-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-cms-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-core-management-lib.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/lib/portal-core-samples-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)
Modified: 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/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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/faces-config.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -202,10 +202,11 @@
<value>#{sessionScope.instancemgr}</value>
</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>session</managed-bean-scope>
+ <managed-bean-scope>request</managed-bean-scope>
<managed-property>
<property-name>portalObjectManager</property-name>
<value>#{sessionScope.portalobjectmgr}</value>
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jboss-portlet.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -40,6 +40,9 @@
<transaction>
<trans-attribute>Required</trans-attribute>
</transaction>
+ <header-content>
+ <link rel="stylesheet" type="text/css" href="/style.css" title="" media="screen"/>
+ </header-content>
</portlet>
<!-- Service injected in the portlet context. -->
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-04-28 13:00:46 UTC (rev 11430)
+++ 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-04-28 17:52:44 UTC (rev 11431)
@@ -9,37 +9,24 @@
<div style="float:left; padding:0 2em 0 2em">
<h:form id="layoutForm">
<table>
- <c:forEach items="#{pageManager.regionNames}" var="regionName"
- varStatus="status">
+ <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status">
<tbody>
- <c:choose>
- <c:when test="#{status.index > 0}">
- <tr>
- <td colspan="2" class="portlet-form-field-label"
- style="border-width:0px;border-top:1px dashed #d5d5d5">#{regionName}
- Region
- </td>
- </tr>
- </c:when>
- <c:otherwise>
- <tr>
- <td colspan="2" class="portlet-form-field-label">#{regionName}
- Region
- </td>
- </tr>
- </c:otherwise>
- </c:choose>
<tr>
+ <td colspan="2" class="portlet-form-field-label"><hr/> #{regionName} Region </td>
+ </tr>
+ <tr>
<td>
<div>
- <h:commandButton value="Up" id="u_#{regionName}"
- actionListener="#{pageManager.assignWindows}"
- styleClass="portlet-form-button"/>
+ <h:commandButton
+ value="Up" id="u_#{regionName}"
+ actionListener="#{pageManager.assignWindows}"
+ styleClass="portlet-form-button"/>
</div>
<div>
- <h:commandButton value="Down" id="d_#{regionName}"
- actionListener="#{pageManager.assignWindows}"
- styleClass="portlet-form-button"/>
+ <h:commandButton
+ value="Down" id="d_#{regionName}"
+ actionListener="#{pageManager.assignWindows}"
+ styleClass="portlet-form-button"/>
</div>
<div style="margin-top: 1em">
<h:commandButton
@@ -90,6 +77,10 @@
<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>
@@ -107,6 +98,10 @@
</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>
@@ -118,6 +113,10 @@
</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>
@@ -131,10 +130,12 @@
</td>
</tr>
<tr>
- <td class="label">
+ <td colspan="2"><hr/>Select content that will be added to the page:
</td>
- <td class="widget">
- <div style="margin-top:3em;">
+ </tr>
+ <tr>
+ <td colspan="2">
+ <div style="margin:3em;">
<jbp:portlet
portletId="#{pageManager.selectedEditorPortletId}"
portletInvoker="#{pageManager.portletInvoker}"
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-04-28 13:00:46 UTC (rev 11430)
+++ 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-04-28 17:52:44 UTC (rev 11431)
@@ -10,8 +10,9 @@
<thead class="portlet-section-header" style="text-align:left;">
<tr>
<th>Name</th>
- <th>Key</th>
+ <th>Description</th>
<th>Value</th>
+ <th>Inherited</th>
<th>Delete</th>
</tr>
</thead>
@@ -19,17 +20,25 @@
<c:forEach items="#{properties.entries}" var="prop" varStatus="status">
<tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
<td>
- <h:outputText>#{prop.displayName.defaultString}</h:outputText>
+ <h:outputText title="#{prop.name}" value="#{prop.displayName}"/>
</td>
<td>
- <h:outputText>#{prop.name}</h:outputText>
+ <h:outputText>#{prop.description}</h:outputText>
</td>
<td>
- <h:inputText value="#{prop.value}"/>
+ <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>Delete</h:outputText>
+ <h:outputText value="Delete"/>
<f:param name="name" value="#{prop.name}"/>
</h:commandLink>
</td>
@@ -40,30 +49,41 @@
<h:commandButton value="Update" styleClass="portlet-form-button"/>
</h:form>
+ <!-- Separation -->
+ <hr/>
+
+ <h3>Add a new property</h3>
+
+ <p>You can either create a predefined property or create one with the name of your choice</p>
+
<h:form>
- <table width="100%">
- <thead class="portlet-section-header" style="text-align:left;">
- <tr>
- <th>Property name</th>
- <th>Property value</th>
- </tr>
- </thead>
- <tbody>
- <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
- <td>
- <h:selectOneMenu value="#{propertyAction.selectedProperty}">
- <f:selectItems value="#{portalobjectmgr.properties}"/>
- </h:selectOneMenu><br />
- <h:outputText value="Other"/><h:inputText value="#{propertyAction.otherPropertyName}"
- validator="#{propertyAction.validatePropertyName}" />
- </td>
- <td>
- <h:inputText value="#{propertyAction.propertyValue}"/>
- </td>
- </tr>
- </tbody>
- </table>
- <h:commandButton value="Add property" styleClass="portlet-form-button" action="#{propertyAction.updateProperty}"/>
+ <fieldset style="border: 1px solid;">
+ <table>
+ <tbody>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="predefinedProperty">Select a predefined property: </h:outputLabel>
+ </td>
+ <td>
+ <h:selectOneMenu id="predefinedProperty" styleClass="portlet-form-button" value="#{propertyAction.selectedProperty}">
+ <f:selectItems value="#{properties.propertyItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="property">Or enter a property name: </h:outputLabel>
+ </td>
+ <td>
+ <h:inputText id="property" styleClass="portlet-form-input-field" value="#{propertyAction.otherPropertyName}" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </fieldset>
+ <div style="text-align:center;padding: 1em 0 1em 0">
+ <h:commandButton value="Add property" styleClass="portlet-form-button" action="#{propertyAction.updateProperty}"/>
+ </div>
</h:form>
</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editSecurity.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editSecurity.xhtml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/common/editSecurity.xhtml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -29,7 +29,8 @@
</tbody>
</table>
<div style="text-align:center;padding: 1em 0 1em 0">
- <ui:insert name="form_submit"/>
+ <h:commandLink id="update" value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/>
+ <h:commandLink id="cancel" value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/>
</div>
</h:form>
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-04-28 13:00:46 UTC (rev 11430)
+++ 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-04-28 17:52:44 UTC (rev 11431)
@@ -114,9 +114,11 @@
<table>
<tr>
<td>
- <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml">
- <ui:param name="pageManager" value="#{dashboard.pageManager}"/>
- </ui:include>
+ <div class="admin-ui">
+ <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml">
+ <ui:param name="pageManager" value="#{dashboard.pageManager}"/>
+ </ui:include>
+ </div>
</td>
</tr>
</table>
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPageSecurity.xhtml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -8,12 +8,6 @@
<h3>Please set the page permissions</h3>
<ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
<ui:param name="auth" value="#{portalobjectmgr.auth}"/>
- <ui:define name="form_submit">
- <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
- <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button" immediate="true">
- <f:param name="id" value="#{node.id}"/>
- </h:commandButton>
- </ui:define>
</ui:decorate>
</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/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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -2,19 +2,12 @@
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:f="http://java.sun.com/jsf/core">
<ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
<ui:define name="content">
<h3>Please set the portal permissions</h3>
<ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
<ui:param name="auth" value="#{portalobjectmgr.auth}"/>
- <ui:define name="form_submit">
- <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
- <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button" immediate="true">
- <f:param name="id" value="#{node.id}"/>
- </h:commandButton>
- </ui:define>
</ui:decorate>
</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/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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/instances.xhtml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -104,10 +104,6 @@
<ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
<ui:param name="auth" value="#{instancemgr.auth}"/>
- <ui:define name="form_submit">
- <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
- <h:commandButton value="Cancel" action="instances" styleClass="portlet-form-button" immediate="true"/>
- </ui:define>
</ui:decorate>
</c:if>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -16,7 +16,7 @@
</tbody>
<tbody>
<h:form>
- <c:forEach items="#{portalobjectmgr.selectedObject.portals}" var="object" varStatus="status">
+ <c:forEach items="#{newWindowWizard.portals}" var="object" varStatus="status">
<tr
class="#{object.id == newWindowWizard.selectedPortalId ? 'portlet-section-selected' : status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
<td>
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-admin.sar/portal-admin.war/style.css 2007-04-28 17:52:44 UTC (rev 11431)
@@ -47,7 +47,7 @@
.admin-ui ul.topnav {
margin-left: 0;
- padding: 3px 0;
+ padding: 4px 0px 3px;
border-bottom: 1px solid;
}
@@ -62,7 +62,7 @@
background-color: #eef;
}
-.admin-ui ul.topnav li a:hover {
+.admin-ui ul.topnav li:hover {
background-color: #ccf;
}
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/dyna.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/dyna.js 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/dyna.js 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,6 +1,6 @@
function sendData(action, windowId, fromPos, fromRegionId, toPos, toRegionId) {
var options = {
- requestHeaders: ["ajax","true"],
+ requestHeaders: ["ajax","true","bilto","toto"],
method: "post",
postBody: "action=" + action + "&windowId=" + windowId + "&fromPos=" + fromPos + "&fromRegion=" + fromRegionId + "&toPos=" + toPos + "&toRegion=" + toRegionId,
onSuccess: function(t)
@@ -24,7 +24,7 @@
function snapshot() {
// Find draggable regions
- var regions_on_page = document.getElementsByClassName("dyna-region");
+ var regions_on_page = document.getElementsByClassName("dnd-region");
// Save current state in the DOM itself
for(var i = 0;i < regions_on_page.length;i++) {
@@ -37,6 +37,33 @@
}
}
+// Check that the URL starts with the provided prefix
+function isURLAccepted(url) {
+ if (url.indexOf("http://") == 0)
+ {
+ var indexOfSlash = url.indexOf("/", "http://".length);
+ if (indexOfSlash < 0)
+ {
+ return false;
+ }
+ else if (indexOfSlash > 0)
+ {
+ var path = url.substring(indexOfSlash);
+ if (path.indexOf(server_base_url) != 0)
+ {
+ return false;
+ }
+ }
+ }
+ else if (url.indexOf(server_base_url) != 0)
+ {
+ return false;
+ }
+
+ //
+ return true;
+}
+
function bilto(event)
{
@@ -54,13 +81,19 @@
//
if (source.nodeName == "A")
{
- url = source.href;
- // We have a get
- options.method = "get"
+ // Check we can handle this URL
+ if (isURLAccepted(source.href)) {
- // We don't block
- options.asynchronous = true;
+ // Set URL
+ url = source.href;
+
+ // We have a get
+ options.method = "get"
+
+ // We don't block
+ options.asynchronous = false;
+ }
}
else if (source.nodeName == "INPUT" && source.type == "submit")
{
@@ -77,50 +110,25 @@
// We don't handle file upload for now
if (enctype != "multipart/form-data") {
- // Set URL
- url = current.action;
- // Set the specified enctype
- options.enctype = enctype;
+ // Check it is a POST
+ if (current.method.toLowerCase() == "post") {
- // Action blocks
- options.asynchronous = false;
+ // Check we can handle this URL
+ if (isURLAccepted(current.action)) {
- // Add body if needed
- if (current.method.toLowerCase() == "post") {
- options.method = "post"
- options.postBody = Form.serialize(current);
- }
- else {
- options.method = "get"
- }
- }
- }
- }
+ // Set URL
+ url = current.action;
- // Check that the URL starts with the provided prefix
- if (url != null)
- {
- if (url.indexOf("http://") == 0)
- {
- var indexOfSlash = url.indexOf("/", "http://".length);
- if (indexOfSlash < 0)
- {
- url = null;
- }
- else if (indexOfSlash > 0)
- {
- var path = url.substring(indexOfSlash);
- if (path.indexOf(server_base_url) != 0)
- {
- url = null;
+ // Set the specified enctype
+ options.enctype = enctype;
+ options.asynchronous = false;
+ options.method = "post"
+ options.postBody = Form.serialize(current);
+ }
}
}
}
- else if (url.indexOf(server_base_url) != 0)
- {
- url = null;
- }
}
// Handle links here
@@ -160,7 +168,6 @@
{
// Get markup fragment
var markup = resp.fragments[id];
- markup = markup.substring(25, markup.length - 7);
// Create a temporary element and paste the innerHTML in it
var srcContainer = document.createElement("div");
@@ -267,12 +274,12 @@
};
// Find the draggable regions
- var regions_on_page = document.getElementsByClassName("dyna-region");
+ var regions_on_page = document.getElementsByClassName("dnd-region");
// Create draggable regions
for(var i = 0;i < regions_on_page.length;i++) {
var region = regions_on_page[i];
- Sortable.create(region, {dropOnEmpty:true,handle:"dyna-handle",tag:"div",containment:regions_on_page,constraint:false});
+ Sortable.create(region, {dropOnEmpty:true,handle:"dnd-handle",tag:"div",containment:regions_on_page,constraint:false,hoverclass:"dnd-droppable"});
}
//
@@ -282,7 +289,7 @@
snapshot();
// Find the dyna portlets
- var portlets_on_page = document.getElementsByClassName("async-window");
+ var portlets_on_page = document.getElementsByClassName("partial-refresh-window");
// Add listener for the dyna windows on the dyna-window element
// and not async-window as this one will have its markup replaced
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/style.css 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-ajax.war/dyna/style.css 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,8 +1,25 @@
/* We need the min-height in order to have a region that is never empty and can receive draggables
min-height doees not work on IE6 and the 2 other lines are there to make it work in that situation.
32 pixels is the height of the region when it is empty. */
-div.dyna-region {
+.dnd-region {
min-height:32px;
height:auto !important;
height:32px;
}
+
+.dnd-handle {
+ cursor: move;
+}
+
+.dnd-cleaner {
+ clear:both;
+ height:1px;
+ margin: -1px 0 0 0; padding:0;
+ border:none;
+ visibility: hidden;
+}
+
+.dnd-droppable {
+ border: red 1px dashed;
+ background-color: Transparent;
+}
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.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource.properties 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource.properties 2007-04-28 17:52:44 UTC (rev 11431)
@@ -77,6 +77,7 @@
CMS_EDITING=Editing File
CMS_LIVE=Make \"Live\"
CMS_VERSION=Version
+CMS_WYSIWYG=WYSIWYG Editor
CMS_LIVEVERSION=Live Version
CMS_SIZE=Size
Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/classes/Resource_it.properties (from rev 11430, labs/jbosslabs/trunk/portal-extensions-newportal/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 (rev 0)
+++ 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-04-28 17:52:44 UTC (rev 11431)
@@ -0,0 +1,93 @@
+################################################################################
+# 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. #
+################################################################################
+
+## CMS ADMIN PORTLET
+TITLE_HEAD=Amministrazione CMS
+TITLE_BROWSE=Navigatore delle Directory
+TITLE_FILEBROWSE=Navigatore dei File
+TITLE_DELETECONFIRM=Conferma di Cancellazione
+TITLE_CREATECOLLCONFIRM=Conferma di creazione della Directory
+TITLE_COPYCONFIRM=Conferma di Copia della Risorsa
+TITLE_MOVECONFIRM=Conferma di Spostamento della Risorsa
+TITLE_VIEWFILE=Visualizzazione delle Proprieta' dei File
+TITLE_EDIT=Modifica File
+TITLE_CREATE=Creazione File
+TITLE_UPLOAD=Caricamento File
+TITLE_SECURECONFIRM=Nodo sicuro
+
+CMS_SEARCH=Ricerca
+CMS_SEARCHNORESULT=Nessun risultato per questa ricerca
+CMS_MENU=Menu delle Azioni
+CMS_ACTION=Azione
+CMS_NAME=Nome
+CMS_TYPE=Tipo
+CMS_CREATED=Creato
+CMS_MODIFIED=Modificato
+CMS_DESCRIPTION=Descrizione
+CMS_VIEW=Visualizza
+CMS_COPY=Copia
+CMS_MOVE=Sposta
+CMS_DELETE=Cancella
+CMS_FOLDER=Cartella
+CMS_FILE=File
+CMS_CREATE=Crea
+CMS_EDIT=Edita
+CMS_UPLOAD=Caricamento
+CMS_MODIFY=Modifica
+CMS_CREATEFOLDER= Crea Cartella
+CMS_CREATEFILE=Crea File
+CMS_UPLOADARCHIVE=Carica Archivio
+CMS_BACKTOBROWSER=Torna al Navigatore delle Directory
+CMS_TRANSFER=Importa/Esporta
+CMS_EXPORTARCHIVE=Esporta Cartella
+CMS_SECURE=Sicuro
+
+CMS_CREATEFILEINDIR=Crea File nella Directory
+CMS_FILENAME=Nome del File
+CMS_TITLE=Titolo
+CMS_LANGUAGE=Lingua
+
+CMS_DELETEPATH=Conferma la Cancellazione di
+CMS_DELETEWARN1=ATTENZIONE! Non ti e\' permesso tornare alla vecchia configurazione\!
+CMS_DELETEWARN2=Sei sicuro di voler cancellare questa risorsa\?
+
+CMS_DESTINATION=Destinazione
+CMS_SOURCE=Sorgente
+
+CMS_EDITING=Editaggio del File
+CMS_LIVE=Rendi \"Dal Vivo\"
+CMS_VERSION=Versione
+
+CMS_LIVEVERSION=Versione dal vivo
+CMS_SIZE=Grandezza
+
+CMS_CONTENT_DIR=Contenuto della Directory
+CMS_CONTENT_DIR_USE=Usa l\'albero delle directory per navigare nella struttura a cartelle del portale.
+CMS_MAIN_USE=Usa la portlet di Amministrazione CMS per gestire il contenuto del tuo portale.
+
+CMS_CREATED_BY=Creato da
+CMS_APPROVE=Approva
+CMS_DENY=Nega
+CMS_APPROVAL=Oggetti in sospeso
+CMS_PATH=Localita\'
+
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/create.jsp 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/create.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -22,6 +22,7 @@
tinyMCE.init({
mode : "textareas",
theme : "advanced",
+ theme_advanced_disable : "styleselect",
plugins : "advhr,advimage,advlink,emotions,insertdatetime,preview,zoom,flash",
theme_advanced_buttons1_add : "fontselect,fontsizeselect,forecolor",
theme_advanced_buttons2_add_before: "cut,copy,paste,separator",
@@ -32,8 +33,23 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "false",
document_base_url : "<%= sDocBase %>",
- extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
+ extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
+
+ var status = true;
+ function toggleEditor()
+ {
+ if(status)
+ {
+ tinyMCE.execCommand("mceRemoveControl", false, "elm1");
+ status = false;
+ }
+ else
+ {
+ tinyMCE.execCommand("mceAddControl", false, "elm1");
+ status = true;
+ }
+ }
</script>
<!-- /tinyMCE -->
@@ -99,6 +115,14 @@
</select>
</td>
</tr>
+ <tr>
+ <td class="portlet-section-header" valign="bottom">
+ ${n:i18n("CMS_WYSIWYG")}:
+ </td>
+ <td>
+ <input type="checkbox" name="wysiwyg" class="portlet-form-input-field" checked onclick="javascript:toggleEditor();"/>
+ </td>
+ </tr>
</table>
</td>
</tr>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/edit.jsp 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms.war/WEB-INF/jsp/cms/admin/edit.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -21,10 +21,11 @@
<!-- tinyMCE -->
<script language="javascript" type="text/javascript"
src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
+<script language="javascript" type="text/javascript">
tinyMCE.init({
mode : "textareas",
theme : "advanced",
+ theme_advanced_disable : "styleselect",
plugins : "advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,flash",
theme_advanced_buttons1_add : "fontselect,fontsizeselect,forecolor",
theme_advanced_buttons2_add_before: "cut,copy,paste,separator",
@@ -37,6 +38,21 @@
document_base_url : "<%= sDocBase %>",
extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
+
+ var status = true;
+ function toggleEditor()
+ {
+ if(status)
+ {
+ tinyMCE.execCommand("mceRemoveControl", false, "elm1");
+ status = false;
+ }
+ else
+ {
+ tinyMCE.execCommand("mceAddControl", false, "elm1");
+ status = true;
+ }
+ }
</script>
<!-- /tinyMCE -->
@@ -107,6 +123,14 @@
<td><%= sVersion %>
</td>
</tr>
+ <tr>
+ <td class="portlet-section-header" valign="bottom">
+ ${n:i18n("CMS_WYSIWYG")}:
+ </td>
+ <td>
+ <input type="checkbox" name="wysiwyg" class="portlet-form-input-field" checked onclick="javascript:toggleEditor();"/>
+ </td>
+ </tr>
</table>
</td>
</tr>
@@ -132,9 +156,10 @@
</tr>
<tr>
<td align="center">
- <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%"
- class="textarea"><%= sContent %>
- </textarea><br>
+ <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%" class="textarea">
+ <%= sContent %>
+ </textarea>
+ <br>
<input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button"/>
<input type="reset" name="reset" value="Reset" class="portlet-form-button"/>
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-04-28 13:00:46 UTC (rev 11430)
+++ 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-04-28 17:52:44 UTC (rev 11431)
@@ -1,5 +1,6 @@
<%@ page import="org.jboss.portal.cms.model.File" %>
<%@ page import="org.jboss.portal.cms.model.Folder" %>
+<%@ page import="org.jboss.portal.cms.model.Content" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
<%@ page import="java.text.Format" %>
<%@ page import="java.text.SimpleDateFormat" %>
@@ -39,9 +40,9 @@
> <a href="<%= url %>"><%= sPathChunk %>
</a>
<%
-}
-else
-{
+ }
+ else
+ {
%>
> <%= sPathChunk %>
<%
@@ -89,10 +90,9 @@
{
File file = (File)files.get(j);
- PortletURL metaURL = renderResponse.createActionURL();
+ PortletURL metaURL = renderResponse.createRenderURL();
metaURL.setParameter("content.uri", file.getBasePath());
metaURL.setParameter("path", sCurrPath);
- metaURL.setParameter("content.action.select", "select");
if ((uri!=null) && (uri.equals(file.getBasePath())))
{
@@ -103,7 +103,6 @@
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 %>"><%=
@@ -117,7 +116,30 @@
%>
</table>
<%
-
- }
-
+if (uri != null)
+{
+ Content content = (Content)renderRequest.getAttribute("content");
%>
+ <p class="portlet-font">
+ Selected file: <%= uri %><br />
+<%
+ if (content.getTitle() != null)
+ {
+ out.println("File title: " + content.getTitle() + "<br />");
+ }
+ if (content.getDescription() != null)
+ {
+ out.println("File description: " + content.getDescription() + "<br />");
+ }
+%>
+ </p>
+<%
+ PortletURL submitURL = renderResponse.createActionURL();
+ submitURL.setParameter("content.uri", uri);
+ submitURL.setParameter("content.action.select", "select");
+%>
+<a href="<%= submitURL.toString() %>">Confirm</a>
+<%
+}
+}
+%>
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)
Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_it.properties (from rev 11430, labs/jbosslabs/trunk/portal-extensions-newportal/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 (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes/Resource_it.properties 2007-04-28 17:52:44 UTC (rev 11431)
@@ -0,0 +1,318 @@
+################################################################################
+# 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. #
+################################################################################
+
+_ASREGISTERED=Non hai ancora un account? Puoi <a href\="index.html?module=user&op=getlogin">crearne uno</a>.
+_BLOCKNICKNAME=Username
+_BLOCKPASSWORD=Password
+
+
+
+MessageOrder=Ordine del messaggio
+Ascending=Ascendente
+Descending=Discendente
+
+AIM=Indirizzo AIM
+ICQ=Numero ICQ
+YIM=Numero YIM
+MSNM=MSN Messenger
+
+YourAIM=Il tuo indirizzo AIM
+YourICQ=Il tuo numero ICQ
+YourYIM=Il tuo numero YIM
+YourMSNM=Il tuo MSN Messenger
+
+MyEmail=La mia e-mail
+MyHomePage=La mia homepage
+
+Question=Domanda segreta
+Answer=Risposta segreta
+Location=Localita'
+Occupation=Occupazione
+Interests=Interessi
+ExtraInfo=Informazioni extra
+YourLocation=La tua localita'
+YourOccupation=La tua occupazione
+YourInterests=Tuoi interessi
+Signature=Firma
+
+LoginSite=Login.
+Register=Registra.
+
+UserExist=Lo Username esiste gia
+ToChangeInfo=per cambiare le tue info
+EmailVerify=Mandato il link di attivazione! Leggi la tua e-mail e clicca sul link per l'attivazione.
+AccountActivated=Account creato con successo!
+UnableActivate=Impossibile validare il nuovo utente.
+LoggingYou=Login in atto, attenti un po'\!
+YouAreLoggedOut=Sei uscito\!
+PassDifferent=Le passwords sono differenti. Devono essere identiche.
+YourPassMustBe=Mi spiace, la tua password deve essere di almeno
+CharLong=caratteri
+UserNotExist=L'utente non esiste\!
+UserRegLogin=Registrazione utente/login
+SelectOption=Seleziona un'opzione dal menu in basso\:
+RetrievePass=Ricevi la password persa.
+RegNewUser=Nuova registrazione utente
+PasswordAgain=Conferma la tua password
+Email=E-mail
+Options=Opzioni
+AllowEmailView=Permetti agli altri utenti di vedere la mia e-mail
+AsRegUser=Come utente registrato puoi\:
+AsReg6=Seleziona differenti temi
+AsReg5=Personalizza i commenti
+AsReg4=Seleziona quanti nuovi oggetti da mostrare sulla homepage
+AsReg3=Prendi un box personale sulla homepage
+AsReg2=Manda news con il tuo username
+AsReg1=Rispondi con il tuo username
+RegisterNow=Registrati ora\! E' gratis\!
+WeDontGive=Non vogliamo darti altre informazioni personali.
+WelcomeTo=Benvenuto su
+Registration=area di registrazione.
+
+Over13_1=Io sono
+Over13_2=o al di sopra o con il consenso dei genitori
+MustBe_1=Devi essere
+MustBe_2=o al di sopra, o con il consenso dei genitori per registrarmi qui.
+Consent_1=(Cliccando sul link qui sopra per verificare quanto detto<br>
+Consent_2=o al di sopra, o con il consenso dei genitori per registrarmi qui.)
+Under13_1=Sono al di sotto
+Under13_2=e non ho il consenso dei genitori.
+
+Sorry=Mi spiace.
+Click=Per favore clicca
+Here=qui
+Return=per ritornare alla pagina principale.
+UserName=Username
+GoBack=Indietro
+Finish=Termina
+PersonalInfo=Informazione personale
+RealName=nome reale
+Optional=(opzionale)
+CanKnowAbout=(massimo 255 caratteri. Scrivi cosa vorresti far sapere agli altri)
+Language=Lingua
+255CharMax=(massimo 255 caratteri. Scrivi la tua firma con la codifica HTML)
+YourAvatar=La tua identita'
+YourHomePage=Il tuo sito web
+TimeZoneOffset=Fuso orario
+EmailNotPublic=(Questa e-mail non sara' pubblica ma e' richiesta. Sara' usata per inviarti la password nel caso la perdessi)
+EmailPublic=(Questa e-mail sara' pubblica. Scrivi quello che vuoi. A prova di spam)
+RealEmail=e-mail principale
+FakeEmail=e-mail secondaria
+NewUser=Nuovo utente
+SaveChanges=Salva le modifiche
+SaveChange=Salva la modifica
+TypeNewPassword=(digita una nuova password due volte per cambiarla)
+Search=Cerca
+All=Tutto
+UsersFoundFor=utenti trovati per
+Pages=pagine
+UsersShown=utenti mostrati
+Delete=Cancella
+Edit=Modifica
+Ok=Ok
+Cancel=Cancella
+AreYouSureToDeleteUser=Sei sicuro di voler cancellare l' utente?
+UserDeleted=Utente cancellato con successo
+ReturnToMemberList=Ritorna alla lista dei membri
+Avatar=Identita'
+AdminFunctions=Funzioni di amministrazione
+URL=URL
+UpdateUser=Aggiorna l'utente
+UserID=User ID
+ForChanges=(Solo per le modifiche)
+MemberList=Lista dei membri
+SearchTip=Consiglio: scegli una lettera, visualizza tutto o cerca un utente se conosci lo username
+
+ThemeText1=Quest'opzione cambiera' il look all'intero sito.
+ThemeText2=Le modifiche saranno valide solo per te.
+ThemeText3=Ogni utente puo' vedere il sito con un tema differente.
+SelectTheme=Seleziona un tema
+ThemeSelection=Selezione del tema
+
+CannotLogin=Non posso procedere con la login
+
+LoginInvalidName=il nome utente non e' valido
+LoginNoSuchUser=il nome utente non esiste
+LoginBadPassword=la tua password non e' corretta
+LoginUnexpectedError=errore inaspettato
+LoginUserDisabled=il tuo account e' stato bloccato. Per favore contatta l'amministratore.
+
+Enable=Attiva
+Disable=Disattiva
+StatusChanged=Lo stato dell'utente e' stato modificato con successo
+
+NotAuth=Non sei autorizzato ad eseguire quest\'operazione
+
+
+REMEMBERME=Ricordami
+LOGIN=Login
+USERNAME=Username
+PASSWORD=Password
+USERLOGIN=Login utente
+
+OPTIONAL=Opzionale
+REQUIRED=Obbligatorio
+
+255MAX=(Firma di massimo 255 caratteri)
+
+NAMENOTAVAILABLE=N/A
+
+MODIFIED_PROFILE=Il tuo profilo e' stato modificato, il portale lavorera' con il vecchio profilo finche' non ti ricolleghi.
+
+# Registration
+REGISTER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=Non hai ancora un account? Puoi
+REGISTER_REGISTER_LINK=crearlo
+REGISTER_REGISTER_ADMIN_LINK=Crea un account
+REGISTER_TY=Grazie per la registrazione.
+REGISTER_BASICINFO=Informazioni base sull'utente
+REGISTER_IM=Identita' del messaggio istantaneo
+REGISTER_ADDITIONAL=Informazioni sull'utente opzionali e aggiuntive
+REGISTER_NEWUSER=Registrazione nuovo utente
+REGISTER_PASSWORDAGAIN=Conferma la tua password
+REGISTER_REALEMAIL=e-mail principale
+REGISTER_EMAILNOTPUBLIC=(Questa e-mail non sara' pubblica ma e' richiesta. Sara' usata per inviarti la password nel caso la perdessi)
+REGISTER_FAKEEMAIL=e-mail secondaria
+REGISTER_EMAILPUBLIC=(Questa e-mail sara' pubblica. Scrivi quello che vuoi. A prova di spam)
+REGISTER_FAKEEMAIL_EXPLAIN=Se questo campo non e' vuoto, l'e-mail principale sara' usata solo per mandare notifiche
+REGISTER_QUESTION=Domanda segreta
+REGISTER_ANSWER=Risposta segreta
+REGISTER_ASREGUSER=Come utente registrato puoi:
+REGISTER_ASREG6=Seleziona differenti temi
+REGISTER_ASREG5=Personalizza i commenti
+REGISTER_ASREG4=Seleziona quanti nuovi oggetti mostrare sulla homepage
+REGISTER_ASREG3=Ottieni un box personale sulla homepage
+REGISTER_ASREG2=Manda news con il tuo username
+REGISTER_ASREG1=Rispondi ai commenti con il tuo username
+REGISTER_REGISTERNOW=Registrati ora! E' gratis!
+REGISTER_WEDONTGIVE=Non vogliamo dare agli altri le tue informazioni personali.
+REGISTER_ALREADYHAVEACCOUNT=Hai gia' un account:
+REGISTER_SIGNIN=Registrati
+REGISTER_GIVENNAME=Nome
+REGISTER_FAMILYNAME=Cognome
+REGISTER_PERSONALINFO=Informazione personale
+REGISTER_VIEWREALEMAIL=Permetti agli altri utenti di vedere il mio indirizzo di posta
+REGISTER_HOMEPAGE=Indirizzo del tuo sito personale
+REGISTER_TIMEZONEOFFSET=Fuso orario
+REGISTER_THEME=Tema
+REGISTER_DEFAULT_THEME=Sito di default
+REGISTER_ICQ=Id ICQ
+REGISTER_AIM=Id AIM
+REGISTER_YIM=Id Yahoo
+REGISTER_MSNM=Id MSN messenger
+REGISTER_SKYPE=Id Skype
+REGISTER_LOCATION=Localita'
+REGISTER_LANGUAGE=Lingua preferita
+REGISTER_OCCUPATION=Occupazione
+REGISTER_INTERESTS=Interessi
+REGISTER_SIGNATURE=Firma
+REGISTER_EXTRAINFO=Informazioni extra
+REGISTER_CANKNOWABOUT=(massimo 255 caratteri. Scrivi quello che vuoi che gli altri sappiano di te)
+REGISTER_SAVECHANGES=Salva le modifiche
+REGISTER_CONFIRMATIONEMAIL=E-mail di conferma
+
+REGISTER_SHOWMENU=Torna al menu utenti
+
+REGISTER_ERROR_INVALIDUSERNAME=Il nome utente non e' valido
+REGISTER_ERROR_EXISTINGUSERNAME=Questo nome utente e' gia' stato preso
+REGISTER_ERROR_INVALIDPASSWORD1=La password non e' valida
+REGISTER_ERROR_INVALIDPASSWORD2=La password non e' valida
+REGISTER_ERROR_PASSWORDMISMATCH=La password non corrisponde
+REGISTER_ERROR_INVALIDREALEMAIL=L'indirizzo di posta non e' valido
+
+REGISTER_CONFIRM=L'utente e' stato creato con successo.
+REGISTER_ADMIN_SEARCH=Visualizza/edita gli utenti
+
+
+MENU_LOGOUT=Logout
+MENU_EDITPROFILE=Modifica il tuo profilo
+MENU_LISTUSERS=Lista di tutti gli utenti
+
+LIST_FILTERS=Applica i filtri alla lista
+LIST_USERSPERPAGE=Utenti per pagina
+LIST_USERNAMECONTAINS=Contiene lo username
+LIST_FULLNAME=Nome per intero
+LIST_USERNAME=Nome utente
+LIST_FIRSTNAME=Nome
+LIST_LASTNAME=Cognome
+LIST_ROLES=Ruoli
+LIST_ACTIONS=Azioni
+LIST_ACTIONSSHOWPROFILE=Profilo
+LIST_ACTIONADDROLESTOUSER=Ruoli
+LIST_ACTIONEDITROLES=Modifica i ruoli
+LIST_ACTIONDELETEUSER=Cancella l'utente
+LIST_SEARCHRESULTS=Cerca i risultati per
+LIST_MATCHING=Utenti trovati
+FILTER=Filtro
+
+NEXTPAGE=Prossima pagina
+PREVIOUSPAGE=Pagina precedente
+
+ASSIGNROLES=Assegna i ruoli
+ROLESAVAILABLE=Ruoli attivi
+EDITROLESFORUSER=Modifica i ruoli per l'utente
+
+
+ROLE_THEREARE=Ci sono
+ROLE_THEREIS=C'e'
+ROLE_ROLESDEFINED=ruoli definiti
+ROLE_ROLEDEFINED=ruolo definito
+
+ROLE_NAME=Nome del nuovo ruolo
+ROLE_DISPLAYNAME=Nome visualizzabile del ruolo
+ROLE_NEWDISPLAYNAME=Nuovo nome visualizzato del ruolo
+ROLE_SELECTONETOMODIFY= Seleziona il ruolo da modificare
+ROLE_SELECTONETODELETE= Seleziona il ruolo da cancellare
+ROLE_CREATE=Crea un nuovo ruolo utente
+ROLE_UPDATE=Aggiorna il ruolo utente
+ROLE_EDIT=Modifica il ruolo utente
+ROLE_DELETE=Cancella il ruolo selezionato
+ROLE_DELETED=Il ruolo e'stato cancellato
+ROLE_EDIT_MEMBERS=Modifica il ruolo dei membri
+ROLE_MAINLIST=Torna alla modifica del ruolo
+ROLE_EDIT_USER=Modifica i ruoli degli utenti
+
+ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Esiste gia' un ruolo con quel nome visualizzabile
+ROLE_ERROR_NAMEALREADYEXISTS=Esiste gia' un ruolo con quel nome
+ROLE_ERROR_NAMEEMPTY=Il nome del ruolo non puo' essere vuoto
+ROLE_ERROR_DISPLAYNAMEEMPTY=Il nome visualizzabile del ruolo non puo' essere vuoto
+ROLE_ERROR_DELETE_FAILED=Non si puo' cancellare il ruolo
+
+MENU_CREATEROLE=Crea un nuovo ruolo
+MENU_EDITROLE=Modifica il ruolo esistente
+MENU_EDITROLEMEMBERS=Modifica i membri del ruolo
+
+ROLE_TEXT_1=Usa questa portlet per creare,editare,cancellare e aggiungere i ruoli agli utenti.
+ROLE_TEXT_2=Questi ruoli sono usati nella portlet di gestione per configurare i permessi.
+
+PERMISSION_PICKPORTLET=Amministrazione dei permessi per le portlet
+PERMISSION_PERMISSIONS=Permessi di modifica
+PERMISSION_TOP=Seleziona un componente da modificare
+PERMISSION_FINERGRAIN=Seleziona un sotto componente per definire i suoi permessi
+PERMISSION_MODIFYROLES=Aggiungi/Rimuovi ruoli
+PERMISSION_MODIFYINGROLES=Modifica i ruoli per
+PERMISSION_DOMAIN=Dominio
+PERMISSION_DOMAIN_MOD=Modifica Dominio
+PERMISSION_DEFINEDROLES=Ruoli definiti
+PERMISSION_IMPLIEDROLES=Ruoli impliciti
+
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/catalog/index.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -9,22 +9,15 @@
<%
String contextPath = request.getContextPath();
- PortalNode parent = (PortalNode) request.getAttribute("parentNode");
+ String parent = (String) request.getAttribute("parentNode");
+ HashMap parents = (HashMap) request.getAttribute("parents");
HashMap parentChildMap = (HashMap) request.getAttribute("pchild");
HashMap parentSiblingMap = (HashMap) request.getAttribute("psib");
%>
<style>
<!--
- #foldheader {
- margin-left: - 20px;
- padding: 3px 0 3px 0px;
- cursor: pointer;
- cursor: hand;
- list-style-image: url( <%= contextPath %>/images/catalog/bullet.gif );
- }
-
- #foldinglist {
+ .foldinglist {
list-style-position: outside;
margin-left: 10px;
padding: 3px 0 3px 0px;
@@ -32,7 +25,7 @@
list-style-image: url( <%= contextPath %>/images/catalog/bullet.gif )
}
- #pagenosub {
+ .pagenosub {
margin-left: - 20px;
list-style-image: url( <%= contextPath %>/images/catalog/bullet.gif )
}
@@ -42,28 +35,40 @@
-->
</style>
-<ul>
- <li id="foldheader"><div class="portlet-form-field-label"><%= parent.getName() %></div></li>
- <ul id="foldinglist">
- <%
- for(Iterator i = parentChildMap.keySet().iterator(); i.hasNext();)
- {
- String childName = (String) i.next();
- PortalNodeURL childURL = (PortalNodeURL) parentChildMap.get(childName);
- %>
- <li id="foldinglist"><div class="portlet-form-field-label"><a
- href="<%= childURL.toString() %>"><%= childName %></a></div></li>
- <%
- }
- %>
- </ul>
+<%
+String output = new String();
+for (Iterator i = parents.keySet().iterator(); i.hasNext();)
+{
+ String name = (String) i.next();
+ PortalNodeURL nodeURL = (PortalNodeURL) parents.get(name);
+ output = "<a href=\"" + nodeURL.toString() + "\">" + name + "</a> > " + output;
+}
+output += parent;
+%>
+
+<div class="portlet-form-field-label"><%= output %></div></li>
+
+<ul id="foldinglist">
+ <li class="pagenosub">
+ <div class="portlet-form-field-label"><%= parent %></div></li>
+ </li>
<%
+ for(Iterator i = parentChildMap.keySet().iterator(); i.hasNext();)
+ {
+ String childName = (String) i.next();
+ PortalNodeURL childURL = (PortalNodeURL) parentChildMap.get(childName);
+ %>
+ <li class="foldinglist"><div class="portlet-form-field-label"><a
+ href="<%= childURL.toString() %>"><%= childName %></a></div></li>
+ <%
+ }
+
for(Iterator j = parentSiblingMap.keySet().iterator(); j.hasNext();)
{
String siblingName = (String) j.next();
PortalNodeURL siblingURL = (PortalNodeURL) parentSiblingMap.get(siblingName);
%>
- <li id="pagenosub">
+ <li class="pagenosub">
<div class="portlet-form-field-label"><a href="<%= siblingURL.toString() %>"><%= siblingName %></a></div></li>
<%
}
Added: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/header.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -0,0 +1,54 @@
+<%@ page import="org.jboss.portal.identity.User" %>
+
+<%
+ User user = (User) request.getAttribute("org.jboss.portal.header.USER");
+ String dashboardURL = (String) request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
+ String loginURL = (String) request.getAttribute("org.jboss.portal.header.LOGIN_URL");
+ String defaultPortalURL = (String) request.getAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL");
+ String adminPortalURL = (String) request.getAttribute("org.jboss.portal.header.ADMIN_PORTAL_URL");
+ String editDashboardURL = (String) request.getAttribute("org.jboss.portal.header.EDIT_DASHBOARD_URL");
+ String copyToDashboardURL = (String) request.getAttribute("org.jboss.portal.header.COPY_TO_DASHBOARD_URL");
+ String signOutURL = (String) request.getAttribute("org.jboss.portal.header.SIGN_OUT_URL");
+%>
+
+<%
+ if (user == null)
+ {
+%>
+ <a href="<%= loginURL %>">Login</a>
+<%
+ }
+ else
+ {
+%>
+Logged in as: <%= user.getUserName() %><br/><br/>
+
+<%
+ if (dashboardURL != null)
+ {
+%> <a href="<%= dashboardURL %>">Dashboard</a> |<%
+ }
+
+ if (defaultPortalURL != null)
+ {
+%> <a href="<%= defaultPortalURL %>">Portal</a> |<%
+ }
+
+ if (adminPortalURL != null)
+ {
+%> <a href="<%= adminPortalURL %>">Admin</a> |<%
+ }
+
+ if (editDashboardURL != null)
+ {
+%> <a href="<%= editDashboardURL %>">Edit page</a> |<%
+ }
+
+ if (copyToDashboardURL != null)
+ {
+%> <a href="<%= copyToDashboardURL %>">Copy to my dashboard</a> |<%
+ }
+%> <a href="<%= signOutURL %>">Logout</a>
+<%
+ }
+%>
\ 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/header/tabs.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/header/tabs.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -0,0 +1,80 @@
+<%@ page import="java.util.Iterator" %>
+<%@ page import="org.jboss.portal.api.node.PortalNode" %>
+<%@ page import="java.util.Locale" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="org.jboss.portal.api.PortalRuntimeContext" %>
+
+<%
+ PortalNode root = (PortalNode)request.getAttribute("org.jboss.portal.api.PORTAL_NODE");
+ PortalNode portal = root;
+ PortalNode mainPage = portal;
+
+ while (portal.getType() != PortalNode.TYPE_PORTAL)
+ {
+ mainPage = portal;
+ portal = portal.getParent();
+ }
+
+ PortalRuntimeContext context = (PortalRuntimeContext)request.getAttribute("org.jboss.portal.api.PORTAL_RUNTIME_CONTEXT");
+
+ // Get a locale
+ Locale locale = request.getLocale();
+ if (locale == null)
+ {
+ locale = Locale.getDefault();
+ }
+%>
+
+<ul id="tabsHeader">
+<%
+ ArrayList tmp = new ArrayList(10);
+ Iterator childrenIt = portal.getChildren().iterator();
+ while (childrenIt.hasNext())
+ {
+ PortalNode child = (PortalNode)childrenIt.next();
+
+ // Get the list of child pages
+ tmp.clear();
+ for (Iterator i = child.getChildren().iterator();i.hasNext();)
+ {
+ PortalNode childChild = (PortalNode)i.next();
+ if (childChild.getType() == PortalNode.TYPE_PAGE)
+ {
+ tmp.add(childChild);
+ }
+ }
+%>
+ <li <% if(child == mainPage) out.println(" id=\"current\""); %> onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"><a href="<%= child.createURL(context) %>"><%= child.getDisplayName(locale) %>
+<%
+ if (tmp.size() == 0)
+ {
+%>
+ </a>
+<%
+ }
+ else
+ {
+%>
+ <!--[if IE 7]><!--></a><!--<![endif]-->
+ <!--[if lte IE 6]><table><tr><td><![endif]-->
+ <ul>
+<%
+ for (Iterator j = tmp.iterator(); j.hasNext();)
+ {
+ PortalNode childChild = (PortalNode)j.next();
+%>
+ <li><a href='<%= childChild.createURL(context) %>'><%= childChild.getDisplayName(locale) %></a></li>
+<%
+ }
+%>
+ </ul>
+ <!--[if lte IE 6]></td></tr></table></a><![endif]-->
+<%
+ }
+%>
+ </li>
+<%
+ }
+
+%>
+</ul>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/createRole.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/createRole.jsp 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/createRole.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,28 +1,33 @@
-<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored ="false" %>
-<portlet:defineObjects/>
-
-<form name="createRole" action="<portlet:actionURL><portlet:param name="op" value="createRole"/></portlet:actionURL>" method="post">
- <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
- <tr>
- <td colspan="2" class="portlet-section-alternate">
- <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/role.gif" align="absmiddle"/>
- ${n:i18n("ROLE_CREATE")}</td>
- </tr>
- <tr>
- <td class="portlet-section-body">${n:i18n("ROLE_NAME")}:</td>
- <td class="portlet-section-body"><input class="portlet-form-input-field" type="text" name="rolename" value="${param["rolename"]}" size="21" maxlength="25"> <n:error key="rolename_error"/></td>
- </tr>
- <tr>
- <td class="portlet-section-body">${n:i18n("ROLE_DISPLAYNAME")}:</td>
- <td class="portlet-section-body"><input class="portlet-form-input-field" type="text" name="roledisplayname" value="${param["roledisplayname"]}" size="21" maxlength="25"> <n:error key="roledisplayname_error"/></td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <input name="createRole" type="submit" value="${n:i18n("ROLE_CREATE")}" class="portlet-form-button">
- </td>
- </tr>
- </table>
-</form>
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+<portlet:defineObjects/>
+
+<form name="createRole" action="<portlet:actionURL><portlet:param name="op" value="createRole"/></portlet:actionURL>"
+ method="post">
+ <table border="0" class="portlet-font" cellspacing="0" cellpadding="2">
+ <tr>
+ <td colspan="2" class="portlet-section-alternate">
+ <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/role.gif" align="absmiddle"/>
+ ${n:i18n("ROLE_CREATE")}</td>
+ </tr>
+ <tr>
+ <td class="portlet-section-body">${n:i18n("ROLE_NAME")}:</td>
+ <td class="portlet-section-body"><input class="portlet-form-input-field" type="text" name="rolename"
+ value="${param["rolename"]}" size="21" maxlength="25"> <n:error
+ key="rolename_error"/></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-body">${n:i18n("ROLE_DISPLAYNAME")}:</td>
+ <td class="portlet-section-body"><input class="portlet-form-input-field" type="text" name="roledisplayname"
+ value="${param["roledisplayname"]}" size="21" maxlength="25"> <n:error
+ key="roledisplayname_error"/></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input name="createRole" type="submit" value="${n:i18n("ROLE_CREATE")}" class="portlet-form-button">
+ </td>
+ </tr>
+ </table>
+</form>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRole.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRole.jsp 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/editRole.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,27 +1,27 @@
-<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored="false" %>
-<portlet:defineObjects/>
-
-<div>
- <h6>${n:i18n("MENU_EDITROLE")}: ${n:out("editroledisplayname")}</h6>
-
- <form name="editRole"
- action="<portlet:actionURL><portlet:param name="op" value="editRole"/></portlet:actionURL>" method="post">
- <input type="hidden" name="roleid" value="${n:out("editroleid")}"/>
-
- <p>
- <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}</label>
- <br/>
- <input name="roledisplayname" type="text" value="${param["editroledisplayname"]}" size="21" maxlength="25"/>
- <n:error key="roledisplayname_error"/>
- </p>
-
- <p><input name="Save" type="submit" class="portlet-form-button" id="Save"
- value="${n:i18n("SaveChanges")}"/>
- <span class="portlet-font"><a
- href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
- </p>
- </form>
-</div>
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+<portlet:defineObjects/>
+
+<div>
+ <h6>${n:i18n("MENU_EDITROLE")}: ${n:out("editroledisplayname")}</h6>
+
+ <form name="editRole"
+ action="<portlet:actionURL><portlet:param name="op" value="editRole"/></portlet:actionURL>" method="post">
+ <input type="hidden" name="roleid" value="${n:out("editroleid")}"/>
+
+ <p>
+ <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}</label>
+ <br/>
+ <input name="roledisplayname" type="text" value="${param["editroledisplayname"]}" size="21" maxlength="25"/>
+ <n:error key="roledisplayname_error"/>
+ </p>
+
+ <p><input name="Save" type="submit" class="portlet-form-button" id="Save"
+ value="${n:i18n("SaveChanges")}"/>
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
+ </p>
+ </form>
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/menu.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/menu.jsp 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role/menu.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,65 +1,74 @@
-<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
-<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page isELIgnored="false" %>
-<portlet:defineObjects/>
-<div class="portlet-section-body">
- <p>
- ${n:i18n("ROLE_TEXT_1")} ${n:i18n("ROLE_TEXT_2")}
- <hr/>
- </p>
- <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
- <tr>
- <td class="portlet-table-text" colspan="3"><strong>${n:out("nbRoles")}</strong></td>
- </tr>
- <n:iterate ctx="role">
- <tr>
- <td width="100%" class="portlet-table-text"><a href="<portlet:renderURL windowState="maximized">
- <portlet:param name="op" value="showEditRole" />
- <portlet:param name="roleid" value="${n:out('role.id')}"/>
- <portlet:param name="roledisplayname" value="${n:out('role.displayname')}"/>
- </portlet:renderURL>">${n:out("role.displayname")}</a></td>
- <td nowrap class="portlet-table-text"><a href="<portlet:actionURL>
- <portlet:param name="op" value="showListEditRoleMembers"/>
- <portlet:param name="roleid" value="${n:out('role.id')}"/>
- <portlet:param name="usersperpage" value="10"/>
- <portlet:param name="usernamefilter" value=""/>
- </portlet:actionURL>">Members</a></td>
- <td nowrap class="portlet-table-text"><a href="<portlet:actionURL>
- <portlet:param name="op" value="removeRole"/>
- <portlet:param name="roleid" value="${n:out('role.id')}"/>
- </portlet:actionURL>">Delete</a></td>
- </tr>
- </n:iterate>
- </table>
- <p><a onclick="hideShow('showall');" href="#" class="addicon">${n:i18n("MENU_CREATEROLE")}</a></p>
- <n:error key="rolename_error"/>
- <br/>
- <n:error key="roledisplayname_error"/>
-</div>
-<div id="showall" class="hidden">
- <div>
- <hr/>
-
- <h6>${n:i18n("ROLE_CREATE")}</h6>
-
- <form name="createRole"
- action="<portlet:actionURL><portlet:param name="op" value="createRole"/></portlet:actionURL>" method="post">
- <p>
- <label class="portlet-form-label">${n:i18n("ROLE_NAME")}</label>
- <br/>
- <input name="rolename" type="text"/>
- </p>
-
- <p>
- <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}</label>
-
- <br/>
- <input name="roledisplayname" type="text"/></p>
-
- <p><input name="Save" type="submit" class="portlet-form-button" id="Save"
- value="${n:i18n("SaveChanges")}"/>
- </p>
- </form>
- </div>
-</div>
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ page isELIgnored="false" %>
+<portlet:defineObjects/>
+<div class="portlet-section-body">
+ <p>
+ ${n:i18n("ROLE_TEXT_1")} ${n:i18n("ROLE_TEXT_2")}
+ <hr/>
+ </p>
+ <table width="100%" border="0" cellspacing="0" class="portlet-table-body">
+ <tr>
+ <td class="portlet-table-text" colspan="3"><strong>${n:out("nbRoles")}</strong></td>
+ </tr>
+ <n:iterate ctx="role">
+ <tr>
+ <td width="100%" class="portlet-table-text"><a href="<portlet:renderURL windowState="maximized">
+ <portlet:param name="op" value="showEditRole" />
+ <portlet:param name="roleid" value="${n:out('role.id')}"/>
+ <portlet:param name="roledisplayname" value="${n:out('role.displayname')}"/>
+ </portlet:renderURL>">${n:out("role.displayname")}</a></td>
+ <td nowrap class="portlet-table-text"><a href="<portlet:actionURL>
+ <portlet:param name="op" value="showListEditRoleMembers"/>
+ <portlet:param name="roleid" value="${n:out('role.id')}"/>
+ <portlet:param name="usersperpage" value="10"/>
+ <portlet:param name="usernamefilter" value=""/>
+ </portlet:actionURL>">Members</a></td>
+ <td nowrap class="portlet-table-text"><a href="<portlet:actionURL>
+ <portlet:param name="op" value="removeRole"/>
+ <portlet:param name="roleid" value="${n:out('role.id')}"/>
+ </portlet:actionURL>">Delete</a></td>
+ </tr>
+ </n:iterate>
+ </table>
+ <p>
+
+ <form class="addicon">
+ <input type="button"
+ class="portlet-form-button"
+ value="${n:i18n("MENU_CREATEROLE")}"
+ onClick="hideShow('showall');">
+ </form>
+
+ <!--a onclick="hideShow('showall');" href="#" class="addicon">${n:i18n("MENU_CREATEROLE")}</a--></p>
+ <n:error key="rolename_error"/>
+ <br/>
+ <n:error key="roledisplayname_error"/>
+</div>
+<div id="showall" class="hidden">
+ <div>
+ <hr/>
+
+ <h6>${n:i18n("ROLE_CREATE")}</h6>
+
+ <form name="createRole"
+ action="<portlet:actionURL><portlet:param name="op" value="createRole"/></portlet:actionURL>" method="post">
+ <p>
+ <label class="portlet-form-label">${n:i18n("ROLE_NAME")}</label>
+ <br/>
+ <input name="rolename" type="text"/>
+ </p>
+
+ <p>
+ <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}</label>
+
+ <br/>
+ <input name="roledisplayname" type="text"/></p>
+
+ <p><input name="Save" type="submit" class="portlet-form-button" id="Save"
+ value="${n:i18n("SaveChanges")}"/>
+ </p>
+ </form>
+ </div>
+</div>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout/portal-renderSet.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -41,4 +41,22 @@
<decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
</set>
</renderSet>
+ <renderSet name="divRendererNoAjax">
+ <set content-type="text/html">
+ <ajax-enabled>false</ajax-enabled>
+ <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer>
+ <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer>
+ <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer>
+ <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer>
+ </set>
+ </renderSet>
+ <renderSet name="emptyRendererNoAjax">
+ <set content-type="text/html">
+ <ajax-enabled>false</ajax-enabled>
+ <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
+ <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer>
+ <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer>
+ <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
+ </set>
+ </renderSet>
</portal-renderSet>
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/portlet.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -40,9 +40,9 @@
<init-param>
<description>Subscription mode</description>
<name>subscriptionMode</name>
+ <value>automatic</value>
+ <!--
<value>emailVerification</value>
- <!--
- <value>automatic</value>
-->
</init-param>
<init-param>
Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/images/catalog/T.gif
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/images/catalog/bullet.gif
===================================================================
(Binary files differ)
Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/images/catalog/minus.gif
===================================================================
(Binary files differ)
Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/images/catalog/plus.gif
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/index.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/index.jsp 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/layouts/generic/index.jsp 2007-04-28 17:52:44 UTC (rev 11431)
@@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html;"/>
<!-- to correct the unsightly Flash of Unstyled Content. -->
<script type="text/javascript"></script>
- <!-- inject the theme; default to the Renaissance theme if nothing is selected for the portal or the page -->
+ <!-- inject the theme, default to the Renaissance theme if nothing is selected for the portal or the page -->
<p:theme themeName="renaissance"/>
<!-- insert header content that was possibly set by portlets on the page -->
<p:headerContent/>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/industrial/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/industrial/portal_style.css 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/industrial/portal_style.css 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1021,19 +1021,3 @@
/* Top level style for the content of a tab. */
.portlet-tab-area {
}
-
-/*****************
-* AJAX Selectors *
-*****************/
-
-.handle {
- cursor: move;
-}
-
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/maple/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/maple/portal_style.css 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/maple/portal_style.css 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1042,22 +1042,6 @@
}
-/*****************
-* AJAX Selectors *
-*****************/
-
-.handle {
- cursor: move;
-}
-
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
-
/****************** Not sure about the following selectors:
PortletHeaderColor
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/mission-critical/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/mission-critical/portal_style.css 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/mission-critical/portal_style.css 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1121,19 +1121,3 @@
/* Top level style for the content of a tab. */
.portlet-tab-area {
}
-
-/*****************
-* AJAX Selectors *
-*****************/
-
-.handle {
- cursor: move;
-}
-
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/phalanx/portal_style.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/phalanx/portal_style.css 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/phalanx/portal_style.css 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1024,19 +1024,3 @@
/* Top level style for the content of a tab. */
.portlet-tab-area {
}
-
-/*****************
-* AJAX Selectors *
-*****************/
-
-.handle {
- cursor: move;
-}
-
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-core.war/themes/renaissance/portal_style.css 2007-04-28 17:52:44 UTC (rev 11431)
@@ -461,7 +461,6 @@
*****************************/
.portlet-container {
-/* margin: 10px;*/
padding: 10px;
}
@@ -496,14 +495,6 @@
height: 29px;
min-width: 9px;
background-position: bottom;
- /*
- background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- border-left: 1px solid #98b7c6;
- width:20px;
- white-space: nowrap;
- */
}
.portlet-titlebar-center {
@@ -511,11 +502,6 @@
background-repeat: repeat-x;
height: 29px;
background-position: bottom;
- /* background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- white-space: nowrap;
- */
}
.portlet-titlebar-right {
@@ -525,14 +511,6 @@
height: 30px;
min-width: 10px;
background-position: bottom left;
- /*
- background-color:#dfe8ed;
- border-top: 1px solid #98b7c6;
- border-right: 1px solid #98b7c6;
- border-bottom: 1px solid #98b7c6;
- width:10px;
- white-space: nowrap;
- */
}
.portlet-content-left {
@@ -1159,18 +1137,10 @@
* AJAX Selectors *
*****************/
-.handle {
- cursor: move;
+.dnd-droppable {
+ border: #E6E8E5 1px solid;
}
-.emptyPlaceMarker {
- border-right: red 1px dashed;
- border-top: red 1px dashed;
- border-left: red 1px dashed;
- border-bottom: red 1px dashed;
- background-color: Transparent;
-}
-
/*******************************************************************************************************************************
New Selectors added by JBoss.ORG UI Design for theme development
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-samples.sar/lib/portal-core-samples-lib.jar
===================================================================
(Binary files differ)
Copied: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_it.properties (from rev 11430, labs/jbosslabs/trunk/portal-extensions-newportal/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_it.properties)
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_it.properties (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/classes/NewsResource_it.properties 2007-04-28 17:52:44 UTC (rev 11431)
@@ -0,0 +1,25 @@
+################################################################################
+# 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. #
+################################################################################
+
+javax.portlet.preference.description.RssXml=URL per RSS
+javax.portlet.preference.description.expires=Scadenza
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/default-object.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -314,7 +314,7 @@
<page-name>TestWithAjax</page-name>
<properties>
<property>
- <name>theme.dyna.async_window_enabled</name>
+ <name>theme.dyna.partial_refresh_enabled</name>
<value>true</value>
</property>
<property>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-samples.sar/portal-samples.war/WEB-INF/jboss-portlet.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -80,13 +80,13 @@
<portlet>
<portlet-name>URLPortlet</portlet-name>
<ajax>
- <asynchronous>false</asynchronous>
+ <partial-refresh>false</partial-refresh>
</ajax>
</portlet>
<portlet>
<portlet-name>AsyncURLPortlet</portlet-name>
<ajax>
- <asynchronous>true</asynchronous>
+ <partial-refresh>true</partial-refresh>
</ajax>
</portlet>
<portlet>
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/binaries/portal/to-copy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -33,7 +33,7 @@
<!-- Bridge portal user events -->
<listener>
- <listener-class>org.jboss.portal.core.event.user.UserEventBridge</listener-class>
+ <listener-class>org.jboss.portal.core.impl.api.user.UserEventBridge</listener-class>
</listener>
<!-- The portal servlet is the main entrance point -->
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.old.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -94,6 +94,13 @@
<!-- Server stack -->
<mbean
+ code="org.jboss.portal.server.aspects.server.SessionLockInterceptor"
+ name="portal:service=Interceptor,type=Server,name=SessionLock"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
code="org.jboss.portal.core.aspects.server.TransactionInterceptor"
name="portal:service=Interceptor,type=Server,name=Transaction"
xmbean-dd=""
@@ -144,6 +151,7 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
+ <depends-list-element>portal:service=Interceptor,type=Server,name=SessionLock</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=UserEvent</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element>
@@ -336,6 +344,13 @@
<xmbean/>
</mbean>
<mbean
+ code="org.jboss.portal.core.aspects.portlet.AjaxInterceptor"
+ name="portal:service=Interceptor,type=Portlet,name=Ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>
+ <mbean
code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory"
name="portal:service=InterceptorStackFactory,type=Producer"
xmbean-dd=""
@@ -350,6 +365,7 @@
<depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Bridge</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element>
+ <depends-list-element>portal:service=Interceptor,type=Portlet,name=Ajax</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Header</depends-list-element>
<depends-list-element>portal:service=Interceptor,type=Portlet,name=Transaction</depends-list-element>
@@ -374,7 +390,7 @@
<attribute name="DefaultLayoutName">generic</attribute>
</mbean>
<mbean
- code="org.jboss.portal.theme.impl.page.PageServiceImpl"
+ code="org.jboss.portal.theme.impl.PageServiceImpl"
name="portal:service=PageService"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -628,22 +644,6 @@
optional-attribute-name="InstanceContainer"
proxy-type="attribute">portal:container=Instance</depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.impl.model.content.generic.GenericContentProviderRegistry"
- name="portal:service=GenericContentProviderRegistry"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Registry"
- proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
- <depends
- optional-attribute-name="CustomizationManager"
- proxy-type="attribute">portal:service=CustomizationManager</depends>
- <depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
- </mbean>
<!-- Integrate identity -->
<mbean
@@ -673,7 +673,7 @@
proxy-type="attribute">portal:service=JAASLoginModule</depends>
</mbean>
- <!-- Command factories -->
+ <!-- Command factories -->
<mbean
code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
name="portal:commandFactory=Delegating"
@@ -972,7 +972,7 @@
<depends
optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
- </mbean>
+ </mbean>
<!-- The federating portlet invoker -->
<mbean
@@ -1059,46 +1059,49 @@
proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
</mbean>
- <!-- The core controller -->
+ <!-- The classic response handler -->
<mbean
- code="org.jboss.portal.core.controller.classic.ClassicController"
- name="portal:controller=Core"
+ code="org.jboss.portal.core.controller.classic.ClassicResponseHandler"
+ name="portal:service=ResponseHandler,type=Classic"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ </mbean>
+
+ <!-- The ajax response handler -->
+ <mbean
+ code="org.jboss.portal.core.controller.ajax.AjaxResponseHandler"
+ name="portal:service=ResponseHandler,type=Ajax"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
<depends
optional-attribute-name="PageService"
proxy-type="attribute">portal:service=PageService</depends>
<depends
- optional-attribute-name="CommandFactory"
- proxy-type="attribute">portal:commandFactory=DefaultPortal</depends>
- <depends
- optional-attribute-name="URLFactory"
- proxy-type="attribute">portal:urlFactory=Delegating</depends>
- <depends
- optional-attribute-name="StackFactory"
- proxy-type="attribute">portal:service=InterceptorStackFactory,type=Command</depends>
- <depends
optional-attribute-name="PortalObjectContainer"
proxy-type="attribute">portal:container=PortalObject</depends>
+ </mbean>
+
+ <!-- The response handler selector -->
+ <mbean
+ code="org.jboss.portal.core.controller.ResponseHandlerSelector"
+ name="portal:service=ResponseHandler,type=Selector"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
<depends
- optional-attribute-name="InstanceContainer"
- proxy-type="attribute">portal:container=Instance</depends>
+ optional-attribute-name="ClassicResponseHandler"
+ proxy-type="attribute">portal:service=ResponseHandler,type=Classic</depends>
<depends
- optional-attribute-name="PortalAuthorizationManagerFactory"
- proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
- <depends
- optional-attribute-name="CustomizationManager"
- proxy-type="attribute">portal:service=CustomizationManager</depends>
- <depends
- optional-attribute-name="ContentRendererRegistry"
- proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+ optional-attribute-name="AjaxResponseHandler"
+ proxy-type="attribute">portal:service=ResponseHandler,type=Ajax</depends>
</mbean>
- <!-- The ajax controller -->
+ <!-- The controller -->
<mbean
- code="org.jboss.portal.core.controller.ajax.AjaxController"
- name="portal:controller=Ajax"
+ code="org.jboss.portal.core.controller.Controller"
+ name="portal:service=Controller"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
@@ -1129,21 +1132,21 @@
<depends
optional-attribute-name="ContentRendererRegistry"
proxy-type="attribute">portal:service=ContentProviderRegistry</depends>
+ <depends
+ optional-attribute-name="ResponseHandler"
+ proxy-type="attribute">portal:service=ResponseHandler,type=Selector</depends>
</mbean>
<!-- The controller factory -->
<mbean
- code="org.jboss.portal.core.controller.ControllerFactory"
+ code="org.jboss.portal.server.impl.RequestControllerFactoryImpl"
name="portal:service=ControllerFactory"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends
- optional-attribute-name="ClassicController"
- proxy-type="attribute">portal:controller=Core</depends>
- <depends
- optional-attribute-name="AjaxController"
- proxy-type="attribute">portal:controller=Ajax</depends>
+ optional-attribute-name="Controller"
+ proxy-type="attribute">portal:service=Controller</depends>
</mbean>
<!-- -->
@@ -1156,6 +1159,9 @@
<depends
optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
+ <depends
+ optional-attribute-name="ServletContainerContext"
+ proxy-type="attribute">portal:service=ServletContainerContext</depends>
</mbean>
<!-- -->
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -108,7 +108,7 @@
<xmbean/>
</mbean>
<mbean
- code="org.jboss.portal.core.event.user.UserEventInterceptor"
+ code="org.jboss.portal.core.impl.api.user.UserEventInterceptor"
name="portal:service=Interceptor,type=Server,name=UserEvent"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
@@ -182,6 +182,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <depends
+ optional-attribute-name="PortalAuthorizationManagerFactory"
+ proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
</mbean>
<mbean
code="org.jboss.portal.core.aspects.controller.PolicyEnforcementInterceptor"
@@ -196,6 +199,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <attribute name="TargetContextPath">/portal-core</attribute>
+ <attribute name="HeaderPath">/WEB-INF/jsp/header/header.jsp</attribute>
+ <attribute name="TabsPath">/WEB-INF/jsp/header/tabs.jsp</attribute>
<depends
optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends>
@@ -674,7 +680,7 @@
</mbean>
<!-- Command factories -->
- <mbean
+ <mbean
code="org.jboss.portal.core.controller.command.mapper.DelegatingCommandFactoryService"
name="portal:commandFactory=Delegating"
xmbean-dd=""
@@ -972,7 +978,7 @@
<depends
optional-attribute-name="Factory"
proxy-type="attribute">portal:urlFactory=Delegating</depends>
- </mbean>
+ </mbean>
<!-- The federating portlet invoker -->
<mbean
@@ -1085,7 +1091,7 @@
<!-- The response handler selector -->
<mbean
- code="org.jboss.portal.core.controller.ResponseHandlerSelector"
+ code="org.jboss.portal.core.controller.handler.ResponseHandlerSelector"
name="portal:service=ResponseHandler,type=Selector"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.old.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.old.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.old.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -92,6 +92,7 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <!-- DOESN'T WORK -->
<filter>
<filter-name>titleAndTimestampFilter</filter-name>
<filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
@@ -102,6 +103,7 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <!-- DOESN'T WORK-->
<filter>
<filter-name>injectLoginLinkFilter</filter-name>
<filter-class>org.jboss.forge.portal.InjectLoginLinks</filter-class>
@@ -109,7 +111,8 @@
<filter-mapping>
<filter-name>injectLoginLinkFilter</filter-name>
- <url-pattern>/*</url-pattern>
+ <!-- <url-pattern>/*</url-pattern> -->
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
</filter-mapping>
<filter>
@@ -122,6 +125,7 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <!-- DOESN'T WORK -->
<filter>
<filter-name>moveMeta</filter-name>
<filter-class>org.jboss.forge.portal.MetaMoveFilter</filter-class>
@@ -132,21 +136,8 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- BlockPages filter -->
- <!-- TAKEN FROM SOHIL'S WEB.XML
+ <!-- SSL Processor -->
<filter>
- <filter-name>BlockPagesFilter</filter-name>
- <filter-class>org.jboss.forge.portal.BlockPagesFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>BlockPagesFilter</filter-name>
- <servlet-name>PortalServlet</servlet-name>
- </filter-mapping>
- -->
-
- <!-- SSL Processor -->
- <filter>
<filter-name>SSLProcessor</filter-name>
<filter-class>org.jboss.forge.portal.SSLProcessor</filter-class>
</filter>
@@ -176,8 +167,23 @@
<servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
</filter-mapping>
+ <filter>
+ <filter-name>downloadsFilter</filter-name>
+ <filter-class>org.jboss.forge.portal.DownloadsFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>downloadsFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<!-- END OF LABS FILTERS -->
+ <!-- Bridge portal user events -->
+ <listener>
+ <listener-class>org.jboss.portal.core.event.user.UserEventBridge</listener-class>
+ </listener>
+
<!-- The portal servlet is the main entrance point -->
<servlet>
<servlet-name>PortalServletWithPathMapping</servlet-name>
@@ -188,9 +194,9 @@
<description>The servlet needs to know wether it is set as a default servlet or not</description>
</init-param>
<init-param>
- <param-name>controllerName</param-name>
- <param-value>portal:controller=Core</param-value>
- <description>The request controller for the portal servlet</description>
+ <param-name>controllerFactoryName</param-name>
+ <param-value>portal:service=ControllerFactory</param-value>
+ <description>The request controller factory for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
<security-role-ref>
@@ -209,9 +215,9 @@
<description>The servlet needs to know wether it is set as a default servlet or not</description>
</init-param>
<init-param>
- <param-name>controllerName</param-name>
- <param-value>portal:controller=Core</param-value>
- <description>The request controller for the portal servlet</description>
+ <param-name>controllerFactoryName</param-name>
+ <param-value>portal:service=ControllerFactory</param-value>
+ <description>The request controller factory for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
<security-role-ref>
@@ -356,8 +362,8 @@
<auth-method>FORM</auth-method>
<realm-name>JBoss Portal</realm-name>
<form-login-config>
- <form-login-page>/login.jsp</form-login-page>
- <form-error-page>/error.jsp</form-error-page>
+ <form-login-page>/showLogin</form-login-page>
+ <form-error-page>/loginFailed</form-error-page>
</form-login-config>
</login-config>
@@ -377,9 +383,9 @@
<description>The servlet needs to know wether it is set as a default servlet or not</description>
</init-param>
<init-param>
- <param-name>controllerName</param-name>
- <param-value>portal:controller=Ajax</param-value>
- <description>The request controller for the portal servlet</description>
+ <param-name>controllerFactoryName</param-name>
+ <param-value>portal:service=ControllerFactory</param-value>
+ <description>The request controller factory for the portal servlet</description>
</init-param>
<load-on-startup>0</load-on-startup>
<security-role-ref>
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2007-04-28 17:52:44 UTC (rev 11431)
@@ -31,7 +31,7 @@
<distributable/>
-->
- <!-- LABS FILTERS -->
+ <!-- LABS FILTERS -->
<servlet>
<servlet-name>loginServlet</servlet-name>
<servlet-class>org.jboss.forge.portal.LoginServlet</servlet-class>
@@ -92,7 +92,6 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- DOESN'T WORK -->
<filter>
<filter-name>titleAndTimestampFilter</filter-name>
<filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
@@ -103,7 +102,6 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- DOESN'T WORK-->
<filter>
<filter-name>injectLoginLinkFilter</filter-name>
<filter-class>org.jboss.forge.portal.InjectLoginLinks</filter-class>
@@ -125,7 +123,6 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- DOESN'T WORK -->
<filter>
<filter-name>moveMeta</filter-name>
<filter-class>org.jboss.forge.portal.MetaMoveFilter</filter-class>
@@ -176,12 +173,12 @@
<filter-name>downloadsFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<!-- END OF LABS FILTERS -->
<!-- Bridge portal user events -->
<listener>
- <listener-class>org.jboss.portal.core.event.user.UserEventBridge</listener-class>
+ <listener-class>org.jboss.portal.core.impl.api.user.UserEventBridge</listener-class>
</listener>
<!-- The portal servlet is the main entrance point -->
@@ -371,32 +368,4 @@
<role-name>Authenticated</role-name>
</security-role>
- <!-- AJAX -->
-
- <!-- The portal servlet for ajax requests -->
- <servlet>
- <servlet-name>PortalServletForAjax</servlet-name>
- <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
- <init-param>
- <param-name>asDefaultServlet</param-name>
- <param-value>false</param-value>
- <description>The servlet needs to know wether it is set as a default servlet or not</description>
- </init-param>
- <init-param>
- <param-name>controllerFactoryName</param-name>
- <param-value>portal:service=ControllerFactory</param-value>
- <description>The request controller factory for the portal servlet</description>
- </init-param>
- <load-on-startup>0</load-on-startup>
- <security-role-ref>
- <role-name>Authenticated</role-name>
- <role-link>Authenticated</role-link>
- </security-role-ref>
- </servlet>
-
- <!-- Provide secure access to authenticated users -->
- <servlet-mapping>
- <servlet-name>PortalServletForAjax</servlet-name>
- <url-pattern>/ajax/*</url-pattern>
- </servlet-mapping>
</web-app>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/MapperTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/MapperTools.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/MapperTools.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,8 +1,10 @@
package org.jboss.labs.mapper;
-import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.ns.WindowNavigationalState;
+import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
+import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
+import org.jboss.portal.core.navstate.NavigationalStateKey;
/**
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
@@ -10,17 +12,28 @@
public class MapperTools {
public static final String JSF_VIEW_ID_PARAM = "org.apache.myfaces.portlet.MyFacesGenericPortlet.VIEW_ID";
- public static WindowNavigationalState getWindowNavState(ServerInvocation invocation,
+ private static Object getWindowNavStateKey(Window window) {
+ //return window.getId() + "_window";
+ return new NavigationalStateKey(WindowNavigationalState.class, window.getId());
+ }
+
+ public static WindowNavigationalState getWindowNavState(ControllerContext controllerContext,
Window window) {
WindowNavigationalState windowNavState = (WindowNavigationalState)
- invocation.getAttribute(ServerInvocation.NAVIGATIONAL_STATE_SCOPE,
- window.getId() + "_window");
+ controllerContext.getAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE,
+ getWindowNavStateKey(window));
+
if (windowNavState == null) {
- windowNavState = new WindowNavigationalState();
- invocation.setAttribute(ServerInvocation.NAVIGATIONAL_STATE_SCOPE,
- window.getId() + "_window", windowNavState);
- }
+ windowNavState = WindowNavigationalState.create();
+ setWindowNavState(controllerContext, window, windowNavState);
+ }
return windowNavState;
}
+
+ public static void setWindowNavState(ControllerContext controllerContext, Window window,
+ WindowNavigationalState windowNavState) {
+ controllerContext.setAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE,
+ getWindowNavStateKey(window), windowNavState);
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/AbstractBaseCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/AbstractBaseCF.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/AbstractBaseCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,9 +1,10 @@
package org.jboss.labs.mapper.command;
import org.jboss.portal.core.model.portal.*;
-import org.jboss.portal.core.model.portal.ns.WindowNavigationalState;
+import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.portlet.StateString;
@@ -28,9 +29,9 @@
this.container = container;
}
- protected ControllerCommand invokeRenderCommand(ServerInvocation invocation, Window window,
+ protected ControllerCommand invokeRenderCommand(ControllerContext controllerContext, ServerInvocation invocation, Window window,
StateString params) {
- WindowNavigationalState windowNavState = MapperTools.getWindowNavState(invocation, window);
+ WindowNavigationalState windowNavState = MapperTools.getWindowNavState(controllerContext, window);
return new InvokePortletWindowRenderCommand(window.getId(), windowNavState.getMode(),
windowNavState.getWindowState(), params);
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -2,6 +2,7 @@
import org.jboss.portal.core.controller.command.mapper.CommandFactory;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.*;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.labs.mapper.PathParser;
@@ -78,8 +79,8 @@
}
}
- public ControllerCommand doMapping(ServerInvocation invocation, String host,
- String contextPath, String requestPath) {
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation,
+ String host, String contextPath, String requestPath) {
PathParser parser = new PathParser(requestPath);
// Redirects.
@@ -122,7 +123,7 @@
Page page = (Page) target;
// First trying to delegate the mapping to a prefix-based factory.
- ControllerCommand cmd = pageDelegatingCF.doMapping(invocation, host, contextPath,
+ ControllerCommand cmd = pageDelegatingCF.doMapping(controllerContext, invocation, host, contextPath,
parser, page);
if (cmd != null) {
@@ -130,11 +131,11 @@
}
// If this is unsuccessfull, doing the default page mappnig.
- return getPortalObjectCF().doMapping(invocation, parser, (Page) target);
+ return getPortalObjectCF().doMapping(controllerContext, invocation, parser, (Page) target);
} else if (target instanceof Window) {
// If the path referenced a window, then the mapping cannot be
// delegated; doing the default window mapping.
- return getPortalObjectCF().doMapping(invocation, parser, (Window) target);
+ return getPortalObjectCF().doMapping(controllerContext, invocation, parser, (Window) target);
} else {
// Unknown portal object type.
return null;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCF.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.command;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.server.ServerInvocation;
@@ -14,13 +15,13 @@
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public interface PortalObjectCF {
- public ControllerCommand doMapping(ServerInvocation invocation, PathParser parser,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, PathParser parser,
Page page);
- public ControllerCommand doMapping(ServerInvocation invocation, PathParser parser,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, PathParser parser,
Window window);
- public ControllerCommand doMapping(ServerInvocation invocation, Window window,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, Window window,
Map<String, Object> additionalParameters,
boolean overwrite);
}
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/PortalObjectCFImpl.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,13 +1,14 @@
package org.jboss.labs.mapper.command;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
import org.jboss.portal.core.model.portal.command.action.ImportPageToDashboardCommand;
import org.jboss.portal.core.model.portal.command.render.RenderPageCommand;
-import org.jboss.portal.core.model.portal.ns.WindowNavigationalState;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.portlet.PortletParametersStateString;
import org.jboss.portal.portlet.StateString;
@@ -37,12 +38,12 @@
@Inject
private ContentManager cm;
- public ControllerCommand doMapping(ServerInvocation invocation, PathParser parser,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, PathParser parser,
Window window) {
- return doMapping(invocation, window, null, true);
+ return doMapping(controllerContext, invocation, window, null, true);
}
- public ControllerCommand doMapping(ServerInvocation invocation, Window window,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, Window window,
Map<String, Object> additionalParameters,
boolean overwrite) {
if (window == null) {
@@ -73,7 +74,7 @@
decoder.decode(queryParams, invocation.getServerContext().getBodyParameterMap());
// Get the window navigational state
- WindowNavigationalState windowNavState = MapperTools.getWindowNavState(invocation, window);
+ WindowNavigationalState windowNavState = MapperTools.getWindowNavState(controllerContext, window);
//
WindowState windowState = decoder.getWindowState();
@@ -130,7 +131,7 @@
}
}
- public ControllerCommand doMapping(ServerInvocation invocation, PathParser parser,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, PathParser parser,
Page page) {
if (page == null) {
throw new IllegalArgumentException("Page cannot be null.");
@@ -146,6 +147,19 @@
// Checking if there is a freezone on the page.
String projectId = page.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER);
+ for (Object child : page.getChildren()) {
+ if (child instanceof Window) {
+ Window window = (Window) child;
+ WindowNavigationalState windowNavState = MapperTools.getWindowNavState(controllerContext, window);
+
+ if (WindowState.MAXIMIZED.equals(windowNavState.getWindowState())) {
+ MapperTools.setWindowNavState(controllerContext, window,
+ new WindowNavigationalState(WindowState.NORMAL, windowNavState.getMode(),
+ windowNavState.getState()));
+ }
+ }
+ }
+
Window freezone = null;
String freezoneId = getFreezoneWindowId(projectId, page);
@@ -182,13 +196,13 @@
Map<String, Object> additionalParameters = new HashMap<String, Object>();
additionalParameters.put(Constants.FREEZONE_PATH_PARAM, path);
- return doMapping(invocation, freezone, additionalParameters, true);
+ return doMapping(controllerContext, invocation, freezone, additionalParameters, true);
}
// Otherwise, invoking a render command on the freezone window.
PortletParametersStateString params = new PortletParametersStateString();
params.setValue(Constants.FREEZONE_PATH_PARAM, path);
- return invokeRenderCommand(invocation, freezone, params);
+ return invokeRenderCommand(controllerContext, invocation, freezone, params);
}
// Invoking a normal page render command.
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/AbstractProjectPortletDelegateCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.command.delegating.page;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.server.ServerInvocation;
@@ -19,9 +20,10 @@
*/
public abstract class AbstractProjectPortletDelegateCF extends AbstractPageDelegateCF {
public abstract String getPortletName();
- public abstract void fillParams(ServerInvocation invocation, PathParser parser, Map<String, Object> params);
+ public abstract void fillParams(ControllerContext controllerContext, ServerInvocation invocation,
+ PathParser parser, Map<String, Object> params);
- public ControllerCommand doMapping(ServerInvocation invocation, String host,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, String host,
String contextPath, PathParser parser, Page page) {
String projectId = page.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER);
@@ -60,14 +62,14 @@
}
Map<String, Object> params = new HashMap<String, Object>();
- fillParams(invocation, parser, params);
+ fillParams(controllerContext, invocation, parser, params);
if (!params.containsKey(PortletRequestDecoder.META_PARAMETER)) {
params.put(PortletRequestDecoder.META_PARAMETER, Integer
.toHexString(PortletRequestDecoder.RENDER_MASK));
}
- return getPortalObjectCF().doMapping(invocation, portletWindow,
+ return getPortalObjectCF().doMapping(controllerContext, invocation, portletWindow,
params, false);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/BlogCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -4,6 +4,7 @@
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.portlet.impl.PortletRequestDecoder;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.core.model.portal.PortalObjectId;
@@ -23,7 +24,7 @@
return "blog";
}
- public void fillParams(ServerInvocation invocation, PathParser parser, Map<String, Object> params) {
+ public void fillParams(ControllerContext controllerContext, ServerInvocation invocation, PathParser parser, Map<String, Object> params) {
String current = parser.getCurrent();
if (current != null) {
params.put("post", parser.getCurrent());
@@ -41,7 +42,7 @@
"/" + Constants.LABS_PORTAL + "/" + "default",
PortalObjectId.CANONICAL_FORMAT);
- public ControllerCommand doMapping(ServerInvocation invocation, String host,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, String host,
String contextPath, PathParser parser, Page page) {
String projectId = page.getDeclaredProperty(Constants.PORTAL_OBJECT_LABS_MARKER);
@@ -81,14 +82,14 @@
}
Map<String, Object> params = new HashMap<String, Object>();
- fillParams(invocation, parser, params);
+ fillParams(controllerContext, invocation, parser, params);
if (!params.containsKey(PortletRequestDecoder.META_PARAMETER)) {
params.put(PortletRequestDecoder.META_PARAMETER, Integer
.toHexString(PortletRequestDecoder.RENDER_MASK));
}
- return getPortalObjectCF().doMapping(invocation, portletWindow,
+ return getPortalObjectCF().doMapping(controllerContext, invocation, portletWindow,
params, false);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/DownloadCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -3,6 +3,7 @@
import org.jboss.labs.mapper.PathParser;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.portlet.impl.PortletRequestDecoder;
+import org.jboss.portal.core.controller.ControllerContext;
import java.util.Map;
@@ -14,7 +15,7 @@
return "downloads";
}
- public void fillParams(ServerInvocation invocation, PathParser parser, Map<String, Object> params) {
+ public void fillParams(ControllerContext controllerContext, ServerInvocation invocation, PathParser parser, Map<String, Object> params) {
params.put("category", parser.getCurrent());
params.put("windowstate", "maximized");
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegateCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegateCF.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegateCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.command.delegating.page;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.labs.mapper.PathParser;
@@ -13,7 +14,7 @@
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public interface PageDelegateCF extends BaseCF {
- public ControllerCommand doMapping(ServerInvocation invocation,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation,
String host, String contextPath,
PathParser parser, Page page);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegatingCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegatingCF.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegatingCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.command.delegating.page;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.labs.mapper.PathParser;
@@ -12,7 +13,8 @@
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
public interface PageDelegatingCF extends BaseCF {
- public ControllerCommand doMapping(ServerInvocation invocation,
+ public ControllerCommand doMapping(ControllerContext controllerContext,
+ ServerInvocation invocation,
String host, String contextPath,
PathParser parser, Page page);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegatingCFImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegatingCFImpl.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/PageDelegatingCFImpl.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.command.delegating.page;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.Page;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.labs.mapper.PathParser;
@@ -21,7 +22,7 @@
factories = new HashMap<String, PageDelegateCF>();
}
- public ControllerCommand doMapping(ServerInvocation invocation, String host,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, String host,
String contextPath, PathParser parser, Page page) {
if (parser.hasFirstToken()) {
// Checking if there is any delegate factory registered for the
@@ -32,7 +33,7 @@
// Found a match; skipping the matched token and proceeding
// with the mapping.
parser.proceed();
- return factories.get(path).doMapping(invocation, host, contextPath,
+ return factories.get(path).doMapping(controllerContext, invocation, host, contextPath,
parser, page);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.command.delegating.page;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.core.model.portal.Page;
@@ -59,7 +60,7 @@
return new RenderPageCommand(wikiPageId);
}
- public ControllerCommand doMapping(ServerInvocation invocation,
+ public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation,
String host, String contextPath, PathParser parser, Page portalPage) {
String firstToken = parser.getFirstToken();
String language = null;
@@ -114,12 +115,12 @@
Window wikiWindow = (Window) getContainer().getObject(windowId);
if (hasMetaParameter(invocation)) {
- return getPortalObjectCF().doMapping(invocation, wikiWindow,
+ return getPortalObjectCF().doMapping(controllerContext, invocation, wikiWindow,
params, false);
} else {
params.put(PortletRequestDecoder.META_PARAMETER, Integer
.toString(PortletRequestDecoder.RENDER_MASK));
- return getPortalObjectCF().doMapping(invocation, wikiWindow,
+ return getPortalObjectCF().doMapping(controllerContext, invocation, wikiWindow,
params, false);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/AbstractLabsProjectPortletUrlFactory.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -8,6 +8,7 @@
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
import org.jboss.portal.core.model.portal.command.action.InvokeWindowCommand;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.server.ServerURL;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.portlet.StateString;
@@ -31,7 +32,7 @@
public abstract void buildPathFromPortletParameters(StringBuffer sb, PortletParametersStateString ppss);
public abstract void finishUrl(ServerURL url);
- public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd) {
+ public ServerURL doMapping(ControllerContext context, ServerInvocation invocation, ControllerCommand cmd) {
if (cmd == null) {
throw new IllegalArgumentException("No null command accepted");
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/BlogUrlFactory.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -5,6 +5,7 @@
import org.jboss.portal.portlet.PortletParametersStateString;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.command.action.InvokeWindowCommand;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
@@ -27,7 +28,7 @@
url.getParameterMap().remove("post");
}
- public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd) {
+ public ServerURL doMapping(ControllerContext context, ServerInvocation invocation, ControllerCommand cmd) {
if (cmd == null) {
throw new IllegalArgumentException("No null command accepted");
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsDelegatingURLFactoryService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsDelegatingURLFactoryService.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsDelegatingURLFactoryService.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -5,12 +5,14 @@
import org.jboss.portal.core.controller.command.mapper.URLFactory;
import org.jboss.portal.core.controller.command.mapper.URLFactoryDelegate;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.server.ServerURL;
import org.jboss.portal.server.ServerInvocation;
import java.util.ArrayList;
/**
+ * TODO: replace w/ portal version
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
*/
@@ -32,7 +34,7 @@
/** The different delegates. */
private ArrayList delegates = new ArrayList();
- public ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd)
+ public ServerURL doMapping(ControllerContext context, ServerInvocation invocation, ControllerCommand cmd)
{
if (cmd == null)
{
@@ -45,7 +47,7 @@
for (int i = 0;i < delegates.size();i++)
{
URLFactory delegate = (URLFactory)delegates.get(i);
- ServerURL url = delegate.doMapping(invocation, cmd);
+ ServerURL url = delegate.doMapping(context, invocation, cmd);
if (url != null)
{
return url;
@@ -56,7 +58,7 @@
//
if (nextFactory != null)
{
- return nextFactory.doMapping(invocation, cmd);
+ return nextFactory.doMapping(context, invocation, cmd);
}
return null;
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-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/LabsMainUrlFactory.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -2,12 +2,15 @@
import org.jboss.portal.core.controller.command.mapper.AbstractURLFactory;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.command.*;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand;
import org.jboss.portal.core.model.portal.command.action.ImportPageToDashboardCommand;
import org.jboss.portal.core.model.portal.command.render.RenderPageCommand;
import org.jboss.portal.core.model.portal.*;
+import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
+import org.jboss.portal.core.navstate.NavigationalStateKey;
import org.jboss.portal.server.ServerURL;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.AbstractServerURL;
@@ -80,7 +83,8 @@
return null;
}
- public ServerURL doMapping(ServerInvocation serverInvocation,
+ public ServerURL doMapping(ControllerContext context,
+ ServerInvocation serverInvocation,
ControllerCommand command) {
if (command == null) {
throw new IllegalArgumentException("No null command accepted");
@@ -121,13 +125,14 @@
String path;
path = getFreezonePathFromStateString(navigationalState);
+
if (path == null) {
// If the path is not in the request parameters, getting it from
// the portlet's navigation state (= render parameters).
- path = getFreezonePathFromStateString((StateString)
- serverInvocation.getContext().getAttributeResolver(
- ServerInvocation.NAVIGATIONAL_STATE_SCOPE).getAttribute(
- renderCmd.getTargetId()));
+ path = getFreezonePathFromStateString(((WindowNavigationalState)
+ context.getAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE,
+ new NavigationalStateKey(WindowNavigationalState.class,
+ renderCmd.getTargetId()))).getState());
}
addToPath(sb, poc.getTargetId(), false);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java 2007-04-28 13:00:46 UTC (rev 11430)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/WikiUrlFactory.java 2007-04-28 17:52:44 UTC (rev 11431)
@@ -1,6 +1,7 @@
package org.jboss.labs.mapper.url;
import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.command.*;
import org.jboss.portal.core.model.portal.command.action.InvokeWindowCommand;
import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand;
@@ -26,7 +27,7 @@
this.pageName = pageName;
}
- public ServerURL doMapping(ServerInvocation serverInvocation, ControllerCommand cmd) {
+ public ServerURL doMapping(ControllerContext context, ServerInvocation serverInvocation, ControllerCommand cmd) {
if (cmd == null) {
throw new IllegalArgumentException("No null command accepted");
}
More information about the jboss-svn-commits
mailing list