gatein SVN: r6159 - components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 17:45:04 -0400 (Thu, 31 Mar 2011)
New Revision: 6159
Modified:
components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java
Log:
Remove outdated assert for SPIAuthenticationTestCase
Modified: components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java
===================================================================
--- components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java 2011-03-31 21:17:05 UTC (rev 6158)
+++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java 2011-03-31 21:45:04 UTC (rev 6159)
@@ -139,7 +139,6 @@
else
{
// Test logout
- assertNotNull(req.getSession(false));
assertEquals("login", v.value);
container.logout(req, resp);
assertNull(req.getSession(false));
13 years, 9 months
- 1
- 0
gatein SVN: r6158 - portal/trunk.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 17:17:05 -0400 (Thu, 31 Mar 2011)
New Revision: 6158
Modified:
portal/trunk/pom.xml
Log:
GTNPORTAL-1845: remove PortalLoginModule, the credentials are being added to the servlet session in the wci module now.
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-03-31 21:02:39 UTC (rev 6157)
+++ portal/trunk/pom.xml 2011-03-31 21:17:05 UTC (rev 6158)
@@ -45,7 +45,7 @@
<org.shindig.version>1.0-r790473-Patch05</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
- <org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version>
+ <org.gatein.wci.version>2.1.0-Beta02</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta01</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta01</org.gatein.wsrp.version>
13 years, 9 months
- 1
- 0
gatein SVN: r6157 - in portal/trunk: component/web/security/src/main/java/org/exoplatform/web/security and 8 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 17:02:39 -0400 (Thu, 31 Mar 2011)
New Revision: 6157
Removed:
portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java
Modified:
portal/trunk/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java
portal/trunk/examples/portal/README.txt
portal/trunk/examples/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml
portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf
portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf
portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java
Log:
GTNPORTAL-1845: remove PortalLoginModule, the credentials are being added to the servlet session in the wci module now.
Modified: portal/trunk/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java
===================================================================
--- portal/trunk/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java 2011-03-31 21:02:39 UTC (rev 6157)
@@ -25,7 +25,6 @@
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.web.AbstractFilter;
-import org.exoplatform.web.security.PortalLoginModule;
import org.gatein.wci.security.Credentials;
import org.jboss.web.tomcat.security.login.WebAuthentication;
@@ -49,8 +48,8 @@
{
HttpServletRequest httpRequest = (HttpServletRequest)request;
- Credentials credentials = (Credentials)httpRequest.getSession().getAttribute(PortalLoginModule.AUTHENTICATED_CREDENTIALS);
-
+ Credentials credentials = (Credentials)httpRequest.getSession().getAttribute(Credentials.CREDENTIALS);
+
// Make programatic login if authenticated credentials are present in session - they were set in another cluster node
if (credentials != null && httpRequest.getRemoteUser() == null)
{
@@ -65,7 +64,7 @@
// This is a workaround... without this code this attr will vanish from session after first request - don't ask...
if (credentials != null && httpRequest.getSession(false) != null)
{
- httpRequest.getSession(false).setAttribute(PortalLoginModule.AUTHENTICATED_CREDENTIALS, credentials);
+ httpRequest.getSession(false).setAttribute(Credentials.CREDENTIALS, credentials);
}
}
else
Deleted: portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java
===================================================================
--- portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java 2011-03-31 21:02:39 UTC (rev 6157)
@@ -1,199 +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 org.exoplatform.container.ExoContainer;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.services.security.jaas.AbstractLoginModule;
-import org.exoplatform.web.login.InitiateLoginServlet;
-import org.gatein.wci.security.Credentials;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.LoginException;
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
-
-/**
- * A login module implementation that relies on the token store to check the
- * password validity. If the token store provides a valid {@link Credentials}
- * value then password stacking is used and the two entries are added in the
- * shared state map. The first entry is keyed by
- * <code>javax.security.auth.login.name</code> and contains the
- * {@link Credentials#getUsername()} value, the second entry is keyed by
- * <code>javax.security.auth.login.password</code> and contains the
- * {@link Credentials#getPassword()} ()} value.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class PortalLoginModule extends AbstractLoginModule
-{
-
- /** Logger. */
- private static final Log log = ExoLogger.getLogger(PortalLoginModule.class);
-
- /** JACC get context method. */
- private static final Method getContextMethod;
-
- static
- {
- Method getContext = null;
- if (isClusteredSSO())
- {
- log.debug("About to configure clustered SSO");
- try
- {
- Class<?> policyContextClass = Thread.currentThread().getContextClassLoader().loadClass("javax.security.jacc.PolicyContext");
- getContext = policyContextClass.getDeclaredMethod("getContext", String.class);
- }
- catch (ClassNotFoundException ignore)
- {
- log.debug("JACC not found ignoring it", ignore);
- }
- catch (Exception e)
- {
- log.error("Could not obtain JACC get context method", e);
- }
- }
-
- //
- getContextMethod = getContext;
- }
-
- public static final String AUTHENTICATED_CREDENTIALS = "authenticatedCredentials";
-
- /**
- * @see javax.security.auth.spi.LoginModule#login()
- */
- @SuppressWarnings("unchecked")
- public boolean login() throws LoginException
- {
-
- Callback[] callbacks = new Callback[2];
- callbacks[0] = new NameCallback("Username");
- callbacks[1] = new PasswordCallback("Password", false);
-
- try
- {
- callbackHandler.handle(callbacks);
- String password = new String(((PasswordCallback)callbacks[1]).getPassword());
-
- 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 (getContextMethod != null && password.startsWith(InitiateLoginServlet.COOKIE_NAME))
- {
- HttpServletRequest request;
- try
- {
- request = (HttpServletRequest)getContextMethod.invoke(null, "javax.servlet.http.HttpServletRequest");
- Object o = request.getSession().getAttribute(AUTHENTICATED_CREDENTIALS);
-
- if (o instanceof Credentials)
- {
- c = (Credentials) o;
- }
- }
- catch(Throwable e)
- {
- log.error(this,e);
- log.error("LoginModule error. Turn off session credentials checking with proper configuration option of " +
- "LoginModule set to false");
- }
- }
-
- if (c != null)
- {
- sharedState.put("javax.security.auth.login.name", c.getUsername());
- sharedState.put("javax.security.auth.login.password", c.getPassword());
- }
- return true;
- }
- catch (Exception e)
- {
- LoginException le = new LoginException();
- le.initCause(e);
- throw le;
- }
- }
-
- /**
- * @see javax.security.auth.spi.LoginModule#commit()
- */
- public boolean commit() throws LoginException
- {
-
- if (getContextMethod != null &&
- sharedState.containsKey("javax.security.auth.login.name") &&
- sharedState.containsKey("javax.security.auth.login.password"))
- {
- String uid = (String)sharedState.get("javax.security.auth.login.name");
- String pass = (String)sharedState.get("javax.security.auth.login.password");
-
- Credentials wc = new Credentials(uid, pass);
-
- HttpServletRequest request = null;
- try
- {
- request = (HttpServletRequest)getContextMethod.invoke(null, "javax.servlet.http.HttpServletRequest");
- request.getSession().setAttribute(AUTHENTICATED_CREDENTIALS, wc);
- }
- catch(Exception e)
- {
- log.error(this,e);
- log.error("LoginModule error. Turn off session credentials checking with proper configuration option of " +
- "LoginModule set to false");
- }
- }
- return true;
- }
-
- /**
- * @see javax.security.auth.spi.LoginModule#abort()
- */
- public boolean abort() throws LoginException
- {
- return true;
- }
-
- /**
- * @see javax.security.auth.spi.LoginModule#logout()
- */
- public boolean logout() throws LoginException
- {
- return true;
- }
-
- @Override
- protected Log getLogger()
- {
- return log;
- }
-
- protected static boolean isClusteredSSO()
- {
- return ExoContainer.getProfiles().contains("cluster");
- }
-}
Modified: portal/trunk/examples/portal/README.txt
===================================================================
--- portal/trunk/examples/portal/README.txt 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/examples/portal/README.txt 2011-03-31 21:02:39 UTC (rev 6157)
@@ -55,9 +55,6 @@
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";
Modified: portal/trunk/examples/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml
===================================================================
--- portal/trunk/examples/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/examples/portal/ear/src/main/application/META-INF/gatein-jboss-beans.xml 2011-03-31 21:02:39 UTC (rev 6157)
@@ -6,10 +6,6 @@
<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>
- </login-module>
<login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required">
<module-option name="portalContainerName">sample-portal</module-option>
<module-option name="realmName">gatein-domain-sample-portal</module-option>
Modified: portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-03-31 21:02:39 UTC (rev 6157)
@@ -6,10 +6,6 @@
<module-option name="portalContainerName">portal</module-option>
<module-option name="realmName">gatein-domain</module-option>
</login-module>
- <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required">
- <module-option name="portalContainerName">portal</module-option>
- <module-option name="realmName">gatein-domain</module-option>
- </login-module>
<login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required">
<module-option name="portalContainerName">portal</module-option>
<module-option name="realmName">gatein-domain</module-option>
Modified: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-03-31 21:02:39 UTC (rev 6157)
@@ -6,10 +6,6 @@
<module-option name="portalContainerName">portal</module-option>
<module-option name="realmName">gatein-domain</module-option>
</login-module>
- <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required">
- <module-option name="portalContainerName">portal</module-option>
- <module-option name="realmName">gatein-domain</module-option>
- </login-module>
<login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required">
<module-option name="portalContainerName">portal</module-option>
<module-option name="realmName">gatein-domain</module-option>
Modified: portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf
===================================================================
--- portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf 2011-03-31 21:02:39 UTC (rev 6157)
@@ -1,6 +1,5 @@
gatein-domain {
org.gatein.wci.security.WCILoginModule optional;
- org.exoplatform.web.security.PortalLoginModule required;
org.exoplatform.services.security.jaas.SharedStateLoginModule required;
org.exoplatform.services.security.j2ee.TomcatLoginModule required;
@@ -10,4 +9,4 @@
// portalContainerName=portal
// realmName=gatein-domain
-};
\ No newline at end of file
+};
Modified: portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf
===================================================================
--- portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf 2011-03-31 21:02:39 UTC (rev 6157)
@@ -1,6 +1,5 @@
gatein-domain {
org.gatein.wci.security.WCILoginModule optional;
- org.exoplatform.web.security.PortalLoginModule required;
org.exoplatform.services.security.jaas.SharedStateLoginModule required;
org.exoplatform.services.security.j2ee.TomcatLoginModule required;
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-03-31 21:02:39 UTC (rev 6157)
@@ -6,10 +6,6 @@
<module-option name="portalContainerName">portal</module-option>
<module-option name="realmName">gatein-domain</module-option>
</login-module>
- <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required">
- <module-option name="portalContainerName">portal</module-option>
- <module-option name="realmName">gatein-domain</module-option>
- </login-module>
<login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required">
<module-option name="portalContainerName">portal</module-option>
<module-option name="realmName">gatein-domain</module-option>
Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java
===================================================================
--- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java 2011-03-31 19:03:18 UTC (rev 6156)
+++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java 2011-03-31 21:02:39 UTC (rev 6157)
@@ -24,8 +24,8 @@
import org.gatein.wsrp.wss.WebServiceSecurityFactory;
import org.picocontainer.Startable;
+import org.wsrp.wss.jboss5.handlers.consumer.JBWSSecurityHandlerWrapper;
import org.wsrp.wss.jboss5.handlers.consumer.WSSecurityCredentialHandler;
-import org.wsrp.wss.jboss5.handlers.consumer.JBWSSecurityHandlerWrapper;
/**
* @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
13 years, 9 months
- 1
- 0
gatein SVN: r6156 - in components/wci/trunk: exo and 16 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 15:03:18 -0400 (Thu, 31 Mar 2011)
New Revision: 6156
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jboss/jboss6/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/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/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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/exo/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/jboss/jboss6/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2011-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/jetty/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-Beta02</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.0-Beta02</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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/core/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/servers/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: components/wci/trunk/tomcat/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
Modified: components/wci/trunk/tomcat/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2011-03-31 19:01:27 UTC (rev 6155)
+++ components/wci/trunk/wci/pom.xml 2011-03-31 19:03:18 UTC (rev 6156)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
13 years, 9 months
- 1
- 0
gatein SVN: r6155 - components/wci/tags.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 15:01:27 -0400 (Thu, 31 Mar 2011)
New Revision: 6155
Added:
components/wci/tags/2.1.0-Beta02/
Log:
[maven-scm] copy for tag 2.1.0-Beta02
13 years, 9 months
- 1
- 0
gatein SVN: r6154 - in components/wci/trunk: exo and 16 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 15:00:07 -0400 (Thu, 31 Mar 2011)
New Revision: 6154
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jboss/jboss6/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/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/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-Beta02
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/exo/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/jboss/jboss6/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/jetty/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-Beta02</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.0-Beta02</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/core/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/servers/jetty6/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/servers/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/test/servers/tomcat7/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: components/wci/trunk/tomcat/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/tomcat/tomcat6/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
Modified: components/wci/trunk/tomcat/tomcat7/pom.xml
===================================================================
--- components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/tomcat/tomcat7/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
+++ components/wci/trunk/wci/pom.xml 2011-03-31 19:00:07 UTC (rev 6154)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
13 years, 9 months
- 1
- 0
gatein SVN: r6153 - in portal/trunk: component/web/security and 12 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-03-31 14:57:52 -0400 (Thu, 31 Mar 2011)
New Revision: 6153
Modified:
portal/trunk/component/web/security/pom.xml
portal/trunk/gadgets/core/pom.xml
portal/trunk/gadgets/eXoGadgets/pom.xml
portal/trunk/gadgets/server/pom.xml
portal/trunk/packaging/dependencies/pom.xml
portal/trunk/packaging/jboss-as5/pkg/pom.xml
portal/trunk/packaging/jboss-as6/pkg/pom.xml
portal/trunk/packaging/jetty/pkg/pom.xml
portal/trunk/packaging/tomcat/pkg/pom.xml
portal/trunk/pom.xml
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java
portal/trunk/webui/portal/pom.xml
portal/trunk/wsrp-integration/extension-component/pom.xml
portal/trunk/wsrp-integration/extension-ear-as5/pom.xml
Log:
GTNPORTAL-1846: Update components and update POM files
Modified: portal/trunk/component/web/security/pom.xml
===================================================================
--- portal/trunk/component/web/security/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/component/web/security/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -39,6 +39,12 @@
<dependency>
<groupId>org.exoplatform.core</groupId>
<artifactId>exo.core.component.organization.api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -62,6 +68,40 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>jpl-pattern</groupId>
+ <artifactId>jpl-pattern</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jpl-util</groupId>
+ <artifactId>jpl-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jacc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.security</groupId>
+ <artifactId>jaas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
Modified: portal/trunk/gadgets/core/pom.xml
===================================================================
--- portal/trunk/gadgets/core/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/gadgets/core/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -85,6 +85,12 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
Modified: portal/trunk/gadgets/eXoGadgets/pom.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/gadgets/eXoGadgets/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -52,6 +52,12 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: portal/trunk/gadgets/server/pom.xml
===================================================================
--- portal/trunk/gadgets/server/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/gadgets/server/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -58,10 +58,24 @@
<artifactId>shindig-features</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- external dependencies -->
@@ -80,18 +94,20 @@
<artifactId>json_simple</artifactId>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>net.oauth</groupId>
<artifactId>core</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<scope>provided</scope>
</dependency>
Modified: portal/trunk/packaging/dependencies/pom.xml
===================================================================
--- portal/trunk/packaging/dependencies/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/dependencies/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -185,8 +185,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
<version>1.6</version>
</dependency>
<dependency>
@@ -309,4 +309,4 @@
</dependencyManagement>
-</project>
\ No newline at end of file
+</project>
Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -130,6 +130,12 @@
<dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.mc-int</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
@@ -376,10 +382,30 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- GateIn -->
@@ -534,11 +560,11 @@
<!-- Various -->
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
@@ -603,8 +629,8 @@
<artifactId>groovy-all</artifactId>
</dependency>
<dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
<version>1.6</version>
</dependency>
<dependency>
Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -128,6 +128,12 @@
<dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.mc-int</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
@@ -374,10 +380,30 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.oauth</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- GateIn -->
@@ -529,11 +555,11 @@
<!-- Various -->
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
@@ -598,8 +624,8 @@
<artifactId>groovy-all</artifactId>
</dependency>
<dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
<version>1.6</version>
</dependency>
<dependency>
Modified: portal/trunk/packaging/jetty/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -542,11 +542,11 @@
<!-- Various -->
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
@@ -918,4 +918,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -471,10 +471,12 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>gatein.portal.component.wsrp</artifactId>
</dependency>
+ -->
<!-- Provided -->
<dependency>
@@ -534,11 +536,11 @@
<!-- Various -->
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-jmx</artifactId>
</dependency>
<dependency>
@@ -602,8 +604,8 @@
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
- <groupId>html-parser</groupId>
- <artifactId>html-parser</artifactId>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
@@ -886,4 +888,4 @@
</modules>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.1-GA</version>
+ <version>1.1.0-Beta01</version>
</parent>
<groupId>org.exoplatform.portal</groupId>
@@ -46,10 +46,10 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version>
- <org.gatein.pc.version>2.3.0-Alpha01</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-Beta01</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.0-Alpha02</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.5-GA</org.gatein.mop.version>
+ <org.gatein.wsrp.version>2.1.0-Beta01</org.gatein.wsrp.version>
+ <org.gatein.mop.version>1.0.6-Beta01</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
@@ -88,6 +88,16 @@
<dependencyManagement>
<dependencies>
+ <!-- Needed becuase of a Maven bug. Components depend on gatein-dep and for some
+ reasons with Maven 2.2.1 it can't find that dependency anymore
+ -->
+ <dependency>
+ <groupId>org.gatein</groupId>
+ <artifactId>gatein-dep</artifactId>
+ <version>1.0.3-Beta01</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- eXo JCR stack -->
<dependency>
@@ -836,12 +846,12 @@
<version>1.0-rc2</version>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>2.0</version>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-jmx</artifactId>
<version>2.0</version>
</dependency>
@@ -885,6 +895,12 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
<version>${org.shindig.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
@@ -1158,64 +1174,21 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
- <repository>
- <id>oauth</id>
- <url>http://oauth.googlecode.com/svn/code/maven</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>exo-int</id>
- <url>http://maven2.exoplatform.org/rest/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
-
-
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
+ <pluginRepositories>
<pluginRepository>
- <id>java.net</id>
- <url>http://download.java.net/maven/2</url>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
<releases>
- <enabled>true</enabled>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <enabled>false</enabled>
- </snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
</pluginRepository>
-
</pluginRepositories>
</project>
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/GroupManagement.java 2011-03-31 18:57:52 UTC (rev 6153)
@@ -33,7 +33,7 @@
* Created by The eXo Platform SAS
* Author : Huu-Dung Kieu
* kieuhdung(a)gmail.com
- * 22 d�c. 08
+ * 22 dec. 08
*/
public class GroupManagement
{
Modified: portal/trunk/webui/portal/pom.xml
===================================================================
--- portal/trunk/webui/portal/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/webui/portal/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -81,6 +81,12 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
<type>jar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: portal/trunk/wsrp-integration/extension-component/pom.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -47,6 +47,12 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-consumer</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.wsrp</groupId>
@@ -114,6 +120,12 @@
<artifactId>jbossws-native-core</artifactId>
<version>3.1.2.GA</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>wscommons-policy</groupId>
+ <artifactId>policy</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- tests -->
@@ -133,4 +145,4 @@
</resources>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: portal/trunk/wsrp-integration/extension-ear-as5/pom.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-03-31 17:37:03 UTC (rev 6152)
+++ portal/trunk/wsrp-integration/extension-ear-as5/pom.xml 2011-03-31 18:57:52 UTC (rev 6153)
@@ -72,6 +72,12 @@
<dependency>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-consumer</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.gatein.wsrp</groupId>
13 years, 9 months
- 1
- 0
gatein SVN: r6152 - components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 13:37:03 -0400 (Thu, 31 Mar 2011)
New Revision: 6152
Modified:
components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPICrossContextLogoutTestCase.java
Log:
Minor fix to get some of the the test running again.
Modified: components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPICrossContextLogoutTestCase.java
===================================================================
--- components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPICrossContextLogoutTestCase.java 2011-03-31 16:42:54 UTC (rev 6151)
+++ components/wci/trunk/test/core/src/main/java/org/gatein/wci/spi/SPICrossContextLogoutTestCase.java 2011-03-31 17:37:03 UTC (rev 6152)
@@ -332,7 +332,7 @@
public String value = "";
}
- static class TestListener implements AuthenticationListener
+ public static class TestListener implements AuthenticationListener
{
private Value value;
13 years, 9 months
- 1
- 0
gatein SVN: r6151 - components/wci/trunk/test/servers/src/common/resources.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 12:42:54 -0400 (Thu, 31 Mar 2011)
New Revision: 6151
Modified:
components/wci/trunk/test/servers/src/common/resources/common.xml
Log:
Make jboss-unit fail if an error occurs (this should really be the default).
Modified: components/wci/trunk/test/servers/src/common/resources/common.xml
===================================================================
--- components/wci/trunk/test/servers/src/common/resources/common.xml 2011-03-31 14:50:28 UTC (rev 6150)
+++ components/wci/trunk/test/servers/src/common/resources/common.xml 2011-03-31 16:42:54 UTC (rev 6151)
@@ -139,7 +139,7 @@
<taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
- <jboss-unit>
+ <jboss-unit failOnError="true">
<tests config="${target.dir}/test-classes/config/remote-jboss-unit.xml">
<property name="archivePath" value="${test.archive.path}"/>
13 years, 9 months
- 1
- 0
gatein SVN: r6150 - in components/wci/trunk/test/servers/tomcat7/src: test/resources/config/server and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 10:50:28 -0400 (Thu, 31 Mar 2011)
New Revision: 6150
Added:
components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/server.xml
Modified:
components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml
Log:
Fix test failure issue when using Tomcat 7 greater than 7.0.6. Can be reverted when the next version of Cargo properly fixes the issue.
Modified: components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml 2011-03-31 14:49:46 UTC (rev 6149)
+++ components/wci/trunk/test/servers/tomcat7/src/integration-tests/build.xml 2011-03-31 14:50:28 UTC (rev 6150)
@@ -50,6 +50,7 @@
<property name="cargo.jvmargs" value="${cargo.debug}"/>
<file file="${target.dir}/test-classes/config/server/tomcat-users.xml" tofile="conf/tomcat-users.xml"/>
+ <configfile file="${target.dir}/test-classes/config/server/server.xml" tofile="conf/server.xml"/>
<deployable type="war" file="${cargo.war}">
<property name="context" value="${cargo.war.context}"/>
</deployable>
Added: components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/server.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/server.xml (rev 0)
+++ components/wci/trunk/test/servers/tomcat7/src/test/resources/config/server/server.xml 2011-03-31 14:50:28 UTC (rev 6150)
@@ -0,0 +1,153 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="@cargo.rmi.port@" shutdown="SHUTDOWN" debug="@catalina.logging.level@">
+ <!-- Security listener. Documentation at /docs/config/listeners.html
+ <Listener className="org.apache.catalina.security.SecurityListener" />
+ -->
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- Editable user database that can also be used by
+ UserDatabaseRealm to authenticate users
+ -->
+ <Resource name="UserDatabase" auth="Container"
+ type="org.apache.catalina.UserDatabase"
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
+ </GlobalNamingResources>
+
+ <!-- A "Service" is a collection of one or more "Connectors" that share
+ a single "Container" Note: A "Service" is not itself a "Container",
+ so you may not define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/service.html
+ -->
+ <Service name="Catalina" debug="@catalina.logging.level@">
+
+ <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+ <!--
+ <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+ maxThreads="150" minSpareThreads="4"/>
+ -->
+
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL HTTP/1.1 Connector on port @cargo.servlet.port@
+ -->
+ <Connector port="@cargo.servlet.port@" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443"
+ scheme="@cargo.protocol@"
+ secure="@catalina.secure@"
+ SSLEnabled="@catalina.secure@"
+ debug="@catalina.logging.level@"
+ emptySessionPath="@catalina.connector.emptySessionPath@"
+ URIEncoding="@catalina.servlet.uriencoding@" />
+ <!-- A "Connector" using the shared thread pool-->
+ <!--
+ <Connector executor="tomcatThreadPool"
+ port="@cargo.servlet.port@" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+ -->
+ <!-- Define a SSL HTTP/1.1 Connector on port 8443
+ This connector uses the JSSE configuration, when using APR, the
+ connector should be using the OpenSSL style configuration
+ described in the APR documentation -->
+ <!--
+ <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS" />
+ -->
+
+ <!-- Define an AJP 1.3 Connector on port @cargo.tomcat.ajp.port@ -->
+ <Connector port="@cargo.tomcat.ajp.port@" protocol="AJP/1.3" redirectPort="8443" />
+
+
+ <!-- An Engine represents the entry point (within Catalina) that processes
+ every request. The Engine implementation for Tomcat stand alone
+ analyzes the HTTP headers included with the request, and passes them
+ on to the appropriate Host (virtual host).
+ Documentation at /docs/config/engine.html -->
+
+ <!-- You should set jvmRoute to support load-balancing via AJP ie :
+ <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+ -->
+ <Engine name="Catalina" defaultHost="@cargo.hostname@"
+ debug="@catalina.logging.level@">
+
+ <!--For clustering, please take a look at documentation at:
+ /docs/cluster-howto.html (simple how to)
+ /docs/config/cluster.html (reference documentation) -->
+ <!--
+ <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+ -->
+
+ <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+ via a brute-force attack -->
+ <Realm className="org.apache.catalina.realm.LockOutRealm">
+ <!-- This Realm uses the UserDatabase configured in the global JNDI
+ resources under the key "UserDatabase". Any edits
+ that are performed against this UserDatabase are immediately
+ available for use by the Realm. -->
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+ </Realm>
+
+ <Host name="@cargo.hostname@" appBase="webapps"
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false"
+ debug="@catalina.logging.level@">
+
+ @tomcat.webapps@
+
+ <!-- SingleSignOn valve, share authentication between web applications
+ Documentation at: /docs/config/valve.html -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Access log processes all example.
+ Documentation at: /docs/config/valve.html
+ Note: The pattern used is equivalent to using pattern="common" -->
+ <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+ prefix="@cargo.hostname@_access_log." suffix=".txt"
+ pattern="%h %l %u %t "%r" %s %b" resolveHosts="false"/>
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
13 years, 9 months
- 1
- 0