gatein SVN: r2543 - in portal/trunk/component/portal/src: main/java/org/exoplatform/portal/pom/config/tasks and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-04-09 04:20:43 -0400 (Fri, 09 Apr 2010)
New Revision: 2543
Added:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/StaleModelException.java
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
Log:
GTNPORTAL-962 : applied submitted patch and completed it : Lose permission in clone node (when edit page navigation)
Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/StaleModelException.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/StaleModelException.java (rev 0)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/StaleModelException.java 2010-04-09 08:20:43 UTC (rev 2543)
@@ -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/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-04-09 06:37:13 UTC (rev 2542)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageTask.java 2010-04-09 08:20:43 UTC (rev 2543)
@@ -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/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-04-09 06:37:13 UTC (rev 2542)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-04-09 08:20:43 UTC (rev 2543)
@@ -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/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2010-04-09 06:37:13 UTC (rev 2542)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2010-04-09 08:20:43 UTC (rev 2543)
@@ -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, 8 months
- 1
- 0
gatein SVN: r2542 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-09 02:37:13 -0400 (Fri, 09 Apr 2010)
New Revision: 2542
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
Log:
GTNPORTAL-944: Check null in processCSSRecursively to avoid NullPointerException
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-04-09 06:22:11 UTC (rev 2541)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-04-09 06:37:13 UTC (rev 2542)
@@ -481,6 +481,10 @@
throws RenderingException, IOException
{
+ if(skin == null)
+ {
+ return;
+ }
// The root URL for the entry
String basePath = skin.getContextPath() + skin.getParentPath();
14 years, 8 months
- 1
- 0
gatein SVN: r2539 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-09 02:07:28 -0400 (Fri, 09 Apr 2010)
New Revision: 2539
Removed:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceNotFoundException.java
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
Log:
GTNPORTAL-944: Modify java code to avoid breaks on contract in ResourceResolver 's javadoc
Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceNotFoundException.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceNotFoundException.java 2010-04-09 04:32:12 UTC (rev 2538)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceNotFoundException.java 2010-04-09 06:07:28 UTC (rev 2539)
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2010 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.resource;
-
-/**
- * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
- * @version $Id$
- *
- */
-public class ResourceNotFoundException extends RuntimeException
-{
- private String resourcePath;
-
- private String errorType;
-
- private final static String INVALID_RESOURCE_PATH = "invalid resource path";
-
- private final static String RESOURCE_RESOLVER_WRONG_PROCESSING = "wrong processing in resource resolver";
-
- public ResourceNotFoundException(String _resourcePath, String message)
- {
- super(message);
- resourcePath = _resourcePath;
- errorType = INVALID_RESOURCE_PATH;
- }
-
- public ResourceNotFoundException(String _resourcePath, String _errorType, String message)
- {
- super(message);
- resourcePath = _resourcePath;
- errorType = _errorType;
- }
-
- public String getResourcePath()
- {
- return resourcePath;
- }
-
- public String getErrorType()
- {
- return errorType;
- }
-}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-04-09 04:32:12 UTC (rev 2538)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-04-09 06:07:28 UTC (rev 2539)
@@ -423,40 +423,57 @@
}
/**
- * Add this method to catch <code>ResourceNotFoundException</code>
- * and to log evoquant message
+ *
+ * This method delegates the resource resolving to MainResourceResolver and prints out appropriated log messages
*
+ * Consider the two cases the method is invoked
+ *
+ * Case 1: Resolve nested .css file
+ *
+ * In Stylesheet.css we have the statement
+ *
+ * @import url(xyzt.css);
+ *
+ * To resolve the resource from xyzt.css, getCSSResource("xyzt.css", "Stylesheet.css") is called
+ *
+ * Case 2: Resolve top root .css file
+ *
+ * To resolve a top root Stylesheet.css file, getCSSResource("Stylesheet.css", "Stylesheet.css") is called
+ *
* @param cssPath
+ * @param outerCssFile
* @return
+ *
*/
- private Resource getCSSResource(String cssPath)
+ private Resource getCSSResource(String cssPath, String outerCssFile)
{
- try{
- return mainResolver.resolve(cssPath);
- }
- catch(ResourceNotFoundException NotFoundEx)
+ Resource resource = mainResolver.resolve(cssPath);
+ if (resource == null)
{
- String notFoundResourcePath = NotFoundEx.getResourcePath();
String logMessage;
- if(!cssPath.equals(notFoundResourcePath))
+ if (!cssPath.equals(outerCssFile))
{
+ int lastIndexOfSlash = cssPath.lastIndexOf('/');
+ String loadedCssFile = (lastIndexOfSlash >= 0)?(cssPath.substring(lastIndexOfSlash + 1)) : cssPath;
logMessage =
- "Invalid <CSS FILE> configuration, please check the @import url(" + notFoundResourcePath + ") in "
- + cssPath + " , SkinService could not load the skin " + cssPath;
+ "Invalid <CSS FILE> configuration, please check the @import url(" + loadedCssFile + ") in "
+ + outerCssFile + " , SkinService could not load the skin " + cssPath;
}
else
{
- logMessage = "Not found <CSS FILE> " + cssPath + " , SkinService could not load the skin " + cssPath;
+ logMessage =
+ "Not found <CSS FILE>, the path " + cssPath + " is invalid, SkinService could not load the skin "
+ + cssPath;
}
log.error(logMessage);
- return null;
}
+ return resource;
}
private void processCSS(Appendable appendable, String cssPath, Orientation orientation, boolean merge)
throws RenderingException, IOException
{
- Resource skin = getCSSResource(cssPath);
+ Resource skin = getCSSResource(cssPath, cssPath);
processCSSRecursively(appendable, merge, skin, orientation);
}
@@ -487,7 +504,7 @@
{
if (merge)
{
- Resource ssskin = getCSSResource(includedPath);
+ Resource ssskin = getCSSResource(includedPath, basePath + skin.getFileName());
processCSSRecursively(appendable, merge, ssskin, orientation);
}
else
@@ -502,7 +519,7 @@
if (merge)
{
String path = skin.getContextPath() + skin.getParentPath() + includedPath;
- Resource ssskin = getCSSResource(path);
+ Resource ssskin = getCSSResource(path, basePath + skin.getFileName());
processCSSRecursively(appendable, merge, ssskin, orientation);
}
else
14 years, 8 months
- 1
- 0
gatein SVN: r2538 - in portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui: workspace and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-04-09 00:32:12 -0400 (Fri, 09 Apr 2010)
New Revision: 2538
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/workspace/UIMainActionListener.java
Log:
- GTNPORTAL-1051. Whatever, always refresh page in ChangePageNodeActionListener
- Improve sourcecode in EditInlineActionListener
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-04-09 02:02:39 UTC (rev 2537)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-04-09 04:32:12 UTC (rev 2538)
@@ -111,8 +111,6 @@
{
showedUIPortal.setSelectedNode(targetPageNode);
showedUIPortal.setSelectedPath(targetedPathNodes);
- showedUIPortal.refreshUIPage();
- return;
}
}
else
@@ -121,12 +119,12 @@
// First, we try to find a cached UIPortal
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
- UIPortal cachedUIPortal = uiPortalApp.getCachedUIPortal(newNavType, newNavId);
- if (cachedUIPortal != null)
+ showedUIPortal = uiPortalApp.getCachedUIPortal(newNavType, newNavId);
+ if (showedUIPortal != null)
{
- cachedUIPortal.setSelectedNode(targetPageNode);
- cachedUIPortal.setSelectedPath(targetedPathNodes);
- uiPortalApp.setShowedUIPortal(cachedUIPortal);
+ showedUIPortal.setSelectedNode(targetPageNode);
+ showedUIPortal.setSelectedPath(targetedPathNodes);
+ uiPortalApp.setShowedUIPortal(showedUIPortal);
//Temporary solution to fix edit inline error while switching between navigations
DataStorage storageService = uiPortalApp.getApplicationComponent(DataStorage.class);
@@ -139,25 +137,21 @@
//Update selected navigation on UserPortalConfig, that is mandatory as at the moment the PortalConfig
//does not hold any navigation data.
userPortalConfig.updateSelectedNavigation(newNavType, newNavId);
-
- cachedUIPortal.refreshUIPage();
- return;
}
else
{
- UIPortal newUIPortal = buildUIPortal(targetedNav, uiPortalApp, uiPortalApp.getUserPortalConfig());
- if(newUIPortal == null)
+ showedUIPortal = buildUIPortal(targetedNav, uiPortalApp, uiPortalApp.getUserPortalConfig());
+ if(showedUIPortal == null)
{
return;
}
- newUIPortal.setSelectedNode(targetPageNode);
- newUIPortal.setSelectedPath(targetedPathNodes);
- uiPortalApp.setShowedUIPortal(newUIPortal);
- uiPortalApp.putCachedUIPortal(newUIPortal);
- newUIPortal.refreshUIPage();
- return;
+ showedUIPortal.setSelectedNode(targetPageNode);
+ showedUIPortal.setSelectedPath(targetedPathNodes);
+ uiPortalApp.setShowedUIPortal(showedUIPortal);
+ uiPortalApp.putCachedUIPortal(showedUIPortal);
}
}
+ showedUIPortal.refreshUIPage();
}
/**
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-04-09 02:02:39 UTC (rev 2537)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-04-09 04:32:12 UTC (rev 2538)
@@ -160,9 +160,7 @@
newPortal.setSelectedNode(uiPortal.getSelectedNode());
newPortal.setSelectedNavigation(uiPortal.getSelectedNavigation());
newPortal.setSelectedPath(uiPortal.getSelectedPath());
-
- // Get instance of UIPage
- newPortal.getChild(UIPageBody.class).setPageBody(newPortal.getSelectedNode(), newPortal);
+ newPortal.refreshUIPage();
UIEditInlineWorkspace uiEditWS = uiWorkingWS.getChild(UIEditInlineWorkspace.class);
uiEditWS.setUIComponent(newPortal);
14 years, 8 months
- 1
- 0
gatein SVN: r2537 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization/management and 2 other directories.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-04-08 22:02:39 -0400 (Thu, 08 Apr 2010)
New Revision: 2537
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_vi.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AdminToolbarPortlet_vi.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization/management/executive-board_vi.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/users_vi.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_vi.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
Log:
GTNPORTAL-789 Vietnamese is not fully translated
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_vi.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_vi.xml 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AccountPortlet_vi.xml 2010-04-09 02:02:39 UTC (rev 2537)
@@ -26,7 +26,7 @@
-->
<UIAccountForm>
<label>
- <Profile>Tiểu sử người dùng</Profile>
+ <Profile>Thông tin Người dùng</Profile>
<username>#{word.userName}:</username>
<SearchUser>Tìm kiếm người dùng</SearchUser>
<password1x>Mật khẩu:</password1x>
@@ -123,8 +123,8 @@
<tab>
<label>
<AccountTemplate>Mẫu tài khoản</AccountTemplate>
- <UIUserProfileInputSet>Tiểu sử người dùng</UIUserProfileInputSet>
- <AccountInputSet>Thiết lập tài khoản</AccountInputSet>
+ <UIUserProfileInputSet>Thông tin Người dùng</UIUserProfileInputSet>
+ <AccountInputSet>Thông tin Tài khoản</AccountInputSet>
<UIUserMembershipSelector>Người dùng thành viên</UIUserMembershipSelector>
</label>
</tab>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AdminToolbarPortlet_vi.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AdminToolbarPortlet_vi.properties 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/AdminToolbarPortlet_vi.properties 2010-04-09 02:02:39 UTC (rev 2537)
@@ -24,4 +24,4 @@
UIAdminToolbarPortlet.action.BrowsePage=Qu\u1ea3n l\u00fd trang
UIAdminToolbarPortlet.action.EditPageAndNavigation=Ch\u1ec9nh s\u1eeda Trang v\u00e0 Navigation
UIAdminToolbarPortlet.action.Editor=Editor
-UIAdminToolbarPortlet.action.EditSiteLayout=Edit Layout
\ No newline at end of file
+UIAdminToolbarPortlet.action.EditSiteLayout=Ch\u1ec9nh s\u1eeda Layout
\ No newline at end of file
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-04-09 02:02:39 UTC (rev 2537)
@@ -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-firstChar=The "{0}" field must start with a character.
+UIGadgetEditor.msg.Invalid=The "{0}" field must not contains special characters.
##package org.exoplatform.organization.webui.component.UIListPermissionSelector
UIListPermissionSelector.header.groupId=Group
UIListPermissionSelector.header.membership=Membership
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_vi.xml 2010-04-09 02:02:39 UTC (rev 2537)
@@ -63,7 +63,7 @@
<UIOrganizer>
<label>
<addCategory>Thêm danh mục</addCategory>
- <autoImport>Truy nhập ứng dụng</autoImport>
+ <autoImport>Truy cập ứng dụng</autoImport>
<categories>Danh mục</categories>
</label>
<title>
@@ -73,7 +73,7 @@
<deleteApplication>Xóa ứng dụng</deleteApplication>
</title>
<msg>
- <importAll>Việc truy nhập ứng dụng sẽ tự động tạo các Danh mục và nhập tất cả các ứng dụng Gadget và Portlet bên trong danh mục tương ứng.</importAll>
+ <importAll>Việc truy cập ứng dụng sẽ tự động tạo các Danh mục và nhập tất cả các ứng dụng Gadget và Portlet bên trong danh mục tương ứng.</importAll>
<deleteCategory>Bạn có chắc chắn là muốn xóa Danh mục này và tất cả các ứng dụng đi kèm bên trong?</deleteCategory>
<deleteApplication>Bạn có chắc chắn là muốn xóa ứng dụng này?</deleteApplication>
<emptyCategory>Danh mục này không chứa bất kỳ ứng dụng nào, click vào nút (+) để thêm ứng dụng.</emptyCategory>
@@ -103,7 +103,7 @@
<name>Tên:</name>
<displayName>#{label.displayName}</displayName>
<description>#{label.description}</description>
- <accessPermissions>Phân quyền truy nhâp:</accessPermissions>
+ <accessPermissions>Phân quyền truy cập:</accessPermissions>
</label>
<title>
<editApplication>Chỉnh sửa ứng dụng</editApplication>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_vi.xml 2010-04-09 02:02:39 UTC (rev 2537)
@@ -26,18 +26,18 @@
-->
<UIOrganizationPortlet>
<label>
- <userManagement>Quản lí người dùng</userManagement>
- <groupManagement>Quản lí nhóm</groupManagement>
- <membershipManagement>Quản lí thành viên</membershipManagement>
+ <userManagement>Quản lý Thành viên</userManagement>
+ <groupManagement>Quản lý Nhóm</groupManagement>
+ <membershipManagement>Quản lý Vai trò</membershipManagement>
</label>
</UIOrganizationPortlet>
<!--
##org.exoplatform.organization.webui.component.UIMembershipTypeForm
-->
<UIMembershipTypeForm>
- <title>Thêm/Sửa Thành viên</title>
+ <title>Thêm/Sửa Vai trò</title>
<label>
- <name>Kiểu thành viên:</name>
+ <name>Tên Vai trò:</name>
<description>Mô tả:</description>
</label>
<action>
@@ -54,36 +54,36 @@
-->
<UIGroupEditMembershipForm>
<label>
- <username>Tên người dùng:</username>
- <membership>Thành viên:</membership>
+ <username>Tên tài khoản:</username>
+ <membership>Vai trò:</membership>
</label>
<action>
<Save>Lưu</Save>
<Cancel>Hủy</Cancel>
</action>
<msg>
- <membership-delete>Không thể lưu thành viên này, nó đã bị xóa!.</membership-delete>
- <membership-exist>Thành viên này đã tồn tại, xin vui lòng chọn thành viên khác!</membership-exist>
+ <membership-delete>Không thể lưu vai trò này, nó đã bị xóa!.</membership-delete>
+ <membership-exist>Vai trò này đã tồn tại, xin vui lòng chọn vai trò khác!</membership-exist>
</msg>
</UIGroupEditMembershipForm>
<EditMembership>
<title>
- <UIGroupEditMembershipForm>Sửa thành viên</UIGroupEditMembershipForm>
- <EditMembership>Sửa Thành viên</EditMembership>
+ <UIGroupEditMembershipForm>Sửa vai trò</UIGroupEditMembershipForm>
+ <EditMembership>Sửa vai trò</EditMembership>
</title>
</EditMembership>
<UIGroupMembershipForm>
<label>
<title>Thành viên nhóm</title>
- <username>Tên người dùng:</username>
- <membership>Kiểu thành viên:</membership>
- <SearchUser>Chọn người dùng</SearchUser>
- <Refresh>Refresh</Refresh>
+ <username>Tên tài khoản:</username>
+ <membership>Vai trò:</membership>
+ <SearchUser>Chọn tài khỏan người dùng</SearchUser>
+ <Refresh>Cập nhật mới</Refresh>
</label>
<action>
<Save>#{word.save}</Save>
</action>
- <title>Thêm thành viên</title>
+ <title>Thêm vai trò</title>
</UIGroupMembershipForm>
<SearchUserForm>
<label>
@@ -107,7 +107,7 @@
-->
<UIMemberShipForm>
<msg>
- <membershipType-exist>Loại thành viên {0} đã tồn tại</membershipType-exist>
+ <membershipType-exist>Loại vai trò {0} đã tồn tại</membershipType-exist>
</msg>
</UIMemberShipForm>
<!--
@@ -116,7 +116,7 @@
<UIMembershipForm>
<label>
<username>Tên người dùng</username>
- <membership>Thành viên</membership>
+ <membership>Vai trò</membership>
<name>Kiểu thành viên</name>
<description>#{word.description}</description>
</label>
@@ -157,7 +157,7 @@
<deleteUser>Bạn có chắc chắn muốn xóa người dùng {0} không?</deleteUser>
</UIListUsers>
<UIListMembershipType>
- <deleteMemberShip>Bạn có chắc chắn muốn xóa kiểu thành viên này không?</deleteMemberShip>
+ <deleteMemberShip>Bạn có chắc chắn muốn xóa vai trò này không?</deleteMemberShip>
</UIListMembershipType>
<!--
##org.exoplatform.organization.webui.component.UIUserInfo
@@ -270,7 +270,7 @@
<firstName>#{word.firstName}</firstName>
<email>#{word.email}</email>
<action>#{word.action}</action>
- <membershipType>Kiểu thành viên</membershipType>
+ <membershipType>Vai trò</membershipType>
<lastLoginTime>Lần cuối cùng đăng nhập</lastLoginTime>
</header>
<label>
@@ -303,7 +303,7 @@
-->
<UIMembershipList>
<header>
- <name>Kiểu thành viên</name>
+ <name>Tên Vai trò</name>
<createdDate>Ngày tạo</createdDate>
<modifiedDate>Ngày sửa</modifiedDate>
<action>#{word.action}</action>
@@ -311,8 +311,8 @@
</header>
<action>
<title>
- <EditMembership>Sửa thành viên</EditMembership>
- <DeleteMembership>Xóa thành viên</DeleteMembership>
+ <EditMembership>Sửa vai trò</EditMembership>
+ <DeleteMembership>Xóa vai trò</DeleteMembership>
</title>
</action>
<msg>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization/management/executive-board_vi.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization/management/executive-board_vi.xml 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/organization/management/executive-board_vi.xml 2010-04-09 02:02:39 UTC (rev 2537)
@@ -23,8 +23,8 @@
<bundle>
<organization>
<title>Tổ chức</title>
- <newstaff>Nhân viên mới</newstaff>
- <management>Quản lý</management>
+ <newstaff>Thêm nhân viên mới</newstaff>
+ <management>Quản lý nhóm, thành viên</management>
</organization>
</bundle>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/users_vi.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/users_vi.xml 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/users_vi.xml 2010-04-09 02:02:39 UTC (rev 2537)
@@ -25,9 +25,9 @@
<platform>
<users>
<sitemap>Sơ đồ trang</sitemap>
- <mylink>Liên kết của tôi</mylink>
+ <mylink>Liên kết cá nhân</mylink>
<dashboard>Bảng điều khiển</dashboard>
</users>
</platform>
-</bundle>
\ No newline at end of file
+</bundle>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_vi.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_vi.xml 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_vi.xml 2010-04-09 02:02:39 UTC (rev 2537)
@@ -66,7 +66,7 @@
-->
<editPermission>Sửa quyền</editPermission>
<email>Hộp thư</email>
- <employer>Nhà tuyển dụng</employer>
+ <employer>Người Quản lý</employer>
<!--
###################################################################
# EXPRESSION START WITH 'f' #
@@ -83,7 +83,7 @@
-->
<groupId>Mã Nhóm</groupId>
<gender>Giới tính</gender>
- <givenName>Tên khai sinh</givenName>
+ <givenName>Tên</givenName>
<!--
###################################################################
# EXPRESSION START WITH 'h' #
@@ -101,7 +101,7 @@
# EXPRESSION START WITH '' #
###################################################################
-->
- <jobTitle>Tên việc làm</jobTitle>
+ <jobTitle>Chức vụ</jobTitle>
<!--
###################################################################
# EXPRESSION START WITH 'l' #
@@ -184,7 +184,7 @@
###################################################################
-->
<width>Chiều rộng</width>
- <website>Trang web</website>
+ <website>Website</website>
</word>
</bundle>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-04-08 16:45:31 UTC (rev 2536)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_vi.properties 2010-04-09 02:02:39 UTC (rev 2537)
@@ -96,7 +96,7 @@
#############################################################################
UIPortalComposer.title.UIPortalComposer=Chỉnh sửa trang
-UIPortalComposer.action.Abort=Thoát
+UIPortalComposer.action.Abort=Hủy bỏ
UIPortalComposer.action.Finish=Hoàn thành
UIPortalComposer.action.ViewProperties=Xem thuộc tính portal
UIPortalComposer.action.SwitchMode=Chuyển chế độ xem
@@ -107,27 +107,27 @@
#Container config options #
#############################################################################
-ContainerOptions.Category.row=Rows Layout
-ContainerOptions.Category.column=Columns Layout
-ContainerOptions.Category.autofitColumn=Autofit Columns Layout
-ContainerOptions.Category.tabs=Tabs Layout
-ContainerOptions.Category.mix=Mixed Layout
+ContainerOptions.Category.row=Bố cục hàng
+ContainerOptions.Category.column=Bố cục cột
+ContainerOptions.Category.autofitColumn=Bố cục cột (Autofit)
+ContainerOptions.Category.tabs=Bố cục tab
+ContainerOptions.Category.mix=Bố cục tổng hợp
-ContainerOptions.Item.oneRow=One Row
-ContainerOptions.Item.twoRows=Two Rows
-ContainerOptions.Item.threeRows=Three Rows
-ContainerOptions.Item.oneColumns=One Column
-ContainerOptions.Item.twoColumns=Two Columns
-ContainerOptions.Item.threeColumns=Three Columns
-ContainerOptions.Item.threeToolbarColumns=Three Toolbar Columns
-ContainerOptions.Item.autofitOneColumns=Autofit One Column
-ContainerOptions.Item.autofitTwoColumns=Autofit Two Columns
-ContainerOptions.Item.autofitThreeColumns=Autofit Three Columns
-ContainerOptions.Item.twoTabs=Two Tabs
-ContainerOptions.Item.threeTabs=Three Tabs
-ContainerOptions.Item.twoColumnsOneRow=Two Columns, One Row
-ContainerOptions.Item.oneRowTwoColumns=One Row, Two Columns
-ContainerOptions.Item.oneRow2Column1Row=One Row, Two Columns, One Row
+ContainerOptions.Item.oneRow=1 hàng
+ContainerOptions.Item.twoRows=2 hàng
+ContainerOptions.Item.threeRows=3 hàng
+ContainerOptions.Item.oneColumns=1 cột
+ContainerOptions.Item.twoColumns=2 cột
+ContainerOptions.Item.threeColumns=3 cột
+ContainerOptions.Item.threeToolbarColumns=3 cột kiểu toolbar
+ContainerOptions.Item.autofitOneColumns=1 cột (Autofit)
+ContainerOptions.Item.autofitTwoColumns=2 cột (Autofit)
+ContainerOptions.Item.autofitThreeColumns=3 cột (Autofit)
+ContainerOptions.Item.twoTabs=2 tab
+ContainerOptions.Item.threeTabs=3 tab
+ContainerOptions.Item.twoColumnsOneRow=2 cột, 1 hàng
+ContainerOptions.Item.oneRowTwoColumns=1 hàng, 2 cột
+ContainerOptions.Item.oneRow2Column1Row=1 hàng, 2 cột, 1 hàng
#############################################################################
# Identifier String Validator #
@@ -168,7 +168,7 @@
UIChangePortal.header.creator=Người khởi tạo
UIChangePortal.header.name=Tên
UIChangePortal.header.skin=Kiểu giao diện
-UIChangePortal.header.action=Hành động
+UIChangePortal.header.action=Thực hiện
UIChangePortal.header.factoryId=Mã Factory
UIChangePortal.lable.TitleBar=Chọn Portal
UIChangePortal.action.close=Đóng lại
@@ -212,7 +212,7 @@
UIUserProfileInputSet.msg.sucsesful.update.userprofile=Update tên truy nhập thành công!
UIUserProfileInputSet.title=Thông tin cá nhân
UIUserProfileInputSet.label.Profile=Tiểu sử
-UIUserProfileInputSet.label.HomeInfo=Thông tin về nơi ở
+UIUserProfileInputSet.label.HomeInfo=Thông tin nơi ở
UIUserProfileInputSet.label.BusinessInfo=Thông tin nơi làm việc
UIGroupMembershipForm.msg.user-not-exist=Tên truy nhập này không tồn tại.
UIGroupMembershipForm.msg.user-not-empty=Tên truy nhập này không được để trống!
@@ -349,7 +349,7 @@
UITabPane.title.UIAccountChangePass=Thay mật khẩu
UIListPermissionSelector.header.groupId=Mã nhóm
UIListPermissionSelector.header.membership=Kiểu thành viên
-UIListPermissionSelector.header.action=Hành động
+UIListPermissionSelector.header.action=Thực hiện
UIListPermissionSelector.action.addPermission=Thêm phân quyền sử dụng
UIListPermissionSelector.action.title.Delete=Xóa
UIListPermissionSelector.label.publicMode=Mặc định tất cả người dùng đều có thể truy cập:
@@ -441,11 +441,11 @@
# org.exoplatform.portal.webui.portal.UIComposer #
#############################################################################
-UIPageEditor.action.Abort=Abort
-UIPageEditor.action.Finish=Finish
-UIPageEditor.title.UIPageEditor=Page Editor
-UIPageEditor.action.ViewProperties=View Page properties
-UIPageEditor.action.SwitchMode=Switch View mode
+UIPageEditor.action.Abort=Hủy bỏ
+UIPageEditor.action.Finish=Hòan thành
+UIPageEditor.title.UIPageEditor=Chỉnh sửa trang
+UIPageEditor.action.ViewProperties=Xem thuộc tính trang
+UIPageEditor.action.SwitchMode=Chuyển chế độ xem
#############################################################################
# org.exoplatform.portal.component.customization.UIPageForm #
@@ -536,7 +536,7 @@
UIPageNavigation.msg.noMakablePageNavigation=Bạn không có quyền khởi tạo Navigation cho bất cứ nhóm nào.
UIPageNavigation.tooltip.upLevel=Mức độ trên
UIPageNavigation.label.navigation=Navigation của {0}
-UIPageNavigation.label.titleBar=Trang của {0}
+UIPageNavigation.label.titleBar=Trang {0}
#############################################################################
# org.exoplatform.portal.webui.component.UIPortalApplication #
@@ -1132,7 +1132,7 @@
UIDropDownControl.title.Empty=Drop Down Control
UIDropDownPageTemp.item.normalPageConfigs=Cấu hình trang
UIDropDownPageTemp.item.columnPageConfigs=Cấu hình trang kiểu cột
-UIDropDownPageTemp.item.mixPageConfigs=Cấu hình trang trộn
+UIDropDownPageTemp.item.mixPageConfigs=Cấu hình trang tổng hợp
UIDropDownPageTemp.item.rowPageConfigs=Cấu hình trang kiểu dòng
UIDropDownPageTemp.item.tabsPageConfigs=Cấu hình trang kiểu tab
14 years, 8 months
- 1
- 0
gatein SVN: r2536 - in portal/trunk: examples/skins/simpleskin/src/main/webapp/skin/Portlet and 2 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-04-08 12:45:31 -0400 (Thu, 08 Apr 2010)
New Revision: 2536
Added:
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/
portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
Modified:
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css
portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css
Log:
GTNPORTAL-890: initial checkin of portlet css classes.
Added: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css (rev 0)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Portlet/Stylesheet.css 2010-04-08 16:45:31 UTC (rev 2536)
@@ -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/trunk/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2010-04-08 16:45:11 UTC (rev 2535)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2010-04-08 16:45:31 UTC (rev 2536)
@@ -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);
Added: portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css (rev 0)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Portlet/Stylesheet.css 2010-04-08 16:45:31 UTC (rev 2536)
@@ -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/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css 2010-04-08 16:45:11 UTC (rev 2535)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css 2010-04-08 16:45:31 UTC (rev 2536)
@@ -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, 8 months
- 1
- 0
gatein SVN: r2535 - in components/wsrp/trunk: admin-gui and 8 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-04-08 12:45:11 -0400 (Thu, 08 Apr 2010)
New Revision: 2535
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:
- Updated version to 1.1.0-GA-SNAPSHOT as next version will be 1.1.0-GA, not 1.0.1-GA as there is some new feature.
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-04-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-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-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/api/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ 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.
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-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-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/common/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ 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.
@@ -20,11 +20,12 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-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-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/consumer/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-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-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -22,13 +22,14 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-04-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -30,7 +30,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-04-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/producer/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ 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.
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-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-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/test/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -1,9 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-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-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ 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.
@@ -22,11 +22,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-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-08 13:43:11 UTC (rev 2534)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-04-08 16:45:11 UTC (rev 2535)
@@ -1,6 +1,6 @@
<!--
~ JBoss, a division of Red Hat
- ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ 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.
@@ -21,11 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>1.0.1-GA-SNAPSHOT</version>
+ <version>1.1.0-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
14 years, 8 months
- 1
- 0
gatein SVN: r2534 - portal/trunk/web/eXoResources/src/main/webapp/skin.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-08 09:43:11 -0400 (Thu, 08 Apr 2010)
New Revision: 2534
Modified:
portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css
Log:
GTNPORTAL-944: Rollback the wrongly committed Stylesheet.css
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css 2010-04-08 12:35:38 UTC (rev 2533)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css 2010-04-08 13:43:11 UTC (rev 2534)
@@ -19,5 +19,4 @@
@import url(DefaultSkin/portal/webui/component/UIPortalApplicationSkin.css);
@import url(DefaultSkin/webui/component/Stylesheet.css);
-@import url(PortletThemes/Stylesheet.css);
-@import url(blahblah.css);
\ No newline at end of file
+@import url(PortletThemes/Stylesheet.css);
\ No newline at end of file
14 years, 8 months
- 1
- 0
gatein SVN: r2533 - in portal/trunk: web/eXoResources/src/main/webapp/skin and 1 other directory.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2010-04-08 08:35:38 -0400 (Thu, 08 Apr 2010)
New Revision: 2533
Added:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceNotFoundException.java
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/SkinService.java
portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css
Log:
GTNPORTAL-944: Improve error management in SkinService
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-08 10:28:32 UTC (rev 2532)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/MainResourceResolver.java 2010-04-08 12:35:38 UTC (rev 2533)
@@ -94,12 +94,21 @@
//
if (context == null)
{
- log.warn("Could not resolve " + targetedContextPath + " resource for path " + path);
- return null;
+ String message = "Could not resolve " + targetedContextPath + " resource for path " + path;
+ log.warn(message);
+ throw new ResourceNotFoundException(path, message);
}
else
{
- return context.getResource(path.substring(i1));
+ 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;
+ }
}
}
}
Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceNotFoundException.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceNotFoundException.java (rev 0)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/ResourceNotFoundException.java 2010-04-08 12:35:38 UTC (rev 2533)
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2010 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.resource;
+
+/**
+ * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
+ * @version $Id$
+ *
+ */
+public class ResourceNotFoundException extends RuntimeException
+{
+ private String resourcePath;
+
+ private String errorType;
+
+ private final static String INVALID_RESOURCE_PATH = "invalid resource path";
+
+ private final static String RESOURCE_RESOLVER_WRONG_PROCESSING = "wrong processing in resource resolver";
+
+ public ResourceNotFoundException(String _resourcePath, String message)
+ {
+ super(message);
+ resourcePath = _resourcePath;
+ errorType = INVALID_RESOURCE_PATH;
+ }
+
+ public ResourceNotFoundException(String _resourcePath, String _errorType, String message)
+ {
+ super(message);
+ resourcePath = _resourcePath;
+ errorType = _errorType;
+ }
+
+ public String getResourcePath()
+ {
+ return resourcePath;
+ }
+
+ public String getErrorType()
+ {
+ return errorType;
+ }
+}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-04-08 10:28:32 UTC (rev 2532)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-04-08 12:35:38 UTC (rev 2533)
@@ -421,11 +421,42 @@
{
return skinConfigs_.size();
}
+
+ /**
+ * Add this method to catch <code>ResourceNotFoundException</code>
+ * and to log evoquant message
+ *
+ * @param cssPath
+ * @return
+ */
+ private Resource getCSSResource(String cssPath)
+ {
+ try{
+ return mainResolver.resolve(cssPath);
+ }
+ catch(ResourceNotFoundException NotFoundEx)
+ {
+ String notFoundResourcePath = NotFoundEx.getResourcePath();
+ String logMessage;
+ if(!cssPath.equals(notFoundResourcePath))
+ {
+ logMessage =
+ "Invalid <CSS FILE> configuration, please check the @import url(" + notFoundResourcePath + ") in "
+ + cssPath + " , SkinService could not load the skin " + cssPath;
+ }
+ else
+ {
+ logMessage = "Not found <CSS FILE> " + cssPath + " , SkinService could not load the skin " + cssPath;
+ }
+ log.error(logMessage);
+ return null;
+ }
+ }
private void processCSS(Appendable appendable, String cssPath, Orientation orientation, boolean merge)
throws RenderingException, IOException
{
- Resource skin = mainResolver.resolve(cssPath);
+ Resource skin = getCSSResource(cssPath);
processCSSRecursively(appendable, merge, skin, orientation);
}
@@ -456,7 +487,7 @@
{
if (merge)
{
- Resource ssskin = mainResolver.resolve(includedPath);
+ Resource ssskin = getCSSResource(includedPath);
processCSSRecursively(appendable, merge, ssskin, orientation);
}
else
@@ -471,7 +502,7 @@
if (merge)
{
String path = skin.getContextPath() + skin.getParentPath() + includedPath;
- Resource ssskin = mainResolver.resolve(path);
+ Resource ssskin = getCSSResource(path);
processCSSRecursively(appendable, merge, ssskin, orientation);
}
else
Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css 2010-04-08 10:28:32 UTC (rev 2532)
+++ portal/trunk/web/eXoResources/src/main/webapp/skin/Stylesheet.css 2010-04-08 12:35:38 UTC (rev 2533)
@@ -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(blahblah.css);
\ No newline at end of file
14 years, 8 months
- 1
- 0
gatein SVN: r2532 - portal/trunk/testsuite.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-04-08 06:28:32 -0400 (Thu, 08 Apr 2010)
New Revision: 2532
Modified:
portal/trunk/testsuite/GateIn_v3.0_BasicPortlets_TestDefinition.ods
portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods
Log:
Update "GateIn_v3.0_MainFucntions_TestDefinition.ods"
Update GateIn_v3.0_BasicPortlets_TestDefinition.ods
Modified: portal/trunk/testsuite/GateIn_v3.0_BasicPortlets_TestDefinition.ods
===================================================================
(Binary files differ)
Modified: portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods
===================================================================
(Binary files differ)
14 years, 8 months
- 1
- 0