March 2010 - gatein-commits - Jboss List Archives

gatein SVN: r2006 - in portal/trunk: web/portal/src/main/webapp/WEB-INF and 1 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-05 10:23:01 -0500 (Fri, 05 Mar 2010) New Revision: 2006 Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/RememberMeFilter.java Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java Log: GTNPORTAL-771 : Remember-me functionality: Roles are not added on session creation Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-03-05 14:37:24 UTC (rev 2005) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-03-05 15:23:01 UTC (rev 2006) @@ -138,7 +138,7 @@ * @param req the incoming request * @return the token */ - private String getRememberMeTokenCookie(HttpServletRequest req) + public static String getRememberMeTokenCookie(HttpServletRequest req) { Cookie[] cookies = req.getCookies(); if (cookies != null) Added: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/RememberMeFilter.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/RememberMeFilter.java (rev 0) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/RememberMeFilter.java 2010-03-05 15:23:01 UTC (rev 2006) @@ -0,0 +1,91 @@ +/* + * 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.web.login; + +import org.gatein.common.text.FastURLEncoder; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Enumeration; + +/** + * The remember me filter performs a send redirect on a portal private servlet mapping when the current request + * is a GET request, the user is not authenticated and there is a remember me token cookie in the request. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class RememberMeFilter implements Filter +{ + /** . */ + private static final FastURLEncoder CONVERTER = FastURLEncoder.getUTF8Instance(); + + public void init(FilterConfig filterConfig) throws ServletException + { + } + + public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException + { + doFilter((HttpServletRequest)req, (HttpServletResponse)resp, chain); + } + + private void doFilter(HttpServletRequest req, HttpServletResponse resp, FilterChain chain) throws IOException, ServletException + { + if (req.getRemoteUser() == null && "GET".equals(req.getMethod())) + { + if (InitiateLoginServlet.getRememberMeTokenCookie(req) != null) + { + StringBuilder builder = new StringBuilder(); + builder.append(req.getContextPath()); + builder.append("/private"); + String pathInfo = req.getPathInfo(); + if (pathInfo != null) + { + builder.append(pathInfo); + } + char sep = '?'; + for (Enumeration<String> e = req.getParameterNames();e.hasMoreElements();) + { + String parameterName = e.nextElement(); + for (String parameteValue : req.getParameterValues(parameterName)) + { + builder.append(sep); + sep = '&'; + builder.append(CONVERTER.encode(parameterName)); + builder.append('='); + builder.append(CONVERTER.encode(parameteValue)); + } + } + String s = builder.toString(); + resp.sendRedirect(s); + return; + } + } + + // + chain.doFilter(req, resp); + } + + public void destroy() + { + } +} Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-03-05 14:37:24 UTC (rev 2005) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-03-05 15:23:01 UTC (rev 2006) @@ -81,19 +81,22 @@ <filter-class>org.exoplatform.web.CacheUserProfileFilter</filter-class> </filter> + <filter> + <filter-name>RememberMeFilter</filter-name> + <filter-class>org.exoplatform.web.login.RememberMeFilter</filter-class> + </filter> + <filter> <filter-name>ClusteredSSOFilter</filter-name> <filter-class>org.exoplatform.web.login.ClusteredSSOFilter</filter-class> </filter> - + <filter-mapping> + <filter-name>RememberMeFilter</filter-name> + <url-pattern>/public/*</url-pattern> + </filter-mapping> - <filter-mapping> + <filter-mapping> <filter-name>ClusteredSSOFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> @@ -144,9 +147,9 @@ </filter-mapping> <filter-mapping> - <filter-name>ThreadLocalSessionProviderInitializedFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> + <filter-name>RestEncodingFilter</filter-name> + <url-pattern>/rest/*</url-pattern> + </filter-mapping>   Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java 2010-03-05 14:37:24 UTC (rev 2005) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java 2010-03-05 15:23:01 UTC (rev 2006) @@ -119,16 +119,19 @@ UIApplication uiapp = context.getUIApplication(); // - HttpSession session = getSession(context); + if (uiapp != null) + { + HttpSession session = getSession(context); - // At this point if it returns null it means that it was not possible to create a session - // because the session might be invalidated and the response is already commited to the client. - // That situation happens during a logout that invalidates the HttpSession - if (session != null) - { - String key = getKey(context); - log.debug("Storing application " + key); - session.setAttribute(APPLICATION_ATTRIBUTE_PREFIX + key, new ApplicationState(uiapp, context.getRemoteUser())); + // At this point if it returns null it means that it was not possible to create a session + // because the session might be invalidated and the response is already commited to the client. + // That situation happens during a logout that invalidates the HttpSession + if (session != null) + { + String key = getKey(context); + log.debug("Storing application " + key); + session.setAttribute(APPLICATION_ATTRIBUTE_PREFIX + key, new ApplicationState(uiapp, context.getRemoteUser())); + } } }

14 years, 9 months

1
0
0 / 0

gatein SVN: r2005 - components/shindig/trunk.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-03-05 09:37:24 -0500 (Fri, 05 Mar 2010) New Revision: 2005 Modified: components/shindig/trunk/pom.xml Log: Remove gpg stuff Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2010-03-05 14:04:49 UTC (rev 2004) +++ components/shindig/trunk/pom.xml 2010-03-05 14:37:24 UTC (rev 2005) @@ -689,6 +689,7 @@ <build> <plugins>  +   +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId>

14 years, 9 months

1
0
0 / 0

gatein SVN: r2004 - in portal/trunk: web/portal/src/main/webapp/login/jsp and 1 other directory.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-03-05 09:04:49 -0500 (Fri, 05 Mar 2010) New Revision: 2004 Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp Log: - fix bug in direct url authentication (like http://localhost:8080/portal/private/classic) - simplified the flow of the InitiateLoginServlet - added debug during the auth process Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-03-05 13:19:56 UTC (rev 2003) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-03-05 14:04:49 UTC (rev 2004) @@ -25,6 +25,8 @@ import org.exoplatform.web.security.security.AbstractTokenService; import org.exoplatform.web.security.security.CookieTokenService; import org.exoplatform.web.security.security.TransientTokenService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import java.io.IOException; @@ -43,12 +45,11 @@ */ public class InitiateLoginServlet extends AbstractHttpServlet { - /** - * Serial version ID - */ - private static final long serialVersionUID = -2553824531076121642L; /** . */ + private static final Logger log = LoggerFactory.getLogger(InitiateLoginServlet.class); + + /** . */ public static final String COOKIE_NAME = "rememberme"; /** . */ @@ -59,62 +60,64 @@ { resp.setContentType("text/html; charset=UTF-8"); HttpSession session = req.getSession(); + + // Looking for credentials stored in the session Credentials credentials = (Credentials)session.getAttribute(InitiateLoginServlet.CREDENTIALS); - session.setAttribute("initialURI", req.getAttribute("javax.servlet.forward.request_uri")); + // if (credentials == null) { - String token = getTokenCookie(req); PortalContainer pContainer = PortalContainer.getInstance(); ServletContext context = pContainer.getPortalContext(); + + // + String token = getRememberMeTokenCookie(req); if (token != null) { AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class); credentials = tokenService.validateToken(token, false); if (credentials == null) { + log.debug("Login initiated with no credentials in session but found token an invalid " + token + " " + + "that will be cleared in next response"); + + // We clear the cookie in the next response as it was not valid Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, ""); cookie.setPath(req.getContextPath()); cookie.setMaxAge(0); resp.addCookie(cookie); + // This allows the customer to define another login page without // changing the portal context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); - return; } + else + { + // Send authentication request + log.debug("Login initiated with no credentials in session but found token " + token + " with existing credentials, " + + "performing authentication"); + sendAuth(resp, credentials.getUsername(), token); + } } else { // This allows the customer to define another login page without // changing the portal + log.debug("Login initiated with no credentials in session and no token cookie, redirecting to login page"); context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); - return; } } else { + // We create a temporary token just for the login time + TransientTokenService tokenService = AbstractTokenService.getInstance(TransientTokenService.class); + String token = tokenService.createToken(credentials); req.getSession().removeAttribute(InitiateLoginServlet.CREDENTIALS); + + // Send authentication request + log.debug("Login initiated with credentials in session, performing authentication"); + sendAuth(resp, credentials.getUsername(), token); } - String token = null; - for (Cookie cookie : req.getCookies()) - { - if (InitiateLoginServlet.COOKIE_NAME.equals(cookie.getName())) - { - String rememberme = req.getParameter(COOKIE_NAME); - if (rememberme != null) - { - token = cookie.getValue(); - break; - } - } - } - if (token == null) - { - TransientTokenService tokenService = AbstractTokenService.getInstance(TransientTokenService.class); - token = tokenService.createToken(credentials); - } - - sendAuth(resp, credentials.getUsername(), token); } protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException @@ -126,11 +129,16 @@ { String url = "j_security_check?j_username=" + jUsername + "&j_password=" + jPassword; url = resp.encodeRedirectURL(url); - resp.sendRedirect(url); } - private String getTokenCookie(HttpServletRequest req) + /** + * Extract the remember me token from the request or returns null. + * + * @param req the incoming request + * @return the token + */ + private String getRememberMeTokenCookie(HttpServletRequest req) { Cookie[] cookies = req.getCookies(); if (cookies != null) Modified: portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java 2010-03-05 13:19:56 UTC (rev 2003) +++ portal/trunk/component/web/src/main/java/org/exoplatform/web/login/PortalLoginController.java 2010-03-05 14:04:49 UTC (rev 2004) @@ -23,6 +23,8 @@ import org.exoplatform.web.security.Credentials; import org.exoplatform.web.security.security.AbstractTokenService; import org.exoplatform.web.security.security.CookieTokenService; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import java.io.IOException; @@ -38,28 +40,28 @@ public class PortalLoginController extends AbstractHttpServlet { - /** - * Serial version ID. - */ - private static final long serialVersionUID = -9167273087235951389L; + /** . */ + private static final Logger log = LoggerFactory.getLogger(PortalLoginController.class); protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - // String username = req.getParameter("username"); String password = req.getParameter("password"); // if (username == null) { + log.error("Tried to access the portal login controller without username provided"); resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No username provided"); } if (password == null) { + log.error("Tried to access the portal login controller without password provided"); resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No password provided"); } // + log.debug("Found username and password and set credentials in http session"); Credentials credentials = new Credentials(username, password); req.getSession().setAttribute(InitiateLoginServlet.CREDENTIALS, credentials); @@ -70,7 +72,12 @@ if (uri == null || uri.length() == 0) { uri = req.getContextPath() + "/private/classic"; + log.debug("No initial URI found, will use default " + uri + " instead "); } + else + { + log.debug("Found initial URI " + uri); + } // if we do have a remember me String rememberme = req.getParameter("rememberme"); @@ -82,6 +89,9 @@ //Create token AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class); String cookieToken = tokenService.createToken(credentials); + + log.debug("Found a remember me request parameter, created a persistent token " + cookieToken + " for it and set it up " + + "in the next response"); Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, cookieToken); cookie.setPath(req.getContextPath()); cookie.setMaxAge((int)tokenService.getValidityTime() / 1000); Modified: portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-03-05 13:19:56 UTC (rev 2003) +++ portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-03-05 14:04:49 UTC (rev 2004) @@ -43,7 +43,7 @@ cookie.setMaxAge(0); response.addCookie(cookie); - response.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding("UTF-8"); response.setContentType("text/html; charset=UTF-8"); %> <!DOCTYPE html @@ -70,7 +70,7 @@ %> <font color="red"><%=res.getString("UILoginForm.label.SigninFail")%></font><%}%> <form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;"> - <input type="hidden" name="uri" value="<%=session.getAttribute("initialURI") %>"/> + <input type="hidden" name="initialURI" value="<%=request.getAttribute("javax.servlet.forward.request_uri")%>"/> <table> <tr class="FieldContainer"> <td class="FieldLabel"><%=res.getString("UILoginForm.label.UserName")%></td>

14 years, 9 months

1
0
0 / 0

gatein SVN: r2003 - portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-03-05 08:19:56 -0500 (Fri, 05 Mar 2010) New Revision: 2003 Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java Log: - GTNPORTAL-823: If a portlet is remote from a producer named foo, add it to a 'Foo Producer' category. Note that this will only work when WSRP is updated to CR01. Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-03-05 13:02:54 UTC (rev 2002) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-03-05 13:19:56 UTC (rev 2003) @@ -46,12 +46,17 @@ import org.gatein.pc.api.info.PortletInfo; import org.picocontainer.Startable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** - * The fundamental reason that motives to use tasks is because of the JMX access that does not - * setup a context and therefore the task either reuse the existing context setup by the portal - * or create a temporary context when accessed by JMX. + * The fundamental reason that motives to use tasks is because of the JMX access that does not setup a context and + * therefore the task either reuse the existing context setup by the portal or create a temporary context when accessed + * by JMX. * * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ @@ -81,6 +86,10 @@ final POMSessionManager mopManager; private static final String REMOTE_DISPLAY_NAME_SUFFIX = " (remote)"; + /** Should match WSRPPortletInfo.PRODUCER_NAME_META_INFO_KEY */ + private static final String PRODUCER_NAME_META_INFO_KEY = "producer-name"; + public static final String PRODUCER_CATEGORY_NAME_SUFFIX = " Producer"; + public ApplicationRegistryServiceImpl(ChromatticManager manager, POMSessionManager mopManager) { ApplicationRegistryChromatticLifeCycle lifeCycle = (ApplicationRegistryChromatticLifeCycle)manager.getLifeCycle("app"); @@ -417,7 +426,8 @@ portletApplicationName = portletApplicationName.replace('/', '_'); portletName = portletName.replace('/', '_'); - LocalizedString keywordsLS = info.getMeta().getMetaValue(MetaInfo.KEYWORDS); + MetaInfo metaInfo = portlet.getInfo().getMeta(); + LocalizedString keywordsLS = metaInfo.getMetaValue(MetaInfo.KEYWORDS); // Set<String> categoryNames = new HashSet<String>(); @@ -428,13 +438,17 @@ String keywords = keywordsLS.getDefaultString(); if (keywords != null && keywords.length() != 0) { - for (String categoryName : keywords.split(",")) { + for (String categoryName : keywords.split(",")) + { // Trim name categoryName = categoryName.trim(); - if (INTERNAL_PORTLET_TAG.equalsIgnoreCase(categoryName)) { + if (INTERNAL_PORTLET_TAG.equalsIgnoreCase(categoryName)) + { log.debug("Skipping portlet (" + portletApplicationName + "," + portletName + ") + tagged as internal"); continue portlet; - } else { + } + else + { categoryNames.add(categoryName); } } @@ -452,6 +466,13 @@ if (remote) { categoryNames.add(REMOTE_CATEGORY_NAME); + + // add producer name to categories for easier finding of portlets for GTNPORTAL-823 + LocalizedString producerNameLS = metaInfo.getMetaValue(PRODUCER_NAME_META_INFO_KEY); + if (producerNameLS != null) + { + categoryNames.add(producerNameLS.getDefaultString() + PRODUCER_CATEGORY_NAME_SUFFIX); + } } // @@ -473,9 +494,7 @@ ContentDefinition app = category.getContentMap().get(portletName); if (app == null) { - MetaInfo metaInfo = portlet.getInfo().getMeta(); LocalizedString descriptionLS = metaInfo.getMetaValue(MetaInfo.DESCRIPTION); - LocalizedString displayNameLS = metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME); String displayName = getLocalizedStringValue(displayNameLS, portletName); @@ -616,7 +635,7 @@ } else if (type == WSRP.CONTENT_TYPE) { - return "/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png"; + return "/eXoResources/skin/sharedImages/Icon80x80/DefaultPortlet.png"; } else if (type == org.exoplatform.portal.pom.spi.gadget.Gadget.CONTENT_TYPE) {

14 years, 9 months

1
0
0 / 0

gatein SVN: r2002 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-03-05 08:02:54 -0500 (Fri, 05 Mar 2010) New Revision: 2002 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPPortletInfo.java Log: - GTNWSRP-9: Added producer name to meta info. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPPortletInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2010-03-05 11:00:22 UTC (rev 2001) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2010-03-05 13:02:54 UTC (rev 2002) @@ -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. @@ -68,6 +68,8 @@ public class WSRPPortletInfo implements org.gatein.pc.api.info.PortletInfo { + public static final String PRODUCER_NAME_META_INFO_KEY = "producer-name"; + private WSRPCapabilitiesInfo capabilities; private MetaInfo metaInfo; private boolean usesMethodGet; @@ -90,7 +92,7 @@ createCapabilitiesInfo(portletDescription); - createMetaInfo(portletDescription); + createMetaInfo(portletDescription, originatingProducerInfo.getId()); createWSRPInfo(portletDescription, originatingProducerInfo.getId()); @@ -361,7 +363,7 @@ capabilities.setMediaTypes(mediaTypes); } - private void createMetaInfo(PortletDescription portletDescription) + private void createMetaInfo(PortletDescription portletDescription, String producerId) { final Map<String, org.gatein.common.i18n.LocalizedString> metaInfos = new HashMap<String, org.gatein.common.i18n.LocalizedString>(); metaInfos.put(MetaInfo.DESCRIPTION, getPortalLocalizedStringOrNullFrom(portletDescription.getDescription())); @@ -396,6 +398,8 @@ metaInfos.put(MetaInfo.KEYWORDS, new org.gatein.common.i18n.LocalizedString(keywordsString, locale)); + metaInfos.put(PRODUCER_NAME_META_INFO_KEY, new org.gatein.common.i18n.LocalizedString(producerId, locale)); + metaInfo = new WSRPMetaInfo(metaInfos); }

14 years, 9 months

1
0
0 / 0

gatein SVN: r2000 - in components/shindig/trunk: assembly and 7 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-03-05 03:49:45 -0500 (Fri, 05 Mar 2010) New Revision: 2000 Modified: components/shindig/trunk/assembly/pom.xml components/shindig/trunk/features/pom.xml components/shindig/trunk/java/common/pom.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: Slight change in version numbering Modified: components/shindig/trunk/assembly/pom.xml =================================================================== --- components/shindig/trunk/assembly/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/assembly/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> <relativePath>../java/pom.xml</relativePath> </parent> Modified: components/shindig/trunk/features/pom.xml =================================================================== --- components/shindig/trunk/features/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/features/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -23,7 +23,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/common/pom.xml =================================================================== --- components/shindig/trunk/java/common/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/java/common/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/java/gadgets/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/pom.xml =================================================================== --- components/shindig/trunk/java/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/java/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> </parent> <artifactId>shindig-parent</artifactId> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/java/samples/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/java/server/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/java/social-api/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2010-03-05 08:45:35 UTC (rev 1999) +++ components/shindig/trunk/pom.xml 2010-03-05 08:49:45 UTC (rev 2000) @@ -28,7 +28,7 @@ <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch-01-SNAPSHOT</version> + <version>1.0-r790473-Patch01-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Shindig Project</name>

14 years, 9 months

1
0
0 / 0

gatein SVN: r1999 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.

by do-not-reply＠jboss.org

Author: tan_pham_dinh Date: 2010-03-05 03:45:35 -0500 (Fri, 05 Mar 2010) New Revision: 1999 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java Log: GTNPORTAL-808: Adding new membership with same name than existing one does not trigger "already exists" warnings Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java 2010-03-05 08:35:59 UTC (rev 1998) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIMembershipTypeForm.java 2010-03-05 08:45:35 UTC (rev 1999) @@ -19,10 +19,10 @@ package org.exoplatform.organization.webui.component; +import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.services.organization.MembershipType; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.web.application.ApplicationMessage; -import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.UIApplication; @@ -90,37 +90,34 @@ MembershipType mt = service.getMembershipTypeHandler().findMembershipType(msTypeName); - if (mt != null) + if (uiForm.getMembershipTypeName() == null) { - MembershipType existMembershipType = service.getMembershipTypeHandler().findMembershipType(mt.getName()); - if (existMembershipType == null) + //For create new membershipType case + if (mt != null) { UIApplication uiApp = event.getRequestContext().getUIApplication(); - uiApp.addMessage(new ApplicationMessage("UIMembershipTypeForm.msg.MembershipNotExist", new String[]{mt - .getName()})); + uiApp.addMessage(new ApplicationMessage("UIMembershipTypeForm.msg.SameName", null)); + return; } - else - { - uiForm.invokeSetBindingBean(mt); - service.getMembershipTypeHandler().saveMembershipType(mt, true); - } + mt = service.getMembershipTypeHandler().createMembershipTypeInstance(); + uiForm.invokeSetBindingBean(mt); + service.getMembershipTypeHandler().createMembershipType(mt, true); + uiMembershipManagement.addOptions(mt); } else { - mt = service.getMembershipTypeHandler().createMembershipTypeInstance(); - uiForm.invokeSetBindingBean(mt); - MembershipType existMembershipType = service.getMembershipTypeHandler().findMembershipType(mt.getName()); - - if (existMembershipType != null) + //For edit a membershipType case + if (mt == null) { UIApplication uiApp = event.getRequestContext().getUIApplication(); - uiApp.addMessage(new ApplicationMessage("UIMembershipTypeForm.msg.SameName", null)); - return; + uiApp.addMessage(new ApplicationMessage("UIMembershipTypeForm.msg.MembershipNotExist", + new String[]{msTypeName})); } - service.getMembershipTypeHandler().createMembershipType(mt, true); - - // Update the list of membership under GroupManagment if any - uiMembershipManagement.addOptions(mt); + else + { + uiForm.invokeSetBindingBean(mt); + service.getMembershipTypeHandler().saveMembershipType(mt, true); + } } uiMembershipManagement.getChild(UIListMembershipType.class).loadData();

14 years, 9 months

1
0
0 / 0

gatein SVN: r1998 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-03-05 03:35:59 -0500 (Fri, 05 Mar 2010) New Revision: 1998 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_043.html Log: Check show site editor menu with "Test_POR_14_043.html" Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_043.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_043.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_043.html 2010-03-05 08:35:59 UTC (rev 1998) @@ -0,0 +1,622 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>Test_POR_14_043</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_14_043</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/register</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-New Account-</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Register New Account-</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Register</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>POR_14_043</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>111111</td> +</tr> +<tr> + <td>type</td> + <td>confirmPassword</td> + <td>111111</td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>POR_14_043</td> +</tr> +<tr> + <td>type</td> + <td>lastName</td> + <td>POR_14_043</td> +</tr> +<tr> + <td>type</td> + <td>emailAddress</td> + <td>por_14_043(a)yahoo.com</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Subscribe</td> + <td>1,1</td> +</tr> +<tr> + <td>echo</td> + <td>--Login in portal--</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalLoginFormAction']//a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-GroupManagement-</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-Select User and group managent in menu</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td> + <td>1,1</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-select group from the tree-</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//td[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>POR_14_043</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-Click add button-</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>membership</td> + <td>label=manager</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-Page Management-</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>ownerType</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>ownerType</td> + <td>label=portal</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//option[@value='portal']</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>por_14_043</td> +</tr> +<tr> + <td>type</td> + <td>title</td> + <td>por_14_043</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UIPortalApplication']/div[@id='UIMaskWorkspace']/div[@class='MiddleLeftDecorator']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//div[@id='UIPortalApplication']/div[@id='UIMaskWorkspace']/div[@class='MiddleLeftDecorator']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UIPortalApplication']/div[@id='UIMaskWorkspace']/div[@class='MiddleLeftDecorator']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//div[@id='UIPortalApplication']/div[@id='UIMaskWorkspace']/div[@class='MiddleLeftDecorator']//div[@class='TabsContainer']/div[3]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Add new node--</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>waitForText</td> + <td>name</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>POR_14_043</td> +</tr> +<tr> + <td>type</td> + <td>label</td> + <td>POR_14_043</td> +</tr> +<tr> + <td>echo</td> + <td>-- Choose Page Selector</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//div[@class='CenterHorizontalTabs']//div[@class='NormalTab']//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Select page created from page lists--</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[contains(@onclick,'por_14_043')]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//img[contains(@onclick,'por_14_043')]</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td>1,1</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>POR_14_043</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>111111</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/portal/public/classic</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalLoginFormAction']//a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>- Go to Manage page again--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Search page created above--</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>por_14_043</td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete page--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>xpath=//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Do you want to delete this page?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Go to User and Group managent--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete POR_14_043 user?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

14 years, 9 months

1
0
0 / 0

gatein SVN: r1997 - in components/shindig/trunk: assembly and 5 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-03-05 02:59:07 -0500 (Fri, 05 Mar 2010) New Revision: 1997 Modified: components/shindig/trunk/assembly/pom.xml components/shindig/trunk/etc/cruisecontrol/config.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: Typo and missing changes Modified: components/shindig/trunk/assembly/pom.xml =================================================================== --- components/shindig/trunk/assembly/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) +++ components/shindig/trunk/assembly/pom.xml 2010-03-05 07:59:07 UTC (rev 1997) @@ -113,27 +113,27 @@ </build> <dependencies> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> <version>${project.version}</version> <type>war</type> Modified: components/shindig/trunk/etc/cruisecontrol/config.xml =================================================================== --- components/shindig/trunk/etc/cruisecontrol/config.xml 2010-03-05 07:24:58 UTC (rev 1996) +++ components/shindig/trunk/etc/cruisecontrol/config.xml 2010-03-05 07:59:07 UTC (rev 1997) @@ -46,14 +46,14 @@ <publishers> <onsuccess> - <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/gadgets/target/shindig-gadgets-1.1-SNAPSHOT-sources.jar"/> - <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/gadgets/target/shindig-gadgets-1.1-SNAPSHOT.jar"/> - <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/server/target/shindig-server-1.1-SNAPSHOT-sources.jar"/> - <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/server/target/shindig-server-1.1-SNAPSHOT.war"/> - <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/common/target/shindig-common-1.1-SNAPSHOT-sources.jar"/> - <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/common/target/shindig-common-1.1-SNAPSHOT.jar"/> - <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/social-api/target/shindig-social-api-1.1-SNAPSHOT-sources.jar"/> - <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/social-api/target/shindig-social-api-1.1-SNAPSHOT.jar"/> + <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/gadgets/target/shindig-gadgets-${project.version}-sources.jar"/> + <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/gadgets/target/shindig-gadgets-${project.version}.jar"/> + <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/server/target/shindig-server-${project.version}-sources.jar"/> + <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/server/target/shindig-server-${project.version}.war"/> + <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/common/target/shindig-common-${project.version}-sources.jar"/> + <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/common/target/shindig-common-${project.version}.jar"/> + <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/social-api/target/shindig-social-api-${project.version}-sources.jar"/> + <artifactspublisher dest="artifacts/${project.name}" file="../shindig/java/social-api/target/shindig-social-api-${project.version}.jar"/> </onsuccess> </publishers> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) +++ components/shindig/trunk/java/gadgets/pom.xml 2010-03-05 07:59:07 UTC (rev 1997) @@ -115,11 +115,11 @@ <dependencies>  <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <type>test-jar</type> <scope>test</scope> @@ -224,7 +224,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <type>test-jar</type> <scope>test</scope> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) +++ components/shindig/trunk/java/samples/pom.xml 2010-03-05 07:59:07 UTC (rev 1997) @@ -82,15 +82,15 @@ <dependencies>  <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> </dependency>  @@ -186,16 +186,16 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> - <version>1.1-SNAPSHOT</version> + <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> - <version>1.1-SNAPSHOT</version> + <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> </dependency> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) +++ components/shindig/trunk/java/server/pom.xml 2010-03-05 07:59:07 UTC (rev 1997) @@ -33,7 +33,7 @@ <description>Default server war containing both the gadget rendering code and the social api code.</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...<connection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection> <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/s...</developerConnection> <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/server</url> </scm> @@ -115,27 +115,27 @@ <dependencies>  <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <scope>provided</scope> </dependency> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) +++ components/shindig/trunk/java/social-api/pom.xml 2010-03-05 07:59:07 UTC (rev 1997) @@ -65,11 +65,11 @@ <dependencies>  <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <type>test-jar</type> <scope>test</scope> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) +++ components/shindig/trunk/pom.xml 2010-03-05 07:59:07 UTC (rev 1997) @@ -389,13 +389,13 @@ <dependencies>  <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <version>${project.version}</version> </dependency> @@ -1261,32 +1261,32 @@ <dependencies>  <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.shindig</groupId> + <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> <version>${project.version}</version> <type>test-jar</type>

14 years, 9 months

1
0
0 / 0

gatein SVN: r1996 - in portal/trunk: skins and 6 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-03-05 02:24:58 -0500 (Fri, 05 Mar 2010) New Revision: 1996 Added: portal/trunk/skins/ portal/trunk/skins/pom.xml portal/trunk/skins/simpleskin/ portal/trunk/skins/simpleskin/pom.xml portal/trunk/skins/simpleskin/src/ portal/trunk/skins/simpleskin/src/main/ portal/trunk/skins/simpleskin/src/main/webapp/ portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/ portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/web.xml portal/trunk/skins/simpleskin/src/main/webapp/skin/ portal/trunk/skins/simpleskin/src/main/webapp/skin/Stylesheet.css Modified: portal/trunk/pom.xml Log: GTNPORTAL-752: Create Maven project for a simple deployable GateIn skin Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-03-05 06:58:02 UTC (rev 1995) +++ portal/trunk/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) @@ -83,6 +83,7 @@ <module>server</module> <module>examples</module> <module>starter</module> + <module>skins</module> <module>packaging</module> <module>testsuite</module> </modules> Added: portal/trunk/skins/pom.xml =================================================================== --- portal/trunk/skins/pom.xml (rev 0) +++ portal/trunk/skins/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) @@ -0,0 +1,20 @@ +<?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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>3.0.0-CR02-SNAPSHOT</version> + </parent> + + <groupId>org.gatein.portal.skins</groupId> + <artifactId>parent</artifactId> + <packaging>pom</packaging> + <name>GateIn Skins</name> + + <modules> + <module>simpleskin</module> + </modules> + +</project> Added: portal/trunk/skins/simpleskin/pom.xml =================================================================== --- portal/trunk/skins/simpleskin/pom.xml (rev 0) +++ portal/trunk/skins/simpleskin/pom.xml 2010-03-05 07:24:58 UTC (rev 1996) @@ -0,0 +1,71 @@ + + +<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"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.gatein.portal.skins</groupId> + <artifactId>parent</artifactId> + <version>3.0.0-CR02-SNAPSHOT</version> + </parent> + + <artifactId>gatein-simple-deployable-skin</artifactId> + <packaging>war</packaging> + <name>GateIn Simple Deployable Skin</name> + <description/> + + <build> + <finalName>simpleDeployableSkin</finalName> + </build> + <reporting> + <plugins> +  + <plugin> + <groupId>gr.abiss.mvn.plugins</groupId> + <artifactId>maven-jstools-plugin</artifactId> + <inherited>false</inherited> + <configuration> +  + <jsDir>src/main/webapp/javascript</jsDir> +  + <includes>**/*.js</includes> +  + <excludes>**/*-compressed.js</excludes> +  + <caseSensitive>true</caseSensitive> +  + </configuration> + <reportSets> + <reportSet> + <reports> +  + <report>jslint</report> + <report>jsdoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> +  + </plugins> + </reporting> + +</project> Added: portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml =================================================================== --- portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml (rev 0) +++ portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/gatein-resources.xml 2010-03-05 07:24:58 UTC (rev 1996) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<gatein-resources + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0" + xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0"> + + +</gatein-resources> \ No newline at end of file Added: portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/web.xml =================================================================== --- portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/web.xml (rev 0) +++ portal/trunk/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2010-03-05 07:24:58 UTC (rev 1996) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> + + + +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.5"> + <display-name>simpleDeployableSkin</display-name> +</web-app> Added: portal/trunk/skins/simpleskin/src/main/webapp/skin/Stylesheet.css =================================================================== --- portal/trunk/skins/simpleskin/src/main/webapp/skin/Stylesheet.css (rev 0) +++ portal/trunk/skins/simpleskin/src/main/webapp/skin/Stylesheet.css 2010-03-05 07:24:58 UTC (rev 1996) @@ -0,0 +1,19 @@ +/** + * 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. + */ +

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits March 2010