gatein SVN: r2553 - in components/wsrp/trunk: admin-gui and 8 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-09 06:50:49 -0400 (Fri, 09 Apr 2010)
New Revision: 2553
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
Log:
Changing version, waiting on Portlet Bridge 2.0-GA
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/api/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/common/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/consumer/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -30,7 +30,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/producer/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/test/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-04-09 10:09:44 UTC (rev 2552)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-04-09 10:50:49 UTC (rev 2553)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.1.0-GA-SNAPSHOT</version>
+ <version>1.1.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
14 years, 2 months
gatein SVN: r2552 - in portal/branches/EPP_5_0_Branch: portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-09 06:09:44 -0400 (Fri, 09 Apr 2010)
New Revision: 2552
Modified:
portal/branches/EPP_5_0_Branch/packaging/profiles.xml
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
Log:
JBEPP-299 Change message when input name for gadget start by number
Modified: portal/branches/EPP_5_0_Branch/packaging/profiles.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/profiles.xml 2010-04-09 10:06:24 UTC (rev 2551)
+++ portal/branches/EPP_5_0_Branch/packaging/profiles.xml 2010-04-09 10:09:44 UTC (rev 2552)
@@ -29,7 +29,7 @@
ex: On Windows 'c:/AS'
ex: On Linux '/home/user/AS'
-->
- <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies>
+ <exo.projects.directory.dependencies>/tmp/jboss-eap-5.0</exo.projects.directory.dependencies>
<!--
If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir)
@@ -41,11 +41,11 @@
<!--
Replace with the name of the directory containing Tomcat 6
-->
- <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
+ <exo.projects.app.tomcat.version></exo.projects.app.tomcat.version>
<!--
Replace with the name of the directory containing JBoss AS 5.1
-->
- <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
+ <exo.projects.app.jboss.version>jboss-as</exo.projects.app.jboss.version>
</properties>
</profile>
</profiles>
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2010-04-09 10:06:24 UTC (rev 2551)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2010-04-09 10:09:44 UTC (rev 2552)
@@ -47,6 +47,8 @@
import org.exoplatform.webui.form.validator.ExpressionValidator;
import org.exoplatform.webui.form.validator.IdentifierValidator;
import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.exoplatform.webui.form.validator.ResourceValidator;
+import org.exoplatform.webui.form.validator.StringLengthValidator;
import org.exoplatform.webui.form.validator.Validator;
import java.io.Serializable;
@@ -79,8 +81,10 @@
Param param = initParams.getParam("SampleGadget");
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
String sample = (String)param.getMapGroovyObject(context);
- addUIFormInput(new UIFormStringInput(FIELD_NAME, null, null).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$",
- "UIGadgetEditor.msg.Invalid"));
+ addUIFormInput(new UIFormStringInput(FIELD_NAME, FIELD_NAME, null).addValidator(MandatoryValidator.class)
+ .addValidator(StringLengthValidator.class, 2, 50)
+ .addValidator(ResourceValidator.class)
+ .addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$","UIGadgetEditor.msg.Invalid-firstChar"));
addUIFormInput(new UIFormTextAreaInput(FIELD_SOURCE, FIELD_SOURCE, sample).addValidator(MandatoryValidator.class)
.addValidator(GadgetSpecValidator.class));
}
Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
===================================================================
--- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-04-09 10:06:24 UTC (rev 2551)
+++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-04-09 10:09:44 UTC (rev 2552)
@@ -145,7 +145,7 @@
UIGadgetEditor.action.Cancel=#{word.cancel}
UIGadgetEditor.msg.invalidSpec=This source is invalid gadget specification.
UIGadgetEditor.gadget.msg.gadgetIsExist=This name already exists, please enter a different name.
-UIGadgetEditor.msg.Invalid=The "{0}" field must not contains special characters.
+UIGadgetEditor.msg.Invalid-firstChar=The "{0}" field must start with a character.
##package org.exoplatform.organization.webui.component.UIListPermissionSelector
UIListPermissionSelector.header.groupId=Group
UIListPermissionSelector.header.membership=Membership
14 years, 2 months
gatein SVN: r2551 - in portal/branches/EPP_5_0_Branch: examples/skins/simpleskin/src/main/webapp/skin/Portlet and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-04-09 06:06:24 -0400 (Fri, 09 Apr 2010)
New Revision: 2551
Added:
portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/
portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet/
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
Removed:
portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
Modified:
portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css
portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Stylesheet.css
Log:
JBEPP-237 GateIn should provide default styling for standard portlet CSS classes
Also fixes decoration for simple skin
Copied: portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet (from rev 2536, portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet)
Deleted: portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2010-04-09 10:06:24 UTC (rev 2551)
@@ -1,292 +0,0 @@
-/******************************************************************************
- * JBoss by 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. *
- ******************************************************************************/
-
-/** FONTS **/
-
-/* Font attributes for the normal fragment font.
-Used for the display of non-accentuated information */
-.portlet-font {
- color: #000000;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
-}
-
-/* Font attributes similar to the portlet.font but the color is lighter */
-.portlet-font-dim {
- color: #777777;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
-}
-
-
-/** MESSAGES **/
-
-/* Status of the current operation. */
-.portlet-msg-status {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-style: normal;
- color: #336699;
-}
-
-/* Help messages, general additional information, etc. */
-.portlet-msg-info {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-style: italic;
- color: #000;
-}
-
-/* Error messages. */
-.portlet-msg-error {
- color: red;
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
-}
-
-/* Warning messages. */
-.portlet-msg-alert {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #821717;
-}
-
-/* Verification of the successful completion of a task. */
-.portlet-msg-success {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #359630;
-}
-
-/** SECTIONS **/
-
-/* Table or section header */
-.portlet-section-header {
- font-weight: bold;
-}
-
-.portlet-section-body {
- color: #333333;
-}
-
-.portlet-section-alternate {
- background-color: #F2F2F2;
-}
-
-.portlet-section-selected {
- background-color: #CBD4E6;
-}
-
-.portlet-section-subheader {
- font-weight: bold;
- font-size: 10px;
-}
-
-.portlet-section-footer {
- font-size: 11px;
-}
-
-/* Text that belongs to the table but does not fall in one of the other categories
-(e.g. explanatory or help text that is associated with the section. */
-.portlet-section-text {
- font-size: 12px;
- font-style: italic;
-}
-
-
-/** TABLE **/
-
-/* Table header */
-.portlet-table-header {
- background-color: #eef;
- padding: 0 5px 5px 5px;
- font-weight: bold;
- color: #333333;
- font-size: 12px;
- border-bottom: 1px solid #d5d5d5;
-}
-
-/* Normal text in a table cell */
-.portlet-table-body {}
-
-/* Text in every other row in the table */
-.portlet-table-alternate {
- background-color: #E6E8E5;
- border-bottom: 1px solid #d5d5d5;
-}
-
-/* Text in a selected cell range */
-.portlet-table-selected {
- color: #000;
- font-size: 12px;
- background-color: #CBD4E6;
-}
-
-/* Text of a subheading */
-.portlet-table-subheader {
- font-weight: bold;
- color: #000;
- font-size: 12px;
-}
-
-/* Table footer */
-.portlet-table-footer {
- padding: 5px 5px 0 5px;
- font-weight: bold;
- color: #333333;
- font-size: 12px;
- border: none;
- border-top: 1px solid #d5d5d5;
-}
-
-/* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
-.portlet-table-text {
- padding: 3px 5px;
- border-bottom: 1px solid #d5d5d5;
-}
-
-/** FORMS **/
-.portlet-form-label {
- font-size: 10px;
- color: #333333;
-}
-
-/* Text of the user-input in an input field. not sure if we need this guy? */
-.portlet-form-input-field {
- color: #000000;
- font-size: 10px;
-}
-
-/* Form Button Style */
-.portlet-form-button {
- font-size: 10px;
- font-weight: bold;
- color: #FFFFFF;
- background-color: #5078aa;
- border-top: 1px solid #97B7C6;
- border-left: 1px solid #97B7C6;
- border-bottom: 1px solid #254869;
- border-right: 1px solid #254869;
-}
-
-/* Text that appears beside a context dependent action icon */
-.portlet-icon-label { }
-
-/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
-not sure if we need this one?.. */
-.portlet-dlg-icon-label { }
-
-/* Text for form field labels */
-.portlet-form-field-label {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- color: #000;
- white-space: nowrap
-}
-
-/* Text for a form field */
-.portlet-form-field {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 10px;
- color: #000; /*margin-top: 10px;*/
-}
-
-/* Text for form field labels */
-.portlet-form-field-label {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- color: #000;
- white-space: nowrap
-}
-
-/* Text for a form field */
-.portlet-form-field {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 10px;
- color: #000; /*margin-top: 10px;*/
-}
-
-
-/** MENUS **/
-
-/*General menu settings such as background color, margins, etc. */
-.portlet-menu {}
-
-/* Normal, unselected menu item. */
-.portlet-menu-item {
- color: #242424;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-/* Selected menu item. */
-.portlet-menu-item-selected {}
-
-.portlet-menu-item-hover {
- color: #5699B7;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-/* Selected menu item when the mouse hovers over it. */
-.portlet-menu-item-hover-selected {}
-
-/* Normal, unselected menu item that has sub-menus. */
-.portlet-menu-cascade-item {}
-
-/* Selected sub-menu item that has sub-menus */
-.portlet-menu-cascade-item-selected {}
-
-.porlet-menu-cascade {}
-
-.portlet-menu-cascade-item-hover {}
-
-.portlet-menu-cascade-item-hover-selected {}
-
-.portlet-menu-separator {}
-
-.portlet-menu-cascade-separator {}
-
-.portlet-menu-content {}
-
-.portlet-menu-content-selected {}
-
-.portlet-menu-content-hover {}
-
-.portlet-menu-content-hover-selected {}
-
-.portlet-menu-indicator {}
-
-.portlet-menu-indicator-selected {}
-
-.portlet-menu-indicator-hover {}
-
-.portlet-menu-indicator-hover-selected {}
-
-.portlet-menu-description {}
-
-.portlet-menu-caption {}
-
Copied: portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css (from rev 2536, portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css)
===================================================================
--- portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css (rev 0)
+++ portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2010-04-09 10:06:24 UTC (rev 2551)
@@ -0,0 +1,292 @@
+/******************************************************************************
+ * JBoss by 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. *
+ ******************************************************************************/
+
+/** FONTS **/
+
+/* Font attributes for the normal fragment font.
+Used for the display of non-accentuated information */
+.portlet-font {
+ color: #000000;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
+
+/* Font attributes similar to the portlet.font but the color is lighter */
+.portlet-font-dim {
+ color: #777777;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
+
+
+/** MESSAGES **/
+
+/* Status of the current operation. */
+.portlet-msg-status {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ color: #336699;
+}
+
+/* Help messages, general additional information, etc. */
+.portlet-msg-info {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-style: italic;
+ color: #000;
+}
+
+/* Error messages. */
+.portlet-msg-error {
+ color: red;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+}
+
+/* Warning messages. */
+.portlet-msg-alert {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #821717;
+}
+
+/* Verification of the successful completion of a task. */
+.portlet-msg-success {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #359630;
+}
+
+/** SECTIONS **/
+
+/* Table or section header */
+.portlet-section-header {
+ font-weight: bold;
+}
+
+.portlet-section-body {
+ color: #333333;
+}
+
+.portlet-section-alternate {
+ background-color: #F2F2F2;
+}
+
+.portlet-section-selected {
+ background-color: #CBD4E6;
+}
+
+.portlet-section-subheader {
+ font-weight: bold;
+ font-size: 10px;
+}
+
+.portlet-section-footer {
+ font-size: 11px;
+}
+
+/* Text that belongs to the table but does not fall in one of the other categories
+(e.g. explanatory or help text that is associated with the section. */
+.portlet-section-text {
+ font-size: 12px;
+ font-style: italic;
+}
+
+
+/** TABLE **/
+
+/* Table header */
+.portlet-table-header {
+ background-color: #eef;
+ padding: 0 5px 5px 5px;
+ font-weight: bold;
+ color: #333333;
+ font-size: 12px;
+ border-bottom: 1px solid #d5d5d5;
+}
+
+/* Normal text in a table cell */
+.portlet-table-body {}
+
+/* Text in every other row in the table */
+.portlet-table-alternate {
+ background-color: #E6E8E5;
+ border-bottom: 1px solid #d5d5d5;
+}
+
+/* Text in a selected cell range */
+.portlet-table-selected {
+ color: #000;
+ font-size: 12px;
+ background-color: #CBD4E6;
+}
+
+/* Text of a subheading */
+.portlet-table-subheader {
+ font-weight: bold;
+ color: #000;
+ font-size: 12px;
+}
+
+/* Table footer */
+.portlet-table-footer {
+ padding: 5px 5px 0 5px;
+ font-weight: bold;
+ color: #333333;
+ font-size: 12px;
+ border: none;
+ border-top: 1px solid #d5d5d5;
+}
+
+/* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
+.portlet-table-text {
+ padding: 3px 5px;
+ border-bottom: 1px solid #d5d5d5;
+}
+
+/** FORMS **/
+.portlet-form-label {
+ font-size: 10px;
+ color: #333333;
+}
+
+/* Text of the user-input in an input field. not sure if we need this guy? */
+.portlet-form-input-field {
+ color: #000000;
+ font-size: 10px;
+}
+
+/* Form Button Style */
+.portlet-form-button {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #5078aa;
+ border-top: 1px solid #97B7C6;
+ border-left: 1px solid #97B7C6;
+ border-bottom: 1px solid #254869;
+ border-right: 1px solid #254869;
+}
+
+/* Text that appears beside a context dependent action icon */
+.portlet-icon-label { }
+
+/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
+not sure if we need this one?.. */
+.portlet-dlg-icon-label { }
+
+/* Text for form field labels */
+.portlet-form-field-label {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ color: #000;
+ white-space: nowrap
+}
+
+/* Text for a form field */
+.portlet-form-field {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 10px;
+ color: #000; /*margin-top: 10px;*/
+}
+
+/* Text for form field labels */
+.portlet-form-field-label {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ color: #000;
+ white-space: nowrap
+}
+
+/* Text for a form field */
+.portlet-form-field {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 10px;
+ color: #000; /*margin-top: 10px;*/
+}
+
+
+/** MENUS **/
+
+/*General menu settings such as background color, margins, etc. */
+.portlet-menu {}
+
+/* Normal, unselected menu item. */
+.portlet-menu-item {
+ color: #242424;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+
+/* Selected menu item. */
+.portlet-menu-item-selected {}
+
+.portlet-menu-item-hover {
+ color: #5699B7;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+
+/* Selected menu item when the mouse hovers over it. */
+.portlet-menu-item-hover-selected {}
+
+/* Normal, unselected menu item that has sub-menus. */
+.portlet-menu-cascade-item {}
+
+/* Selected sub-menu item that has sub-menus */
+.portlet-menu-cascade-item-selected {}
+
+.porlet-menu-cascade {}
+
+.portlet-menu-cascade-item-hover {}
+
+.portlet-menu-cascade-item-hover-selected {}
+
+.portlet-menu-separator {}
+
+.portlet-menu-cascade-separator {}
+
+.portlet-menu-content {}
+
+.portlet-menu-content-selected {}
+
+.portlet-menu-content-hover {}
+
+.portlet-menu-content-hover-selected {}
+
+.portlet-menu-indicator {}
+
+.portlet-menu-indicator-selected {}
+
+.portlet-menu-indicator-hover {}
+
+.portlet-menu-indicator-hover-selected {}
+
+.portlet-menu-description {}
+
+.portlet-menu-caption {}
+
Modified: portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css
===================================================================
--- portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2010-04-09 10:00:34 UTC (rev 2550)
+++ portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2010-04-09 10:06:24 UTC (rev 2551)
@@ -17,4 +17,6 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-@import url(SimpleSkin/UIPortalApplicationSkin.css);
\ No newline at end of file
+@import url(SimpleSkin/UIPortalApplicationSkin.css);
+@import url(PortletThemes/Stylesheet.css);
+@import url(Portlet/Stylesheet.css);
Copied: portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet (from rev 2536, portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet)
Deleted: portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2010-04-09 10:06:24 UTC (rev 2551)
@@ -1,292 +0,0 @@
-/******************************************************************************
- * JBoss by 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. *
- ******************************************************************************/
-
-/** FONTS **/
-
-/* Font attributes for the normal fragment font.
-Used for the display of non-accentuated information */
-.portlet-font {
- color: #000000;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
-}
-
-/* Font attributes similar to the portlet.font but the color is lighter */
-.portlet-font-dim {
- color: #777777;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
-}
-
-
-/** MESSAGES **/
-
-/* Status of the current operation. */
-.portlet-msg-status {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-style: normal;
- color: #336699;
-}
-
-/* Help messages, general additional information, etc. */
-.portlet-msg-info {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-style: italic;
- color: #000;
-}
-
-/* Error messages. */
-.portlet-msg-error {
- color: red;
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
-}
-
-/* Warning messages. */
-.portlet-msg-alert {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #821717;
-}
-
-/* Verification of the successful completion of a task. */
-.portlet-msg-success {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #359630;
-}
-
-/** SECTIONS **/
-
-/* Table or section header */
-.portlet-section-header {
- font-weight: bold;
-}
-
-.portlet-section-body {
- color: #333333;
-}
-
-.portlet-section-alternate {
- background-color: #F2F2F2;
-}
-
-.portlet-section-selected {
- background-color: #CBD4E6;
-}
-
-.portlet-section-subheader {
- font-weight: bold;
- font-size: 10px;
-}
-
-.portlet-section-footer {
- font-size: 11px;
-}
-
-/* Text that belongs to the table but does not fall in one of the other categories
-(e.g. explanatory or help text that is associated with the section. */
-.portlet-section-text {
- font-size: 12px;
- font-style: italic;
-}
-
-
-/** TABLE **/
-
-/* Table header */
-.portlet-table-header {
- background-color: #eef;
- padding: 0 5px 5px 5px;
- font-weight: bold;
- color: #333333;
- font-size: 12px;
- border-bottom: 1px solid #d5d5d5;
-}
-
-/* Normal text in a table cell */
-.portlet-table-body {}
-
-/* Text in every other row in the table */
-.portlet-table-alternate {
- background-color: #E6E8E5;
- border-bottom: 1px solid #d5d5d5;
-}
-
-/* Text in a selected cell range */
-.portlet-table-selected {
- color: #000;
- font-size: 12px;
- background-color: #CBD4E6;
-}
-
-/* Text of a subheading */
-.portlet-table-subheader {
- font-weight: bold;
- color: #000;
- font-size: 12px;
-}
-
-/* Table footer */
-.portlet-table-footer {
- padding: 5px 5px 0 5px;
- font-weight: bold;
- color: #333333;
- font-size: 12px;
- border: none;
- border-top: 1px solid #d5d5d5;
-}
-
-/* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
-.portlet-table-text {
- padding: 3px 5px;
- border-bottom: 1px solid #d5d5d5;
-}
-
-/** FORMS **/
-.portlet-form-label {
- font-size: 10px;
- color: #333333;
-}
-
-/* Text of the user-input in an input field. not sure if we need this guy? */
-.portlet-form-input-field {
- color: #000000;
- font-size: 10px;
-}
-
-/* Form Button Style */
-.portlet-form-button {
- font-size: 10px;
- font-weight: bold;
- color: #FFFFFF;
- background-color: #5078aa;
- border-top: 1px solid #97B7C6;
- border-left: 1px solid #97B7C6;
- border-bottom: 1px solid #254869;
- border-right: 1px solid #254869;
-}
-
-/* Text that appears beside a context dependent action icon */
-.portlet-icon-label { }
-
-/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
-not sure if we need this one?.. */
-.portlet-dlg-icon-label { }
-
-/* Text for form field labels */
-.portlet-form-field-label {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- color: #000;
- white-space: nowrap
-}
-
-/* Text for a form field */
-.portlet-form-field {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 10px;
- color: #000; /*margin-top: 10px;*/
-}
-
-/* Text for form field labels */
-.portlet-form-field-label {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- color: #000;
- white-space: nowrap
-}
-
-/* Text for a form field */
-.portlet-form-field {
- font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
- font-size: 10px;
- color: #000; /*margin-top: 10px;*/
-}
-
-
-/** MENUS **/
-
-/*General menu settings such as background color, margins, etc. */
-.portlet-menu {}
-
-/* Normal, unselected menu item. */
-.portlet-menu-item {
- color: #242424;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-/* Selected menu item. */
-.portlet-menu-item-selected {}
-
-.portlet-menu-item-hover {
- color: #5699B7;
- text-decoration: none;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-/* Selected menu item when the mouse hovers over it. */
-.portlet-menu-item-hover-selected {}
-
-/* Normal, unselected menu item that has sub-menus. */
-.portlet-menu-cascade-item {}
-
-/* Selected sub-menu item that has sub-menus */
-.portlet-menu-cascade-item-selected {}
-
-.porlet-menu-cascade {}
-
-.portlet-menu-cascade-item-hover {}
-
-.portlet-menu-cascade-item-hover-selected {}
-
-.portlet-menu-separator {}
-
-.portlet-menu-cascade-separator {}
-
-.portlet-menu-content {}
-
-.portlet-menu-content-selected {}
-
-.portlet-menu-content-hover {}
-
-.portlet-menu-content-hover-selected {}
-
-.portlet-menu-indicator {}
-
-.portlet-menu-indicator-selected {}
-
-.portlet-menu-indicator-hover {}
-
-.portlet-menu-indicator-hover-selected {}
-
-.portlet-menu-description {}
-
-.portlet-menu-caption {}
-
Copied: portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css (from rev 2536, portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css)
===================================================================
--- portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css (rev 0)
+++ portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2010-04-09 10:06:24 UTC (rev 2551)
@@ -0,0 +1,292 @@
+/******************************************************************************
+ * JBoss by 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. *
+ ******************************************************************************/
+
+/** FONTS **/
+
+/* Font attributes for the normal fragment font.
+Used for the display of non-accentuated information */
+.portlet-font {
+ color: #000000;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
+
+/* Font attributes similar to the portlet.font but the color is lighter */
+.portlet-font-dim {
+ color: #777777;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
+
+
+/** MESSAGES **/
+
+/* Status of the current operation. */
+.portlet-msg-status {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ color: #336699;
+}
+
+/* Help messages, general additional information, etc. */
+.portlet-msg-info {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-style: italic;
+ color: #000;
+}
+
+/* Error messages. */
+.portlet-msg-error {
+ color: red;
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+}
+
+/* Warning messages. */
+.portlet-msg-alert {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #821717;
+}
+
+/* Verification of the successful completion of a task. */
+.portlet-msg-success {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #359630;
+}
+
+/** SECTIONS **/
+
+/* Table or section header */
+.portlet-section-header {
+ font-weight: bold;
+}
+
+.portlet-section-body {
+ color: #333333;
+}
+
+.portlet-section-alternate {
+ background-color: #F2F2F2;
+}
+
+.portlet-section-selected {
+ background-color: #CBD4E6;
+}
+
+.portlet-section-subheader {
+ font-weight: bold;
+ font-size: 10px;
+}
+
+.portlet-section-footer {
+ font-size: 11px;
+}
+
+/* Text that belongs to the table but does not fall in one of the other categories
+(e.g. explanatory or help text that is associated with the section. */
+.portlet-section-text {
+ font-size: 12px;
+ font-style: italic;
+}
+
+
+/** TABLE **/
+
+/* Table header */
+.portlet-table-header {
+ background-color: #eef;
+ padding: 0 5px 5px 5px;
+ font-weight: bold;
+ color: #333333;
+ font-size: 12px;
+ border-bottom: 1px solid #d5d5d5;
+}
+
+/* Normal text in a table cell */
+.portlet-table-body {}
+
+/* Text in every other row in the table */
+.portlet-table-alternate {
+ background-color: #E6E8E5;
+ border-bottom: 1px solid #d5d5d5;
+}
+
+/* Text in a selected cell range */
+.portlet-table-selected {
+ color: #000;
+ font-size: 12px;
+ background-color: #CBD4E6;
+}
+
+/* Text of a subheading */
+.portlet-table-subheader {
+ font-weight: bold;
+ color: #000;
+ font-size: 12px;
+}
+
+/* Table footer */
+.portlet-table-footer {
+ padding: 5px 5px 0 5px;
+ font-weight: bold;
+ color: #333333;
+ font-size: 12px;
+ border: none;
+ border-top: 1px solid #d5d5d5;
+}
+
+/* Text that belongs to the table but does not fall in one of the other categories (e.g. explanatory or help text that is associated with the table). */
+.portlet-table-text {
+ padding: 3px 5px;
+ border-bottom: 1px solid #d5d5d5;
+}
+
+/** FORMS **/
+.portlet-form-label {
+ font-size: 10px;
+ color: #333333;
+}
+
+/* Text of the user-input in an input field. not sure if we need this guy? */
+.portlet-form-input-field {
+ color: #000000;
+ font-size: 10px;
+}
+
+/* Form Button Style */
+.portlet-form-button {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #5078aa;
+ border-top: 1px solid #97B7C6;
+ border-left: 1px solid #97B7C6;
+ border-bottom: 1px solid #254869;
+ border-right: 1px solid #254869;
+}
+
+/* Text that appears beside a context dependent action icon */
+.portlet-icon-label { }
+
+/* Text that appears beside a "standard" icon (e.g Ok, or Cancel)
+not sure if we need this one?.. */
+.portlet-dlg-icon-label { }
+
+/* Text for form field labels */
+.portlet-form-field-label {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ color: #000;
+ white-space: nowrap
+}
+
+/* Text for a form field */
+.portlet-form-field {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 10px;
+ color: #000; /*margin-top: 10px;*/
+}
+
+/* Text for form field labels */
+.portlet-form-field-label {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ color: #000;
+ white-space: nowrap
+}
+
+/* Text for a form field */
+.portlet-form-field {
+ font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
+ font-size: 10px;
+ color: #000; /*margin-top: 10px;*/
+}
+
+
+/** MENUS **/
+
+/*General menu settings such as background color, margins, etc. */
+.portlet-menu {}
+
+/* Normal, unselected menu item. */
+.portlet-menu-item {
+ color: #242424;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+
+/* Selected menu item. */
+.portlet-menu-item-selected {}
+
+.portlet-menu-item-hover {
+ color: #5699B7;
+ text-decoration: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+}
+
+/* Selected menu item when the mouse hovers over it. */
+.portlet-menu-item-hover-selected {}
+
+/* Normal, unselected menu item that has sub-menus. */
+.portlet-menu-cascade-item {}
+
+/* Selected sub-menu item that has sub-menus */
+.portlet-menu-cascade-item-selected {}
+
+.porlet-menu-cascade {}
+
+.portlet-menu-cascade-item-hover {}
+
+.portlet-menu-cascade-item-hover-selected {}
+
+.portlet-menu-separator {}
+
+.portlet-menu-cascade-separator {}
+
+.portlet-menu-content {}
+
+.portlet-menu-content-selected {}
+
+.portlet-menu-content-hover {}
+
+.portlet-menu-content-hover-selected {}
+
+.portlet-menu-indicator {}
+
+.portlet-menu-indicator-selected {}
+
+.portlet-menu-indicator-hover {}
+
+.portlet-menu-indicator-hover-selected {}
+
+.portlet-menu-description {}
+
+.portlet-menu-caption {}
+
Modified: portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Stylesheet.css
===================================================================
--- portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Stylesheet.css 2010-04-09 10:00:34 UTC (rev 2550)
+++ portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/Stylesheet.css 2010-04-09 10:06:24 UTC (rev 2551)
@@ -19,4 +19,5 @@
@import url(DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css);
@import url(DefaultSkin/webui/component/Stylesheet.css);
-@import url(PortletThemes/Stylesheet.css);
\ No newline at end of file
+@import url(PortletThemes/Stylesheet.css);
+@import url(Portlet/Stylesheet.css);
14 years, 2 months
gatein SVN: r2550 - in portal/trunk: gadgets/server/src/main/webapp/WEB-INF/classes/containers/default and 2 other directories.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-04-09 06:00:34 -0400 (Fri, 09 Apr 2010)
New Revision: 2550
Modified:
portal/trunk/gadgets/core/src/main/java/containers/default/container.js
portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java
Log:
GTNPORTAL-1014 : Returned currentView does not match enum view
Modified: portal/trunk/gadgets/core/src/main/java/containers/default/container.js
===================================================================
--- portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-04-09 09:44:03 UTC (rev 2549)
+++ portal/trunk/gadgets/core/src/main/java/containers/default/container.js 2010-04-09 10:00:34 UTC (rev 2550)
@@ -114,12 +114,12 @@
"jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
- "home" : {
+ "HOME" : {
"isOnlyVisible" : false,
"urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}",
"aliases": ["DASHBOARD", "default"]
},
- "canvas" : {
+ "HOME" : {
"isOnlyVisible" : true,
"urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}",
"aliases" : ["FULL_PAGE"]
Modified: portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js
===================================================================
--- portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2010-04-09 09:44:03 UTC (rev 2549)
+++ portal/trunk/gadgets/server/src/main/webapp/WEB-INF/classes/containers/default/container.js 2010-04-09 10:00:34 UTC (rev 2550)
@@ -114,12 +114,12 @@
"jsonProxyUrl" : "http://%host%/eXoGadgetServer/gadgets/makeRequest"
},
"views" : {
- "home" : {
+ "HOME" : {
"isOnlyVisible" : false,
"urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/home?{var}",
"aliases": ["DASHBOARD", "default"]
},
- "canvas" : {
+ "CANVAS" : {
"isOnlyVisible" : true,
"urlTemplate" : "http://%host%/eXoGadgetServer/gadgets/canvas?{var}",
"aliases" : ["FULL_PAGE"]
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-04-09 09:44:03 UTC (rev 2549)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/gadget/Gadgets.js 2010-04-09 10:00:34 UTC (rev 2550)
@@ -276,10 +276,10 @@
*/
gadgets.IfrGadgetService.prototype.getUrlForView = function(
view) {
- if (view === 'canvas') {
- return 'canvas';
- } else if (view === 'home') {
- return 'home';
+ if (view === 'CANVAS') {
+ return 'CANVAS';
+ } else if (view === 'HOME') {
+ return 'HOME';
} else {
return null;
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-04-09 09:44:03 UTC (rev 2549)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2010-04-09 10:00:34 UTC (rev 2550)
@@ -86,9 +86,9 @@
public static final String PREF_DEBUG = "_pref_debug_";
- public static final String HOME_VIEW = "home";
+ public static final String HOME_VIEW = "HOME";
- public static final String CANVAS_VIEW = "canvas";
+ public static final String CANVAS_VIEW = "HOME";
public String view = HOME_VIEW;
14 years, 2 months
gatein SVN: r2549 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-09 05:44:03 -0400 (Fri, 09 Apr 2010)
New Revision: 2549
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java
Log:
GTNPORTAL-944: Rollback MainResourceResolver to revision 2532
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java 2010-04-09 09:29:48 UTC (rev 2548)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java 2010-04-09 09:44:03 UTC (rev 2549)
@@ -94,21 +94,13 @@
//
if (context == null)
{
- String message = "Could not resolve " + targetedContextPath + " resource for path " + path;
- log.warn(message);
- throw new ResourceNotFoundException(path, message);
+ log.warn("Could not resolve " + targetedContextPath + " resource for path " + path);
+ return null;
}
else
{
- Resource resource = context.getResource(path.substring(i1));
- if(resource == null)
- {
- throw new ResourceNotFoundException(path, "Could not resolve resource with path " + path.substring(i1) + " under context path " + targetedContextPath);
- }
- else
- {
- return resource;
- }
+ return context.getResource(path.substring(i1));
}
+
}
}
14 years, 2 months
gatein SVN: r2548 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-09 05:29:48 -0400 (Fri, 09 Apr 2010)
New Revision: 2548
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-04-09 09:29:27 UTC (rev 2547)
+++ components/mop/trunk/api/pom.xml 2010-04-09 09:29:48 UTC (rev 2548)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.1-CR01</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-04-09 09:29:27 UTC (rev 2547)
+++ components/mop/trunk/core/pom.xml 2010-04-09 09:29:48 UTC (rev 2548)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.1-CR01</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-04-09 09:29:27 UTC (rev 2547)
+++ components/mop/trunk/pom.xml 2010-04-09 09:29:48 UTC (rev 2548)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.1-CR01</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.1-CR01</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.1-CR01</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.1-CR01</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-04-09 09:29:27 UTC (rev 2547)
+++ components/mop/trunk/spi/pom.xml 2010-04-09 09:29:48 UTC (rev 2548)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.1-CR01</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 2 months
gatein SVN: r2547 - components/mop/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-09 05:29:27 -0400 (Fri, 09 Apr 2010)
New Revision: 2547
Added:
components/mop/tags/1.0.1-CR01/
Log:
[maven-scm] copy for tag 1.0.1-CR01
Copied: components/mop/tags/1.0.1-CR01 (from rev 2546, components/mop/trunk)
14 years, 2 months
gatein SVN: r2546 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-09 05:29:00 -0400 (Fri, 09 Apr 2010)
New Revision: 2546
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.1-CR01
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-04-09 09:27:12 UTC (rev 2545)
+++ components/mop/trunk/api/pom.xml 2010-04-09 09:29:00 UTC (rev 2546)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.1-CR01-SNAPSHOT</version>
+ <version>1.0.1-CR01</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-04-09 09:27:12 UTC (rev 2545)
+++ components/mop/trunk/core/pom.xml 2010-04-09 09:29:00 UTC (rev 2546)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.1-CR01-SNAPSHOT</version>
+ <version>1.0.1-CR01</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-04-09 09:27:12 UTC (rev 2545)
+++ components/mop/trunk/pom.xml 2010-04-09 09:29:00 UTC (rev 2546)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.1-CR01-SNAPSHOT</version>
+ <version>1.0.1-CR01</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.1-CR01</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.1-CR01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.1-CR01</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-04-09 09:27:12 UTC (rev 2545)
+++ components/mop/trunk/spi/pom.xml 2010-04-09 09:29:00 UTC (rev 2546)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.1-CR01-SNAPSHOT</version>
+ <version>1.0.1-CR01</version>
</parent>
<!-- ****************** -->
14 years, 2 months
gatein SVN: r2545 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-09 05:27:12 -0400 (Fri, 09 Apr 2010)
New Revision: 2545
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
GTNMOP-20 : Integrate JCR 1.12.1-CR1
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-04-09 09:03:37 UTC (rev 2544)
+++ components/mop/trunk/api/pom.xml 2010-04-09 09:27:12 UTC (rev 2545)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-CR01-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-04-09 09:03:37 UTC (rev 2544)
+++ components/mop/trunk/core/pom.xml 2010-04-09 09:27:12 UTC (rev 2545)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-CR01-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-04-09 09:03:37 UTC (rev 2544)
+++ components/mop/trunk/pom.xml 2010-04-09 09:27:12 UTC (rev 2545)
@@ -34,7 +34,7 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-CR01-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
@@ -140,7 +140,7 @@
<!-- maven-enforcer-plugin -->
<jdk.min.version>1.6</jdk.min.version>
- <org.chromattic.version>1.0.0</org.chromattic.version>
+ <org.chromattic.version>1.0.1-cr1</org.chromattic.version>
</properties>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-04-09 09:03:37 UTC (rev 2544)
+++ components/mop/trunk/spi/pom.xml 2010-04-09 09:27:12 UTC (rev 2545)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-CR01-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 2 months
gatein SVN: r2544 - in portal/branches/EPP_5_0_Branch/component/portal/src: main/java/org/exoplatform/portal/pom/config/tasks and 2 other directories.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-04-09 05:03:37 -0400 (Fri, 09 Apr 2010)
New Revision: 2544
Added:
portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/config/StaleModelException.java
Modified:
portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java
portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/branches/EPP_5_0_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
Log:
JBEPP-270: GTNPORTAL-962 ported to the branch
Added: portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/config/StaleModelException.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/config/StaleModelException.java (rev 0)
+++ portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/config/StaleModelException.java 2010-04-09 09:03:37 UTC (rev 2544)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.portal.config;
+
+/**
+ * This exception signals that the passed argument model is stale and that the underlying update operation
+ * could not be accomplished.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class StaleModelException extends StorageException
+{
+
+ public StaleModelException()
+ {
+ }
+
+ public StaleModelException(String message)
+ {
+ super(message);
+ }
+
+ public StaleModelException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ public StaleModelException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
Modified: portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-04-09 08:20:43 UTC (rev 2543)
+++ portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-04-09 09:03:37 UTC (rev 2544)
@@ -21,6 +21,7 @@
import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.portal.mop.Described;
+import org.exoplatform.portal.mop.ProtectedResource;
import org.exoplatform.portal.pom.config.POMTask;
import org.exoplatform.portal.pom.config.cache.DataAccessMode;
import org.exoplatform.portal.pom.config.cache.CacheableDataTask;
@@ -164,6 +165,12 @@
dstDescribed.setName(srcDescribed.getName());
dstDescribed.setDescription(srcDescribed.getDescription());
+ // Copy src permissions to dst permission
+ PageData srcPageData = new Mapper(session).load(srcPage);
+ ProtectedResource pr = dstPage.adapt(ProtectedResource.class);
+ pr.setAccessPermissions(srcPageData.getAccessPermissions());
+ pr.setEditPermission(srcPageData.getEditPermission());
+
copy(srcPage, dstPage, srcPage.getRootComponent(), dstPage.getRootComponent());
//
@@ -178,6 +185,24 @@
UIComponent dstChild = dst.add(srcChild.getObjectType(), srcChild.getObjectId());
//
+ if (srcChild.isAdapted(Described.class))
+ {
+ Described srcDescribed = srcChild.adapt(Described.class);
+ Described dstDescribed = dstChild.adapt(Described.class);
+ dstDescribed.setName(srcDescribed.getName());
+ dstDescribed.setDescription(srcDescribed.getDescription());
+ }
+
+ //
+ if (srcChild.isAdapted(ProtectedResource.class))
+ {
+ ProtectedResource srcPR = srcChild.adapt(ProtectedResource.class);
+ ProtectedResource dstPR = dstChild.adapt(ProtectedResource.class);
+ dstPR.setAccessPermissions(srcPR.getAccessPermissions());
+ dstPR.setEditPermission(srcPR.getEditPermission());
+ }
+
+ //
Attributes srcAttrs = srcChild.getAttributes();
Attributes dstAttrs = dstChild.getAttributes();
for (String key : srcAttrs.getKeys())
Modified: portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-04-09 08:20:43 UTC (rev 2543)
+++ portal/branches/EPP_5_0_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-04-09 09:03:37 UTC (rev 2544)
@@ -20,6 +20,7 @@
package org.exoplatform.portal.pom.data;
import org.exoplatform.portal.config.NoSuchDataException;
+import org.exoplatform.portal.config.StaleModelException;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.ApplicationType;
@@ -708,7 +709,7 @@
dstChild = session.findObjectById(ObjectType.COMPONENT, srcChildId);
if (dstChild == null)
{
- throw new AssertionError("Could not find supposed present child with id " + srcChildId);
+ throw new StaleModelException("Could not find supposed present child with id " + srcChildId);
}
// julien : this can fail due to a bug in chromattic not implementing equals method properly
@@ -774,7 +775,7 @@
}
else
{
- throw new AssertionError("Was not expecting child " + srcChild);
+ throw new StaleModelException("Was not expecting child " + srcChild);
}
changes.add(new ModelChange.Create(dst.getObjectId(), srcChild));
}
Modified: portal/branches/EPP_5_0_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
===================================================================
--- portal/branches/EPP_5_0_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2010-04-09 08:20:43 UTC (rev 2543)
+++ portal/branches/EPP_5_0_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2010-04-09 09:03:37 UTC (rev 2544)
@@ -24,16 +24,7 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.portal.application.PortletPreferences;
import org.exoplatform.portal.application.Preference;
-import org.exoplatform.portal.config.model.Application;
-import org.exoplatform.portal.config.model.ApplicationState;
-import org.exoplatform.portal.config.model.ApplicationType;
-import org.exoplatform.portal.config.model.Container;
-import org.exoplatform.portal.config.model.Dashboard;
-import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.PageNavigation;
-import org.exoplatform.portal.config.model.PageNode;
-import org.exoplatform.portal.config.model.PortalConfig;
-import org.exoplatform.portal.config.model.TransientApplicationState;
+import org.exoplatform.portal.config.model.*;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMSessionManager;
import org.exoplatform.portal.pom.data.ModelChange;
@@ -627,6 +618,26 @@
//
Application banner2 = (Application)container.getChildren().get(0);
// assertEquals(banner2.getInstanceId(), banner1.getInstanceId());
+
+ //
+ Page srcPage = storage_.getPage("portal::test::test4");
+ srcPage.setEditPermission("Administrator");
+ Application<Portlet>portlet = (Application<Portlet>)srcPage.getChildren().get(0);
+ portlet.setDescription("NewPortlet");
+
+ ArrayList<ModelObject> modelObject = srcPage.getChildren();
+ modelObject.set(0, portlet);
+
+ srcPage.setChildren(modelObject);
+
+ storage_.save(srcPage);
+ Page dstPage = storage_.clonePage(srcPage.getPageId(), srcPage.getOwnerType(), srcPage.getOwnerId(), "_PageTest1234");
+ Application<Portlet>portlet1 = (Application<Portlet>)dstPage.getChildren().get(0);
+ // Check src's edit permission and dst's edit permission
+ assertEquals(srcPage.getEditPermission(), dstPage.getEditPermission());
+
+ // Check src's children and dst's children
+ assertEquals(portlet.getDescription(), portlet1.getDescription());
}
public void testDashboard() throws Exception
14 years, 2 months