gatein SVN: r7938 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-11-02 12:42:51 -0400 (Wed, 02 Nov 2011)
New Revision: 7938
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js
Log:
GTNPORTAL-1001: GateIn+Opera: problem with script
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js 2011-11-02 15:05:52 UTC (rev 7937)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/Browser.js 2011-11-02 16:42:51 UTC (rev 7938)
@@ -287,6 +287,15 @@
this.getBrowserWidth = function() {
return document.body.clientWidth ;
}
+ this.eventListener = function(object, event, operation) {
+ object.addEventListener(event, operation, false);
+ }
+ this.setOpacity = function(component, value) {
+ component.style.opacity = value/100 ;
+ }
+ this.getEventSource = function(e) {
+ return e.target ;
+ }
} ;
Browser.prototype.isIE6 = function() {
12 years, 6 months
gatein SVN: r7937 - epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-11-02 11:05:52 -0400 (Wed, 02 Nov 2011)
New Revision: 7937
Modified:
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyRequestHandler.java
Log:
JBEPP-1164: update patch to reflect changes made in gatein trunk. Deemed to be a better approach to this issue.
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyRequestHandler.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyRequestHandler.java 2011-11-02 14:28:05 UTC (rev 7936)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyRequestHandler.java 2011-11-02 15:05:52 UTC (rev 7937)
@@ -19,11 +19,8 @@
package org.exoplatform.portal.application;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfig;
import org.exoplatform.portal.config.UserPortalConfigService;
-import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.mop.SiteKey;
import org.exoplatform.portal.mop.user.UserNavigation;
import org.exoplatform.portal.mop.user.UserNode;
@@ -91,55 +88,32 @@
{
String requestSiteName = context.getParameter(PortalRequestHandler.REQUEST_SITE_NAME);
String requestPath = context.getParameter(PortalRequestHandler.REQUEST_PATH);
-
- // Resolve the user node
- UserPortalConfig cfg = userPortalService.getUserPortalConfig(requestSiteName, context.getRequest().getRemoteUser(), userPortalContext);
- if (cfg == null)
- {
- HttpServletRequest req = context.getRequest();
- DataStorage storage = (DataStorage)PortalContainer.getComponent(DataStorage.class);
- PortalConfig persistentPortalConfig = storage.getPortalConfig(requestSiteName);
- if (persistentPortalConfig == null)
- {
- return false;
- }
- if(req.getRemoteUser() == null)
- {
- String doLoginPath = req.getContextPath() + "/" + "dologin" + "?initialURI=" + req.getRequestURI();
- context.getResponse().sendRedirect(doLoginPath);
- }
- else
- {
- context.getResponse().sendError(HttpServletResponse.SC_FORBIDDEN);
- }
- return true;
- }
-
-
- UserPortal userPortal = cfg.getUserPortal();
- UserNodeFilterConfig.Builder builder = UserNodeFilterConfig.builder().withAuthMode(UserNodeFilterConfig.AUTH_READ);
- UserNode userNode = userPortal.resolvePath(builder.build(), requestPath);
+ SiteKey siteKey = SiteKey.portal(requestSiteName);
+ String uri = requestPath;
- //
- SiteKey siteKey;
- String uri;
- if (userNode != null)
+ // Resolve the user node if node path is indicated
+ if (!requestPath.equals(""))
{
- siteKey = userNode.getNavigation().getKey();
- uri = userNode.getURI();
+ UserPortalConfig cfg = userPortalService.getUserPortalConfig(requestSiteName, context.getRequest().getRemoteUser(), userPortalContext);
+ if (cfg != null)
+ {
+ UserPortal userPortal = cfg.getUserPortal();
+ UserNodeFilterConfig.Builder builder = UserNodeFilterConfig.builder().withAuthMode(UserNodeFilterConfig.AUTH_READ);
+ UserNode userNode = userPortal.resolvePath(builder.build(), requestPath);
+
+ if (userNode != null)
+ {
+ siteKey = userNode.getNavigation().getKey();
+ uri = userNode.getURI();
+ }
+ }
}
- else
- {
- siteKey = SiteKey.portal("classic");
- uri = "";
- }
//
PortalURLContext urlContext = new PortalURLContext(context, siteKey);
NodeURL url = urlFactory.newURL(NodeURL.TYPE, urlContext);
- // For now we redirect on the default classic site
url.setResource(new NavigationResource(siteKey.getType(), siteKey.getName(), uri));
url.setMimeType(MimeType.PLAIN);
12 years, 6 months
gatein SVN: r7936 - in components/sso/trunk: spnego and 1 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2011-11-02 10:28:05 -0400 (Wed, 02 Nov 2011)
New Revision: 7936
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOFilter.java
components/sso/trunk/spnego/pom.xml
components/sso/trunk/spnego/src/main/java/org/gatein/sso/spnego/NegotiationAuthenticator.java
Log:
GTNPORTAL-2251 Handle login through portal/login to avoid need of changes in login.jsp
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOFilter.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOFilter.java 2011-11-02 14:01:37 UTC (rev 7935)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/filter/SPNEGOFilter.java 2011-11-02 14:28:05 UTC (rev 7936)
@@ -1,24 +1,26 @@
/*
-* JBoss, a division of Red Hat
-* Copyright 2006, 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.
-*/
+ * JBoss, a division of Red Hat
+ * Copyright 2011, 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.
+ */
+
package org.gatein.sso.agent.filter;
import java.io.IOException;
@@ -28,54 +30,83 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import org.exoplatform.container.web.AbstractFilter;
-import org.exoplatform.services.security.Authenticator;
-import org.exoplatform.services.security.IdentityRegistry;
-import org.exoplatform.services.security.Identity;
/**
- * Note: This Filter should not be needed anymore. Once various SPNEGO scenarios have been tested and stabilized, I would recommend removing this from the codebase in
- * a future release of the module
- *
- * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ * Filter is needed because when fallback to FORM authentication, we don't need to redirect request to PortalLoginController to secured URI,
+ * but we need to go directly to /initiatelogin without going again through Tomcat authenticator.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
*/
public class SPNEGOFilter extends AbstractFilter
{
-
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException
- {
- HttpServletRequest httpRequest = (HttpServletRequest)request;
- try
- {
- String remoteUser = httpRequest.getRemoteUser();
-
- if(remoteUser != null)
- {
- //Check and make sure the IdentityRegistry is consistent
- IdentityRegistry identityRegistry = (IdentityRegistry) getContainer()
- .getComponentInstanceOfType(IdentityRegistry.class);
- if(identityRegistry.getIdentity(remoteUser) == null)
- {
- Authenticator authenticator = (Authenticator) getContainer()
- .getComponentInstanceOfType(Authenticator.class);
-
- Identity identity = authenticator.createIdentity(remoteUser);
-
- identityRegistry.register(identity);
- }
- }
-
- chain.doFilter(request, response);
- }
- catch(Throwable t)
- {
- throw new RuntimeException(t);
- }
- }
- public void destroy()
- {
- }
+ public static final String ATTR_INITIAL_URI = "SPNEGOFilter.initialURI";
+
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException
+ {
+ HttpServletRequest httpRequest = (HttpServletRequest)request;
+ HttpServletResponse httpResponse = (HttpServletResponse)response;
+ try
+ {
+ if (isLoginControllerInProgress(httpRequest))
+ {
+ // first save initialURI as parameter into HTTP session. We may need it later in authenticator
+ String initialURI = httpRequest.getParameter("initialURI");
+ if (initialURI != null)
+ {
+ httpRequest.getSession().setAttribute(ATTR_INITIAL_URI, initialURI);
+ }
+
+ // we need to redirect directly to initiatelogin without going through secured URL.
+ HttpServletResponse wrapperResponse = new IgnoreRedirectHttpResponse(httpResponse);
+ chain.doFilter(request, wrapperResponse);
+ httpResponse.sendRedirect("/portal/initiatelogin");
+ }
+ else
+ {
+ chain.doFilter(request, response);
+ }
+ }
+ catch(Throwable t)
+ {
+ throw new RuntimeException(t);
+ }
+ }
+
+ public void destroy()
+ {
+ }
+
+ private boolean isLoginControllerInProgress(HttpServletRequest request)
+ {
+ String action = request.getRequestURI();
+
+ if (action != null && action.equals("/portal/login"))
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ // Ignoring calls to response.sendRedirect, which are performed from PortalLoginController
+ private class IgnoreRedirectHttpResponse extends HttpServletResponseWrapper
+ {
+
+ public IgnoreRedirectHttpResponse(HttpServletResponse response)
+ {
+ super(response);
+ }
+
+ @Override
+ public void sendRedirect(String location)
+ {
+ }
+
+ }
}
Modified: components/sso/trunk/spnego/pom.xml
===================================================================
--- components/sso/trunk/spnego/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
+++ components/sso/trunk/spnego/pom.xml 2011-11-02 14:28:05 UTC (rev 7936)
@@ -25,6 +25,11 @@
<groupId>org.jboss.security</groupId>
<artifactId>jboss-negotiation-spnego</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-agent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
Modified: components/sso/trunk/spnego/src/main/java/org/gatein/sso/spnego/NegotiationAuthenticator.java
===================================================================
--- components/sso/trunk/spnego/src/main/java/org/gatein/sso/spnego/NegotiationAuthenticator.java 2011-11-02 14:01:37 UTC (rev 7935)
+++ components/sso/trunk/spnego/src/main/java/org/gatein/sso/spnego/NegotiationAuthenticator.java 2011-11-02 14:28:05 UTC (rev 7936)
@@ -26,11 +26,14 @@
import org.apache.catalina.Realm;
import org.apache.catalina.Session;
import org.apache.catalina.authenticator.AuthenticatorBase;
+import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.authenticator.FormAuthenticator;
+import org.apache.catalina.authenticator.SavedRequest;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.deploy.LoginConfig;
import org.apache.log4j.Logger;
+import org.gatein.sso.agent.filter.SPNEGOFilter;
import org.jboss.security.negotiation.MessageFactory;
import org.jboss.security.negotiation.NegotiationException;
import org.jboss.security.negotiation.NegotiationMessage;
@@ -297,6 +300,32 @@
}
}
+ /**
+ * Return the request URI (with the corresponding query string, if any)
+ * from the saved request so that we can redirect to it. We need to override this method
+ * because Constants.FORM_REQUEST_NOTE can be null sometimes (when request was send to /portal/login without displaying login.jsp page)
+ *
+ * @param session Our current session
+ */
+ protected String savedRequestURL(Session session)
+ {
+ String savedURI = super.savedRequestURL(session);
+
+ // use url saved by SPNEGOFilter if saved request not found
+ if (savedURI == null)
+ {
+ savedURI = (String)session.getSession().getAttribute(SPNEGOFilter.ATTR_INITIAL_URI);
+ }
+
+ // using default context if nothing helped
+ if (savedURI == null)
+ {
+ savedURI = session.getSession().getServletContext().getContextPath();
+ }
+
+ return savedURI;
+ }
+
private void initiateNegotiation(final Request request, final HttpServletResponse response, final LoginConfig config)
throws IOException
{
12 years, 6 months
gatein SVN: r7935 - in components/pc/trunk: api and 19 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-11-02 10:01:37 -0400 (Wed, 02 Nov 2011)
New Revision: 7935
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/api/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/bridge/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/controller/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/docs/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/docs/user-guide/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/federation/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/jsr168api/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/management/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -33,7 +33,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portlet Container</name>
@@ -49,9 +49,9 @@
</issueManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.3.0-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.3.0-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.0-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/portal/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/portlet/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/samples/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/core/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-core</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/servers/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-11-02 14:01:22 UTC (rev 7934)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-11-02 14:01:37 UTC (rev 7935)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-GA</version>
+ <version>2.3.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
12 years, 6 months
gatein SVN: r7934 - components/pc/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-11-02 10:01:22 -0400 (Wed, 02 Nov 2011)
New Revision: 7934
Added:
components/pc/tags/2.3.0-GA/
Log:
[maven-release-plugin] copy for tag 2.3.0-GA
12 years, 6 months
gatein SVN: r7933 - in components/pc/trunk: api and 19 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-11-02 10:01:10 -0400 (Wed, 02 Nov 2011)
New Revision: 7933
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
[maven-release-plugin] prepare release 2.3.0-GA
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/api/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/bridge/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/controller/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/docs/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/docs/user-guide/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/federation/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/jsr168api/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/management/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -33,7 +33,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
<packaging>pom</packaging>
<name>GateIn - Portlet Container</name>
@@ -49,9 +49,9 @@
</issueManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.3.0-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.3.0-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.0-GA</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/portal/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/portlet/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/samples/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/core/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-core</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/servers/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-11-02 14:01:10 UTC (rev 7933)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta09-SNAPSHOT</version>
+ <version>2.3.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
12 years, 6 months
gatein SVN: r7932 - in components/pc/trunk/test/core: src/main/resources and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-11-02 09:47:41 -0400 (Wed, 02 Nov 2011)
New Revision: 7932
Modified:
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/core/src/main/resources/common.xml
Log:
GTNPC-74 : Add some random value to the common.xml artifact
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-11-02 13:41:46 UTC (rev 7931)
+++ components/pc/trunk/test/core/pom.xml 2011-11-02 13:47:41 UTC (rev 7932)
@@ -203,9 +203,30 @@
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<pluginManagement>
<plugins>
<plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-resources</id>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>@</delimiter>
+ </delimiters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Modified: components/pc/trunk/test/core/src/main/resources/common.xml
===================================================================
--- components/pc/trunk/test/core/src/main/resources/common.xml 2011-11-02 13:41:46 UTC (rev 7931)
+++ components/pc/trunk/test/core/src/main/resources/common.xml 2011-11-02 13:47:41 UTC (rev 7932)
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<!-- @version@ -->
<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
12 years, 6 months
gatein SVN: r7931 - in epp/portal/branches/EPP_5_2_Branch: web/portal/src/main/webapp/groovy/portal/webui/application and 2 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-11-02 09:41:46 -0400 (Wed, 02 Nov 2011)
New Revision: 7931
Modified:
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
Log:
JBEPP-1331: Problem with gadgets when the host name includes the word "portal"
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2011-11-02 13:05:00 UTC (rev 7930)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/src/main/webapp/groovy/gadget/webui/component/UIGadgetViewMode.gtmpl 2011-11-02 13:41:46 UTC (rev 7931)
@@ -4,7 +4,7 @@
import org.exoplatform.portal.webui.application.GadgetUtil;
import org.exoplatform.webui.application.portlet.PortletRequestContext;
- def hostName = GadgetUtil.getRelGadgetServerUrl();
+ def hostName = GadgetUtil.getGadgetServerUrl();
def rcontext = _ctx.getRequestContext() ;
def windowId = rcontext.getWindowId();
def id = uicomponent.getId() + "-" + windowId ;
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl 2011-11-02 13:05:00 UTC (rev 7930)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/groovy/portal/webui/application/UIGadget.gtmpl 2011-11-02 13:41:46 UTC (rev 7931)
@@ -4,7 +4,7 @@
def rcontext = _ctx.getRequestContext();
JavascriptManager jsmanager = rcontext.getJavascriptManager();
- def hostName = GadgetUtil.getRelGadgetServerUrl();
+ def hostName = GadgetUtil.getGadgetServerUrl();
def url = null;
def metadata = "";
def posX = uicomponent.getProperties().getIntValue("locationX") + "px";
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java 2011-11-02 13:05:00 UTC (rev 7930)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/GadgetUtil.java 2011-11-02 13:41:46 UTC (rev 7931)
@@ -40,6 +40,8 @@
import java.util.Iterator;
import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+
/**
* Created by The eXo Platform SAS Author : Pham Thanh Tung
* thanhtungty(a)gmail.com Oct 2, 2008
@@ -200,84 +202,46 @@
return getLocalHostBase() + "/" + PortalContainer.getCurrentRestContextName() + "/private/" + uri;
}
- // TODO: TanPham:Replace by getGadgetServerUrl to make server url
- // static private String getHostBase() {
- // String hostName = getHostName();
- // URL url = null;
- // try {
- // url = new URL(hostName);
- // } catch (Exception e) {}
- // if(url == null) return hostName ;
- // int index = hostName.indexOf(url.getPath()) ;
- // if(index < 1) return hostName ;
- // return hostName.substring(0, index) ;
- // }
+ /**
+ * Make full URL of gadget server
+ * @return URL String
+ */
public static String getGadgetServerUrl()
{
- String hostName = getHostName();
+ String uriString = getGadgetServerURI();
try
{
- new URL(hostName);
+ new URL(uriString);
}
catch (Exception e)
{
- try
- {
- String newHostName = getLocalHostName() + "/" + hostName;
- new URL(newHostName);
- hostName = newHostName;
- }
- catch (Exception e2)
- {
- }
+ return getLocalHostBase() + (uriString.startsWith("/") ? uriString : ("/" + uriString));
}
- return hostName;
+ return uriString;
}
- // TODO: Using in gtmpl templates
+ /**
+ * See getGadgetServerUrl()
+ * @return URL String
+ */
+ @Deprecated
public static String getRelGadgetServerUrl()
{
- String url = getGadgetServerUrl();
- String localHostBase = getLocalHostBase();
- int index = url.indexOf(localHostBase);
- if (index >= 0)
- return url.substring(index + localHostBase.length());
- return url;
+ return getGadgetServerUrl();
}
- static private String getLocalHostBase()
+ static private String getGadgetServerURI()
{
- String hostName = getLocalHostName();
- URL url = null;
- try
- {
- url = new URL(hostName);
- }
- catch (Exception e)
- {
- }
- if (url == null)
- return hostName;
- int index = hostName.indexOf(url.getPath());
- if (index < 1)
- return hostName;
- return hostName.substring(0, index);
- }
-
- static private String getHostName()
- {
ExoContainer container = ExoContainerContext.getCurrentContainer();
GadgetRegistryService gadgetService =
(GadgetRegistryService)container.getComponentInstanceOfType(GadgetRegistryService.class);
return gadgetService.getHostName();
}
- static private String getLocalHostName()
+ static private String getLocalHostBase()
{
- PortalRequestContext pContext = Util.getPortalRequestContext();
- StringBuffer requestUrl = pContext.getRequest().getRequestURL();
- int index = requestUrl.indexOf(pContext.getRequestContextPath());
- return requestUrl.substring(0, index);
+ HttpServletRequest request = Util.getPortalRequestContext().getRequest();
+ return request.getScheme() + "://" + request.getServerName() + ((request.getServerPort() != 80) ? ":" + request.getServerPort() : "");
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2011-11-02 13:05:00 UTC (rev 7930)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2011-11-02 13:41:46 UTC (rev 7931)
@@ -45,6 +45,8 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import javax.servlet.http.HttpServletRequest;
+
/**
* Created by The eXo Platform SARL
* Author : dang.tung
@@ -75,7 +77,6 @@
UILogin uilogin = uiForm.getParent();
WebuiRequestContext requestContext = event.getRequestContext();
PortalRequestContext portalContext = PortalRequestContext.getCurrentInstance();
- String url = portalContext.getRequest().getRequestURL().toString();
MailService mailSrc = uiForm.getApplicationComponent(MailService.class);
OrganizationService orgSrc = uiForm.getApplicationComponent(OrganizationService.class);
String userName = uiForm.getUIStringInput(Username).getValue();
@@ -141,7 +142,8 @@
{
e.printStackTrace();
}
- String host = url.substring(0, url.indexOf(requestContext.getRequestContextPath()));
+ HttpServletRequest request = portalContext.getRequest();
+ String host = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
String activeLink = host + requestContext.getRequestContextPath() + "/public/" + portalName
+ "?portal:componentId=UIPortal&portal:action=RecoveryPasswordAndUsername&tokenId="
+ tokenId;
12 years, 6 months
gatein SVN: r7930 - epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-11-02 09:05:00 -0400 (Wed, 02 Nov 2011)
New Revision: 7930
Modified:
epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties
Log:
JBEPP-1332: Externalize some JCR Workspace properties
Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-11-02 12:11:01 UTC (rev 7929)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-11-02 13:05:00 UTC (rev 7930)
@@ -37,7 +37,7 @@
gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml
gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml
-gatein.jcr.workspace.default=portal-system
+gatein.jcr.workspace.default=collaboration
gatein.jcr.workspace.system=system
# IDM
12 years, 6 months
gatein SVN: r7929 - epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-11-02 08:11:01 -0400 (Wed, 02 Nov 2011)
New Revision: 7929
Modified:
epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js
Log:
JBEPP-1334: Gadget render error in HTTPS mode
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js 2011-11-02 11:40:58 UTC (rev 7928)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/src/main/webapp/containers/default/container.js 2011-11-02 12:11:01 UTC (rev 7929)
@@ -111,7 +111,7 @@
},
// Default Js Uri config: also must be overridden.
-"gadgets.uri.js.host" : "http://%host%/",
+"gadgets.uri.js.host" : "//%host%/",
"gadgets.uri.js.path" : "/eXoGadgetServer/gadgets/js",
// Default concat Uri config; used for testing.
12 years, 6 months