gatein SVN: r1252 - in components/common/trunk: common and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-01-13 05:26:26 -0500 (Wed, 13 Jan 2010)
New Revision: 1252
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/logging/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2010-01-13 10:26:11 UTC (rev 1251)
+++ components/common/trunk/common/pom.xml 2010-01-13 10:26:26 UTC (rev 1252)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR03</version>
+ <version>2.0.0-CR04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-CR03</version>
+ <version>2.0.0-CR04-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/common/trunk/logging/pom.xml
===================================================================
--- components/common/trunk/logging/pom.xml 2010-01-13 10:26:11 UTC (rev 1251)
+++ components/common/trunk/logging/pom.xml 2010-01-13 10:26:26 UTC (rev 1252)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR03</version>
+ <version>2.0.0-CR04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-logging</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2010-01-13 10:26:11 UTC (rev 1251)
+++ components/common/trunk/mc/pom.xml 2010-01-13 10:26:26 UTC (rev 1252)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR03</version>
+ <version>2.0.0-CR04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-CR03</version>
+ <version>2.0.0-CR04-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2010-01-13 10:26:11 UTC (rev 1251)
+++ components/common/trunk/pom.xml 2010-01-13 10:26:26 UTC (rev 1252)
@@ -6,7 +6,7 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR03</version>
+ <version>2.0.0-CR04-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.0-CR03</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.0-CR03</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url>
</scm>
<!-- Import dependency management configuration -->
14 years, 11 months
gatein SVN: r1251 - components/common/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-01-13 05:26:11 -0500 (Wed, 13 Jan 2010)
New Revision: 1251
Added:
components/common/tags/2.0.0-CR03/
Log:
[maven-scm] copy for tag 2.0.0-CR03
Copied: components/common/tags/2.0.0-CR03 (from rev 1250, components/common/trunk)
14 years, 11 months
gatein SVN: r1250 - in components/common/trunk: common and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-01-13 05:25:42 -0500 (Wed, 13 Jan 2010)
New Revision: 1250
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/logging/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-CR03
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2010-01-13 07:51:21 UTC (rev 1249)
+++ components/common/trunk/common/pom.xml 2010-01-13 10:25:42 UTC (rev 1250)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-CR03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-CR03</version>
</dependency>
<dependency>
Modified: components/common/trunk/logging/pom.xml
===================================================================
--- components/common/trunk/logging/pom.xml 2010-01-13 07:51:21 UTC (rev 1249)
+++ components/common/trunk/logging/pom.xml 2010-01-13 10:25:42 UTC (rev 1250)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-CR03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-logging</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2010-01-13 07:51:21 UTC (rev 1249)
+++ components/common/trunk/mc/pom.xml 2010-01-13 10:25:42 UTC (rev 1250)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-CR03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-CR03</version>
</dependency>
<dependency>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2010-01-13 07:51:21 UTC (rev 1249)
+++ components/common/trunk/pom.xml 2010-01-13 10:25:42 UTC (rev 1250)
@@ -6,7 +6,7 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-CR03</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.0-CR03</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.0-CR03</url>
</scm>
<!-- Import dependency management configuration -->
14 years, 11 months
gatein SVN: r1248 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-01-13 01:56:42 -0500 (Wed, 13 Jan 2010)
New Revision: 1248
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js
Log:
GTNPORTAL-442: Still have problems with DnD in Firefox
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-01-13 04:19:28 UTC (rev 1247)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-01-13 06:56:42 UTC (rev 1248)
@@ -246,6 +246,15 @@
var srcElement = dndEvent.dragObject ;
var targetElement = dndEvent.foundTargetObject;
+ if(!targetElement) {
+ if(!dndEvent.dragObject.isComponent) {
+ dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ;
+ newComponent = true;
+ }
+ dndEvent.dragObject.style.width = "auto";
+ return;
+ }
+
var newComponent = false;
if(srcElement.isComponent && (targetElement.foundIndex != null)) {
if(eXo.portal.PortalDragDrop.layoutTypeElementNode != null) {
@@ -261,8 +270,6 @@
newComponent = true;
}
- if(!targetElement) return;
-
var params = [
{name: "srcID", value: (srcElement.id.replace(/^UIPortlet-/, "")).replace(/^UIContainer-/,"")},
{name: "targetID", value: targetElement.id.replace(/^.*-/, "")},
14 years, 11 months
gatein SVN: r1247 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2010-01-12 23:19:28 -0500 (Tue, 12 Jan 2010)
New Revision: 1247
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js
Log:
GTNPORTAL-420: Problems when dragdrop in IE
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-01-13 03:58:54 UTC (rev 1246)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-01-13 04:19:28 UTC (rev 1247)
@@ -199,7 +199,7 @@
if(!dndEvent.dragObject.isComponent) {
dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ;
}
- if(dndEvent.dragObject.parentNode.tagName.toLowerCase() == "td") {
+ if(dndEvent.dragObject.parentNode.nodeName.toLowerCase() == "td") {
dndEvent.dragObject.parentNode.style.width = "auto";
}
// fix bug WEBOS-196
@@ -375,7 +375,7 @@
insertBlock.style.width = "auto" ;
- if(eXo.portal.PortalDragDrop.parentDragObject.tagName.toLowerCase() == "td") {
+ if(eXo.portal.PortalDragDrop.parentDragObject.nodeName.toLowerCase() == "td") {
DOMUtil.removeElement(eXo.portal.PortalDragDrop.parentDragObject) ;
}
};
14 years, 11 months
gatein SVN: r1246 - portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-01-12 22:58:54 -0500 (Tue, 12 Jan 2010)
New Revision: 1246
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
Log:
GTNPORTAL-455: Don't display arrow icon when change language to Arabic
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2010-01-13 03:46:49 UTC (rev 1245)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIToolbarContainer/Stylesheet.css 2010-01-13 03:58:54 UTC (rev 1246)
@@ -121,7 +121,7 @@
.UIToolbarContainer .MenuItem .ArrowIcon {
background: url('background/ToolbarContainer.gif') no-repeat right bottom; /* orientation=lt */
- background: url('background/ToolbarContainer-rt.gif') no-repeat 5px bottom; /* orientation=rt */
+ background: url('background/ToolbarContainer-rt.gif') no-repeat -5px bottom; /* orientation=rt */
}
.UIToolbarContainer .MenuItem a {
14 years, 11 months
gatein SVN: r1245 - in portal/trunk/web/portal/src/main/webapp/login: skin and 1 other directory.
by do-not-reply＠jboss.org
Author: thuy.nguyen
Date: 2010-01-12 22:46:49 -0500 (Tue, 12 Jan 2010)
New Revision: 1245
Modified:
portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
portal/trunk/web/portal/src/main/webapp/login/skin/Stylesheet.css
Log:
GTNPORTAL-453:Error UI in Login form in private mode
Modified: portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
===================================================================
--- portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-01-13 03:42:02 UTC (rev 1244)
+++ portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-01-13 03:46:49 UTC (rev 1245)
@@ -86,17 +86,19 @@
</tr>
</table>
<div id="UIPortalLoginFormAction" class="LoginButton" onclick="login();">
- <div class="LoginButtonContainer">
- <div class="Button">
- <div class="LeftButton">
- <div class="RightButton">
- <div class="MiddleButton">
- <a href="#"><%=res.getString("UILoginForm.label.Signin")%></a>
- </div>
- </div>
- </div>
- </div>
- </div>
+ <table class="LoginButtonContainer">
+ <tr>
+ <td class="Button">
+ <div class="LeftButton">
+ <div class="RightButton">
+ <div class="MiddleButton">
+ <a href="#"><%=res.getString("UILoginForm.label.Signin")%></a>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
</div>
<div class="ClearLeft"><span></span></div>
<script type='text/javascript'>
Modified: portal/trunk/web/portal/src/main/webapp/login/skin/Stylesheet.css
===================================================================
--- portal/trunk/web/portal/src/main/webapp/login/skin/Stylesheet.css 2010-01-13 03:42:02 UTC (rev 1244)
+++ portal/trunk/web/portal/src/main/webapp/login/skin/Stylesheet.css 2010-01-13 03:46:49 UTC (rev 1245)
@@ -139,11 +139,12 @@
}
.UILogin .LoginContent .LoginButtonContainer {
-
+ padding-left: 32px; /* orientation=rt */
+ width: auto;
+ margin: auto;
}
.UILogin .LoginContent .Button {
- width: 80px;
height: 22px;
margin: auto;
}
14 years, 11 months
gatein SVN: r1244 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-01-12 22:42:02 -0500 (Tue, 12 Jan 2010)
New Revision: 1244
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
Log:
GTNPORTAL-447 Show duplicate name of page in specical case in Sitemap page (Chau Ngoc Tuan)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-01-13 02:31:59 UTC (rev 1243)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-01-13 03:42:02 UTC (rev 1244)
@@ -332,7 +332,8 @@
{
PortalRequestContext prContext = Util.getPortalRequestContext();
UIPortalNavigation uiNavigation = event.getSource();
-
+ // reload TreeNodes
+ uiNavigation.loadTreeNodes();
TreeNode treeNode = uiNavigation.getTreeNodes();
expandAllNode(treeNode);
14 years, 11 months
gatein SVN: r1243 - portal/trunk/web/portal/src/main/webapp/groovy/webui/core.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-01-12 21:31:59 -0500 (Tue, 12 Jan 2010)
New Revision: 1243
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl
Log:
GTNPORTAL-430 Show exception when delete page in special case
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl 2010-01-13 00:35:49 UTC (rev 1242)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIRepeater.gtmpl 2010-01-13 02:31:59 UTC (rev 1243)
@@ -12,7 +12,8 @@
String name = uicomponent.getLabel() ;
UIForm uiForm = uicomponent.getAncestorOfType(UIForm.class);
- DateFormat dateFormat = null;
+ DateFormat dateFormat = null;
+ try {
%>
<div id="$uicomponent.id">
<table class="UIGrid" cellspacing="0">
@@ -89,4 +90,6 @@
%>
</tbody>
</table>
-</div>
\ No newline at end of file
+</div>
+
+<% } catch (java.lang.Throwable e) {} %>
\ No newline at end of file
14 years, 11 months
gatein SVN: r1242 - portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/renderers.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-12 19:35:49 -0500 (Tue, 12 Jan 2010)
New Revision: 1242
Modified:
portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/renderers/ValueRendererRegistry.java
Log:
- Contract for getRendererFor is to always return a renderer.
Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/renderers/ValueRendererRegistry.java
===================================================================
--- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/renderers/ValueRendererRegistry.java 2010-01-12 22:48:45 UTC (rev 1241)
+++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/core/renderers/ValueRendererRegistry.java 2010-01-13 00:35:49 UTC (rev 1242)
@@ -28,7 +28,9 @@
import java.sql.Time;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -61,7 +63,7 @@
{
if (value == null)
{
- return null;
+ return ValueRenderer.NULL_RENDERER;
}
else
{
@@ -99,7 +101,7 @@
// the type class is a super class of the valueType class
// This cast is OK
@SuppressWarnings("unchecked")
- ValueRenderer<? super V> tmp = (ValueRenderer<? super V>) entry.getValue();
+ ValueRenderer<? super V> tmp = (ValueRenderer<? super V>)entry.getValue();
renderer = tmp;
// OK
@@ -168,7 +170,7 @@
{
// this cast is OK
@SuppressWarnings("unchecked")
- ValueRenderer<? super V> renderer = (ValueRenderer<? super V>) renderers.get(valueType);
+ ValueRenderer<? super V> renderer = (ValueRenderer<? super V>)renderers.get(valueType);
return renderer;
}
}
14 years, 11 months