gatein SVN: r6720 - in epp/portal/branches/EPP_5_2_Branch/component: web/security/src/main/java/org/exoplatform/web/login and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-22 22:24:17 -0400 (Wed, 22 Jun 2011)
New Revision: 6720
Removed:
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/PortalLoginController.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java
Modified:
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
Log:
Merge Revisions 5822 6031
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1822/component:5943
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/trunk/component:4891,5744,5822,5943,6033,6168,6196,6201-6203,6205-6206
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1822/component:5943
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2011-06-23 00:06:57 UTC (rev 6719)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2011-06-23 02:24:17 UTC (rev 6720)
@@ -25,6 +25,7 @@
import org.exoplatform.services.log.Log;
import org.exoplatform.web.security.security.AbstractTokenService;
import org.exoplatform.web.security.security.CookieTokenService;
+import org.gatein.wci.security.WCIController;
import java.io.IOException;
import java.util.Enumeration;
@@ -59,6 +60,8 @@
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
+ WCIController wciController = new GateinWCIController(getServletContext());
+
PortalContainer pContainer = PortalContainer.getInstance();
ServletContext context = pContainer.getPortalContext();
// Unregister the token cookie
@@ -66,7 +69,7 @@
// Clear the token cookie
clearTokenCookie(req, resp);
// This allows the customer to define another login page without changing the portal
- context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp);
+ wciController.showLoginForm(req, resp);
}
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2011-06-23 00:06:57 UTC (rev 6719)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2011-06-23 02:24:17 UTC (rev 6720)
@@ -25,11 +25,10 @@
import org.exoplatform.web.security.security.TicketConfiguration;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
-import org.gatein.wci.authentication.AuthenticationResult;
-import org.gatein.wci.authentication.GenericAuthenticationResult;
-import org.gatein.wci.authentication.ProgrammaticAuthenticationResult;
+import org.gatein.wci.ServletContainer;
import org.gatein.wci.security.Credentials;
import org.gatein.wci.impl.DefaultServletContainerFactory;
+import org.gatein.wci.security.WCIController;
import java.io.IOException;
@@ -37,7 +36,6 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
/**
* Initiate the login dance.
@@ -58,14 +56,18 @@
public static final long LOGIN_VALIDITY =
1000 * TicketConfiguration.getInstance(TicketConfiguration.class).getValidityTime();
+ /** . */
+ private WCIController wciController;
+
+ /** . */
+ private ServletContainer servletContainer = DefaultServletContainerFactory.getInstance().getServletContainer();
+
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
resp.setContentType("text/html; charset=UTF-8");
- HttpSession session = req.getSession();
- // Looking for credentials stored in the session
- Credentials credentials = (Credentials)session.getAttribute(Credentials.CREDENTIALS);
+ Credentials credentials = getWCIController().getCredentials(req, resp);
//
if (credentials == null)
@@ -89,15 +91,14 @@
// This allows the customer to define another login page without
// changing the portal
- showLoginForm(req, resp);
+ getWCIController().showLoginForm(req, resp);
}
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);
- sendAuth(req, resp, credentials.getUsername(), token);
+ getWCIController().sendAuth(req, resp, credentials.getUsername(), token);
}
}
else
@@ -105,75 +106,21 @@
// 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");
- showLoginForm(req, resp);
+ getWCIController().showLoginForm(req, resp);
}
}
else
{
// WCI authentication
- AuthenticationResult result = DefaultServletContainerFactory.getInstance().getServletContainer()
- .login(req, resp, credentials.getUsername(), credentials.getPassword(), LOGIN_VALIDITY);
-
- log.debug("Login initiated with credentials in session, performing authentication");
- if (result instanceof GenericAuthenticationResult)
- {
- ((GenericAuthenticationResult) result).perform(req, resp);
- }
- else if (result instanceof ProgrammaticAuthenticationResult)
- {
- resp.sendRedirect(resp.encodeRedirectURL((String)req.getAttribute("javax.servlet.forward.request_uri")));
- }
+ servletContainer.login(req, resp, credentials, LOGIN_VALIDITY, wciController.getInitialURI(req));
}
}
- private void showLoginForm(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
- {
- /*String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri");
- if (initialURI == null)
- {
- throw new IllegalStateException("request attribute javax.servlet.forward.request_uri should not be null here");
- }*/
- String initialURI = getInitialURI(req);
- try
- {
- String queryString = (String)req.getAttribute("javax.servlet.forward.query_string");
- if ((String)req.getAttribute("javax.servlet.forward.query_string") != null)
- {
- initialURI = initialURI + "?" + queryString;
- }
- //req.setAttribute("org.gatein.portal.login.initial_uri", initialURI);
- //req.getSession(true).setAttribute("org.gatein.portal.login.initial_uri", initialURI);
- req.setAttribute("org.gatein.portal.login.initial_uri", initialURI);
- getServletContext().getRequestDispatcher("/login/jsp/login.jsp").include(req, resp);
- }
- finally
- {
- //req.removeAttribute("org.gatein.portal.login.initial_uri");
- //req.getSession(true).removeAttribute("org.gatein.portal.login.initial_uri");
- req.removeAttribute("org.gatein.portal.login.initial_uri");
- }
- }
-
-
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
doGet(req, resp);
}
- //private void sendAuth(HttpServletResponse resp, String jUsername, String jPassword) throws IOException
- private void sendAuth(HttpServletRequest req, HttpServletResponse resp, String jUsername, String jPassword) throws IOException
- {
- //String url = "j_security_check?j_username=" + jUsername + "&j_password=" + jPassword;
- String initialURI = getInitialURI(req);
- if (!initialURI.endsWith("/"))
- {
- initialURI += "/";
- }
- String url = initialURI + "j_security_check?j_username=" + jUsername + "&j_password=" + jPassword;
- url = resp.encodeRedirectURL(url);
- resp.sendRedirect(url);
- }
-
/**
* Extract the remember me token from the request or returns null.
*
@@ -204,4 +151,11 @@
{
return true;
}
+
+ private WCIController getWCIController() {
+ if (wciController == null) {
+ wciController = new GateinWCIController(getServletContext());
+ }
+ return wciController;
+ }
}
Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/PortalLoginController.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/PortalLoginController.java 2011-06-23 00:06:57 UTC (rev 6719)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/PortalLoginController.java 2011-06-23 02:24:17 UTC (rev 6720)
@@ -1,118 +0,0 @@
-/**
- * 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.exoplatform.container.web.AbstractHttpServlet;
-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;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author <a href="mailto:trong.tran@exoplatform.com">Tran The Trong</a>
- * @version $Revision$
- */
-public class PortalLoginController extends AbstractHttpServlet
-{
-
- /** . */
- 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");
- return;
- }
- if (password == null)
- {
- log.error("Tried to access the portal login controller without password provided");
- resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "No password provided");
- return;
- }
-
- //
- log.debug("Found username and password and set credentials in http session");
- Credentials credentials = new Credentials(username, password);
- req.getSession().setAttribute(InitiateLoginServlet.CREDENTIALS, credentials);
-
- // Obtain initial URI
- String uri = req.getParameter("initialURI");
-
- // otherwise compute one
- 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");
- if ("true".equals(rememberme))
- {
- boolean isRemember = "true".equals(req.getParameter(InitiateLoginServlet.COOKIE_NAME));
- if (isRemember)
- {
- //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());
- resp.addCookie(cookie);
- }
- }
-
- //
- resp.sendRedirect(uri);
- }
-
- protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
- {
- doGet(req, resp);
- }
-
- @Override
- protected boolean requirePortalEnvironment()
- {
- return true;
- }
-}
Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java 2011-06-23 00:06:57 UTC (rev 6719)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java 2011-06-23 02:24:17 UTC (rev 6720)
@@ -1,88 +0,0 @@
-/*
-* Copyright (C) 2003-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.security;
-
-import org.exoplatform.web.login.InitiateLoginServlet;
-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 org.gatein.wci.security.WCILoginController;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
- * @version $Revision$
- */
-public class PortalLoginController extends WCILoginController {
-
- /** . */
- private static final Logger log = LoggerFactory.getLogger(PortalLoginController.class);
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- super.doGet(req, resp);
-
- // Obtain initial URI
- String uri = req.getParameter("initialURI");
-
- // otherwise compute one
- if (uri == null || uri.length() == 0)
- {
- //uri = req.getContextPath() + "/private/classic";
- uri = req.getContextPath();
- log.debug("No initial URI found, will use default " + uri + " instead ");
- }
- else
- {
- log.debug("Found initial URI " + uri);
- //req.getSession(true).setAttribute("org.gatein.portal.login.initial_uri", uri);
- }
-
- // if we do have a remember me
- String rememberme = req.getParameter("rememberme");
- if ("true".equals(rememberme))
- {
- boolean isRemember = "true".equals(req.getParameter(InitiateLoginServlet.COOKIE_NAME));
- if (isRemember)
- {
- //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);
- cookie.setMaxAge((int)tokenService.getValidityTime());
- resp.addCookie(cookie);
- }
- }
-
- //
- resp.sendRedirect(uri);
- }
-}
13 years, 6 months
- 1
- 0
gatein SVN: r6719 - epp/portal/branches/EPP_5_2_Branch/component.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-22 20:06:57 -0400 (Wed, 22 Jun 2011)
New Revision: 6719
Removed:
epp/portal/branches/EPP_5_2_Branch/component/wsrp/
Modified:
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/component/pom.xml
Log:
JBEPP-952 merge r6033
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1822/component:5943
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/trunk/component:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1822/component:5943
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/trunk/component:4891,5744,5822,5943,6033,6168,6196,6201-6203,6205-6206
Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-06-22 23:53:54 UTC (rev 6718)
+++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-06-23 00:06:57 UTC (rev 6719)
@@ -38,7 +38,6 @@
<module>test</module>
<module>common</module>
<module>pc</module>
- <module>wsrp</module>
<module>resources</module>
<module>application-registry</module>
<module>portal</module>
13 years, 6 months
- 1
- 0
gatein SVN: r6718 - in epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web: security and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-22 19:53:54 -0400 (Wed, 22 Jun 2011)
New Revision: 6718
Added:
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/LogoutControl.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TicketConfiguration.java
Log:
JBEPP-952 merge r5822
Added: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/LogoutControl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/LogoutControl.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/LogoutControl.java 2011-06-22 23:53:54 UTC (rev 6718)
@@ -0,0 +1,50 @@
+/*
+* Copyright (C) 2003-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;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class LogoutControl
+{
+ private static final ThreadLocal<Boolean> wantLogout = new ThreadLocal<Boolean>()
+ {
+ @Override
+ protected Boolean initialValue() {
+ return false;
+ }
+ };
+
+ public static void cancelLogout()
+ {
+ wantLogout.set(false);
+ }
+
+ public static void wantLogout()
+ {
+ wantLogout.set(true);
+ }
+
+ public static boolean isLogoutRequired()
+ {
+ return wantLogout.get();
+ }
+}
\ No newline at end of file
Added: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginController.java 2011-06-22 23:53:54 UTC (rev 6718)
@@ -0,0 +1,88 @@
+/*
+* Copyright (C) 2003-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.security;
+
+import org.exoplatform.web.login.InitiateLoginServlet;
+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 org.gatein.wci.security.WCILoginController;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class PortalLoginController extends WCILoginController {
+
+ /** . */
+ private static final Logger log = LoggerFactory.getLogger(PortalLoginController.class);
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ super.doGet(req, resp);
+
+ // Obtain initial URI
+ String uri = req.getParameter("initialURI");
+
+ // otherwise compute one
+ if (uri == null || uri.length() == 0)
+ {
+ //uri = req.getContextPath() + "/private/classic";
+ uri = req.getContextPath();
+ log.debug("No initial URI found, will use default " + uri + " instead ");
+ }
+ else
+ {
+ log.debug("Found initial URI " + uri);
+ //req.getSession(true).setAttribute("org.gatein.portal.login.initial_uri", uri);
+ }
+
+ // if we do have a remember me
+ String rememberme = req.getParameter("rememberme");
+ if ("true".equals(rememberme))
+ {
+ boolean isRemember = "true".equals(req.getParameter(InitiateLoginServlet.COOKIE_NAME));
+ if (isRemember)
+ {
+ //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);
+ cookie.setMaxAge((int)tokenService.getValidityTime());
+ resp.addCookie(cookie);
+ }
+ }
+
+ //
+ resp.sendRedirect(uri);
+ }
+}
Added: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TicketConfiguration.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TicketConfiguration.java (rev 0)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TicketConfiguration.java 2011-06-22 23:53:54 UTC (rev 6718)
@@ -0,0 +1,76 @@
+/*
+* Copyright (C) 2003-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.security.security;
+
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
+
+/**
+ * This class is only used to get validity form configuration.
+ *
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class TicketConfiguration extends AbstractTokenService<GateInToken, String>
+{
+
+ public TicketConfiguration(InitParams initParams)
+ {
+ super(initParams);
+ }
+
+ @Override
+ public GateInToken getToken(String id)
+ {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public GateInToken deleteToken(String id)
+ {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public String[] getAllTokens()
+ {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ protected String decodeKey(String stringKey)
+ {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public long size() throws Exception
+ {
+ throw new NotImplementedException();
+ }
+
+ public String createToken(Credentials credentials) throws IllegalArgumentException, NullPointerException
+ {
+ throw new NotImplementedException();
+ }
+}
13 years, 6 months
- 1
- 0
gatein SVN: r6717 - in epp/portal/branches/EPP_5_2_Branch: component/web/security and 9 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-06-22 19:50:33 -0400 (Wed, 22 Jun 2011)
New Revision: 6717
Removed:
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/Credentials.java
Modified:
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/RememberMeFilter.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/GateInToken.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/Token.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/TokenStore.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractTokenService.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenEntry.java
epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TransientTokenService.java
epp/portal/branches/EPP_5_2_Branch/examples/
epp/portal/branches/EPP_5_2_Branch/examples/extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
epp/portal/branches/EPP_5_2_Branch/examples/portal/README.txt
epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
Log:
JBEPP-952 merge r5822
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Added: svn:mergeinfo
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1822/component:5943
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/trunk/component:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-06-22 23:50:33 UTC (rev 6717)
@@ -63,5 +63,9 @@
<artifactId>jboss-as-tomcat</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-wci</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -25,9 +25,9 @@
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.web.AbstractFilter;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.PortalLoginModule;
+import org.gatein.wci.security.Credentials;
import org.jboss.web.tomcat.security.login.WebAuthentication;
import javax.servlet.FilterChain;
@@ -77,4 +77,4 @@
public void destroy()
{
}
-}
+}
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -19,18 +19,20 @@
package org.exoplatform.web.login;
-import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.web.AbstractHttpServlet;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.security.AbstractTokenService;
import org.exoplatform.web.security.security.CookieTokenService;
-import org.exoplatform.web.security.security.TransientTokenService;
+import org.exoplatform.web.security.security.TicketConfiguration;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
+import org.gatein.wci.authentication.AuthenticationResult;
+import org.gatein.wci.authentication.GenericAuthenticationResult;
+import org.gatein.wci.authentication.ProgrammaticAuthenticationResult;
+import org.gatein.wci.security.Credentials;
+import org.gatein.wci.impl.DefaultServletContainerFactory;
import java.io.IOException;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -53,7 +55,8 @@
public static final String COOKIE_NAME = "rememberme";
/** . */
- public static final String CREDENTIALS = "credentials";
+ public static final long LOGIN_VALIDITY =
+ 1000 * TicketConfiguration.getInstance(TicketConfiguration.class).getValidityTime();
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -62,14 +65,11 @@
HttpSession session = req.getSession();
// Looking for credentials stored in the session
- Credentials credentials = (Credentials)session.getAttribute(InitiateLoginServlet.CREDENTIALS);
+ Credentials credentials = (Credentials)session.getAttribute(Credentials.CREDENTIALS);
//
if (credentials == null)
{
- PortalContainer pContainer = PortalContainer.getInstance();
- ServletContext context = pContainer.getPortalContext();
-
//
String token = getRememberMeTokenCookie(req);
if (token != null)
@@ -96,7 +96,8 @@
// 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);
+ //sendAuth(resp, credentials.getUsername(), token);
+ sendAuth(req, resp, credentials.getUsername(), token);
}
}
else
@@ -109,24 +110,30 @@
}
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);
+ // WCI authentication
+ AuthenticationResult result = DefaultServletContainerFactory.getInstance().getServletContainer()
+ .login(req, resp, credentials.getUsername(), credentials.getPassword(), LOGIN_VALIDITY);
- // Send authentication request
log.debug("Login initiated with credentials in session, performing authentication");
- sendAuth(resp, credentials.getUsername(), token);
+ if (result instanceof GenericAuthenticationResult)
+ {
+ ((GenericAuthenticationResult) result).perform(req, resp);
+ }
+ else if (result instanceof ProgrammaticAuthenticationResult)
+ {
+ resp.sendRedirect(resp.encodeRedirectURL((String)req.getAttribute("javax.servlet.forward.request_uri")));
+ }
}
}
private void showLoginForm(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
- String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri");
+ /*String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri");
if (initialURI == null)
{
throw new IllegalStateException("request attribute javax.servlet.forward.request_uri should not be null here");
- }
+ }*/
+ String initialURI = getInitialURI(req);
try
{
String queryString = (String)req.getAttribute("javax.servlet.forward.query_string");
@@ -134,23 +141,35 @@
{
initialURI = initialURI + "?" + queryString;
}
+ //req.setAttribute("org.gatein.portal.login.initial_uri", initialURI);
+ //req.getSession(true).setAttribute("org.gatein.portal.login.initial_uri", initialURI);
req.setAttribute("org.gatein.portal.login.initial_uri", initialURI);
getServletContext().getRequestDispatcher("/login/jsp/login.jsp").include(req, resp);
}
finally
{
+ //req.removeAttribute("org.gatein.portal.login.initial_uri");
+ //req.getSession(true).removeAttribute("org.gatein.portal.login.initial_uri");
req.removeAttribute("org.gatein.portal.login.initial_uri");
}
}
+
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
doGet(req, resp);
}
- private void sendAuth(HttpServletResponse resp, String jUsername, String jPassword) throws IOException
+ //private void sendAuth(HttpServletResponse resp, String jUsername, String jPassword) throws IOException
+ private void sendAuth(HttpServletRequest req, HttpServletResponse resp, String jUsername, String jPassword) throws IOException
{
- String url = "j_security_check?j_username=" + jUsername + "&j_password=" + jPassword;
+ //String url = "j_security_check?j_username=" + jUsername + "&j_password=" + jPassword;
+ String initialURI = getInitialURI(req);
+ if (!initialURI.endsWith("/"))
+ {
+ initialURI += "/";
+ }
+ String url = initialURI + "j_security_check?j_username=" + jUsername + "&j_password=" + jPassword;
url = resp.encodeRedirectURL(url);
resp.sendRedirect(url);
}
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/RememberMeFilter.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/RememberMeFilter.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/login/RememberMeFilter.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -19,9 +19,13 @@
package org.exoplatform.web.login;
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.web.AbstractFilter;
+import org.exoplatform.web.security.security.CookieTokenService;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.text.FastURLEncoder;
+import org.gatein.wci.security.Credentials;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
@@ -36,18 +40,14 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class RememberMeFilter implements Filter
+public class RememberMeFilter extends AbstractFilter
{
/** . */
private static final FastURLEncoder CONVERTER = FastURLEncoder.getUTF8Instance();
/** . */
private static final Logger log = LoggerFactory.getLogger(RememberMeFilter.class);
-
- 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);
@@ -60,39 +60,67 @@
String token = InitiateLoginServlet.getRememberMeTokenCookie(req);
if (token != null)
{
- StringBuilder builder = new StringBuilder();
- builder.append(req.getContextPath());
- builder.append("/private");
- String pathInfo = req.getPathInfo();
- if (pathInfo != null)
+
+ ExoContainer container = getContainer();
+ Object o =
+ ((CookieTokenService)container.getComponentInstanceOfType(CookieTokenService.class)).validateToken(
+ token, false);
+ if (o instanceof Credentials)
{
- builder.append(pathInfo);
+ req.getSession().setAttribute(Credentials.CREDENTIALS, o);
+ resp.sendRedirect(resp.encodeRedirectURL(
+ loginUrl(
+ req.getContextPath(),
+ privateUri(req)
+ )
+ ));
+ resp.flushBuffer();
}
- 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();
- log.debug("Redirecting unauthenticated request with token " + token + " to URL " + s);
- resp.sendRedirect(s);
- return;
}
}
//
- chain.doFilter(req, resp);
+ if (!resp.isCommitted())
+ {
+ chain.doFilter(req, resp);
+ }
}
public void destroy()
{
}
+
+ private String privateUri(HttpServletRequest req)
+ {
+ 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));
+ }
+ }
+ return builder.toString();
+ }
+
+ private String loginUrl(String context, String initUrl)
+ {
+ return String.format(
+ "%s/login?initialURI=%s",
+ context, initUrl
+ );
+ }
}
Deleted: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/Credentials.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/Credentials.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/Credentials.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -1,81 +0,0 @@
-/**
- * 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.security;
-
-import java.io.Serializable;
-
-/**
- * An immutable object that contains a username and a password.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class Credentials implements Serializable
-{
-
-
-
- /** . */
- private final String username;
-
- /** . */
- private final String password;
-
- /**
- * Construct a new instance.
- *
- * @param username the username value
- * @param password the password value
- * @throws NullPointerException if any argument is null
- */
- public Credentials(String username, String password) throws NullPointerException
- {
- if (username == null)
- {
- throw new NullPointerException("Username is null");
- }
- if (password == null)
- {
- throw new NullPointerException("Password is null");
- }
- this.username = username;
- this.password = password;
- }
-
- /**
- * Returns the username.
- *
- * @return the username
- */
- public String getUsername()
- {
- return username;
- }
-
- /**
- * Returns the password.
- *
- * @return the password
- */
- public String getPassword()
- {
- return password;
- }
-}
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/GateInToken.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/GateInToken.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/GateInToken.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -19,7 +19,9 @@
package org.exoplatform.web.security;
+import org.gatein.wci.security.Credentials;
+
/**
* Created by The eXo Platform SAS
* Author : Tan Pham Dinh
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -24,8 +24,7 @@
import org.exoplatform.services.log.Log;
import org.exoplatform.services.security.jaas.AbstractLoginModule;
import org.exoplatform.web.login.InitiateLoginServlet;
-import org.exoplatform.web.security.security.CookieTokenService;
-import org.exoplatform.web.security.security.TransientTokenService;
+import org.gatein.wci.security.Credentials;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.NameCallback;
@@ -99,25 +98,23 @@
callbackHandler.handle(callbacks);
String password = new String(((PasswordCallback)callbacks[1]).getPassword());
- ExoContainer container = getContainer();
- Object o =
- ((TransientTokenService)container.getComponentInstanceOfType(TransientTokenService.class)).validateToken(
- password, true);
- if (o == null)
- o =
- ((CookieTokenService)container.getComponentInstanceOfType(CookieTokenService.class)).validateToken(
- password, false);
+ Credentials c = null;
+
//
-
// For clustered config check credentials stored and propagated in session. This won't work in tomcat because
// of lack of JACC PolicyContext so the code must be a bit defensive
- if (o == null && getContextMethod != null && password.startsWith(InitiateLoginServlet.COOKIE_NAME))
+ if (getContextMethod != null && password.startsWith(InitiateLoginServlet.COOKIE_NAME))
{
HttpServletRequest request;
try
{
request = (HttpServletRequest)getContextMethod.invoke(null, "javax.servlet.http.HttpServletRequest");
- o = request.getSession().getAttribute(AUTHENTICATED_CREDENTIALS);
+ Object o = request.getSession().getAttribute(AUTHENTICATED_CREDENTIALS);
+
+ if (o instanceof Credentials)
+ {
+ c = (Credentials) o;
+ }
}
catch(Throwable e)
{
@@ -125,16 +122,12 @@
log.error("LoginModule error. Turn off session credentials checking with proper configuration option of " +
"LoginModule set to false");
}
-
}
- if (o instanceof Credentials)
+ if (c != null)
{
- Credentials wc = (Credentials)o;
-
- // Set shared state
- sharedState.put("javax.security.auth.login.name", wc.getUsername());
- sharedState.put("javax.security.auth.login.password", wc.getPassword());
+ sharedState.put("javax.security.auth.login.name", c.getUsername());
+ sharedState.put("javax.security.auth.login.password", c.getPassword());
}
return true;
}
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/Token.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/Token.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/Token.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -18,6 +18,8 @@
*/
package org.exoplatform.web.security;
+import org.gatein.wci.security.Credentials;
+
/**
* A token.
*/
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/TokenStore.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/TokenStore.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/TokenStore.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -19,6 +19,8 @@
package org.exoplatform.web.security;
+import org.gatein.wci.security.Credentials;
+
/**
* The token store is a place where temporary tokens are held.
*
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractTokenService.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractTokenService.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractTokenService.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -25,9 +25,9 @@
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
import org.exoplatform.web.login.InitiateLoginServlet;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.Token;
import org.exoplatform.web.security.TokenStore;
+import org.gatein.wci.security.Credentials;
import org.picocontainer.Startable;
import java.util.List;
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -26,8 +26,8 @@
import org.exoplatform.commons.chromattic.SessionContext;
import org.exoplatform.container.component.ComponentPlugin;
import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
import java.util.Collection;
import java.util.Date;
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -21,8 +21,8 @@
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
import java.util.Collection;
import java.util.Date;
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenEntry.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -22,8 +22,8 @@
import org.chromattic.api.annotations.Name;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
import java.util.Date;
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TransientTokenService.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TransientTokenService.java 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/src/main/java/org/exoplatform/web/security/security/TransientTokenService.java 2011-06-22 23:50:33 UTC (rev 6717)
@@ -20,8 +20,8 @@
package org.exoplatform.web.security.security;
import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
import java.util.concurrent.ConcurrentHashMap;
Property changes on: epp/portal/branches/EPP_5_2_Branch/examples
___________________________________________________________________
Added: svn:mergeinfo
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/examples:5868
/portal/branches/branch-GTNPORTAL-1592/examples:4894
/portal/branches/branch-GTNPORTAL-1643/examples:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/examples:5348,5402,5445
/portal/branches/branch-GTNPORTAL-1731/examples:5668
/portal/branches/branch-GTNPORTAL-1745/examples:5765
/portal/branches/branch-GTNPORTAL-1822/examples:5943
/portal/branches/branch-GTNPORTAL-1832/examples:6030,6063
/portal/trunk/examples:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2011-06-22 23:50:33 UTC (rev 6717)
@@ -1,3 +1,6 @@
+<%
+ String initialURI = _ctx.getRequestContext().getParentAppRequestContext().getRequestContextPath() + "/private/" + _ctx.getRequestContext().getParentAppRequestContext().getPortalOwner();
+%>
<div class="UIHomePagePortlet" id="$uicomponent.id">
<div class="TRContainer">
<div class="PortletDecoration">
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/README.txt
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/README.txt 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/README.txt 2011-06-22 23:50:33 UTC (rev 6717)
@@ -37,6 +37,65 @@
the load order is first the gatein.ear then the sample-portal.ear and finally the starter.ear
########################################
+# On Tomcat (tested on Tomcat 6.0.20)
+########################################
+
+We assume that you have a clean Tomcat version of GateIn: ie We assume that you have already all the jar files of GateIn and their dependencies
+into tomcat/lib and you have the related relam name "gatein-domain" defined in the file tomcat/conf/jaas.conf
+
+1. Add the file sample-portal.war from sample/portal/war/target/ to the tomcat/webapps directory
+2. Add the file rest-sample-portal.war from sample/portal/rest-war/target/ to the tomcat/webapps directory
+3. Add the folder starter from starter/war/target/ to the tomcat/webapps directory
+4. Rename the directory (unzipped folder) starter to "starter.war" (for more details see the warning below)
+5. Add the jar file exo.portal.sample.portal.config-X.Y.Z.jar from sample/portal/config/target/ to the tomcat/lib directory
+6. Add the jar file exo.portal.sample.portal.jar-X.Y.Z.jar from sample/portal/jar/target/ to the tomcat/lib directory
+7. Define the related realm in your file tomcat/conf/jaas.conf, as below:
+
+gatein-domain-sample-portal {
+ org.gatein.wci.security.WCILoginModule optional
+ portalContainerName="sample-portal"
+ realmName="gatein-domain-sample-portal";
+ org.exoplatform.web.security.PortalLoginModule required
+ portalContainerName="sample-portal"
+ realmName="gatein-domain-sample-portal";
+ org.exoplatform.services.security.jaas.SharedStateLoginModule required
+ portalContainerName="sample-portal"
+ realmName="gatein-domain-sample-portal";
+ org.exoplatform.services.security.j2ee.TomcatLoginModule required
+ portalContainerName="sample-portal"
+ realmName="gatein-domain-sample-portal";
+};
+8. Define the context of sample-portal by creating a file called "sample-portal.xml" in tomcat/conf/Catalina/localhost/ with the following content
+
+<Context path='/sample-portal' docBase='sample-portal' debug='0' reloadable='true' crossContext='true' privileged='true'>
+ <Logger className='org.apache.catalina.logger.SystemOutLogger'
+ prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/>
+ <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/>
+ <Realm className='org.apache.catalina.realm.JAASRealm'
+ appName='gatein-domain-sample-portal'
+ userClassNames='org.exoplatform.services.security.jaas.UserPrincipal'
+ roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal'
+ debug='0' cache='false'/>
+ <Valve className='org.apache.catalina.authenticator.FormAuthenticator' characterEncoding='UTF-8'/></Context>
+
+9. Define the context of rest-sample-portal by creating a file called "rest-sample-portal.xml" in tomcat/conf/Catalina/localhost/ with the following content
+
+<Context path="/rest-sample-portal" docBase="rest-sample-portal" reloadable="true" crossContext="false">
+
+ <Logger className='org.apache.catalina.logger.SystemOutLogger'
+ prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/>
+ <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/>
+ <Realm className='org.apache.catalina.realm.JAASRealm'
+ appName='gatein-domain-sample-portal'
+ userClassNames="org.exoplatform.services.security.jaas.UserPrincipal"
+ roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal"
+ debug='0' cache='false'/>
+</Context>
+
+WARNING: This can only work if the starter.war is the last war file to be loaded, so don't hesitate to rename it if your war files are loaded
+following to the alphabetic order
+
+########################################
# HOW TO TEST
########################################
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml 2011-06-22 23:50:33 UTC (rev 6717)
@@ -2,6 +2,10 @@
<application-policy xmlns="urn:jboss:security-beans:1.0" name="gatein-domain-sample-portal">
<authentication>
+ <login-module code="org.gatein.wci.security.WCILoginModule" flag="optional">
+ <module-option name="portalContainerName">sample-portal</module-option>
+ <module-option name="realmName">gatein-domain-sample-portal</module-option>
+ </login-module>
<login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required">
<module-option name="portalContainerName">sample-portal</module-option>
<module-option name="realmName">gatein-domain-sample-portal</module-option>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-06-22 23:50:33 UTC (rev 6717)
@@ -178,7 +178,7 @@
<servlet>
<servlet-name>PortalLoginController</servlet-name>
- <servlet-class>org.exoplatform.web.login.PortalLoginController</servlet-class>
+ <servlet-class>org.exoplatform.web.security.PortalLoginController</servlet-class>
</servlet>
<servlet>
<servlet-name>InitiateLoginServlet</servlet-name>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2011-06-22 20:22:21 UTC (rev 6716)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2011-06-22 23:50:33 UTC (rev 6717)
@@ -1,3 +1,6 @@
+<%
+ String initialURI = _ctx.getRequestContext().getParentAppRequestContext().getRequestContextPath() + "/private/" + _ctx.getRequestContext().getParentAppRequestContext().getPortalOwner();
+%>
<div class="UIHomePagePortlet" id="$uicomponent.id">
<div class="TRContainer">
<div class="PortletDecoration">
13 years, 6 months
- 1
- 0
gatein SVN: r6716 - components/wci/trunk/test/servers/jetty6.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-06-22 16:22:21 -0400 (Wed, 22 Jun 2011)
New Revision: 6716
Modified:
components/wci/trunk/test/servers/jetty6/pom.xml
Log:
-uncomment jetty tests
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 17:30:12 UTC (rev 6715)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 20:22:21 UTC (rev 6716)
@@ -278,134 +278,134 @@
</execution>
</executions>
</plugin>
- <!--<plugin>-->
- <!--<artifactId>maven-antrun-plugin</artifactId>-->
- <!--<dependencies>-->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
- <!--<dependency>-->
- <!--<groupId>org.jboss.unit</groupId>-->
- <!--<artifactId>jboss-unit-tooling-ant</artifactId>-->
- <!--<version>${version.jboss.unit}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.jboss.unit</groupId>-->
- <!--<artifactId>jboss-unit</artifactId>-->
- <!--<version>${version.jboss.unit}</version>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-ant</artifactId>
+ <version>${version.jboss.unit}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit</artifactId>
+ <version>${version.jboss.unit}</version>
+ </dependency>
- <!--<dependency>-->
- <!--<groupId>org.codehaus.cargo</groupId>-->
- <!--<artifactId>cargo-ant</artifactId>-->
- <!--<version>${version.cargo}</version>-->
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<groupId>ant</groupId>-->
- <!--<artifactId>ant</artifactId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.jdom</groupId>-->
- <!--<artifactId>jdom</artifactId>-->
- <!--<version>1.1</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>dom4j</groupId>-->
- <!--<artifactId>dom4j</artifactId>-->
- <!--<version>1.6.1</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>jaxen</groupId>-->
- <!--<artifactId>jaxen</artifactId>-->
- <!--<version>1.1.1</version>-->
- <!--</dependency>-->
- <!--</dependencies>-->
- <!--<version>1.3</version>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>integration-testing</id>-->
- <!--<phase>integration-test</phase>-->
- <!--<configuration>-->
- <!--<tasks>-->
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>${version.cargo}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>integration-testing</id>
+ <phase>integration-test</phase>
+ <configuration>
+ <tasks>
- <!--<!– properties to pass to the build.xml –>-->
- <!--<property name="project.build.directory" value="${project.build.directory}" />-->
- <!--<property name="plugin_classpath" refid="maven.plugin.classpath" />-->
- <!--<property name="test_classpath" refid="maven.test.classpath" />-->
+ <!-- properties to pass to the build.xml -->
+ <property name="project.build.directory" value="${project.build.directory}" />
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <property name="test_classpath" refid="maven.test.classpath" />
- <!--<!– hack here allows for profiles to effect tasks in the build.xml –>-->
- <!--<!– this should be removed when the antrun plugin properly handles properties –>-->
- <!--<condition property="test.generic.enable">-->
- <!--<istrue value="${test.generic}" />-->
- <!--</condition>-->
- <!--<condition property="test.native.enable">-->
- <!--<istrue value="${test.native}" />-->
- <!--</condition>-->
- <!--<condition property="test.exo.enable">-->
- <!--<istrue value="${test.exo}" />-->
- <!--</condition>-->
- <!--<condition property="test.endpoint.enable">-->
- <!--<istrue value="${test.endpoint}" />-->
- <!--</condition>-->
- <!--<condition property="cargo.debug" value="${test.cargo.debug}">-->
- <!--<isset property="test.cargo.debug" />-->
- <!--</condition>-->
- <!--<condition property="cargo.debug" value="">-->
- <!--<not>-->
- <!--<isset property="test.cargo.debug" />-->
- <!--</not>-->
- <!--</condition>-->
- <!--<!– end profiles hack –>-->
+ <!-- hack here allows for profiles to effect tasks in the build.xml -->
+ <!-- this should be removed when the antrun plugin properly handles properties -->
+ <condition property="test.generic.enable">
+ <istrue value="${test.generic}" />
+ </condition>
+ <condition property="test.native.enable">
+ <istrue value="${test.native}" />
+ </condition>
+ <condition property="test.exo.enable">
+ <istrue value="${test.exo}" />
+ </condition>
+ <condition property="test.endpoint.enable">
+ <istrue value="${test.endpoint}" />
+ </condition>
+ <condition property="cargo.debug" value="${test.cargo.debug}">
+ <isset property="test.cargo.debug" />
+ </condition>
+ <condition property="cargo.debug" value="">
+ <not>
+ <isset property="test.cargo.debug" />
+ </not>
+ </condition>
+ <!-- end profiles hack -->
- <!--<!– server dependencies –>-->
- <!--<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" />-->
- <!--<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" />-->
- <!--<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" />-->
- <!--<property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" />-->
- <!--<property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" />-->
- <!--<property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" />-->
- <!--<property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" />-->
- <!--<property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />-->
- <!--<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />-->
- <!--<property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />-->
- <!--<property name="dependency.gatein-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}" />-->
- <!--<property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" />-->
- <!--<property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" />-->
- <!--<property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" />-->
+ <!-- server dependencies -->
+ <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" />
+ <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" />
+ <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" />
+ <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" />
+ <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" />
+ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" />
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" />
+ <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />
+ <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />
+ <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />
+ <property name="dependency.gatein-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}" />
+ <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" />
+ <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" />
+ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" />
- <!--<!– locations of archives to use –>-->
- <!--<property name="test.archives.directory" value="${project.build.directory}/test-archives" />-->
- <!--<property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" />-->
- <!--<property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" />-->
- <!--<property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" />-->
+ <!-- locations of archives to use -->
+ <property name="test.archives.directory" value="${project.build.directory}/test-archives" />
+ <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war" />
+ <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war" />
+ <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war" />
- <!--<property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" />-->
- <!--<property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" />-->
- <!--<property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" />-->
+ <property name="test.endpoint.default.server.mapping.server.war" value="${test.archives.directory}/test-endpoint-default-servlet-mapping.war" />
+ <property name="test.endpoint.root.mapping.server.war" value="${test.archives.directory}/test-endpoint-root-path-mapping.war" />
+ <property name="test.endpoint.path.mapping.server.war" value="${test.archives.directory}/test-endpoint-path-mapping.war" />
- <!--<property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />-->
- <!--<property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />-->
- <!--<property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />-->
+ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" />
+ <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" />
+ <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />
- <!--<!– location of common.xml shared between the different server's build.xml –>-->
- <!--<property name="common.xml.file" value="${test.common.xml}" />-->
- <!--<!– –>-->
+ <!-- location of common.xml shared between the different server's build.xml -->
+ <property name="common.xml.file" value="${test.common.xml}" />
+ <!-- -->
- <!--<!– Cargo Jetty deployer –>-->
- <!--<property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-6-and-earlier-deployer.war.path}" />-->
+ <!-- Cargo Jetty deployer -->
+ <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-6-and-earlier-deployer.war.path}" />
- <!--<ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true">-->
- <!--<target name="tests" />-->
- <!--</ant>-->
- <!--</tasks>-->
- <!--</configuration>-->
- <!--<goals>-->
- <!--<goal>run</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
+ <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true">
+ <target name="tests" />
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<properties>
13 years, 6 months
- 1
- 0
gatein SVN: r6715 - in portal/trunk: packaging and 1 other directory.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-06-22 13:30:12 -0400 (Wed, 22 Jun 2011)
New Revision: 6715
Modified:
portal/trunk/packaging/pom.xml
portal/trunk/pom.xml
Log:
- update to WCI 2.1.0-Beta04
Modified: portal/trunk/packaging/pom.xml
===================================================================
--- portal/trunk/packaging/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
+++ portal/trunk/packaging/pom.xml 2011-06-22 17:30:12 UTC (rev 6715)
@@ -47,7 +47,7 @@
<module>jboss-as6</module>
</modules>
</profile>
- <!--<profile>
+ <profile>
<id>release</id>
<modules>
<module>tomcat</module>
@@ -55,7 +55,7 @@
<module>jboss-as5</module>
<module>jboss-as6</module>
</modules>
- </profile>-->
+ </profile>
<profile>
<id>pkg-tomcat</id>
<modules>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
+++ portal/trunk/pom.xml 2011-06-22 17:30:12 UTC (rev 6715)
@@ -44,7 +44,7 @@
<org.shindig.version>1.0-r790473-Patch06</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version>
- <org.gatein.wci.version>2.1.0-Beta03</org.gatein.wci.version>
+ <org.gatein.wci.version>2.1.0-Beta04</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta04</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version>
13 years, 6 months
- 1
- 0
gatein SVN: r6714 - in components/wci/trunk: exo and 19 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-06-22 12:32:08 -0400 (Wed, 22 Jun 2011)
New Revision: 6714
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jboss/jboss6/pom.xml
components/wci/trunk/jboss/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/portlets/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/jboss6/pom.xml
components/wci/trunk/test/servers/jetty6/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/test/servers/tomcat7/pom.xml
components/wci/trunk/tomcat/pom.xml
components/wci/trunk/tomcat/tomcat6/pom.xml
components/wci/trunk/tomcat/tomcat7/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/exo/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jboss/jboss6/pom.xml
===================================================================
--- components/wci/trunk/jboss/jboss6/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/jboss/jboss6/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 6 compatibility component</name>
Modified: components/wci/trunk/jboss/pom.xml
===================================================================
--- components/wci/trunk/jboss/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/jboss/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/jetty/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.1.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.1.0-Beta04</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.0-Beta04</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/core/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Gatein Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Native Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/portlets/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-portlets</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: components/wci/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/servers/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: components/wci/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: components/wci/trunk/tomcat/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/tomcat/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: components/wci/trunk/tomcat/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 6 compatibility component</name>
Modified: components/wci/trunk/tomcat/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 7 compatibility component</name>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2011-06-22 16:30:39 UTC (rev 6713)
+++ components/wci/trunk/wci/pom.xml 2011-06-22 16:32:08 UTC (rev 6714)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04</version>
+ <version>2.1.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
13 years, 6 months
- 1
- 0
gatein SVN: r6713 - components/wci/tags.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-06-22 12:30:39 -0400 (Wed, 22 Jun 2011)
New Revision: 6713
Added:
components/wci/tags/2.1.0-Beta04/
Log:
[maven-release-plugin] copy for tag 2.1.0-Beta04
13 years, 6 months
- 1
- 0
gatein SVN: r6712 - in components/wci/trunk: exo and 19 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-06-22 12:29:39 -0400 (Wed, 22 Jun 2011)
New Revision: 6712
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jboss/jboss6/pom.xml
components/wci/trunk/jboss/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/portlets/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/jboss6/pom.xml
components/wci/trunk/test/servers/jetty6/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/test/servers/tomcat7/pom.xml
components/wci/trunk/tomcat/pom.xml
components/wci/trunk/tomcat/tomcat6/pom.xml
components/wci/trunk/tomcat/tomcat7/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare release 2.1.0-Beta04
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/exo/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jboss/jboss6/pom.xml
===================================================================
--- components/wci/trunk/jboss/jboss6/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/jboss/jboss6/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -1,13 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 6 compatibility component</name>
Modified: components/wci/trunk/jboss/pom.xml
===================================================================
--- components/wci/trunk/jboss/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/jboss/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -1,9 +1,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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/jetty/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.1.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.1.0-Beta04</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.0-Beta04</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/core/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
<packaging>war</packaging>
<name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
<packaging>war</packaging>
<name>GateIn - WCI Gatein Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,11 +2,11 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
<packaging>war</packaging>
<name>GateIn - WCI Native Test Portlet</name>
</project>
Modified: components/wci/trunk/test/portlets/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/portlets/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -1,9 +1,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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-portlets</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: components/wci/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss6/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
Modified: components/wci/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/servers/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: components/wci/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: components/wci/trunk/tomcat/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/tomcat/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -1,9 +1,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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: components/wci/trunk/tomcat/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -1,13 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 6 compatibility component</name>
Modified: components/wci/trunk/tomcat/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -1,13 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 7 compatibility component</name>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
+++ components/wci/trunk/wci/pom.xml 2011-06-22 16:29:39 UTC (rev 6712)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta04-SNAPSHOT</version>
+ <version>2.1.0-Beta04</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
13 years, 6 months
- 1
- 0
gatein SVN: r6711 - portal/trunk/packaging.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-06-22 12:17:47 -0400 (Wed, 22 Jun 2011)
New Revision: 6711
Modified:
portal/trunk/packaging/pom.xml
Log:
- fix accidental commit
Modified: portal/trunk/packaging/pom.xml
===================================================================
--- portal/trunk/packaging/pom.xml 2011-06-22 16:13:21 UTC (rev 6710)
+++ portal/trunk/packaging/pom.xml 2011-06-22 16:17:47 UTC (rev 6711)
@@ -47,7 +47,7 @@
<module>jboss-as6</module>
</modules>
</profile>
- <profile>
+ <!--<profile>
<id>release</id>
<modules>
<module>tomcat</module>
@@ -55,7 +55,7 @@
<module>jboss-as5</module>
<module>jboss-as6</module>
</modules>
- </profile>
+ </profile>-->
<profile>
<id>pkg-tomcat</id>
<modules>
13 years, 6 months
- 1
- 0