[gatein-commits] gatein SVN: r5764 - in components/wci/trunk: jboss and 37 other directories.

Author: mwringe Date: 2011-01-17 22:12:21 -0500 (Mon, 17 Jan 2011) New Revision: 5764 Added: components/wci/trunk/jboss/ components/wci/trunk/jboss/jboss6/ components/wci/trunk/jboss/jboss6/pom.xml components/wci/trunk/jboss/jboss6/src/ components/wci/trunk/jboss/jboss6/src/main/ components/wci/trunk/jboss/jboss6/src/main/java/ components/wci/trunk/jboss/jboss6/src/main/java/org/ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java components/wci/trunk/test/servers/jboss6/ components/wci/trunk/test/servers/jboss6/pom.xml components/wci/trunk/test/servers/jboss6/src/ components/wci/trunk/test/servers/jboss6/src/assembly/ components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-default-servlet-mapping.xml components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-path-mapping.xml components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-root-path-mapping.xml components/wci/trunk/test/servers/jboss6/src/assembly/spi-exo-server.xml components/wci/trunk/test/servers/jboss6/src/assembly/spi-generic-server.xml components/wci/trunk/test/servers/jboss6/src/assembly/spi-native-server.xml components/wci/trunk/test/servers/jboss6/src/integration-tests/ components/wci/trunk/test/servers/jboss6/src/integration-tests/.build.xml.swp components/wci/trunk/test/servers/jboss6/src/integration-tests/build.xml components/wci/trunk/test/servers/jboss6/src/test/ components/wci/trunk/test/servers/jboss6/src/test/resources/ components/wci/trunk/test/servers/jboss6/src/test/resources/config/ components/wci/trunk/test/servers/jboss6/src/test/resources/config/remote-jboss-unit.xml components/wci/trunk/test/servers/jboss6/src/test/resources/config/servers.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/context.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/roles.properties components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/users.properties components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/web.xml Modified: components/wci/trunk/pom.xml components/wci/trunk/test/servers/pom.xml Log: GTNWCI-22: initial checkin of JBoss 6 support for wci. Added: components/wci/trunk/jboss/jboss6/pom.xml =================================================================== --- components/wci/trunk/jboss/jboss6/pom.xml (rev 0) +++ components/wci/trunk/jboss/jboss6/pom.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,29 @@ +<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-Alpha03-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-jboss6</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI JBoss 6 compatibility component</name> + + <dependencies> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.web</groupId> + <artifactId>jbossweb</artifactId> + <version>3.0.0-CR1</version> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <version>1.0.0.Final</version> + </dependency> + </dependencies> + +</project> Added: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java =================================================================== --- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java (rev 0) +++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ContainerServlet.java 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,126 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2011, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.gatein.wci.jboss; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; + +import org.apache.catalina.Container; +import org.apache.catalina.ContainerServlet; +import org.apache.catalina.Engine; +import org.apache.catalina.Wrapper; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class JB6ContainerServlet extends HttpServlet implements ContainerServlet +{ + /** . */ + private Wrapper wrapper; + + /** . */ + private JB6ServletContainerContext containerContext; + + /** . */ + private boolean started; + + public Wrapper getWrapper() + { + return wrapper; + } + + public void setWrapper(Wrapper wrapper) + { + this.wrapper = wrapper; + + // + if (wrapper != null) + { + attemptStart(); + } + else + { + attemptStop(); + } + } + + public void init() throws ServletException + { + started = true; + + // + attemptStart(); + } + + public void destroy() + { + started = false; + + // + attemptStop(); + } + + private void attemptStart() + { + if (started && wrapper != null) + { + start(); + } + } + + private void attemptStop() + { + if (!started || wrapper == null) + { + stop(); + } + } + + private void start() + { + Container container = wrapper; + while (container.getParent() != null) + { + container = container.getParent(); + if (container instanceof Engine) + { + Engine engine = (Engine) container; + containerContext = new JB6ServletContainerContext(engine); + containerContext.start(); + break; + } + } + } + + private void stop() + { + if (containerContext != null) + { + containerContext.stop(); + + // + containerContext = null; + } + } +} Added: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java =================================================================== --- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java (rev 0) +++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6ServletContainerContext.java 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,341 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2011, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.gatein.wci.jboss; + +import org.apache.catalina.Container; +import org.apache.catalina.ContainerEvent; +import org.apache.catalina.ContainerListener; +import org.apache.catalina.Context; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; +import org.apache.catalina.Lifecycle; +import org.apache.catalina.LifecycleEvent; +import org.apache.catalina.LifecycleListener; +import org.apache.catalina.core.StandardContext; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; +import org.gatein.wci.RequestDispatchCallback; +import org.gatein.wci.authentication.AuthenticationResult; +import org.gatein.wci.authentication.GenericAuthentication; +import org.gatein.wci.authentication.GenericAuthenticationResult; +import org.gatein.wci.authentication.ProgrammaticAuthenticationResult; +import org.gatein.wci.authentication.TicketService; +import org.gatein.wci.command.CommandDispatcher; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.gatein.wci.security.Credentials; +import org.gatein.wci.spi.ServletContainerContext; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class JB6ServletContainerContext implements ServletContainerContext, ContainerListener, LifecycleListener +{ + private final static Logger log = LoggerFactory.getLogger(JB6ServletContainerContext.class); + + /** . */ + //TODO: maybe we should rename this to /jbossgateinservlet? but older versions of jboss + // use the tomcat ServletContainerContext. + private final CommandDispatcher dispatcher = new CommandDispatcher("/tomcatgateinservlet"); + + /** The monitored hosts. */ + private final Set<String> monitoredHosts = new HashSet<String>(); + + /** The monitored contexts. */ + private final Set<String> monitoredContexts = new HashSet<String>(); + + /** . */ + private final Engine engine; + + /** . */ + private Registration registration; + + public JB6ServletContainerContext(Engine engine) + { + this.engine = engine; + } + + public Object include(ServletContext targetServletContext, HttpServletRequest request, HttpServletResponse response, + RequestDispatchCallback callback, Object handback) throws ServletException, IOException + { + return dispatcher.include(targetServletContext, request, response, callback, handback); + } + + public void setCallback(Registration registration) + { + this.registration = registration; + } + + public void unsetCallback(Registration registration) + { + this.registration = null; + } + + public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, + String password, long validityMillis) throws ServletException + { + try + { + request.login(userName, password); + } + catch (ServletException se) + { + se.printStackTrace(); + try + { + String ticket = GenericAuthentication.TICKET_SERVICE.createTicket(new Credentials(userName, password), + TicketService.DEFAULT_VALIDITY); + String url = "j_security_check?j_username=" + userName + "&j_password=" + ticket; + url = response.encodeRedirectURL(url); + response.sendRedirect(url); + response.flushBuffer(); + } + catch (Exception ignore) + { + } + return null; + } + return new ProgrammaticAuthenticationResult(); + } + + public void logout(HttpServletRequest request, HttpServletResponse response) throws ServletException + { + request.logout(); + request.getSession().invalidate(); + } + + public synchronized void containerEvent(ContainerEvent event) + { + if (event.getData() instanceof Host) + { + Host host = (Host) event.getData(); + + // + if (Container.ADD_CHILD_EVENT.equals(event.getType())) + { + registerHost(host); + } + else if (Container.REMOVE_CHILD_EVENT.equals(event.getType())) + { + unregisterHost(host); + } + } + else if (event.getData() instanceof StandardContext) + { + StandardContext context = (StandardContext) event.getData(); + + // + if (Container.ADD_CHILD_EVENT.equals(event.getType())) + { + registerContext(context); + } + else if (Container.REMOVE_CHILD_EVENT.equals(event.getType())) + { + unregisterContext(context); + } + } + } + + public void lifecycleEvent(LifecycleEvent event) + { + if (event.getSource() instanceof Context) + { + Context context = (Context) event.getSource(); + + // + if (Lifecycle.AFTER_START_EVENT.equals(event.getType())) + { + start(context); + } + else if (Lifecycle.BEFORE_STOP_EVENT.equals(event.getType())) + { + stop(context); + } + } + } + + void start() + { + DefaultServletContainerFactory.registerContext(this); + + // + Container[] childrenContainers = engine.findChildren(); + for (Container childContainer : childrenContainers) + { + if (childContainer instanceof Host) + { + Host host = (Host) childContainer; + registerHost(host); + } + } + + // + engine.addContainerListener(this); + } + + void stop() + { + engine.removeContainerListener(this); + + // + Container[] childrenContainers = engine.findChildren(); + for (Container childContainer : childrenContainers) + { + if (childContainer instanceof Host) + { + Host host = (Host) childContainer; + unregisterHost(host); + } + } + + // + registration.cancel(); + registration = null; + } + + /** + * Register an host for registration which means that we fire events for all the contexts it contains and we + * subscribe for its life cycle events. If the host is already monitored nothing is done. + * + * @param host the host to register for monitoring + */ + private void registerHost(Host host) + { + if (!monitoredHosts.contains(host.getName())) + { + Container[] childrenContainers = host.findChildren(); + for (Container childContainer : childrenContainers) + { + if (childContainer instanceof StandardContext) + { + StandardContext context = (StandardContext) childContainer; + registerContext(context); + } + } + + // + host.addContainerListener(this); + + // + monitoredHosts.add(host.getName()); + } + } + + private void unregisterHost(Host host) + { + if (monitoredHosts.contains(host.getName())) + { + monitoredHosts.remove(host.getName()); + + // + host.removeContainerListener(this); + + // + Container[] childrenContainers = host.findChildren(); + for (Container childContainer : childrenContainers) + { + if (childContainer instanceof StandardContext) + { + StandardContext context = (StandardContext) childContainer; + unregisterContext(context); + } + } + } + } + + private void registerContext(StandardContext context) + { + if (!monitoredContexts.contains(context.getName())) + { + context.addLifecycleListener(this); + + // + if (context.getState() == 1) + { + start(context); + } + + // + monitoredContexts.add(context.getName()); + } + } + + private void unregisterContext(StandardContext context) + { + if (monitoredContexts.contains(context.getName())) + { + monitoredContexts.remove(context.getName()); + + // + if (context.getState() == 1) + { + stop(context); + } + + // + context.removeLifecycleListener(this); + } + } + + private void start(Context context) + { + try + { + log.debug("Context added " + context.getPath()); + JB6WebAppContext webAppContext = new JB6WebAppContext(context); + + // + if (registration != null) + { + registration.registerWebApp(webAppContext); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + private void stop(Context context) + { + try + { + if (registration != null) + { + registration.unregisterWebApp(context.getPath()); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } +} Added: components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java =================================================================== --- components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java (rev 0) +++ components/wci/trunk/jboss/jboss6/src/main/java/org/gatein/wci/jboss/JB6WebAppContext.java 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,128 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2011, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.gatein.wci.jboss; + +import java.io.IOException; +import java.io.InputStream; + +import javax.servlet.ServletContext; + +import org.apache.catalina.Context; +import org.apache.catalina.Wrapper; +import org.gatein.wci.command.CommandServlet; +import org.gatein.wci.spi.WebAppContext; +import org.w3c.dom.Document; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class JB6WebAppContext implements WebAppContext +{ + /** . */ + private Document descriptor; + + /** . */ + private ServletContext servletContext; + + /** . */ + private ClassLoader loader; + + /** . */ + private String contextPath; + + /** . */ + private final Context context; + + /** . */ + private Wrapper commandServlet; + + JB6WebAppContext(Context context) throws Exception + { + this.context = context; + + // + servletContext = context.getServletContext(); + loader = context.getLoader().getClassLoader(); + contextPath = context.getPath(); + } + + public void start() throws Exception + { + try + { + commandServlet = context.createWrapper(); + commandServlet.setName("TomcatGateInServlet"); + commandServlet.setLoadOnStartup(0); + commandServlet.setServletClass(CommandServlet.class.getName()); + context.addChild(commandServlet); + context.addServletMapping("/tomcatgateinservlet", "TomcatGateInServlet"); + } + catch (Exception e) + { + cleanup(); + throw e; + } + } + + public void stop() + { + cleanup(); + } + + private void cleanup() + { + if (commandServlet != null) + { + try + { + context.removeServletMapping("tomcatgateinservlet"); + context.removeChild(commandServlet); + } + catch (Exception e) + { + } + } + } + + public ServletContext getServletContext() + { + return servletContext; + } + + public ClassLoader getClassLoader() + { + return loader; + } + + public String getContextPath() + { + return contextPath; + } + + public boolean importFile(String parentDirRelativePath, String name, InputStream source, boolean overwrite) + throws IOException + { + return false; + } +} Modified: components/wci/trunk/pom.xml =================================================================== --- components/wci/trunk/pom.xml 2011-01-17 17:47:37 UTC (rev 5763) +++ components/wci/trunk/pom.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -91,6 +91,11 @@ </dependency> <dependency> <groupId>org.gatein.wci</groupId> + <artifactId>wci-jboss6</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> <artifactId>wci-jetty</artifactId> <version>${project.version}</version> </dependency> @@ -144,6 +149,7 @@ <module>exo</module> <module>tomcat/tomcat6</module> <module>tomcat/tomcat7</module> + <module>jboss/jboss6</module> <module>jetty</module> <module>test</module> </modules> Added: components/wci/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/pom.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/pom.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,424 @@ +<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-server-parent</artifactId> + <version>2.1.0-Alpha03-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-jboss6</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI JBoss 6.0 test component</name> + + <dependencies> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat7</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-jboss6</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-native-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-gatein-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-exo-portlet</artifactId> + <scope>test</scope> + <type>war</type> + </dependency> + + <dependency> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-mc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <scope>test</scope> + </dependency> + <!-- JBOSS UNIT DEPENDENCIES --> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-remote</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-mc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-ant</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- JBOSS MICROCONAINER DEPENDENCIES --> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-dependency</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <!-- OTHER DEPENDENCIES --> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </dependency> + + <!-- JBoss Deployer --> + <dependency> + <groupId>org.jboss.integration</groupId> + <artifactId>jboss-profileservice-spi</artifactId> + <version>5.1.0.SP1</version> + <scope>test</scope> + </dependency> + + </dependencies> + + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-common-build.xml</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>test</finalName> + <appendAssemblyId>true</appendAssemblyId> + <!-- we don't want to add these archives into the repo --> + <attach>false</attach> + <outputDirectory>${project.build.directory}/test-archives</outputDirectory> + <descriptors> + <descriptor>src/assembly/spi-native-server.xml</descriptor> + <descriptor>src/assembly/spi-generic-server.xml</descriptor> + <descriptor>src/assembly/spi-exo-server.xml</descriptor> + <descriptor>src/assembly/endpoint-default-servlet-mapping.xml</descriptor> + <descriptor>src/assembly/endpoint-path-mapping.xml</descriptor> + <descriptor>src/assembly/endpoint-root-path-mapping.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>assemble</id> + <phase>test</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + <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.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" /> + + <!-- 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.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-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" /> + <property name="dependency.gatein-wci-jboss.jar" value="${maven.dependency.org.gatein.wci.wci-jboss6.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.cargo-jboss-deployer.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-tools-jboss-deployer-5.1-and-onwards.jar.path}" /> + <property name="dependency.jboss-profile-service.jar" value="${maven.dependency.org.jboss.integration.jboss-profileservice-spi.jar.path}" /> + <property name="dependency.cargo-core-container-jboss.jar" value="${maven.dependency.org.codehaus.cargo.cargo-core-container-jboss.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" /> + + <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}" /> + + <!-- location of common.xml shared between the different server's build.xml --> + <property name="common.xml.file" value="${test.common.xml}" /> + <!-- --> + + <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> + <!-- Fix 1.0.3 deployment problems with jboss51 deployer--> + <version.cargo>1.0.2</version.cargo> + </properties> + + <profiles> + <profile> + <id>all</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <test.generic>true</test.generic> + <test.native>true</test.native> + <test.exo>true</test.exo> + <test.endpoint>true</test.endpoint> + </properties> + </profile> + <profile> + <id>generic</id> + <properties> + <test.generic>true</test.generic> + </properties> + </profile> + <profile> + <id>native</id> + <properties> + <test.native>true</test.native> + </properties> + </profile> + <profile> + <id>exo</id> + <properties> + <test.exo>true</test.exo> + </properties> + </profile> + <profile> + <id>endpoint</id> + <properties> + <test.endpoint>true</test.endpoint> + </properties> + </profile> + <profile> + <id>cargo.debug</id> + <properties> + <test.cargo.debug>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000</test.cargo.debug> + </properties> + </profile> + </profiles> +</project> Added: components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-default-servlet-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-default-servlet-mapping.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,41 @@ +<assembly> + <id>endpoint-default-servlet-mapping</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/endpoint/default-servlet-mapping-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-path-mapping.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,41 @@ +<assembly> + <id>endpoint-path-mapping</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/endpoint/path-mapping-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-root-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/assembly/endpoint-root-path-mapping.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,41 @@ +<assembly> + <id>endpoint-root-path-mapping</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/endpoint/root-path-mapping-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/jboss6/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/assembly/spi-exo-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/assembly/spi-exo-server.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,41 @@ +<assembly> + <id>spi-exo-server</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/exo/server-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/jboss6/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/assembly/spi-generic-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/assembly/spi-generic-server.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,41 @@ +<assembly> + <id>spi-generic-server</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/generic/server-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/jboss6/src/assembly/spi-native-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/assembly/spi-native-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/assembly/spi-native-server.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,41 @@ +<assembly> + <id>spi-native-server</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/test-classes/support/native/server-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <scope>test</scope> + <outputDirectory>WEB-INF/lib</outputDirectory> + <includes> + <include>org.gatein.wci:wci-test-core</include> + <!-- gatein-common --> + <include>org.gatein.common:common-mc</include> + <!-- jboss-unit --> + <include>org.jboss.unit:jboss-unit</include> + <include>org.jboss.unit:jboss-unit-mc</include> + <include>org.jboss.unit:jboss-unit-remote</include> + <include>org.jboss.unit:portal-test-generic</include> + <include>org.jboss.unit:portal-test</include> + <include>org.jboss.remoting:jboss-remoting</include> + <!-- jboss-microcontainer --> + <include>org.jboss.microcontainer:jboss-dependency</include> + <include>org.jboss:jboss-reflect</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss:jboss-mdr</include> + <include>javax.xml.bind:jaxb-api</include> + <include>org.jboss:jbossxb</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/jboss6/src/integration-tests/.build.xml.swp =================================================================== (Binary files differ) Property changes on: components/wci/trunk/test/servers/jboss6/src/integration-tests/.build.xml.swp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wci/trunk/test/servers/jboss6/src/integration-tests/build.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/integration-tests/build.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/integration-tests/build.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,92 @@ +<?xml version="1.0"?> +<project name="jboss-integration-test" default="tests"> + + <import file="${common.xml.file}"/> + + <!-- SYSTEM PROPERTIES --> + <property environment="env"/> + <property name="test.cargo.home" value="${env.JBOSS_6_0_HOME}"/> + + <!-- properties unique per app server --> + <property name="test.server.name" value="JBoss"/> + <property name="test.server.version" value="6.0"/> + <property name="test.remote.server.name" value="RemoteJBoss_6_0"/> + <property name="cargo.container.id" value="jboss6x"/> + <!-- end unique properties --> + + <target name="tests" unless="maven.test.skip"> + <antcall target="tests.common"/> + </target> + + <path id="server.libs"> + <path refid="gatein-common-shared"/> + + <!-- server specific dependencies --> + <path path="${dependency.gatein-wci-core.jar}"/> + <path path="${dependency.gatein-wci-tomcat.jar}"/> + <path path="${dependency.gatein-wci-jboss.jar}"/> + <path path="${dependency.gatein-wci-exo.jar}"/> + </path> + + <!-- NOTE: we disable the JBoss ondemand deployment since it inters with our tests + to determine what applications are deployed --> + <target name="cargo.start" depends="cargo.setup"> + <cargo + containerId="${cargo.container.id}" + home="${test.cargo.home}" + log="${cargo.log.dir}/cargo.${test.id}.start.log" + action="start" + timeout="240000" + wait="${cargo.wait}"> + <sharedClasspath> + <path refid="server.libs"/> + </sharedClasspath> + <configuration home="${test.cargo.dir}"> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <property name="cargo.jvmargs" value="${cargo.debug} -Djboss.as.deployment.ondemand=false"/> + <property name="cargo.rmi.port" value="1099"/> + <deployable type="war" file="${cargo.war}"> + <property name="context" value="${cargo.war.context}"/> + </deployable> + </configuration> + </cargo> + </target> + +<!-- + <target name="cargo.start" depends="cargo.setup"> + <cargo + containerId="${cargo.container.id}" + home="${test.cargo.home}" + log="${cargo.log.dir}/cargo.${test.id}.start.log" + action="start" + timeout="240000" + wait="${cargo.wait}"> + <sharedClasspath> + <path refid="server.libs"/> + </sharedClasspath> + <configuration home="${test.cargo.dir}"> + <property name="cargo.servlet.port" value="8080"/> + <property name="cargo.logging" value="high"/> + <property name="cargo.jvmargs" value="${cargo.debug}"/> + <property name="cargo.rmi.port" value="1099"/> + <deployable type="war" file="${cargo.war}"> + <property name="context" value="${cargo.war.context}"/> + </deployable> + </configuration> + </cargo> + </target> +--> + <target name="cargo.stop" depends="cargo.setup"> + <cargo + containerId="${cargo.container.id}" + home="${test.cargo.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" + action="stop"> + <configuration home="${test.cargo.dir}"> + <property name="cargo.rmi.port" value="1099"/> + </configuration> + </cargo> + </target> + +</project> Added: components/wci/trunk/test/servers/jboss6/src/test/resources/config/remote-jboss-unit.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/config/remote-jboss-unit.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/config/remote-jboss-unit.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> + <generic> + <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/> + </generic> +</jboss-unit> + Added: components/wci/trunk/test/servers/jboss6/src/test/resources/config/servers.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/config/servers.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/config/servers.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,20 @@ +<servers> + <server> + <server-name>RemoteJBoss_6_0</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>jboss6x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> +</servers> Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> +</web-app> Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/foo/*</url-pattern> + </servlet-mapping> +</web-app> Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/endpoint/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/META-INF/context.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,63 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/spi/generic/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.exoplatform.services.portletcontainer.impl.servlet.PortletApplicationListener</listener-class> + </listener> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <listener> + <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>PortletWrapper</servlet-name> + <servlet-class>org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>PortletWrapper</servlet-name> + <url-pattern>/PortletWrapper</url-pattern> + </servlet-mapping> +</web-app> Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/META-INF/context.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +</jboss-web> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,61 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/spi/generic/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <listener> + <listener-class>org.gatein.wci.impl.generic.GenericServletContainerContext</listener-class> + </listener> + <servlet> + <servlet-name>TestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>TestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>GateInServlet</servlet-name> + <url-pattern>/gateinservlet</url-pattern> + </servlet-mapping> +</web-app> Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/META-INF/context.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,13 @@ +### ====================================================================== ### +## ## +## JBoss Bootstrap Log4j Configuration ## +## ## +### ====================================================================== ### + +log4j.rootCategory=ALL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.Target=System.out +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,13 @@ +handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler + +############################################################ +# Handler specific properties. +# Describes specific configuration info for Handlers. +############################################################ + +org.apache.juli.FileHandler.level = FINE +org.apache.juli.FileHandler.directory = ${catalina.base}/logs +org.apache.juli.FileHandler.prefix = test-spi. + +java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/context.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,2 @@ +<Context privileged="true"> <!-- crossContext="true" --> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository>test:loader=portlet</loader-repository> + </class-loading> +<!-- <security-domain>java:/jaas/test-123</security-domain> --> +</jboss-web> Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/roles.properties =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/roles.properties (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/roles.properties 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1 @@ +foo=test Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/users.properties =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/users.properties (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/users.properties 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1 @@ +foo=bar Added: components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss6/src/test/resources/support/native/server-war/WEB-INF/web.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -0,0 +1,73 @@ +<?xml version="1.0"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_location</param-name> + <param-value>org/gatein/portal/test/web/spi/native/server-beans.xml</param-value> + </context-param> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <listener> + <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> + </listener> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.gatein.wci.jboss.JB6ContainerServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet> + <servlet-name>SPITestServlet</servlet-name> + <servlet-class>org.gatein.wci.TestServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>SPITestServlet</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + + <security-constraint> + <display-name>Test security</display-name> + <web-resource-collection> + <web-resource-name>Protected resources</web-resource-name> + <url-pattern>/foo/*</url-pattern> + <http-method>GET</http-method> + <http-method>POST</http-method> + </web-resource-collection> + + <auth-constraint> + <role-name>test</role-name> + </auth-constraint> + </security-constraint> + + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>Test security</realm-name> + </login-config> +</web-app> Modified: components/wci/trunk/test/servers/pom.xml =================================================================== --- components/wci/trunk/test/servers/pom.xml 2011-01-17 17:47:37 UTC (rev 5763) +++ components/wci/trunk/test/servers/pom.xml 2011-01-18 03:12:21 UTC (rev 5764) @@ -67,6 +67,7 @@ <module>tomcat7</module> <module>jboss42</module> <module>jboss51</module> + <module>jboss6</module> </modules> </profile> <profile> @@ -76,6 +77,7 @@ <module>tomcat7</module> <module>jboss42</module> <module>jboss51</module> + <module>jboss6</module> <module>jetty6</module> </modules> </profile> @@ -111,10 +113,17 @@ </modules> </profile> <profile> + <id>jboss6</id> + <modules> + <module>jboss6</module> + </modules> + </profile> + <profile> <id>jboss</id> <modules> <module>jboss42</module> <module>jboss51</module> + <module>jboss6</module> </modules> </profile> <profile>