gatein SVN: r1592 - components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers.
by do-not-reply＠jboss.org
Author: wesleyhales
Date: 2010-02-09 16:31:51 -0500 (Tue, 09 Feb 2010)
New Revision: 1592
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
Log:
fix cancel button on wsrp consumer editor
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 21:18:41 UTC (rev 1591)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 21:31:51 UTC (rev 1592)
@@ -182,7 +182,7 @@
value="#{i18n.edit_consumer_refresh}"
title="#{i18n.edit_consumer_refresh_title}"/>
- <webui:commandButton action="#{consumer.listConsumers}"
+ <webui:commandButton action="#{consumersMgr.listConsumers}"
id="list-cons-link"
value="#{i18n.edit_consumer_cancel}"
immediate="true"/>
16 years, 2 months
- 1
- 0
gatein SVN: r1591 - in components/wsrp/trunk/admin-gui/src/main/webapp: WEB-INF/tags and 6 other directories.
by do-not-reply＠jboss.org
Author: wesleyhales
Date: 2010-02-09 16:18:41 -0500 (Tue, 09 Feb 2010)
New Revision: 1591
Added:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Error.gif
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/SelectIcon.gif
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Warning.gif
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css
components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
Log:
styles for wsrp consumer admin
Added: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml (rev 0)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml 2010-02-09 21:18:41 UTC (rev 1591)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+ "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib>
+ <namespace>http://jboss.org/gatein</namespace>
+ <tag>
+ <tag-name>commandButton</tag-name>
+ <source>xhtml/commandButton.xhtml</source>
+ </tag>
+</facelet-taglib>
\ No newline at end of file
Added: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml (rev 0)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-09 21:18:41 UTC (rev 1591)
@@ -0,0 +1,45 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2010, 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.
+ -->
+
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+<table class="ActionContainer">
+ <tr>
+ <td>
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <h:commandLink id="#{id}" action="#{action}"
+ value="#{value}" immediate="#{immediate}"/>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+</table>
+
+</ui:composition>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2010-02-09 19:34:47 UTC (rev 1590)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2010-02-09 21:18:41 UTC (rev 1591)
@@ -57,6 +57,11 @@
<param-value>server</param-value>
</context-param>
+ <context-param>
+ <param-name>facelets.LIBRARIES</param-name>
+ <param-value>/WEB-INF/tags/webui.taglib.xml</param-value>
+ </context-param>
+
<servlet>
<servlet-name>FacesServlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-09 19:34:47 UTC (rev 1590)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/common/template.xhtml 2010-02-09 21:18:41 UTC (rev 1591)
@@ -36,26 +36,27 @@
<ui:insert name="topnav">Top navigation</ui:insert>
<div class="tab-container">
+ <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-warn"/>
+ <div style="width:98%;margin: 0 auto">
-
<ui:insert name="objectpath">Object path if needed</ui:insert>
<div class="wsrp-content-container">
<ui:remove>
<c:if test="#{!empty title}">
- <h3 class="UIControlBar">${title}</h3>
+ <h3>${title}</h3>
</c:if>
</ui:remove>
<!-- Status message -->
- <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
- fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
</div>
</div>
-
+ </div>
</div>
</ui:composition>
\ No newline at end of file
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 19:34:47 UTC (rev 1590)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 21:18:41 UTC (rev 1591)
@@ -63,26 +63,88 @@
</ui:define>
<ui:define name="objectpath">
- <h:form id="cons-temp-form1">
- <div class="UIControlBar">
- <span class="#{!empty title ? 'selected' : 'pathItem'}">
- <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}"
- value="#{i18n.path_consumers_root}"/>
- </span>
- <c:if test="#{empty title}">
- <span class="pathSeparator">
- <h:graphicImage url="/img/pathSeparator.png" alt=">"/>
- </span>
- <span
- class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
- <h:outputFormat value="#{i18n.path_consumers_consumer}">
- <f:param value="#{consumer.id}"/>
- </h:outputFormat>
- (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
- #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
- </span>
- </c:if>
- </div>
- </h:form>
+
+
+
+
+ <div class="UIBarStyle">
+ <div class="BarStyle2">
+ <div class="LeftBar">
+ <div class="RightBar">
+ <div class="MiddleBar">
+ <div class="full-width">
+ <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}">
+ <div class="float-left half-width">
+
+
+
+ <!-- Consumer creation -->
+ <div class="create-container">
+ <h:form id="createConsumer" styleClass="createObjectForm">
+ <span class="portlet-font">#{i18n.consumers_create_title}</span>
+ <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
+ label="Consumer Name" required="true"/>  
+
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <h:commandLink id="createConsumerButton" action="#{consumersMgr.createConsumer}"
+ value="#{i18n.consumers_create_submit}"/>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+ <ui:remove>
+ <h:message for="consumerName" errorClass="portlet-msg-error"/>
+ </ui:remove>
+ </h:form>
+ </div>
+
+
+ </div>
+ </f:subview>
+
+ <div class="#{showAddConsumer eq true ? 'float-right half-width' : 'full-width'}">
+
+ <h:form id="cons-temp-form1">
+ <div class="UIControlBar">
+ <c:if test="#{empty title}">
+ <span
+ class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left">
+ <h:outputFormat value="#{i18n.path_consumers_consumer}">
+ <f:param value="#{consumer.id}"/>
+ </h:outputFormat>
+ (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
+ </span>
+ </c:if>
+
+ <span class="#{!empty title ? 'selected' : 'pathItem'} float-right">
+ <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}"
+ value="#{i18n.path_consumers_root}"/>
+ </span>
+
+ </div>
+ </h:form>
+
+ </div>
+
+ </div>
+
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
</ui:define>
</ui:decorate>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-09 19:34:47 UTC (rev 1590)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-09 21:18:41 UTC (rev 1591)
@@ -28,37 +28,12 @@
xmlns:c="http://java.sun.com/jstl/core">
<ui:param name="title" value="#{i18n.consumers_title}"/>
+ <ui:param name="showAddConsumer" value="true"/>
<ui:define name="content">
- <!-- Consumer creation -->
- <div class="create-container">
- <h:form id="createConsumer" styleClass="createObjectForm">
- <span class="portlet-font">#{i18n.consumers_create_title}</span>
- <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
- required="true"/>  
- <table class="ActionContainer">
- <tr>
- <td>
- <div class="ButtonLeft">
- <div class="ButtonRight">
- <div class="ButtonMiddle">
- <h:commandLink id="createConsumerButton" action="#{consumersMgr.createConsumer}"
- value="#{i18n.consumers_create_submit}"/>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <h:message for="consumerName" errorClass="portlet-msg-error"/>
-
- </h:form>
- </div>
- <br/>
-
<!-- Consumers list -->
<h:form id="consumer-list-form">
<h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons"
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 19:34:47 UTC (rev 1590)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 21:18:41 UTC (rev 1591)
@@ -25,7 +25,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:webui="http://jboss.org/gatein">
<ui:param name="title" value=""/>
<ui:define name="content">
@@ -176,13 +177,16 @@
<tr>
<th/>
<td class="portlet-section-buttonrow">
- <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}"
- value="#{i18n.edit_consumer_refresh}"
- title="#{i18n.edit_consumer_refresh_title}"
- styleClass="portlet-form-button"/>
- <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}"
- value="#{i18n.edit_consumer_cancel}" immediate="true"
- styleClass="portlet-form-button"/>
+ <webui:commandButton action="#{consumer.refreshConsumer}"
+ id="refresh-cons-link"
+ value="#{i18n.edit_consumer_refresh}"
+ title="#{i18n.edit_consumer_refresh_title}"/>
+
+ <webui:commandButton action="#{consumer.listConsumers}"
+ id="list-cons-link"
+ value="#{i18n.edit_consumer_cancel}"
+ immediate="true"/>
+
</td>
</tr>
</table>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-09 19:34:47 UTC (rev 1590)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-09 21:18:41 UTC (rev 1591)
@@ -1,12 +1,16 @@
.UIWsrpPortlet .UIControlBar {
- background: url('background/ControlIcon.gif') repeat-x center -222px;
- border: 1px solid #b7b7b7;
- height: 23px;
- line-height: 23px;
- padding: 0px 10px;
- margin: 5px 0px;
+ /*background: url('background/ControlIcon.gif') repeat-x center -222px;*/
+ /*border: 1px solid #b7b7b7;*/
+ /*height: 23px;*/
+ line-height: 28px;
+ padding: 4px 10px 0 0;
+ /*margin: 5px 0px;*/
+ font-weight: bold;
+ text-align: right;
}
+/***************************** Consumer Form Style ************************/
+
.UIWsrpPortlet .cons-temp-form {
height: 27px;
}
@@ -26,13 +30,35 @@
.UIWsrpPortlet .create-container .ActionContainer {
position: absolute;
- top: -2px;
+ top: 7px;
}
-.ActionButton {
+/***************************** Messages Style ************************/
+.portlet-msg-success {
+ color: darkgreen;
+ background: url('background/SelectIcon.gif') no-repeat left top;
+ list-style: none;
+ padding: 0 0 0 20px;
+ font-weight: bold;
}
+.portlet-msg-warn {
+ color: orange;
+ background: url('background/Warning.gif') no-repeat left top;
+ list-style: none;
+ padding: 0 0 0 20px;
+ font-weight: bold;
+}
+
+.portlet-msg-error {
+ color: darkred;
+ background: url('background/Error.gif') no-repeat left top;
+ list-style: none;
+ padding: 0 0 0 20px;
+ font-weight: bold;
+}
+
/***************************** ActionButton Style ************************/
.UIWsrpPortlet .ActionContainer {
width: auto;
Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Error.gif
===================================================================
(Binary files differ)
Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Error.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/SelectIcon.gif
===================================================================
(Binary files differ)
Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/SelectIcon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Warning.gif
===================================================================
(Binary files differ)
Property changes on: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/background/Warning.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-09 19:34:47 UTC (rev 1590)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/style.css 2010-02-09 21:18:41 UTC (rev 1591)
@@ -350,5 +350,5 @@
.wsrp-consumers-ui .wsrp-content-container {
margin: 0 auto 0 auto;
- width: 98%;
+ width: 100%;
}
16 years, 2 months
- 1
- 0
gatein SVN: r1590 - in portal/trunk/portlet/exoadmin: src/main/java/org/exoplatform/wsrp/webui and 5 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-09 14:34:47 -0500 (Tue, 09 Feb 2010)
New Revision: 1590
Removed:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/WSRPAdminPortlet_en.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/WSRPAdminPortlet_fr.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/WSRPAdminPortlet/
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/wsrp/
portal/trunk/portlet/exoadmin/src/main/webapp/skin/wsrp/
Modified:
portal/trunk/portlet/exoadmin/pom.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
Log:
- Removed WebUI WSRP Admin portlet (yes, it was this invasive and I'm not even sure I have removed everything!) :(
Modified: portal/trunk/portlet/exoadmin/pom.xml
===================================================================
--- portal/trunk/portlet/exoadmin/pom.xml 2010-02-09 13:56:49 UTC (rev 1589)
+++ portal/trunk/portlet/exoadmin/pom.xml 2010-02-09 19:34:47 UTC (rev 1590)
@@ -45,25 +45,6 @@
<version>3.0.0-CR01-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-producer-lib</artifactId>
- <version>${org.gatein.wsrp.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-consumer</artifactId>
- <version>${org.gatein.wsrp.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.gatein.wsrp</groupId>
- <artifactId>wsrp-integration-api</artifactId>
- <version>${org.gatein.wsrp.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/WSRPAdminPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/WSRPAdminPortlet_en.properties 2010-02-09 13:56:49 UTC (rev 1589)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/WSRPAdminPortlet_en.properties 2010-02-09 19:34:47 UTC (rev 1590)
@@ -1,43 +0,0 @@
-#
-# JBoss, a division of Red Hat
-# Copyright 2010, 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.
-#
-ConsumerEditor.label.name=Consumer name:
-ConsumerEditor.label.cache=Seconds before cache expiration:
-ConsumerEditor.label.timeout=Milliseconds before timeout:
-ConsumerEditor.label.wsdl=WSDL URL:
-ConsumerEditor.label.local=Local registration properties:
-ConsumerEditor.label.expected=Expected registration properties:
-registration_property_status_inexistent=Inexistent
-registration_property_status_missing=Missing
-registration_property_status_missing_value=Value missing
-registration_property_status_unchecked_value=Unchecked
-registration_property_status_invalid_value=Invalid
-registration_property_status_valid=Valid
-Producer.label.policyClassName=Policy class name:
-Producer.label.validatorClassName=Validator class name:
-Producer.label.registrationproperties=Registration properties:
-Producer.label.registrationrequiredforfulldescription=Registration required for full service description.
-Producer.label.strictmode=Strict mode.
-Producer.label.requiresregistration=Requires registration?
-UITabPane.title.Producer=Producer configuration
-UITabPane.title.Consumers=Consumers configuration
-
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/WSRPAdminPortlet_fr.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/WSRPAdminPortlet_fr.properties 2010-02-09 13:56:49 UTC (rev 1589)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/WSRPAdminPortlet_fr.properties 2010-02-09 19:34:47 UTC (rev 1590)
@@ -1,43 +0,0 @@
-#
-# JBoss, a division of Red Hat
-# Copyright 2010, 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.
-#
-
-ConsumerEditor.label.cache=Secondes avant expiration du cache:
-ConsumerEditor.label.expected=Propri�t�s attendues d'enregistrement:
-ConsumerEditor.label.local=Propri�t�s locales d'enregistrement:
-ConsumerEditor.label.name=Nom du consommateur:
-ConsumerEditor.label.timeout=Millisecondes avant timeout:
-ConsumerEditor.label.wsdl=URL du WSDL:
-registration_property_status_inexistent=Inexistante
-registration_property_status_invalid_value=Invalide
-registration_property_status_missing=Manquante
-registration_property_status_missing_value=Valeur manquante
-registration_property_status_unchecked_value=Non-v�rifi�e
-registration_property_status_valid=Valide
-Producer.label.policyClassName=Nom de la classe de politique de validation:
-Producer.label.registrationproperties=Propri�t�s d'enregistrement:
-Producer.label.registrationrequiredforfulldescription=Enregistrement n�cessaire pour la description compl�te.
-Producer.label.requiresregistration=Requiert l'enregistrement?
-Producer.label.strictmode=Mode strict.
-Producer.label.validatorClassName=Nom de la classe du validateur:
-UITabPane.title.Consumers=Configuration des consommateurs
-UITabPane.title.Producer=Configuration du producteur
\ No newline at end of file
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-09 13:56:49 UTC (rev 1589)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2010-02-09 19:34:47 UTC (rev 1590)
@@ -83,15 +83,5 @@
<skin-name>Default</skin-name>
<css-path>/skin/register/webui/component/DefaultStylesheet.css</css-path>
</portlet-skin>
-
- <!-- WSRP Admin Portlet skins -->
-
- <portlet-skin>
- <application-name>exoadmin</application-name>
- <portlet-name>WSRPAdminPortlet</portlet-name>
- <skin-name>Default</skin-name>
- <css-path>/skin/wsrp/webui/component/DefaultStylesheet.css</css-path>
- </portlet-skin>
-
</gatein-resources>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-02-09 13:56:49 UTC (rev 1589)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-02-09 19:34:47 UTC (rev 1590)
@@ -108,37 +108,6 @@
</portlet>
<portlet>
- <description xml:lang="EN">WSRP Admin Portlet</description>
- <portlet-name>WSRPAdminPortlet</portlet-name>
- <display-name xml:lang="EN">WSRP Admin Portlet</display-name>
- <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class>
-
- <init-param>
- <name>webui.configuration</name>
- <value>/WEB-INF/conf/portlet/exoadmin/WSRPAdminPortlet/webui/configuration.xml</value>
- </init-param>
-
- <expiration-cache>0</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>help</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
-
- <resource-bundle>locale.portlet.exoadmin.WSRPAdminPortlet</resource-bundle>
- <portlet-info>
- <title>WSRP Admin Portlet</title>
- <short-title>WSRP Admin Portlet</short-title>
- <keywords>Administration,WSRP</keywords>
- </portlet-info>
-
- <security-role-ref>
- <role-name>admin</role-name>
- <role-link>admin</role-link>
- </security-role-ref>
- </portlet>
-
- <portlet>
<description xml:lang="EN">Group Navigation Portlet</description>
<portlet-name>GroupNavigationPortlet</portlet-name>
<display-name xml:lang="EN">Group Navigation Portlet</display-name>
16 years, 2 months
- 1
- 0
gatein SVN: r1589 - in portal/trunk/server: tomcat/patch/src/main/tomcat/conf and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-09 08:56:49 -0500 (Tue, 09 Feb 2010)
New Revision: 1589
Modified:
portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
portal/trunk/server/tomcat/patch/src/main/tomcat/conf/jaas.conf
Log:
Commented out configuration to make life easier
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2010-02-09 13:40:08 UTC (rev 1588)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2010-02-09 13:56:49 UTC (rev 1589)
@@ -15,6 +15,18 @@
<module-option name="realmName">gatein-domain</module-option>
</login-module>
</authentication>
+
+ <!-- Uncomment this part (and comment the other part for CAS integration -->
+ <!--
+ <authentication>
+ <login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required">
+ </login-module>
+ <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+ </authentication>
+ -->
</application-policy>
</deployment>
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/conf/jaas.conf
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/conf/jaas.conf 2010-02-09 13:40:08 UTC (rev 1588)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/conf/jaas.conf 2010-02-09 13:56:49 UTC (rev 1589)
@@ -2,4 +2,11 @@
org.exoplatform.web.security.PortalLoginModule required;
org.exoplatform.services.security.jaas.SharedStateLoginModule required;
org.exoplatform.services.security.j2ee.TomcatLoginModule required;
+
+ // Uncomment the following part (and comment the other part for CAS integration
+ // org.gatein.sso.agent.login.SSOLoginModule required
+ // org.exoplatform.services.security.j2ee.JbossLoginModule required
+ // portalContainerName=portal
+ // realmName=gatein-domain
+
};
16 years, 2 months
- 1
- 0
gatein SVN: r1588 - in portal/trunk/docs/reference-guide/en: modules and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-09 08:40:08 -0500 (Tue, 09 Feb 2010)
New Revision: 1588
Added:
portal/trunk/docs/reference-guide/en/images/sso.png
Modified:
portal/trunk/docs/reference-guide/en/modules/SSO.xml
Log:
Adding picture
Added: portal/trunk/docs/reference-guide/en/images/sso.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/sso.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: portal/trunk/docs/reference-guide/en/modules/SSO.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/SSO.xml 2010-02-09 13:35:34 UTC (rev 1587)
+++ portal/trunk/docs/reference-guide/en/modules/SSO.xml 2010-02-09 13:40:08 UTC (rev 1588)
@@ -73,7 +73,7 @@
</listitem>
<listitem>
- <para>Replace: <programlisting role="XML"> <!--
+ <para>Replace: <programlisting> <!--
| Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate,
| AuthenticationHandlers actually authenticate credentials. Here we declare the AuthenticationHandlers that
| authenticate the Principals that the CredentialsToPrincipalResolvers identified. CAS will try these handlers in turn
@@ -104,7 +104,7 @@
<para>With the following (Make sure to set the host, port and
context with the values corresponding to your portal)</para>
- <para><programlisting role="XML"><!--
+ <para><programlisting><!--
| Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate,
| AuthenticationHandlers actually authenticate credentials. Here we declare the AuthenticationHandlers that
| authenticate the Principals that the CredentialsToPrincipalResolvers identified. CAS will try these handlers in turn
@@ -170,6 +170,11 @@
<para>Now you should be able to start Tomcat and access
http://localhost:8888/cas but at this stage you won't be able to
login.</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/sso.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
</listitem>
</orderedlist>
</section>
@@ -189,7 +194,7 @@
<para>In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml
and uncomment the section for CAS</para>
- <para><programlisting role="XML"><authentication>
+ <para><programlisting><authentication>
<login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required">
</login-module>
<login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required">
16 years, 2 months
- 1
- 0
gatein SVN: r1587 - portal/trunk/docs/reference-guide/en.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-09 08:35:34 -0500 (Tue, 09 Feb 2010)
New Revision: 1587
Added:
portal/trunk/docs/reference-guide/en/Reference_Guide.ent
Log:
Adding missing entity file
Added: portal/trunk/docs/reference-guide/en/Reference_Guide.ent
===================================================================
--- portal/trunk/docs/reference-guide/en/Reference_Guide.ent (rev 0)
+++ portal/trunk/docs/reference-guide/en/Reference_Guide.ent 2010-02-09 13:35:34 UTC (rev 1587)
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "GateIn 3.0">
+<!ENTITY BOOKID "Reference Guide">
+<!ENTITY YEAR "2010">
+<!ENTITY HOLDER "Red Hat, Inc">
16 years, 2 months
- 1
- 0
gatein SVN: r1586 - portal/trunk/docs/reference-guide/en/modules.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-09 08:25:29 -0500 (Tue, 09 Feb 2010)
New Revision: 1586
Modified:
portal/trunk/docs/reference-guide/en/modules/SSO.xml
Log:
Rewrote the SSO chapter
Modified: portal/trunk/docs/reference-guide/en/modules/SSO.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/SSO.xml 2010-02-09 11:10:41 UTC (rev 1585)
+++ portal/trunk/docs/reference-guide/en/modules/SSO.xml 2010-02-09 13:25:29 UTC (rev 1586)
@@ -1,156 +1,284 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "../Reference_Guide.ent">
%BOOK_ENTITIES;
]>
-<chapter id="chap-Reference_Guide-Single_Sign_On">
- <title>Single Sign On</title>
- <section id="sect-Reference_Guide-Single_Sign_On-Overview_of_SSO">
- <title>Overview of SSO</title>
- <para>
- Portal as an integration and aggregation platform provides some form of SSO by itself. When you log into the portal you gain access to many systems through portlets using a single identity. Still in many cases you need to integrate the portal infrastructure with other SSO enabled systems. There are many different Identity Management solutions on the market. In most cases each SSO framework provides its own way to plug into Java EE application.
- </para>
- </section>
-
- <section id="sect-Reference_Guide-Single_Sign_On-CAS_Central_Authentication_Service">
- <title>CAS - Central Authentication Service</title>
- <para>
- This Single Sign On plugin enables seamless integration between GateIn Portal and the CAS Single Sign On Framework. Details about CAS can be found <ulink url="http://www.ja-sig.org/products/cas/">here</ulink>
- </para>
- <section id="sect-Reference_Guide-CAS_Central_Authentication_Service-Integration">
- <title>Integration</title>
- <section id="sect-Reference_Guide-Integration-From_source">
- <title>From source</title>
- <itemizedlist>
- <listitem>
- <para>
- Check out the GateIn SSO component from SVN using the following command:
-<programlisting>
-
-svn co http://anonsvn.jboss.org/repos/gatein/components/sso/tags/<appropriate sso component version>
+<chapter>
+ <title>Single Sign On</title>
+
+ <section>
+ <title>Overview of SSO</title>
+
+ <para>Portal as an integration and aggregation platform provides some form
+ of SSO by itself. When you log into the portal you gain access to many
+ systems through portlets using a single identity. Still in many cases you
+ need to integrate the portal infrastructure with other SSO enabled
+ systems. There are many different Identity Management solutions on the
+ market. In most cases each SSO framework provides its own way to plug into
+ Java EE application.</para>
+ </section>
+
+ <section>
+ <title>CAS - Central Authentication Service</title>
+
+ <para>This Single Sign On plugin enables seamless integration between
+ GateIn Portal and the CAS Single Sign On Framework. Details about CAS can
+ be found <ulink
+ url="http://www.ja-sig.org/products/cas/">here.</ulink></para>
+
+ <para>The integration consitsts in two parts, the first part consists of
+ installing or configuring a CAS server, the second part consists of
+ setting up the portal to use the CAS server.</para>
+
+ <section>
+ <title>CAS server</title>
+
+ <para>First we will set up the server to authenticate against the portal
+ login module. You can find more information about setting up the server
+ by reading the official CAS documentation, here we will install the CAS
+ server on Tomcat</para>
+
+ <section>
+ <title>Obtaining CAS</title>
+
+ <para>You can download CAS from
+ http://www.jasig.org/cas/download.</para>
+
+ <para>Once downloaded extract it in what we will call $CAS_HOME from
+ now.</para>
+ </section>
+
+ <section>
+ <title>Modifying CAS server</title>
+
+ <para>To simplify we will directly modify the sources so that the
+ produced web archive is configured the way we want.</para>
+
+ <para>First we will want to change the authenticaton handler to use
+ the portal authentication handler:</para>
+
+ <para>The CAS Server Plugin makes secure authentication callbacks to a
+ RESTful service installed on the remote GateIn server in order to
+ authenticate a user. In order for the plugin to function correctly, it
+ needs to be properly configured to connect to this service. This
+ configuration is done via the
+ <emphasis>cas.war/WEB-INF/deployerConfigContext.xml</emphasis>
+ file.</para>
+
+ <orderedlist>
+ <listitem>
+ <para>Open
+ $CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/deployerConfigContext.xml</para>
+ </listitem>
+
+ <listitem>
+ <para>Replace: <programlisting role="XML"> <!--
+ | Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate,
+ | AuthenticationHandlers actually authenticate credentials. Here we declare the AuthenticationHandlers that
+ | authenticate the Principals that the CredentialsToPrincipalResolvers identified. CAS will try these handlers in turn
+ | until it finds one that both supports the Credentials presented and succeeds in authenticating.
+ +-->
+ <property name="authenticationHandlers">
+ <list>
+ <!--
+ | This is the authentication handler that authenticates services by means of callback via SSL, thereby validating
+ | a server side SSL certificate.
+ +-->
+ <bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler"
+ p:httpClient-ref="httpClient" />
+ <!--
+ | This is the authentication handler declaration that every CAS deployer will need to change before deploying CAS
+ | into production. The default SimpleTestUsernamePasswordAuthenticationHandler authenticates UsernamePasswordCredentials
+ | where the username equals the password. You will need to replace this with an AuthenticationHandler that implements your
+ | local authentication strategy. You might accomplish this by coding a new such handler and declaring
+ | edu.someschool.its.cas.MySpecialHandler here, or you might use one of the handlers provided in the adaptors modules.
+ +-->
+ <bean
+ class="org.jasig.cas.authentication.handler.support.SimpleTestUsernamePasswordAuthenticationHandler" />
+ </list>
+ </property></programlisting></para>
+ </listitem>
+
+ <listitem>
+ <para>With the following (Make sure to set the host, port and
+ context with the values corresponding to your portal)</para>
+
+ <para><programlisting role="XML"><!--
+ | Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate,
+ | AuthenticationHandlers actually authenticate credentials. Here we declare the AuthenticationHandlers that
+ | authenticate the Principals that the CredentialsToPrincipalResolvers identified. CAS will try these handlers in turn
+ | until it finds one that both supports the Credentials presented and succeeds in authenticating.
+ +-->
+ <property name="authenticationHandlers">
+ <list>
+ <!--
+ | This is the authentication handler that authenticates services by means of callback via SSL, thereby validating
+ | a server side SSL certificate.
+ +-->
+ <bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler"
+ p:httpClient-ref="httpClient" />
+ <!--
+ | This is the authentication handler declaration that every CAS deployer will need to change before deploying CAS
+ | into production. The default SimpleTestUsernamePasswordAuthenticationHandler authenticates UsernamePasswordCredentials
+ | where the username equals the password. You will need to replace this with an AuthenticationHandler that implements your
+ | local authentication strategy. You might accomplish this by coding a new such handler and declaring
+ | edu.someschool.its.cas.MySpecialHandler here, or you might use one of the handlers provided in the adaptors modules.
+ +-->
+ <!-- Integrates with the Gatein Authentication Service to perform authentication -->
+ <!--
+ | Note: Modify the Plugin Configuration based on the actual information of a GateIn instance.
+ | The instance can be anywhere on the internet...Not necessarily on localhost where CAS is running
+ +-->
+ <bean class="org.gatein.sso.cas.plugin.AuthenticationPlugin">
+ <property name="gateInHost"><value>localhost</value></property>
+ <property name="gateInPort"><value>8080</value></property>
+ <property name="gateInContext"><value>portal</value></property>
+ </bean>
+ </list>
+ </property></programlisting></para>
+ </listitem>
+
+ <listitem>
+ <para>Copy gatein-cas-plugin-<VERSION>.jar and
+ commons-httpclient-<VERSION>.jar into the newly created
+ directory
+ $CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/lib</para>
+ </listitem>
+
+ <listitem>
+ <para>Get an installation of Tomcat and extract it in what we will
+ call $TOMCAT_HOME. Change the default port to avoid a conflict
+ with the default GateIn (for testing purposes). Edit
+ $TOMCAT_HOME/conf/server.xml and replace the 8080 port to
+ 8888.<note>
+ <para>If you are running GateIn with Tomcat on the same
+ machine you will also need to change the port 8005 to
+ something else to avoid port conflicts.</para>
+ </note></para>
+ </listitem>
+
+ <listitem>
+ <para>Go to $CAS_HOME/cas-server-webapp and do 'mvn
+ install'</para>
+ </listitem>
+
+ <listitem>
+ <para>Copy $CAS_HOME/cas-server-webapp/target/cas.war into
+ $TOMCAT_HOME/webapps</para>
+
+ <para>Now you should be able to start Tomcat and access
+ http://localhost:8888/cas but at this stage you won't be able to
+ login.</para>
+ </listitem>
+ </orderedlist>
+ </section>
+</section>
+ <section>
+ <title>Setup the CAS client</title>
+
+ <orderedlist>
+ <listitem>
+ <para>Copy the CAS client core
+ ($CAS_HOME/cas-server-webapp/target/cas-server-webapp-<VERSION>/WEB-INF/lib/cas-client-core-<VERSION>.jar
+ into gatein.ear/lib (Or if you are running GateIn in Tomcat, in
+ $GATEIN_HOME/lib)</para>
+ </listitem>
+
+ <listitem>
+ <para>In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml
+ and uncomment the section for CAS</para>
+
+ <para><programlisting role="XML"><authentication>
+ <login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required">
+ </login-module>
+ <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+</authentication></programlisting></para>
+
+ <para>If you are running GateIn in Tomcat, edit
+ $GATEIN_HOME/conf/jaas.conf and uncomment the secion for
+ CAS</para>
+
+ <para><programlisting>org.gatein.sso.agent.login.SSOLoginModule required
+org.exoplatform.services.security.j2ee.JbossLoginModule required
+portalContainerName=portal
+realmName=gatein-domain</programlisting>At this point, you can test the
+ installation, start GateIn (assuming that the CAS server using
+ Tomcat is still running) by going to http://localhost:8888/cas you
+ should be able to login with username 'root' and password 'gtn' or
+ any account created through the portal.</para>
+ </listitem>
+ </orderedlist>
+ </section>
+
+ <section>
+ <title>Setup the portal to redirect to CAS</title>
+
+ <para>Now we want to tell GateIn to redirect all user authentication
+ to the CAS server.</para>
+
+ <para>The CAS server can be located anywhere on the Internet, and this
+ information must be properly configured within the GateIn instance.
+ This configuration needs to be done in 3 files <itemizedlist>
+ <listitem>
+ <emphasis>In
+ gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl
+ replace the javascript at the bottom by:</emphasis>
+
+ <para>
+ <programlisting><script>
+<%=uicomponent.event("Close");%>
+ window.location = 'http://localhost:8888/cas/login?service=http://localhost:8080/portal/priv...';
+</script>
</programlisting>
- </para>
- </listitem>
- <listitem>
- <para>
- Update <emphasis>packaging/profiles.xml</emphasis> to reflect the directories where your local JBoss AS 5.1.0.GA and Tomcat 6.0.2 are installed
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section id="sect-Reference_Guide-Integration-Install_CAS_plugin_into_a_designated_CAS_3.3.4_server">
- <title>Install CAS plugin into a designated CAS (3.3.4) server</title>
- <itemizedlist>
- <listitem>
- <para>
-
-<programlisting>
-
- mvn -Pplugin-cas-install install
-</programlisting>
- </para>
- </listitem>
- </itemizedlist>
- </section>
-
- <section id="sect-Reference_Guide-Integration-Install_CAS_GateIn_Agent_into_the_designated_GateIn_server">
- <title>Install CAS GateIn Agent into the designated GateIn server</title>
- <itemizedlist>
- <listitem>
- <para>
-
-<programlisting>
-
- mvn -Pgatein-cas-install install
-</programlisting>
- </para>
- </listitem>
- </itemizedlist>
- </section>
+ </para>
+ </listitem>
- </section>
-
- <section id="sect-Reference_Guide-CAS_Central_Authentication_Service-CAS_Server_Plugin_Configuration">
- <title>CAS Server Plugin Configuration</title>
- <para>
- The CAS Server Plugin makes secure authentication callbacks to a RESTful service installed on the remote GateIn server in order to authenticate a user. In order for the plugin to function correctly, it needs to be properly configured to connect to this service. This configuration is done via the <emphasis>cas.war/WEB-INF/deployerConfigContext.xml</emphasis> file.
- </para>
- <para>
-
-<programlisting>
-
- <!--
- Note: Modify the Plugin Configuration based on the actual information of a GateIn instance.
- The instance can be anywhere on the internet...Not on localhost where CAS is running
- -->
- <bean class="org.gatein.sso.cas.plugin.AuthenticationPlugin">
- <property name="gateInHost"><value>localhost</value></property>
- <property name="gateInPort"><value>8080</value></property>
- <property name="gateInContext"><value>portal</value></property>
- </bean>
+ <listitem>
+ <emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace
+ everything by:</emphasis>
+
+ <para>
+ <programlisting><html>
+ <head>
+ <script type="text/javascript">
+ window.location = 'http://localhost:8888/cas/login?service=http://localhost:8080/portal/priv...';
+ </script>
+ </head>
+ <body>
+ </body>
+</html>
</programlisting>
- </para>
- </section>
-
- <section id="sect-Reference_Guide-CAS_Central_Authentication_Service-GateIn_Agent_Configuration">
- <title>GateIn Agent Configuration</title>
- <para>
- In a Single Sign On usecase, the GateIn server re-directs all "private" resource requests to the CAS server for authentication first. The CAS server can be located anywhere on the Internet, and this information must be properly configured within the GateIn instance. This configuration needs to be done in 3 files
- <itemizedlist>
- <listitem>
- <emphasis>gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl</emphasis>
- <para>
-
-<programlisting>
-
- <script>
- <%=uicomponent.event("Close");%>
- window.location = 'http://localhost:8888/cas/login?service=http://localhost:8080/portal/priv...';
- </script>
-</programlisting>
- </para>
- </listitem>
- <listitem>
- <emphasis>gatein.ear/02portal.war/login/jsp/login.jsp</emphasis>
- <para>
-
-<programlisting>
-
- <html>
- <head>
- <script type="text/javascript">
- window.location = 'http://localhost:8888/cas/login?service=http://localhost:8080/portal/priv...';
- </script>
- </head>
- <body>
- </body>
- </html>
-</programlisting>
- </para>
- </listitem>
- <listitem>
- <emphasis>gatein.ear/02portal.war/WEB-INF/web.xml</emphasis>
- <para>
-
-<programlisting>
-
- <servlet>
- <servlet-name>InitiateLoginServlet</servlet-name>
- <servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class>
- <init-param>
- <param-name>casServerUrl</param-name>
- <param-value>http://localhost:8888/cas</param-value>
- </init-param>
- </servlet>
-</programlisting>
- </para>
- </listitem>
- </itemizedlist>
- </para>
- </section>
+ </para>
+ </listitem>
- </section>
+ <listitem>
+ <emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the
+ InitiateLoginServlet declaration by:</emphasis>
+ <para>
+ <programlisting><servlet>
+ <servlet-name>InitiateLoginServlet</servlet-name>
+ <servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class>
+ <init-param>
+ <param-name>ssoServerUrl</param-name>
+ <param-value>http://localhost:8888/cas</param-value>
+ </init-param>
+</servlet></programlisting>
+ </para>
+ </listitem>
+ </itemizedlist></para>
+
+ <para>From now on, all links redirecting to the user authentication
+ pages will redirect to the CAS centralized authentication form.</para>
+ </section>
+ </section>
+ <section>
+ <title>Open SSO</title>
+
+ <para></para>
+ </section>
</chapter>
-
16 years, 2 months
- 1
- 0
gatein SVN: r1585 - in portal/trunk: component/portal/src/test/java/org/exoplatform/portal/config and 6 other directories.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-02-09 06:10:41 -0500 (Tue, 09 Feb 2010)
New Revision: 1585
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/PageUtils.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
Log:
GTNPORTAL-602: Clean up code in UserPortalConfigService
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/GroupPortalConfigListener.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -49,9 +49,7 @@
/** . */
private final OrganizationService orgService;
- public GroupPortalConfigListener(
- UserPortalConfigService portalConfigService,
- DataStorage dataStorage,
+ public GroupPortalConfigListener(UserPortalConfigService portalConfigService, DataStorage dataStorage,
OrganizationService orgService)
{
this.portalConfigService = portalConfigService;
@@ -67,7 +65,7 @@
String groupId = group.getId().trim();
// Remove all descendant navigations
- removeGroupNavigation(group, portalConfigService);
+ removeGroupNavigation(group, dataStorage);
portalConfigService.removeUserPortalConfig(PortalConfig.GROUP_TYPE, groupId);
}
@@ -163,16 +161,16 @@
}
}
- private void removeGroupNavigation(Group group, UserPortalConfigService portalConfigService) throws Exception
+ private void removeGroupNavigation(Group group, DataStorage dataService) throws Exception
{
GroupHandler groupHandler = orgService.getGroupHandler();
Collection<String> descendantGroups = getDescendantGroups(group, groupHandler);
PageNavigation navigation = null;
for (String childGroup : descendantGroups)
{
- navigation = portalConfigService.getPageNavigation(PortalConfig.GROUP_TYPE, childGroup);
+ navigation = dataService.getPageNavigation(PortalConfig.GROUP_TYPE, childGroup);
if (navigation != null)
- portalConfigService.remove(navigation);
+ dataService.remove(navigation);
}
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigListener.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -93,7 +93,7 @@
pageNav.setOwnerId(userName);
pageNav.setPriority(5);
pageNav.setNodes(new ArrayList<PageNode>());
- portalConfigService.create(pageNav);
+ dataStorage.create(pageNav);
}
}
finally
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -105,7 +105,7 @@
}
List<PageNavigation> navigations = new ArrayList<PageNavigation>();
- PageNavigation navigation = getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
+ PageNavigation navigation = storage_.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
if (navigation != null)
{
navigation.setModifiable(userACL_.hasPermission(portal.getEditPermission()));
@@ -121,7 +121,7 @@
}
else
{
- navigation = getPageNavigation(PortalConfig.USER_TYPE, accessUser);
+ navigation = storage_.getPageNavigation(PortalConfig.USER_TYPE, accessUser);
if (navigation != null)
{
navigation.setModifiable(true);
@@ -145,7 +145,7 @@
{
continue;
}
- navigation = getPageNavigation(PortalConfig.GROUP_TYPE, groupId);
+ navigation = storage_.getPageNavigation(PortalConfig.GROUP_TYPE, groupId);
if (navigation == null)
{
continue;
@@ -254,6 +254,7 @@
* @param portal
* @throws Exception
*/
+ @Deprecated
public void update(PortalConfig portal) throws Exception
{
storage_.save(portal);
@@ -302,6 +303,7 @@
* @param page the page to remove
* @throws Exception any exception
*/
+ @Deprecated
public void remove(Page page) throws Exception
{
storage_.remove(page);
@@ -314,6 +316,7 @@
* @param page the page to create
* @throws Exception any exception
*/
+ @Deprecated
public void create(Page page) throws Exception
{
storage_.create(page);
@@ -327,6 +330,7 @@
* @return the list of model changes that occured
* @throws Exception any exception
*/
+ @Deprecated
public List<ModelChange> update(Page page) throws Exception
{
List<ModelChange> changes = storage_.save(page);
@@ -340,6 +344,7 @@
* @param navigation the navigation to create
* @throws Exception any exception
*/
+ @Deprecated
public void create(PageNavigation navigation) throws Exception
{
storage_.create(navigation);
@@ -352,6 +357,7 @@
* @param navigation the navigation to update
* @throws Exception any exception
*/
+ @Deprecated
public void update(PageNavigation navigation) throws Exception
{
storage_.save(navigation);
@@ -364,11 +370,13 @@
* @param navigation the navigation to remove
* @throws Exception any exception
*/
+ @Deprecated
public void remove(PageNavigation navigation) throws Exception
{
storage_.remove(navigation);
}
+ @Deprecated
public PageNavigation getPageNavigation(String ownerType, String id) throws Exception
{
PageNavigation navigation = storage_.getPageNavigation(ownerType, id);
@@ -389,7 +397,7 @@
public PageNode createNodeFromPageTemplate(String nodeName, String nodeLabel, String pageId, String ownerType,
String ownerId) throws Exception
{
- Page page = renewPage(pageId, nodeName, ownerType, ownerId);
+ Page page = storage_.clonePage(pageId, nodeName, ownerType, ownerId);
PageNode pageNode = new PageNode();
if (nodeLabel == null || nodeLabel.trim().length() < 1)
{
@@ -411,6 +419,7 @@
* @return the newly created page
* @throws Exception any exception
*/
+ @Deprecated
public Page renewPage(String pageId, String pageName, String ownerType, String ownerId) throws Exception
{
return storage_.clonePage(pageId, ownerType, ownerId, pageName);
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -110,7 +110,8 @@
};
PortalContainer container = getContainer();
- userPortalConfigSer_ = (UserPortalConfigService)container.getComponentInstanceOfType(UserPortalConfigService.class);
+ userPortalConfigSer_ =
+ (UserPortalConfigService)container.getComponentInstanceOfType(UserPortalConfigService.class);
orgService_ = (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class);
mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
authenticator = (Authenticator)container.getComponentInstanceOfType(Authenticator.class);
@@ -148,7 +149,8 @@
return map;
}
- public void testUpdatePortalConfig() {
+ public void testUpdatePortalConfig()
+ {
new UnitTest()
{
public void execute() throws Exception
@@ -161,16 +163,16 @@
assertEquals("classic", portalCfg.getName());
assertEquals("en", portalCfg.getLocale());
portalCfg.setLocale("fr");
-
- userPortalConfigSer_.update(portalCfg);
+ storage_.save(portalCfg);
+
userPortalCfg = userPortalConfigSer_.getUserPortalConfig("classic", "root");
portalCfg = userPortalCfg.getPortalConfig();
assertEquals("fr", portalCfg.getLocale());
}
}.execute("root");
}
-
+
public void testRootGetUserPortalConfig()
{
new UnitTest()
@@ -446,7 +448,7 @@
page.setOwnerId("/platform/administrators");
page.setName("newAccount");
assertTrue(events.isEmpty());
- userPortalConfigSer_.remove(page);
+ storage_.remove(page);
assertEquals(1, events.size());
Event event = events.removeFirst();
assertEquals(DataStorage.PAGE_REMOVED, event.getEventName());
@@ -470,7 +472,7 @@
page.setOwnerId("/platform/administrators");
page.setName("whatever");
assertTrue(events.isEmpty());
- userPortalConfigSer_.create(page);
+ storage_.create(page);
assertEquals(1, events.size());
Event event = events.removeFirst();
assertEquals(DataStorage.PAGE_CREATED, event.getEventName());
@@ -496,11 +498,11 @@
page.setOwnerId("/platform/administrators");
page.setName("whatever");
page.setTitle("testTitle");
- userPortalConfigSer_.create(page);
+ storage_.create(page);
String newName = "newPage";
- Page newPage =
- userPortalConfigSer_.renewPage(page.getPageId(), newName, page.getOwnerType(), page.getOwnerId());
+ Page newPage = storage_.clonePage(page.getPageId(), page.getOwnerType(), page.getOwnerId(), newName);
+
assertEquals(newName, newPage.getName());
assertEquals(page.getTitle(), newPage.getTitle());
}
@@ -520,7 +522,7 @@
page.setShowMaxWindow(true);
page.setTitle("newAccount title");
assertTrue(events.isEmpty());
- userPortalConfigSer_.create(page);
+ storage_.create(page);
assertEquals(1, events.size());
Event event = events.removeFirst();
assertEquals(DataStorage.PAGE_CREATED, event.getEventName());
@@ -530,38 +532,37 @@
assertEquals("newAccount", p.getName());
assertEquals("newAccount title", p.getTitle());
assertTrue(p.isShowMaxWindow());
-
+
p.setShowMaxWindow(false);
- userPortalConfigSer_.update(p);
+ storage_.save(p);
p = userPortalConfigSer_.getPage("group::/platform/administrators::newAccount");
assertFalse(p.isShowMaxWindow());
p.setShowMaxWindow(true);
- userPortalConfigSer_.update(p);
+ storage_.save(p);
p = userPortalConfigSer_.getPage("group::/platform/administrators::newAccount");
assertTrue(p.isShowMaxWindow());
p.setShowMaxWindow(false);
- userPortalConfigSer_.update(p);
+ storage_.save(p);
p = userPortalConfigSer_.getPage("group::/platform/administrators::newAccount");
assertFalse(p.isShowMaxWindow());
p.setShowMaxWindow(true);
- userPortalConfigSer_.update(p);
+ storage_.save(p);
p = userPortalConfigSer_.getPage("group::/platform/administrators::newAccount");
assertTrue(p.isShowMaxWindow());
-
+
Page p2 = userPortalConfigSer_.getPage("group::/platform/administrators::newAccount");
assertEquals("group", p2.getOwnerType());
assertEquals("/platform/administrators", p2.getOwnerId());
assertEquals("newAccount", p2.getName());
-// assertFalse(p2.isShowMaxWindow());
+ // assertFalse(p2.isShowMaxWindow());
p2.setTitle("newAccount title 1");
p2.setShowMaxWindow(true);
- userPortalConfigSer_.update(p2);
-
+ storage_.save(p2);
+
Page p3 = userPortalConfigSer_.getPage("group::/platform/administrators::newAccount");
assertEquals("newAccount title 1", p3.getTitle());
-// assertTrue(p3.isShowMaxWindow());
-
-
+ // assertTrue(p3.isShowMaxWindow());
+
}
}.execute(null);
}
@@ -576,14 +577,14 @@
navigation.setOwnerType("group");
navigation.setOwnerId("/platform/administrators");
assertTrue(events.isEmpty());
- userPortalConfigSer_.remove(navigation);
+ storage_.remove(navigation);
assertEquals(1, events.size());
Event event = events.removeFirst();
assertEquals(DataStorage.NAVIGATION_REMOVED, event.getEventName());
PageNavigation n = ((PageNavigation)event.getData());
assertEquals("group", n.getOwnerType());
assertEquals("/platform/administrators", n.getOwnerId());
- assertEquals(null, userPortalConfigSer_.getPageNavigation("group", "/platform/administrators"));
+ assertEquals(null, storage_.getPageNavigation("group", "/platform/administrators"));
}
}.execute(null);
}
@@ -597,82 +598,82 @@
PageNavigation navigation = new PageNavigation();
navigation.setOwnerType("group");
navigation.setOwnerId("/platform/administrators");
- userPortalConfigSer_.remove(navigation);
+ storage_.remove(navigation);
assertNotNull(events.removeLast());
assertTrue(events.isEmpty());
- userPortalConfigSer_.create(navigation);
+ storage_.create(navigation);
assertEquals(1, events.size());
Event event = events.removeFirst();
assertEquals(DataStorage.NAVIGATION_CREATED, event.getEventName());
PageNavigation n = ((PageNavigation)event.getData());
assertEquals("group", n.getOwnerType());
assertEquals("/platform/administrators", n.getOwnerId());
- PageNavigation n2 = userPortalConfigSer_.getPageNavigation("group", "/platform/administrators");
+ PageNavigation n2 = storage_.getPageNavigation("group", "/platform/administrators");
assertEquals("group", n2.getOwnerType());
assertEquals("/platform/administrators", n2.getOwnerId());
}
}.execute(null);
}
-/*
- public void testCreateMultipleNavigations(){
- for(int i =0; i < 10; i++){
- createNavigation(null, "group", "/platform/administrators" + i);
+ /*
+ public void testCreateMultipleNavigations(){
+ for(int i =0; i < 10; i++){
+ createNavigation(null, "group", "/platform/administrators" + i);
+ }
}
- }
-
- private void createNavigation(final String user, final String ownerType, final String ownerId)
- {
- new UnitTest()
+
+ private void createNavigation(final String user, final String ownerType, final String ownerId)
{
-
- public void execute() throws Exception
+ new UnitTest()
{
- createNavigationInSeperatedThread();
- }
- private void createNavigationInSeperatedThread()
- {
- Thread task = new Thread()
+ public void execute() throws Exception
{
- public void run()
+ createNavigationInSeperatedThread();
+ }
+
+ private void createNavigationInSeperatedThread()
+ {
+ Thread task = new Thread()
{
- PageNavigation navigation = new PageNavigation();
- navigation.setOwnerType(ownerType);
- navigation.setOwnerId(ownerId);
- try
+ public void run()
{
- userPortalConfigSer_.create(navigation);
- Event event = events.removeFirst();
- assertEquals(DataStorage.CREATE_NAVIGATION_EVENT, event.getEventName());
- PageNavigation n1 = (PageNavigation)event.getSource();
- assertEquals(ownerType, n1.getOwnerType());
- assertEquals(ownerId, n1.getOwnerId());
- PageNavigation n2 = userPortalConfigSer_.getPageNavigation(ownerType, ownerId);
- assertEquals(ownerType, n2.getOwnerType());
- assertEquals(ownerId, n2.getOwnerId());
+ PageNavigation navigation = new PageNavigation();
+ navigation.setOwnerType(ownerType);
+ navigation.setOwnerId(ownerId);
+ try
+ {
+ userPortalConfigSer_.create(navigation);
+ Event event = events.removeFirst();
+ assertEquals(DataStorage.CREATE_NAVIGATION_EVENT, event.getEventName());
+ PageNavigation n1 = (PageNavigation)event.getSource();
+ assertEquals(ownerType, n1.getOwnerType());
+ assertEquals(ownerId, n1.getOwnerId());
+ PageNavigation n2 = storage_.getPageNavigation(ownerType, ownerId);
+ assertEquals(ownerType, n2.getOwnerType());
+ assertEquals(ownerId, n2.getOwnerId());
+ }
+ catch (Exception ex)
+ {
+ assertTrue("Failed while create '" + ownerType + " ' navigation for owner: " + ownerId, false);
+ ex.printStackTrace();
+ }
}
- catch (Exception ex)
- {
- assertTrue("Failed while create '" + ownerType + " ' navigation for owner: " + ownerId, false);
- ex.printStackTrace();
- }
+ };
+
+ task.start();
+ try
+ {
+ task.sleep(200);
}
- };
-
- task.start();
- try
- {
- task.sleep(200);
+ catch (InterruptedException ex)
+ {
+ ex.printStackTrace();
+ }
}
- catch (InterruptedException ex)
- {
- ex.printStackTrace();
- }
- }
- }.execute(user);
- }
-*/
+ }.execute(user);
+ }
+ */
public void testUpdateNavigation()
{
@@ -685,7 +686,7 @@
navigation.setOwnerId("/platform/administrators");
navigation.setPriority(3);
assertTrue(events.isEmpty());
- userPortalConfigSer_.update(navigation);
+ storage_.save(navigation);
assertEquals(1, events.size());
Event event = events.removeFirst();
assertEquals(DataStorage.NAVIGATION_UPDATED, event.getEventName());
@@ -693,7 +694,7 @@
assertEquals("group", n.getOwnerType());
assertEquals("/platform/administrators", n.getOwnerId());
assertEquals(3, n.getPriority());
- PageNavigation n2 = userPortalConfigSer_.getPageNavigation("group", "/platform/administrators");
+ PageNavigation n2 = storage_.getPageNavigation("group", "/platform/administrators");
assertEquals("group", n2.getOwnerType());
assertEquals("/platform/administrators", n2.getOwnerId());
assertEquals(3, n2.getPriority());
@@ -707,7 +708,7 @@
{
public void execute() throws Exception
{
- Page clone = userPortalConfigSer_.renewPage("portal::test::test4", "test5", "portal", "test");
+ Page clone = storage_.clonePage("portal::test::test4", "portal", "test", "test5");
assertNotNull(clone);
assertEquals("portal", clone.getOwnerType());
assertEquals("test", clone.getOwnerId());
@@ -770,7 +771,6 @@
PortalConfig cfg = storage_.getPortalConfig(PortalConfig.USER_TYPE, "overwritelayout");
assertNotNull(cfg);
-
Container container = cfg.getPortalLayout();
assertNotNull(container);
assertEquals(2, container.getChildren().size());
@@ -863,10 +863,10 @@
mgr.clearCache();
DataCache cache = mgr.getDecorator(DataCache.class);
long readCount0 = cache.getReadCount();
- userPortalConfigSer_.getPageNavigation("portal", "test");
+ storage_.getPageNavigation("portal", "test");
long readCount1 = cache.getReadCount();
assertTrue(readCount1 > readCount0);
- userPortalConfigSer_.getPageNavigation("portal", "test");
+ storage_.getPageNavigation("portal", "test");
long readCount2 = cache.getReadCount();
assertEquals(readCount1, readCount2);
}
Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java
===================================================================
--- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UITabPaneDashboard.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -20,6 +20,7 @@
package org.exoplatform.dashboard.webui.component;
import org.exoplatform.portal.application.PortalRequestContext;
+import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageNavigation;
@@ -69,6 +70,8 @@
private UserPortalConfigService configService;
+ private DataStorage dataService;
+
private PageNavigation pageNavigation;
private UIPortal uiPortal;
@@ -80,6 +83,7 @@
public UITabPaneDashboard() throws Exception
{
configService = getApplicationComponent(UserPortalConfigService.class);
+ dataService = getApplicationComponent(DataStorage.class);
uiPortal = Util.getUIPortal();
initPageNavigation();
}
@@ -165,7 +169,7 @@
boolean isRemoved = true; // To check
PageNavigation updateNav =
- configService.getPageNavigation(pageNavigation.getOwnerType(), pageNavigation.getOwnerId());
+ dataService.getPageNavigation(pageNavigation.getOwnerType(), pageNavigation.getOwnerId());
for (PageNode pageNode : updateNav.getNodes())
{
if (pageNode.getUri().equals(tobeRemoved.getUri()))
@@ -199,13 +203,13 @@
{
Page page = configService.getPage(pageRef);
if (page != null)
- configService.remove(page);
+ dataService.remove(page);
UIPortal uiPortal = Util.getUIPortal();
// Remove from cache
uiPortal.setUIPage(pageRef, null);
}
//uiPortal.setSelectedNode(selectedNode);
- configService.update(pageNavigation);
+ dataService.save(pageNavigation);
}
}
else
@@ -269,8 +273,8 @@
//uiPortal.setSelectedNode(pageNode);
- configService.create(page);
- configService.update(pageNavigation);
+ dataService.create(page);
+ dataService.save(pageNavigation);
return fullName;
}
@@ -348,7 +352,7 @@
renamedNode.setUri(newUri);
- configService.update(pageNavigation);
+ dataService.save(pageNavigation);
return newUri;
}
catch (Exception ex)
@@ -379,7 +383,7 @@
nodes.set(firstIndex, secondNode);
nodes.set(secondIndex, firstNode);
- configService.update(pageNavigation);
+ dataService.save(pageNavigation);
return true;
}
catch (Exception ex)
@@ -428,7 +432,7 @@
return;
}
String uri = tabPane.createNewPageNode(newTabLabel);
-
+
//If new node is created with success, then redirect to it
if (uri != null)
{
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -294,8 +294,7 @@
UIPortal uiPortal = Util.getUIPortal();
removeNavigationByID(uiPortal.getNavigations(), navigation);
- UserPortalConfigService dataService = uicomp.getApplicationComponent(UserPortalConfigService.class);
- dataService.remove(navigation);
+ service.remove(navigation);
event.getRequestContext().addUIComponentToUpdateByAjax(uicomp);
//Update UserToolbarGroupPortlet
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -309,6 +309,7 @@
UISiteManagement uicomp = event.getSource();
String portalName = event.getRequestContext().getRequestParameter(OBJECTID);
UserPortalConfigService service = uicomp.getApplicationComponent(UserPortalConfigService.class);
+ DataStorage dataService = uicomp.getApplicationComponent(DataStorage.class);
PortalRequestContext prContext = Util.getPortalRequestContext();
WebuiRequestContext context = event.getRequestContext();
UIApplication uiApplication = context.getUIApplication();
@@ -336,7 +337,8 @@
naviManager.setOwner(portalName);
naviManager.setOwnerType(PortalConfig.PORTAL_TYPE);
- PageNavigation navi = service.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
+ PageNavigation navi = dataService.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
+
uicomp.setSelectedNavigation(navi);
UINavigationNodeSelector selector = naviManager.getChild(UINavigationNodeSelector.class);
ArrayList<PageNavigation> list = new ArrayList<PageNavigation>();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -25,6 +25,7 @@
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.portal.application.PortalRequestContext;
+import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.ApplicationType;
import org.exoplatform.portal.config.model.CloneApplicationState;
@@ -250,12 +251,12 @@
if (uiPage.isModifiable())
{
Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
- UserPortalConfigService configService = uiPortalApp.getApplicationComponent(UserPortalConfigService.class);
if (page.getChildren() == null)
{
page.setChildren(new ArrayList<ModelObject>());
}
- configService.update(page);
+ DataStorage dataService = uiPortalApp.getApplicationComponent(DataStorage.class);
+ dataService.save(page);
}
PortalRequestContext pcontext = Util.getPortalRequestContext();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIAddGroupNavigation.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -121,7 +121,6 @@
{
WebuiRequestContext ctx = event.getRequestContext();
UIAddGroupNavigation uicomp = event.getSource();
- UserPortalConfigService service = uicomp.getApplicationComponent(UserPortalConfigService.class);
// get navigation id
String ownerId = event.getRequestContext().getRequestParameter(OBJECTID);
@@ -148,7 +147,7 @@
}
// create navigation for group
- service.create(pageNav);
+ dataService.create(pageNav);
// add navigation to UIPortal 's navigations
UIPortal uiPortal = Util.getUIPortal();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -20,6 +20,7 @@
package org.exoplatform.portal.webui.navigation;
import org.exoplatform.portal.application.PortalRequestContext;
+import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfig;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.PageNavigation;
@@ -98,6 +99,7 @@
PortalRequestContext prContext = Util.getPortalRequestContext();
UINavigationManagement uiManagement = event.getSource();
UINavigationNodeSelector uiNodeSelector = uiManagement.getChild(UINavigationNodeSelector.class);
+ DataStorage dataService = uiManagement.getApplicationComponent(DataStorage.class);
UserPortalConfigService portalConfigService =
uiManagement.getApplicationComponent(UserPortalConfigService.class);
@@ -105,7 +107,7 @@
String editedOwnerType = navigation.getOwnerType();
String editedOwnerId = navigation.getOwnerId();
// Check existed
- PageNavigation persistNavigation = portalConfigService.getPageNavigation(editedOwnerType, editedOwnerId);
+ PageNavigation persistNavigation = dataService.getPageNavigation(editedOwnerType, editedOwnerId);
if (persistNavigation == null) {
UIApplication uiApp = Util.getPortalRequestContext().getUIApplication();
uiApp.addMessage(new ApplicationMessage("UINavigationManagement.msg.NavigationNotExistAnymore", null));
@@ -123,7 +125,7 @@
UserPortalConfig portalConfig = portalConfigService.getUserPortalConfig(navigation.getOwnerId(), prContext.getRemoteUser());
if(portalConfig != null)
{
- portalConfigService.update(navigation);
+ dataService.save(persistNavigation);
} else {
UIApplication uiApp = Util.getPortalRequestContext().getUIApplication();
uiApp.addMessage(new ApplicationMessage("UIPortalForm.msg.notExistAnymore", null));
@@ -138,7 +140,7 @@
}
else
{
- portalConfigService.update(navigation);
+ dataService.save(navigation);
}
UIPortalApplication uiPortalApp = Util.getUIPortalApplication();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNavigationForm.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -21,7 +21,6 @@
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.DataStorage;
-import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.PageNavigation;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
@@ -161,9 +160,8 @@
// Check existed
PortalRequestContext prContext = Util.getPortalRequestContext();
- UserPortalConfigService portalConfigService = uiForm.getApplicationComponent(UserPortalConfigService.class);
- PageNavigation persistNavigation =
- portalConfigService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId());
+ DataStorage dataService = uiForm.getApplicationComponent(DataStorage.class);
+ PageNavigation persistNavigation = dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId());
if (persistNavigation == null)
{
UIApplication uiApp = Util.getPortalRequestContext().getUIApplication();
@@ -178,8 +176,6 @@
WebuiRequestContext pcontext = event.getRequestContext();
- UserPortalConfigService service = uiForm.getApplicationComponent(UserPortalConfigService.class);
-
// if edit navigation
if (pageNav != null)
{
@@ -189,7 +185,7 @@
pageNav.setPriority(priority);
// update navigation
- service.update(pageNav);
+ dataService.save(pageNav);
UIPopupWindow uiPopup = uiForm.getParent();
uiPopup.setShow(false);
@@ -214,7 +210,6 @@
UIPortalApplication uiPortalApp = Util.getUIPortal().getAncestorOfType(UIPortalApplication.class);
// ensure this navigation is not exist
- DataStorage dataService = uiForm.getApplicationComponent(DataStorage.class);
if (dataService.getPageNavigation(pageNav.getOwnerType(), pageNav.getOwnerId()) != null)
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageNavigationForm.msg.existPageNavigation",
@@ -223,9 +218,8 @@
}
// create navigation for group
+ dataService.create(pageNav);
- service.create(pageNav);
-
// close popup window, update popup window
UIPopupWindow uiPopup = uiForm.getParent();
uiPopup.setShow(false);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/PageUtils.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/PageUtils.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/PageUtils.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.webui.page;
+import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.PageNavigation;
import org.exoplatform.portal.config.model.PageNode;
@@ -75,7 +76,9 @@
node.setUri(node.getName());
navi.addNode(node);
- configService.update(navi);
+
+ DataStorage dataService = uiPortal.getApplicationComponent(DataStorage.class);
+ dataService.save(navi);
setNavigation(uiPortal.getNavigations(), navi);
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIDesktopPage.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -19,7 +19,7 @@
package org.exoplatform.portal.webui.page;
-import org.exoplatform.portal.config.UserPortalConfigService;
+import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.model.ModelObject;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageNavigation;
@@ -117,10 +117,10 @@
if (!uiPage.isModifiable())
return;
Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
- UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class);
if (page.getChildren() == null)
page.setChildren(new ArrayList<ModelObject>());
- configService.update(page);
+ DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class);
+ dataService.save(page);
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -22,7 +22,6 @@
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfig;
-import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Container;
import org.exoplatform.portal.config.model.ModelObject;
import org.exoplatform.portal.config.model.Page;
@@ -330,12 +329,12 @@
if (uiPage.isModifiable())
{
Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
- UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class);
if (page.getChildren() == null)
{
page.setChildren(new ArrayList<ModelObject>());
}
- configService.update(page);
+ DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class);
+ dataService.save(page);
}
break;
}
@@ -358,12 +357,12 @@
{
uiPage.removeChildById(id);
Page page = (Page)PortalDataMapper.buildModelObject(uiPage);
- UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class);
if (page.getChildren() == null)
{
page.setChildren(new ArrayList<ModelObject>());
}
- configService.update(page);
+ DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class);
+ dataService.save(page);
pcontext.setFullRender(false);
pcontext.setResponseComplete(true);
pcontext.getWriter().write(EventListener.RESULT_OK);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -20,7 +20,6 @@
package org.exoplatform.portal.webui.page;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
-import org.exoplatform.commons.utils.LazyPageList;
import org.exoplatform.commons.utils.PageList;
import org.exoplatform.commons.utils.PageListAccess;
import org.exoplatform.portal.application.PortalRequestContext;
@@ -137,18 +136,17 @@
public boolean feedDataWithQuery(Query<Page> query) throws Exception
{
lastQuery_ = query;
-
+
UIVirtualList virtualList = getChild(UIVirtualList.class);
- DataStorage dataStorage = getApplicationComponent(DataStorage.class);
- if(lastQuery_ == null)
+ if (lastQuery_ == null)
{
lastQuery_ = new Query<Page>(null, null, null, null, Page.class);
}
virtualList.dataBind(new PageQueryAccessList(lastQuery_, 10));
-
+
UIRepeater repeater = (UIRepeater)virtualList.getDataFeed();
PageList datasource = repeater.getDataSource();
-
+
if (datasource.getAvailable() > 0)
{
return true;
@@ -158,7 +156,7 @@
return false;
}
}
-
+
/**
* Show a popup informing that no result available for the last query
*
@@ -169,7 +167,7 @@
uiApp.addMessage(new ApplicationMessage("UISearchForm.msg.empty", null));
Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages());
}
-
+
public void quickSearch(UIFormInputSet quickSearchInput) throws Exception
{
UIFormStringInput input = (UIFormStringInput)quickSearchInput.getChild(0);
@@ -184,14 +182,14 @@
else if (selectBoxValue.equals("ownerId"))
query.setOwnerId(value);
query.setName(null);
-
+
lastQuery_ = query;
boolean dataAvailable = feedDataWithQuery(lastQuery_);
- if(!dataAvailable)
+ if (!dataAvailable)
{
showNoResultMessagePopup();
}
-
+
if (this.<UIComponent> getParent() instanceof UIPopupWindow)
{
UIPopupWindow popupWindow = getParent();
@@ -246,8 +244,8 @@
if (currentPage > 0)
datasource.getPage(currentPage);
}
- */
-
+ */
+
static public class DeleteActionListener extends EventListener<UIPageBrowser>
{
public void execute(Event<UIPageBrowser> event) throws Exception
@@ -256,6 +254,7 @@
PortalRequestContext pcontext = Util.getPortalRequestContext();
String id = pcontext.getRequestParameter(OBJECTID);
UserPortalConfigService service = uiPageBrowser.getApplicationComponent(UserPortalConfigService.class);
+ DataStorage dataService = uiPageBrowser.getApplicationComponent(DataStorage.class);
UIPortalApplication uiPortalApp = (UIPortalApplication)pcontext.getUIApplication();
if (service.getPage(id) == null)
@@ -276,8 +275,9 @@
UIRepeater repeater = (UIRepeater)virtualList.getDataFeed();
PageListAccess datasource = (PageListAccess)repeater.getDataSource();
int currentPage = datasource.getCurrentPage();
- service.remove(page);
+ dataService.remove(page);
+
UIPortal uiPortal = Util.getUIPortal();
if (uiPortal.getSelectedNode().getPageReference().equals(page.getPageId()))
{
@@ -289,7 +289,7 @@
else
{
boolean dataAvailable = uiPageBrowser.feedDataWithQuery(uiPageBrowser.getLastQuery());
- if(!dataAvailable)
+ if (!dataAvailable)
{
showNoResultMessagePopup();
}
@@ -417,12 +417,11 @@
UIPage uiPage = uiPageForm.getUIPage();
Page page = new Page();
uiPageForm.invokeSetBindingBean(page);
- UserPortalConfigService configService = uiPageForm.getApplicationComponent(UserPortalConfigService.class);
+ DataStorage dataService = uiPageForm.getApplicationComponent(DataStorage.class);
// create new page
if (uiPage == null)
{
- DataStorage dataStorage = uiPageForm.getApplicationComponent(DataStorage.class);
- Page existPage = dataStorage.getPage(page.getPageId());
+ Page existPage = dataService.getPage(page.getPageId());
if (existPage != null)
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageForm.msg.sameName", null));
@@ -432,7 +431,7 @@
page.setModifiable(true);
if (page.getChildren() == null)
page.setChildren(new ArrayList<ModelObject>());
- configService.create(page);
+ dataService.create(page);
postSave(uiPortalApp, pcontext);
return;
}
@@ -456,7 +455,7 @@
// page.setTemplate(uiPage.getTemplate());
if (page.getChildren() == null)
page.setChildren(new ArrayList<ModelObject>());
- configService.update(page);
+ dataService.save(page);
postSave(uiPortalApp, pcontext);
return;
}
@@ -480,7 +479,7 @@
page.setChildren(new ArrayList<ModelObject>());
if (Page.DESKTOP_PAGE.equals(uiPage.getFactoryId()))
{
- configService.update(page);
+ dataService.save(page);
postSave(uiPortalApp, pcontext);
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -21,7 +21,6 @@
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserACL;
-import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageNavigation;
import org.exoplatform.portal.config.model.PageNode;
@@ -37,7 +36,6 @@
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.web.application.JavascriptManager;
-import org.exoplatform.web.application.RequestContext;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.ComponentConfigs;
@@ -85,7 +83,7 @@
private void saveData() throws Exception
{
- UserPortalConfigService service = getApplicationComponent(UserPortalConfigService.class);
+ DataStorage dataService = getApplicationComponent(DataStorage.class);
UIPagePreview uiPagePreview = getChild(UIPagePreview.class);
UIPage uiPage = (UIPage)uiPagePreview.getUIComponent();
UIPortal uiPortal = Util.getUIPortal();
@@ -129,8 +127,8 @@
}
uiNodeSelector.selectPageNodeByUri(pageNode.getUri());
- service.create(page);
- service.update(pageNav);
+ dataService.create(page);
+ dataService.save(pageNav);
setNavigation(uiPortal.getNavigations(), uiNodeSelector.getSelectedNavigation());
String uri = pageNav.getId() + "::" + pageNode.getUri();
PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -22,6 +22,7 @@
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.portal.application.PortalRequestContext;
+import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.UserPortalConfig;
import org.exoplatform.portal.config.UserPortalConfigService;
@@ -331,8 +332,8 @@
pcontext.setFullRender(true);
UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID);
pcontext.addUIComponentToUpdateByAjax(uiWorkingWS);
- UserPortalConfigService service = uiPageForm.getApplicationComponent(UserPortalConfigService.class);
- service.update(page);
+ DataStorage dataService = uiPageForm.getApplicationComponent(DataStorage.class);
+ dataService.save(page);
return;
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -22,7 +22,6 @@
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserACL;
-import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.ModelObject;
import org.exoplatform.portal.config.model.Page;
import org.exoplatform.portal.config.model.PageNavigation;
@@ -409,11 +408,9 @@
if (page.getChildren() == null)
page.setChildren(new ArrayList<ModelObject>());
- UserPortalConfigService service = uiForm.getApplicationComponent(UserPortalConfigService.class);
-
// check page is exist
- DataStorage dataStorage = uiForm.getApplicationComponent(DataStorage.class);
- Page existPage = dataStorage.getPage(page.getPageId());
+ DataStorage dataService = uiForm.getApplicationComponent(DataStorage.class);
+ Page existPage = dataService.getPage(page.getPageId());
if (existPage != null)
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageForm.msg.sameName", null));
@@ -422,7 +419,7 @@
}
// save page to database
- service.create(page);
+ dataService.create(page);
pageSelector.setValue(page.getPageId());
}
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -167,10 +167,11 @@
PortalConfig portalConfig = (PortalConfig)PortalDataMapper.buildModelObject(editPortal);
UserPortalConfigService configService = getApplicationComponent(UserPortalConfigService.class);
+ DataStorage dataStorage = getApplicationComponent(DataStorage.class);
if (isPortalExist(editPortal))
{
- configService.update(portalConfig);
+ dataStorage.save(portalConfig);
}
else
{
@@ -639,7 +640,8 @@
}
// Perform mop update
- portalConfigService.update(page);
+ DataStorage dataService = uiWorkingWS.getApplicationComponent(DataStorage.class);
+ dataService.save(page);
uiToolPanel.setUIComponent(null);
// Update UIPage cache on UIPortal
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-02-09 10:34:27 UTC (rev 1584)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-02-09 11:10:41 UTC (rev 1585)
@@ -161,11 +161,11 @@
invokeGetBindingBean(editPortal);
((UIFormStringInput)getChild(UIFormInputSet.class).getChildById(FIELD_NAME)).setValue(getPortalOwner());
-
-
+
LocaleConfigService localeConfigService = getApplicationComponent(LocaleConfigService.class);
LocaleConfig localeConfig = localeConfigService.getLocaleConfig(editPortal.getLocale());
- this.<UIFormInputSet> getChildById("PortalSetting").<UIFormSelectBox>getChildById(FIELD_LOCALE).setValue(localeConfig.getLanguage());
+ this.<UIFormInputSet> getChildById("PortalSetting").<UIFormSelectBox> getChildById(FIELD_LOCALE).setValue(
+ localeConfig.getLanguage());
setActions(new String[]{"Save", "Close"});
}
@@ -193,7 +193,7 @@
SelectItemOption<String> option =
new SelectItemOption<String>(localeConfig.getLocale().getDisplayName(currentLocate), localeConfig
.getLanguage());
- if(defaultLanguage.equals(localeConfig.getLanguage()))
+ if (defaultLanguage.equals(localeConfig.getLanguage()))
{
option.setSelected(true);
}
@@ -271,6 +271,7 @@
{
UIPortalForm uiForm = event.getSource();
+ DataStorage dataService = uiForm.getApplicationComponent(DataStorage.class);
UserPortalConfigService service = uiForm.getApplicationComponent(UserPortalConfigService.class);
PortalRequestContext prContext = Util.getPortalRequestContext();
@@ -287,7 +288,7 @@
{
PortalConfig portalConfig = (PortalConfig)PortalDataMapper.buildModelObject(uiPortal);
UserPortalConfigService configService = uiForm.getApplicationComponent(UserPortalConfigService.class);
- configService.update(portalConfig);
+ dataService.save(portalConfig);
}
else
{
@@ -334,9 +335,9 @@
UserPortalConfig userPortalConfig = service.getUserPortalConfig(portalName, pcontext.getRemoteUser());
PortalConfig pconfig = userPortalConfig.getPortalConfig();
uiForm.invokeSetBindingBean(pconfig);
- PageNavigation navigation = service.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
- service.update(pconfig);
- service.update(navigation);
+ PageNavigation navigation = dataService.getPageNavigation(PortalConfig.PORTAL_TYPE, portalName);
+ dataService.save(pconfig);
+ dataService.save(navigation);
UIPortalApplication uiPortalApp = event.getSource().getAncestorOfType(UIPortalApplication.class);
UIMaskWorkspace uiMaskWS = uiPortalApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
uiMaskWS.setUIComponent(null);
16 years, 2 months
- 1
- 0
gatein SVN: r1584 - portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-09 05:34:27 -0500 (Tue, 09 Feb 2010)
New Revision: 1584
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css
Log:
GTNPORTAL-513 Error displaying in Page Editor composer when change language to Italian
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css 2010-02-09 09:41:14 UTC (rev 1583)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UIPopup/UIPopupWindow/Stylesheet.css 2010-02-09 10:34:27 UTC (rev 1584)
@@ -115,7 +115,9 @@
float: left; /* orientation=rt */
cursor: nw-resize; /* orientation=lt */
cursor: ne-resize; /* orientation=rt */
- margin-top:-29px;
+ position: absolute;
+ bottom: 8px;
+ right: 8px;
}
.UIPopupWindow .BottomLeftCornerDecorator {
16 years, 2 months
- 1
- 0
gatein SVN: r1583 - portal/trunk/component/common/src/main/java/conf.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-09 04:41:14 -0500 (Tue, 09 Feb 2010)
New Revision: 1583
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
Log:
bind database with java: prefix in JBoss AS
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-09 09:33:04 UTC (rev 1582)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-09 09:41:14 UTC (rev 1583)
@@ -25,7 +25,7 @@
# JCR
gatein.jcr.config.type=local
-gatein.jcr.datasource.name=jdbcjcr
+gatein.jcr.datasource.name=java:jdbcjcr
gatein.jcr.datasource.dialect=hsqldb
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
@@ -33,7 +33,7 @@
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
#IDM
-gatein.idm.datasource.name=jdbcidm
+gatein.idm.datasource.name=java:jdbcidm
gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
# temporary here, need to remove it
16 years, 2 months
- 1
- 0