Author: mwringe Date: 2009-11-03 15:34:20 -0500 (Tue, 03 Nov 2009) New Revision: 482 Added: components/wci/trunk/test/core/ components/wci/trunk/test/core/pom.xml components/wci/trunk/test/core/src/ components/wci/trunk/test/core/src/main/ components/wci/trunk/test/core/src/main/java/ components/wci/trunk/test/core/src/main/java/org/ components/wci/trunk/test/core/src/main/resources/ components/wci/trunk/test/core/src/main/resources/org/ components/wci/trunk/test/core/src/main/resources/org/gatein/ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/server-beans.xml components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/generic/ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/generic/server-beans.xml components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml components/wci/trunk/test/core/src/test/ components/wci/trunk/test/core/src/test/resources/ components/wci/trunk/test/core/src/test/resources/local-jboss-unit.xml components/wci/trunk/test/portlets/ components/wci/trunk/test/portlets/exo-portlet/ components/wci/trunk/test/portlets/exo-portlet/pom.xml components/wci/trunk/test/portlets/exo-portlet/src/ components/wci/trunk/test/portlets/exo-portlet/src/main/ components/wci/trunk/test/portlets/exo-portlet/src/main/webapp/ components/wci/trunk/test/portlets/exo-portlet/src/main/webapp/WEB-INF/ components/wci/trunk/test/portlets/exo-portlet/src/main/webapp/WEB-INF/web.xml components/wci/trunk/test/portlets/gatein-portlet/ components/wci/trunk/test/portlets/gatein-portlet/pom.xml components/wci/trunk/test/portlets/gatein-portlet/src/ components/wci/trunk/test/portlets/gatein-portlet/src/main/ components/wci/trunk/test/portlets/gatein-portlet/src/main/webapp/ components/wci/trunk/test/portlets/gatein-portlet/src/main/webapp/WEB-INF/ components/wci/trunk/test/portlets/gatein-portlet/src/main/webapp/WEB-INF/web.xml components/wci/trunk/test/portlets/native-portlet/ components/wci/trunk/test/portlets/native-portlet/pom.xml components/wci/trunk/test/portlets/native-portlet/src/ components/wci/trunk/test/portlets/native-portlet/src/main/ components/wci/trunk/test/portlets/native-portlet/src/main/webapp/ components/wci/trunk/test/portlets/native-portlet/src/main/webapp/WEB-INF/ components/wci/trunk/test/portlets/native-portlet/src/main/webapp/WEB-INF/web.xml components/wci/trunk/test/servers/ components/wci/trunk/test/servers/.pom.xml.swp components/wci/trunk/test/servers/jboss42/ components/wci/trunk/test/servers/jboss42/pom.xml components/wci/trunk/test/servers/jboss42/src/ components/wci/trunk/test/servers/jboss42/src/assembly/ components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-default-servlet-mapping.xml components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-path-mapping.xml components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-root-path-mapping.xml components/wci/trunk/test/servers/jboss42/src/assembly/spi-exo-server.xml components/wci/trunk/test/servers/jboss42/src/assembly/spi-generic-server.xml components/wci/trunk/test/servers/jboss42/src/assembly/spi-native-server.xml components/wci/trunk/test/servers/jboss42/src/integration-tests/ components/wci/trunk/test/servers/jboss42/src/integration-tests/.build.xml.swp components/wci/trunk/test/servers/jboss42/src/integration-tests/build.xml components/wci/trunk/test/servers/jboss42/src/test/ components/wci/trunk/test/servers/jboss42/src/test/resources/ components/wci/trunk/test/servers/jboss42/src/test/resources/config/ components/wci/trunk/test/servers/jboss42/src/test/resources/config/remote-jboss-unit.xml components/wci/trunk/test/servers/jboss42/src/test/resources/config/servers.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/path-mapping-war/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/META-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/META-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/META-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/context.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss51/ components/wci/trunk/test/servers/jboss51/pom.xml components/wci/trunk/test/servers/jboss51/src/ components/wci/trunk/test/servers/jboss51/src/assembly/ components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-default-servlet-mapping.xml components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-path-mapping.xml components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-root-path-mapping.xml components/wci/trunk/test/servers/jboss51/src/assembly/spi-exo-server.xml components/wci/trunk/test/servers/jboss51/src/assembly/spi-generic-server.xml components/wci/trunk/test/servers/jboss51/src/assembly/spi-native-server.xml components/wci/trunk/test/servers/jboss51/src/integration-tests/ components/wci/trunk/test/servers/jboss51/src/integration-tests/.build.xml.swp components/wci/trunk/test/servers/jboss51/src/integration-tests/build.xml components/wci/trunk/test/servers/jboss51/src/test/ components/wci/trunk/test/servers/jboss51/src/test/resources/ components/wci/trunk/test/servers/jboss51/src/test/resources/config/ components/wci/trunk/test/servers/jboss51/src/test/resources/config/remote-jboss-unit.xml components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/path-mapping-war/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/META-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/META-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/META-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/META-INF/context.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/context.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jetty6/ components/wci/trunk/test/servers/jetty6/pom.xml components/wci/trunk/test/servers/jetty6/src/ components/wci/trunk/test/servers/jetty6/src/assembly/ components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-default-servlet-mapping.xml components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-path-mapping.xml components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-root-path-mapping.xml components/wci/trunk/test/servers/jetty6/src/assembly/spi-exo-server.xml components/wci/trunk/test/servers/jetty6/src/assembly/spi-generic-server.xml components/wci/trunk/test/servers/jetty6/src/assembly/spi-native-server.xml components/wci/trunk/test/servers/jetty6/src/integration-tests/ components/wci/trunk/test/servers/jetty6/src/integration-tests/build.xml components/wci/trunk/test/servers/jetty6/src/test/ components/wci/trunk/test/servers/jetty6/src/test/resources/ components/wci/trunk/test/servers/jetty6/src/test/resources/config/ components/wci/trunk/test/servers/jetty6/src/test/resources/config/remote-jboss-unit.xml components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/ components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/jetty.xml components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/jetty.xml-bak components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/realm.properties components/wci/trunk/test/servers/jetty6/src/test/resources/config/servers.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/default-servlet-mapping-war/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/path-mapping-war/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/root-path-mapping-war/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/META-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/META-INF/context.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/WEB-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/META-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/META-INF/context.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/WEB-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/META-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/META-INF/context.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/jetty-web.xml components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/pom.xml components/wci/trunk/test/servers/src/ components/wci/trunk/test/servers/src/common/ components/wci/trunk/test/servers/src/common/resources/ components/wci/trunk/test/servers/src/common/resources/common.xml components/wci/trunk/test/servers/tomcat6/ components/wci/trunk/test/servers/tomcat6/.pom.xml.swp components/wci/trunk/test/servers/tomcat6/pom.xml components/wci/trunk/test/servers/tomcat6/src/ components/wci/trunk/test/servers/tomcat6/src/assembly/ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml components/wci/trunk/test/servers/tomcat6/src/integration-tests/ components/wci/trunk/test/servers/tomcat6/src/integration-tests/build.xml components/wci/trunk/test/servers/tomcat6/src/test/ components/wci/trunk/test/servers/tomcat6/src/test/resources/ components/wci/trunk/test/servers/tomcat6/src/test/resources/config/ components/wci/trunk/test/servers/tomcat6/src/test/resources/config/remote-jboss-unit.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/config/server/ components/wci/trunk/test/servers/tomcat6/src/test/resources/config/server/tomcat-users.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/config/servers.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/default-servlet-mapping-war/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/path-mapping-war/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/root-path-mapping-war/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/META-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/META-INF/context.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/META-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/META-INF/context.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/META-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/META-INF/context.xml components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/web.xml Removed: components/wci/trunk/test/core/src/main/java/org/jboss/ components/wci/trunk/test/src/test/java/org/ Modified: components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6Handler.java components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java components/wci/trunk/pom.xml components/wci/trunk/test/pom.xml Log: Split up tests into smaller components for each server type. Enable the jetty module, but tests are not run against it by default yet. Modified: components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6Handler.java =================================================================== --- components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6Handler.java 2009-11-03 19:51:42 UTC (rev 481) +++ components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6Handler.java 2009-11-03 20:34:20 UTC (rev 482) @@ -1,47 +1,47 @@ -//package org.jboss.portal.web.impl.jetty; -// -//import java.io.IOException; -// -//import javax.servlet.ServletException; -//import javax.servlet.http.HttpServletRequest; -//import javax.servlet.http.HttpServletResponse; -// -//import org.mortbay.jetty.Server; -//import org.mortbay.jetty.handler.AbstractHandler; -// -//public class Jetty6Handler extends AbstractHandler -//{ -// Server server; -// Jetty6ServletContainerContext containerContext; -// -// public Jetty6Handler (Server server) -// { -// this.server = server; -// System.out.println("SERVER : " + server); -// server.addHandler(this); -// } -// -// protected void doStart() throws Exception { -// super.doStart(); -// containerContext = new Jetty6ServletContainerContext(server); -// containerContext.start(); -// } -// -// protected void doStop() throws Exception { -// super.doStop(); -// -// if (containerContext != null) -// { -// containerContext.stop(); -// containerContext = null; -// } -// } -// -// public void handle(String target, HttpServletRequest request, -// HttpServletResponse response, int dispatch) throws IOException, -// ServletException { -// // Do Nothing for now. This doesn't actually handle anything, but needs to be a handler -// // to tie in the jetty lifecycle and to be able to have access to the server object.. -// } -// -//} \ No newline at end of file +package org.gatein.wci.jetty; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.AbstractHandler; + +public class Jetty6Handler extends AbstractHandler +{ + Server server; + Jetty6ServletContainerContext containerContext; + + public Jetty6Handler (Server server) + { + this.server = server; + System.out.println("SERVER : " + server); + server.addHandler(this); + } + + protected void doStart() throws Exception { + super.doStart(); + containerContext = new Jetty6ServletContainerContext(server); + containerContext.start(); + } + + protected void doStop() throws Exception { + super.doStop(); + + if (containerContext != null) + { + containerContext.stop(); + containerContext = null; + } + } + + public void handle(String target, HttpServletRequest request, + HttpServletResponse response, int dispatch) throws IOException, + ServletException { + // Do Nothing for now. This doesn't actually handle anything, but needs to be a handler + // to tie in the jetty lifecycle and to be able to have access to the server object.. + } + +} \ No newline at end of file Modified: components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java =================================================================== --- components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2009-11-03 19:51:42 UTC (rev 481) +++ components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2009-11-03 20:34:20 UTC (rev 482) @@ -1,255 +1,255 @@ -//package org.jboss.portal.web.impl.jetty; -// -//import java.io.IOException; -//import java.util.HashSet; -//import java.util.Set; -// -//import javax.servlet.ServletContext; -//import javax.servlet.ServletException; -//import javax.servlet.http.HttpServletRequest; -//import javax.servlet.http.HttpServletResponse; -// -//import org.jboss.portal.web.RequestDispatchCallback; -//import org.jboss.portal.web.command.CommandDispatcher; -//import org.jboss.portal.web.impl.DefaultServletContainerFactory; -//import org.jboss.portal.web.spi.ServletContainerContext; -//import org.mortbay.component.Container; -//import org.mortbay.component.LifeCycle; -//import org.mortbay.component.LifeCycle.Listener; -//import org.mortbay.component.Container.Relationship; -//import org.mortbay.jetty.Handler; -//import org.mortbay.jetty.Server; -//import org.mortbay.jetty.handler.ContextHandlerCollection; -//import org.mortbay.jetty.webapp.WebAppContext; -// -//public class Jetty6ServletContainerContext implements ServletContainerContext, org.mortbay.component.Container.Listener, LifeCycle.Listener -//{ -// -// private Registration registration; -// -// private Container container; -// private Server server; -// private ContextHandlerCollection chc; -// -// /** The monitored contexts. */ -// private final Set<String> monitoredContexts = new HashSet<String>(); -// -// private final Set<String> monitoredContextHandlerCollection = new HashSet<String>(); -// -// public Jetty6ServletContainerContext(Server server) { -// this.server = server; -// this.container = server.getContainer(); -// } -// -// /** . */ -// private final CommandDispatcher dispatcher = new CommandDispatcher(); -// -// 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 void start() -// { -// DefaultServletContainerFactory.registerContext(this); -// -// Handler[] children = server.getChildHandlersByClass(ContextHandlerCollection.class); -// for (int i = 0; i < children.length; i++) -// { -// ContextHandlerCollection chc = (ContextHandlerCollection)children[i]; -// registerContextHandlerCollection(chc); -// } -// container.addEventListener(this); -// } -// -// public void stop() -// { -// container.removeEventListener(this); -// -// Handler[] children = server.getChildHandlersByClass(ContextHandlerCollection.class); -// for (int i=0; i< children.length; i++) -// { -// ContextHandlerCollection chc = (ContextHandlerCollection)children[i]; -// unregisterContextHandlerCollection(chc); -// } -// -// registration.cancel(); -// registration = null; -// } -// -// public void addBean(Object bean) -// { -// if (bean instanceof ContextHandlerCollection) -// { -// ContextHandlerCollection chc = (ContextHandlerCollection)bean; -// registerContextHandlerCollection(chc); -// } -// else if (bean instanceof WebAppContext) -// { -// WebAppContext wac = (WebAppContext)bean; -// registerWebAppContext(wac); -// } -// } -// -// public void removeBean(Object bean) -// { -// if (bean instanceof ContextHandlerCollection) -// { -// ContextHandlerCollection chc = (ContextHandlerCollection)bean; -// unregisterContextHandlerCollection(chc); -// } -// else if (bean instanceof WebAppContext) -// { -// WebAppContext wac = (WebAppContext)bean; -// unregisterWebAppContext(wac); -// } -// } -// -// public void add(Relationship relationship) -// { -// //ignore event for now -// } -// -// public void remove(Relationship relationship) -// { -// //ignore event for now -// } -// -// private void startWebAppContext(WebAppContext webappContext) -// { -// try -// { -// Jetty6WebAppContext context = new Jetty6WebAppContext(webappContext); -// -// // -// if (registration != null) -// { -// registration.registerWebApp(context); -// } -// } -// catch (Exception e) -// { -// e.printStackTrace(); -// } -// -// } -// -// private void stopWebAppContext(WebAppContext webappContext) -// { -// try -// { -// if (registration != null) -// { -// registration.unregisterWebApp(webappContext.getContextPath()); -// } -// } -// catch (Exception e) -// { -// e.printStackTrace(); -// } -// } -// -// private void registerWebAppContext(WebAppContext wac) -// { -// // using servletContext since its the standard object and not jetty specific -// // (need standard object when using ServletContextListener). -// if (!monitoredContexts.contains(wac.getServletContext().getServletContextName())) -// { -// wac.addLifeCycleListener(this); -// if (wac.isStarted()) -// { -// startWebAppContext(wac); -// } -// -// monitoredContexts.add(wac.getContextPath()); -// } -// } -// -// private void unregisterWebAppContext(WebAppContext wac) -// { -// System.out.println("UNREGISTERWEBAPPCONTEXT : " + wac); -// if (monitoredContexts.contains(wac.getServletContext().getServletContextName())) -// { -// monitoredContexts.remove(wac.getServletContext().getServletContextName()); -// -// // -// if (wac.isStarted()) -// { -// stopWebAppContext(wac); -// } -// -// //TODO: remove event listener from the webappcontext -// wac.removeLifeCycleListener(this); -// } -// } -// -// private void registerContextHandlerCollection(ContextHandlerCollection chc) -// { -// if (!monitoredContextHandlerCollection.contains(chc.toString())) -// { -// Handler[] children = chc.getChildHandlersByClass(WebAppContext.class); -// for (int i = 0; i < children.length; i++) -// { -// WebAppContext webAppContext = (WebAppContext)children[i]; -// registerWebAppContext(webAppContext); -// } -// } -// -// monitoredContextHandlerCollection.add(chc.toString()); -// } -// -// private void unregisterContextHandlerCollection(ContextHandlerCollection chc) -// { -// if (monitoredContextHandlerCollection.contains(chc.toString())) -// { -// monitoredContextHandlerCollection.remove(chc.toString()); -// -// Handler[] children = chc.getChildHandlersByClass(WebAppContext.class); -// for (int i = 0; i < children.length; i++) -// { -// WebAppContext webAppContext = (WebAppContext)children[i]; -// unregisterWebAppContext(webAppContext); -// } -// } -// } -// -// public void lifeCycleFailure(LifeCycle lifeCycle, Throwable t) -// { -// //ignore event -// } -// -// public void lifeCycleStarted(LifeCycle lifeCycle) -// { -// startWebAppContext((WebAppContext)lifeCycle); -// } -// -// public void lifeCycleStarting(LifeCycle lifeCycle) -// { -// //ignore event -// } -// -// public void lifeCycleStopped(LifeCycle lifeCycle) -// { -// stopWebAppContext((WebAppContext)lifeCycle); -// } -// -// public void lifeCycleStopping(LifeCycle lifeCycle) -// { -// //Ignore event -// } -// -//} -// +package org.gatein.wci.jetty; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.gatein.wci.RequestDispatchCallback; +import org.gatein.wci.command.CommandDispatcher; +import org.gatein.wci.impl.DefaultServletContainerFactory; +import org.gatein.wci.spi.ServletContainerContext; +import org.mortbay.component.Container; +import org.mortbay.component.LifeCycle; +import org.mortbay.component.Container.Relationship; +import org.mortbay.jetty.Handler; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.handler.ContextHandlerCollection; +import org.mortbay.jetty.webapp.WebAppContext; + +public class Jetty6ServletContainerContext implements ServletContainerContext, org.mortbay.component.Container.Listener, LifeCycle.Listener +{ + + private Registration registration; + + private Container container; + private Server server; + private ContextHandlerCollection chc; + + /** The monitored contexts. */ + private final Set<String> monitoredContexts = new HashSet<String>(); + + private final Set<String> monitoredContextHandlerCollection = new HashSet<String>(); + + public Jetty6ServletContainerContext(Server server) { + this.server = server; + this.container = server.getContainer(); + } + + /** . */ + private final CommandDispatcher dispatcher = new CommandDispatcher("/jettygateinservlet"); + + 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 void start() + { + DefaultServletContainerFactory.registerContext(this); + + Handler[] children = server.getChildHandlersByClass(ContextHandlerCollection.class); + for (int i = 0; i < children.length; i++) + { + ContextHandlerCollection chc = (ContextHandlerCollection)children[i]; + registerContextHandlerCollection(chc); + } + container.addEventListener(this); + } + + public void stop() + { + container.removeEventListener(this); + + Handler[] children = server.getChildHandlersByClass(ContextHandlerCollection.class); + for (int i=0; i< children.length; i++) + { + ContextHandlerCollection chc = (ContextHandlerCollection)children[i]; + unregisterContextHandlerCollection(chc); + } + + registration.cancel(); + registration = null; + } + + public void addBean(Object bean) + { + if (bean instanceof ContextHandlerCollection) + { + ContextHandlerCollection chc = (ContextHandlerCollection)bean; + registerContextHandlerCollection(chc); + } + else if (bean instanceof WebAppContext) + { + WebAppContext wac = (WebAppContext)bean; + System.out.println("ADDING WEBAPP " + wac.getWar()); + registerWebAppContext(wac); + } + } + + public void removeBean(Object bean) + { + if (bean instanceof ContextHandlerCollection) + { + ContextHandlerCollection chc = (ContextHandlerCollection)bean; + unregisterContextHandlerCollection(chc); + } + else if (bean instanceof WebAppContext) + { + WebAppContext wac = (WebAppContext)bean; + unregisterWebAppContext(wac); + } + } + + public void add(Relationship relationship) + { + //ignore event for now + } + + public void remove(Relationship relationship) + { + //ignore event for now + } + + private void startWebAppContext(WebAppContext webappContext) + { + try + { + Jetty6WebAppContext context = new Jetty6WebAppContext(webappContext); + + // + if (registration != null) + { + registration.registerWebApp(context); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + + } + + private void stopWebAppContext(WebAppContext webappContext) + { + try + { + if (registration != null) + { + registration.unregisterWebApp(webappContext.getContextPath()); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + private void registerWebAppContext(WebAppContext wac) + { + // using servletContext since its the standard object and not jetty specific + // (need standard object when using ServletContextListener). + if (!monitoredContexts.contains(wac.getServletContext().getServletContextName())) + { + wac.addLifeCycleListener(this); + if (wac.isStarted()) + { + startWebAppContext(wac); + } + + monitoredContexts.add(wac.getContextPath()); + } + } + + private void unregisterWebAppContext(WebAppContext wac) + { + System.out.println("UNREGISTERWEBAPPCONTEXT : " + wac); + if (monitoredContexts.contains(wac.getServletContext().getServletContextName())) + { + monitoredContexts.remove(wac.getServletContext().getServletContextName()); + + // + if (wac.isStarted()) + { + stopWebAppContext(wac); + } + + //TODO: remove event listener from the webappcontext + wac.removeLifeCycleListener(this); + } + } + + private void registerContextHandlerCollection(ContextHandlerCollection chc) + { + if (!monitoredContextHandlerCollection.contains(chc.toString())) + { + Handler[] children = chc.getChildHandlersByClass(WebAppContext.class); + for (int i = 0; i < children.length; i++) + { + WebAppContext webAppContext = (WebAppContext)children[i]; + registerWebAppContext(webAppContext); + } + } + + monitoredContextHandlerCollection.add(chc.toString()); + } + + private void unregisterContextHandlerCollection(ContextHandlerCollection chc) + { + if (monitoredContextHandlerCollection.contains(chc.toString())) + { + monitoredContextHandlerCollection.remove(chc.toString()); + + Handler[] children = chc.getChildHandlersByClass(WebAppContext.class); + for (int i = 0; i < children.length; i++) + { + WebAppContext webAppContext = (WebAppContext)children[i]; + unregisterWebAppContext(webAppContext); + } + } + } + + public void lifeCycleFailure(LifeCycle lifeCycle, Throwable t) + { + //ignore event + } + + public void lifeCycleStarted(LifeCycle lifeCycle) + { + startWebAppContext((WebAppContext)lifeCycle); + } + + public void lifeCycleStarting(LifeCycle lifeCycle) + { + //ignore event + } + + public void lifeCycleStopped(LifeCycle lifeCycle) + { + stopWebAppContext((WebAppContext)lifeCycle); + } + + public void lifeCycleStopping(LifeCycle lifeCycle) + { + //Ignore event + } + +} + Modified: components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java =================================================================== --- components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java 2009-11-03 19:51:42 UTC (rev 481) +++ components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java 2009-11-03 20:34:20 UTC (rev 482) @@ -1,125 +1,125 @@ -///****************************************************************************** -// * 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. * -// ******************************************************************************/ -//package org.jboss.portal.web.impl.jetty; -// -//import org.w3c.dom.Document; -//import org.jboss.portal.web.command.CommandServlet; -//import org.jboss.portal.web.spi.WebAppContext; -//import org.mortbay.jetty.handler.ContextHandlerCollection; -//import org.mortbay.jetty.servlet.Context; -//import org.mortbay.jetty.servlet.ServletHolder; -// -//import javax.servlet.ServletContext; -//import java.io.InputStream; -//import java.io.IOException; -// -//public class Jetty6WebAppContext implements WebAppContext -//{ -// -// /** The logger. */ -//// protected final Logger log = Logger.getLogger(getClass()); -// -// /** . */ -// private Document descriptor; -// -// /** . */ -// private ServletContext servletContext; -// -// /** . */ -// private ClassLoader loader; -// -// /** . */ -// private String contextPath; -// -// /** . */ -// private final Context context; -// -// /** . */ -// private ServletHolder commandServlet; -// -// Jetty6WebAppContext(Context context) throws Exception -// { -// this.context = context; -// // -// servletContext = context.getServletContext(); -// loader = context.getClassLoader(); -// contextPath = context.getContextPath(); -// } -// -// public void start() throws Exception -// { -// try -// { -// commandServlet = new ServletHolder(); -// commandServlet.setName("JBossServlet"); -// commandServlet.setInitOrder(0); -// commandServlet.setClassName(CommandServlet.class.getName()); -// context.addServlet(commandServlet, "/jbossportlet"); -// } -// catch (Exception e) -// { -// cleanup(); -// throw e; -// } -// } -// -// public void stop() -// { -// cleanup(); -// } -// -// private void cleanup() -// { -// if (commandServlet != null) -// { -// try -// { -// commandServlet.getServletHandler(); -// commandServlet.stop(); -// } -// 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; -// } -//} +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.gatein.wci.jetty; + +import java.io.IOException; +import java.io.InputStream; + +import javax.servlet.ServletContext; + +import org.gatein.wci.command.CommandServlet; +import org.gatein.wci.spi.WebAppContext; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.ServletHolder; +import org.w3c.dom.Document; + +public class Jetty6WebAppContext implements WebAppContext +{ + + /** The logger. */ +// protected final Logger log = Logger.getLogger(getClass()); + + /** . */ + private Document descriptor; + + /** . */ + private ServletContext servletContext; + + /** . */ + private ClassLoader loader; + + /** . */ + private String contextPath; + + /** . */ + private final Context context; + + /** . */ + private ServletHolder commandServlet; + + Jetty6WebAppContext(Context context) throws Exception + { + this.context = context; + // + servletContext = context.getServletContext(); + loader = context.getClassLoader(); + contextPath = context.getContextPath(); + } + + public void start() throws Exception + { + try + { + commandServlet = new ServletHolder(); + commandServlet.setName("JBossServlet"); + commandServlet.setInitOrder(0); + commandServlet.setClassName(CommandServlet.class.getName()); + context.addServlet(commandServlet, "/jettygateinservlet"); + } + catch (Exception e) + { + cleanup(); + throw e; + } + } + + public void stop() + { + cleanup(); + } + + private void cleanup() + { + if (commandServlet != null) + { + try + { + commandServlet.getServletHandler(); + commandServlet.stop(); + } + 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 2009-11-03 19:51:42 UTC (rev 481) +++ components/wci/trunk/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -26,7 +26,7 @@ <version.junit>3.8.2-brew</version.junit> <version.jaxb>2.1</version.jaxb> - <version.jetty>6.1.7</version.jetty> + <version.jetty>6.1.21</version.jetty> <version.jaxen>1.0-FCS</version.jaxen> <version.saxpath>1.0-FCS</version.saxpath> @@ -72,6 +72,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-jetty</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.gatein.wci</groupId> <artifactId>wci-exo</artifactId> <version>${project.version}</version> @@ -88,8 +93,13 @@ <artifactId>jetty</artifactId> <version>${version.jetty}</version> </dependency> - <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${version.jetty}</version> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${version.apache.commons-logging}</version> Added: components/wci/trunk/test/core/pom.xml =================================================================== --- components/wci/trunk/test/core/pom.xml (rev 0) +++ components/wci/trunk/test/core/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,109 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-parent</artifactId> + <version>2.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-core</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI test component</name> + <dependencies> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + </dependency> + + <dependency> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </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> + </dependency> + + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-remote</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-mc</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-ant</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-maven2</artifactId> + <version>1.2.3</version> + <dependencies> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> + <version>1.2.3</version> + </dependency> + </dependencies> + <configuration> + <testsuites> + <testsuite> + <config>${project.build.directory}/test-classes/local-jboss-unit.xml</config> + </testsuite> + </testsuites> + <reports> + <xml>${project.build.directory}/test/reports/local/xml/local</xml> + <html>${project.build.directory}/test/reports/local/html/local</html> + </reports> + </configuration> + <executions> + <execution> + <id>jboss-unit-tests</id> + <phase>test</phase> + <goals> + <goal>execute</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + </properties> +</project> Copied: components/wci/trunk/test/core/src/main/java/org (from rev 432, components/wci/trunk/test/src/test/java/org) Added: components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/server-beans.xml =================================================================== --- components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/server-beans.xml (rev 0) +++ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/endpoint/server-beans.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,106 @@ +<?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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="RemoteTestSuite" class="org.jboss.unit.remote.driver.CompositeRemoteTestDriver"> + <constructor> + <parameter class="org.jboss.unit.driver.impl.composite.AbstractCompositeTestDriver"><inject bean="TestSuite"/></parameter> + </constructor> + </bean> + + <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"> + <property name="delegate"><inject bean="RemoteTestSuite"/></property> + </bean> + + <bean name="TestDriverServerExporter" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> + <constructor> + <parameter>socket://localhost:5400</parameter> + <parameter><inject bean="TestDriverServer"/></parameter> + <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter> + </constructor> + </bean> + + <bean name="ServletContainerFactory" class="org.gatein.wci.impl.DefaultServletContainerFactory"> + <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> + </bean> + + <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> + <constructor factoryMethod="getServletContainer"> + <factory bean="ServletContainerFactory"/> + </constructor> + </bean> + + <bean name="TestSuite" class="org.jboss.unit.driver.impl.composite.CompositeTestDriver"/> + + <bean name="GetTestCase" class="org.gatein.wci.endpoint.GetTestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + + <bean name="PostApplicationXWWWFormURLEncodedTestCase" class="org.gatein.wci.endpoint.PostApplicationXWWWFormURLEncodedTestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + + <bean name="PostMultipartFormDataTestCase" class="org.gatein.wci.endpoint.PostMultipartFormDataTestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + + <bean name="WebPathTestCase" class="org.gatein.wci.endpoint.WebPathTestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + + <bean name="RenderURLTestCase" class="org.gatein.wci.endpoint.RenderURLTestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + +</deployment> + Added: components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/generic/server-beans.xml =================================================================== --- components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/generic/server-beans.xml (rev 0) +++ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/generic/server-beans.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,70 @@ +<?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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="RemoteTestSuite" class="org.jboss.unit.remote.driver.CompositeRemoteTestDriver"> + <constructor> + <parameter class="org.jboss.unit.driver.impl.composite.AbstractCompositeTestDriver"><inject bean="TestSuite"/></parameter> + </constructor> + </bean> + + <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"> + <property name="delegate"><inject bean="RemoteTestSuite"/></property> + </bean> + + <bean name="TestDriverServerExporter" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> + <constructor> + <parameter>socket://localhost:5400</parameter> + <parameter><inject bean="TestDriverServer"/></parameter> + <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter> + </constructor> + </bean> + + <bean name="ServletContainerFactory" GetTestCaseclass="org.gatein.wci.impl.DefaultServletContainerFactory"> + <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> + </bean> + + <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> + <constructor factoryMethod="getServletContainer"> + <factory bean="ServletContainerFactory"/> + </constructor> + </bean> + + <bean name="TestSuite" class="org.jboss.unit.driver.impl.composite.CompositeTestDriver"/> + + <bean name="SPITestCase" class="org.gatein.wci.spi.SPITestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + +</deployment> + Added: components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml =================================================================== --- components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml (rev 0) +++ components/wci/trunk/test/core/src/main/resources/org/gatein/portal/test/web/spi/native/server-beans.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,78 @@ +<?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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="RemoteTestSuite" class="org.jboss.unit.remote.driver.CompositeRemoteTestDriver"> + <constructor> + <parameter class="org.jboss.unit.driver.impl.composite.AbstractCompositeTestDriver"><inject bean="TestSuite"/></parameter> + </constructor> + </bean> + + <bean name="TestDriverServer" class="org.jboss.unit.remote.driver.RemoteTestDriverServer"> + <property name="delegate"><inject bean="RemoteTestSuite"/></property> + </bean> + + <bean name="TestDriverServerExporter" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter"> + <constructor> + <parameter>socket://localhost:5400</parameter> + <parameter><inject bean="TestDriverServer"/></parameter> + <parameter>org.jboss.unit.remote.driver.RemoteTestDriver</parameter> + </constructor> + </bean> + + <bean name="ServletContainerFactory" GetTestCaseclass="org.gatein.wci.impl.DefaultServletContainerFactory"> + <constructor factoryClass="org.gatein.wci.impl.DefaultServletContainerFactory" factoryMethod="getInstance"/> + </bean> + + <bean name="ServletContainer" class="org.gatein.wci.ServletContainer"> + <constructor factoryMethod="getServletContainer"> + <factory bean="ServletContainerFactory"/> + </constructor> + </bean> + + <bean name="TestSuite" class="org.jboss.unit.driver.impl.composite.CompositeTestDriver"/> + + <bean name="SPITestCase" class="org.gatein.wci.spi.SPITestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + + <bean name="SPICompatiblityTestCase" class="org.gatein.wci.spi.SPICompatibilityTestCase"> + <install bean="TestSuite" method="mount"> + <parameter><this/></parameter> + </install> + <uninstall bean="TestSuite" method="unmount"> + <parameter><this/></parameter> + </uninstall> + </bean> + +</deployment> Added: components/wci/trunk/test/core/src/test/resources/local-jboss-unit.xml =================================================================== --- components/wci/trunk/test/core/src/test/resources/local-jboss-unit.xml (rev 0) +++ components/wci/trunk/test/core/src/test/resources/local-jboss-unit.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,11 @@ +<?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"> + <pojo> + <test> + <class name="org.gatein.wci.container.ServletContainerTestCase"/> + </test> + </pojo> +</jboss-unit> Modified: components/wci/trunk/test/pom.xml =================================================================== --- components/wci/trunk/test/pom.xml 2009-11-03 19:51:42 UTC (rev 481) +++ components/wci/trunk/test/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -5,292 +5,46 @@ <version>2.0.0-CR1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>wci-test</artifactId> - <packaging>jar</packaging> - <name>GateIn - WCI test component</name> + <artifactId>wci-test-parent</artifactId> + <packaging>pom</packaging> + <name>GateIn - WCI test parent</name> - <dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> + <artifactId>wci-test-native-portlet</artifactId> + <type>war</type> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-tomcat</artifactId> + <artifactId>wci-test-gatein-portlet</artifactId> + <type>war</type> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.gatein.wci</groupId> - <artifactId>wci-exo</artifactId> + <artifactId>wci-test-exo-portlet</artifactId> + <type>war</type> + <version>${project.version}</version> </dependency> + </dependencies> + </dependencyManagement> - <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>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>catalina</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </dependency> - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <!-- SCOPE TEST --> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-mc</artifactId> - <scope>test</scope> - </dependency> - <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> - </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> - </dependency> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>portal-test-generic</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-logging-jdk</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-logging-log4j</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting</groupId> - <artifactId>jboss-remoting</artifactId> - </dependency> - <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>jboss</groupId> - <artifactId>jboss-serialization</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - </dependency> - <dependency> - <groupId>saxpath</groupId> - <artifactId>saxpath</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cargo</groupId> - <artifactId>cargo-manager</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-jetty-deployer</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-ant</artifactId> - <exclusions> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> + <modules> + <module>core</module> + <module>portlets/gatein-portlet</module> + <module>portlets/exo-portlet</module> + <module>portlets/native-portlet</module> + <module>servers</module> + </modules> - <build> - <plugins> - <plugin> - <groupId>org.jvnet.maven-antrun-extended-plugin</groupId> - <artifactId>maven-antrun-extended-plugin</artifactId> - <version>1.13</version> - - <dependencies> - <dependency> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-ant</artifactId> - <version>${version.jboss.unit}</version> - </dependency> - - <!--stuff to run servers for tests--> - <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.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>${version.cargo}</version> - <scope>test</scope> - </dependency> - - </dependencies> - <executions> - <execution> - <id>test</id> - <phase>integration-test</phase> - <configuration> - <tasks> - - <property name="compile_classpath" refid="maven.compile.classpath" /> - <property name="runtime_classpath" refid="maven.runtime.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - <property name="project.version" value="${project.version}" /> - - <!-- --> - <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" /> - <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}" /> - <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.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.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}" /> - - <!-- GateIn --> - <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" /> - <property name="dependency.gatein-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.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-tomcat.jar.path}" /> - <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> - - <!-- JBoss Unit --> - <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}" /> - <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}" /> - <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}" /> - <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}" /> - <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}" /> - <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}" /> - - <!-- JBoss Microcontainer --> - <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" /> - <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.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}" /> - <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}" /> - <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}" /> - <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}" /> - <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}" /> - <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}" /> - <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}" /> - <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}" /> - <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}" /> - <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}" /> - <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> - - <!-- Cargo Jetty deployer --> - <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}" /> - - <ant antfile="${basedir}/src/test/build.xml"> - <target name="tests" /> - </ant> - - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <properties> - </properties> </project> Added: components/wci/trunk/test/portlets/exo-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/exo-portlet/pom.xml (rev 0) +++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,11 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-parent</artifactId> + <version>2.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-exo-portlet</artifactId> + <packaging>war</packaging> + <name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name> +</project> Added: components/wci/trunk/test/portlets/exo-portlet/src/main/webapp/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/portlets/exo-portlet/src/main/webapp/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/portlets/exo-portlet/src/main/webapp/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<?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> + <listener> + <listener-class>org.exoplatform.services.portletcontainer.impl.servlet.PortletApplicationListener</listener-class> + </listener> + + <servlet> + <servlet-name>PortletWrapper</servlet-name> + <servlet-class>org.exoplatform.services.portletcontainer.impl.servlet.ServletWrapper</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>PortletWrapper</servlet-name> + <url-pattern>/PortletWrapper</url-pattern> + </servlet-mapping> +</web-app> Added: components/wci/trunk/test/portlets/gatein-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/gatein-portlet/pom.xml (rev 0) +++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,13 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-parent</artifactId> + <version>2.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-gatein-portlet</artifactId> + <packaging>war</packaging> + <name>GateIn - WCI Gatein Test Portlet</name> + + +</project> Added: components/wci/trunk/test/portlets/gatein-portlet/src/main/webapp/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/portlets/gatein-portlet/src/main/webapp/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/portlets/gatein-portlet/src/main/webapp/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,39 @@ +<?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> + <servlet> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>GateInServlet</servlet-name> + <url-pattern>/gateinservlet</url-pattern> + </servlet-mapping> +</web-app> + Added: components/wci/trunk/test/portlets/native-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-portlet/pom.xml (rev 0) +++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,11 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-parent</artifactId> + <version>2.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-native-portlet</artifactId> + <packaging>war</packaging> + <name>GateIn - WCI Native Test Portlet</name> +</project> Added: components/wci/trunk/test/portlets/native-portlet/src/main/webapp/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/portlets/native-portlet/src/main/webapp/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/portlets/native-portlet/src/main/webapp/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,31 @@ +<?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> + <!-- left blank as native portlets don't need to have anything specified --> +</web-app> + Added: components/wci/trunk/test/servers/.pom.xml.swp =================================================================== (Binary files differ) Property changes on: components/wci/trunk/test/servers/.pom.xml.swp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wci/trunk/test/servers/jboss42/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/pom.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,350 @@ +<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.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-jboss42</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI JBoss 4.2 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-tomcat</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> + <!-- 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> + </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> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + </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>resolver</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> + + + </dependencies> + + + <build> + <plugins> + <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.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </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.log4j.jar" value="${maven.dependency.apache-log4j.log4j.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-tomcat.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}" /> + + <!-- 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> + </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/jboss42/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-default-servlet-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-default-servlet-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jboss42/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-path-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jboss42/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-root-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/assembly/endpoint-root-path-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jboss42/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/assembly/spi-exo-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/assembly/spi-exo-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jboss42/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/assembly/spi-generic-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/assembly/spi-generic-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jboss42/src/assembly/spi-native-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/assembly/spi-native-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/assembly/spi-native-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jboss42/src/integration-tests/.build.xml.swp =================================================================== (Binary files differ) Property changes on: components/wci/trunk/test/servers/jboss42/src/integration-tests/.build.xml.swp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wci/trunk/test/servers/jboss42/src/integration-tests/build.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/integration-tests/build.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/integration-tests/build.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,64 @@ +<?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_4_2_HOME}"/> + + <!-- properties unique per app server --> + <property name="test.server.name" value="JBoss"/> + <property name="test.server.version" value="4.2"/> + <property name="test.remote.server.name" value="RemoteJBoss_4_2"/> + <property name="cargo.container.id" value="jboss42x"/> + <!-- 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-exo.jar}"/> + </path> + + <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" + 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/jboss42/src/test/resources/config/remote-jboss-unit.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/config/remote-jboss-unit.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/config/remote-jboss-unit.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/config/servers.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/config/servers.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/config/servers.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,20 @@ +<servers> + <server> + <server-name>RemoteJBoss_4_2</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>jboss4x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> +</servers> Added: components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/exo/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/exo/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/generic/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/native/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context privileged="true"> <!-- crossContext="true" --> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss42/src/test/resources/support/native/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss42/src/test/resources/support/native/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,54 @@ +<?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.tomcat.TC6ContainerServlet</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> +</web-app> Added: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,350 @@ +<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.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-jboss51</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI JBoss 5.1 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-tomcat</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> + <!-- 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> + </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> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + </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>resolver</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> + + + </dependencies> + + + <build> + <plugins> + <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.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </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.log4j.jar" value="${maven.dependency.apache-log4j.log4j.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-tomcat.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}" /> + + <!-- 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> + </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/jboss51/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-default-servlet-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-default-servlet-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-path-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-root-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/assembly/endpoint-root-path-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/assembly/spi-exo-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/assembly/spi-exo-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/assembly/spi-generic-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/assembly/spi-generic-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/assembly/spi-native-server.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/assembly/spi-native-server.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/assembly/spi-native-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/integration-tests/.build.xml.swp =================================================================== (Binary files differ) Property changes on: components/wci/trunk/test/servers/jboss51/src/integration-tests/.build.xml.swp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wci/trunk/test/servers/jboss51/src/integration-tests/build.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/integration-tests/build.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/integration-tests/build.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,64 @@ +<?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_5_1_HOME}"/> + + <!-- properties unique per app server --> + <property name="test.server.name" value="JBoss"/> + <property name="test.server.version" value="5.1"/> + <property name="test.remote.server.name" value="RemoteJBoss_5_1"/> + <property name="cargo.container.id" value="jboss51x"/> + <!-- 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-exo.jar}"/> + </path> + + <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" + 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/jboss51/src/test/resources/config/remote-jboss-unit.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/config/remote-jboss-unit.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/config/remote-jboss-unit.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/config/servers.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/config/servers.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,20 @@ +<servers> + <server> + <server-name>RemoteJBoss_5_1</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>jboss5x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> +</servers> Added: components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/exo/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/exo/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/generic/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/native/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/native/server-war/WEB-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context privileged="true"> <!-- crossContext="true" --> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss51/src/test/resources/support/native/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jboss51/src/test/resources/support/native/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,54 @@ +<?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.tomcat.TC6ContainerServlet</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> +</web-app> Added: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,364 @@ +<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.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-jetty6</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI Jetty 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-jetty</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> + <!-- 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> + </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> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + </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>resolver</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> + + <!-- Jetty Deployer --> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-jetty-deployer</artifactId> + <type>war</type> + <version>1.0.1-SNAPSHOT</version> + </dependency> + + </dependencies> + + + <build> + <plugins> + <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> --> + <version>1.0.1-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> +<!-- <version>${version.cargo}</version> --> + <version>1.0.1-SNAPSHOT</version> + <scope>test</scope> + </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.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" /> + <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" /> + <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" /> + <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" /> + <property name="dependency.gatein-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}" /> + <property name="dependency.gatein-wci-exo.jar" value="${maven.dependency.org.gatein.wci.wci-exo.jar.path}" /> + <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" /> + <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" /> + + <!-- locations of archives to use --> + <property name="test.archives.directory" value="${project.build.directory}/test-archives"/> + <property name="test.generic.server.war" value="${test.archives.directory}/test-spi-generic-server.war"/> + <property name="test.native.server.war" value="${test.archives.directory}/test-spi-native-server.war"/> + <property name="test.exo.server.war" value="${test.archives.directory}/test-spi-exo-server.war"/> + + <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}"/> + <!-- --> + + <!-- Cargo Jetty deployer --> + <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}" /> + + + <ant antfile="${basedir}/src/integration-tests/build.xml" inheritRefs="true"> + <target name="tests"/> + </ant> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <properties> + </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/jetty6/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-default-servlet-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-default-servlet-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jetty6/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-path-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jetty6/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-root-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/assembly/endpoint-root-path-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jetty6/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/assembly/spi-exo-server.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/assembly/spi-exo-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jetty6/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/assembly/spi-generic-server.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/assembly/spi-generic-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jetty6/src/assembly/spi-native-server.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/assembly/spi-native-server.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/assembly/spi-native-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,42 @@ +<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-kernel</include> + <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/jetty6/src/integration-tests/build.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/integration-tests/build.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/integration-tests/build.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,76 @@ +<?xml version="1.0"?> +<project name="jetty-integration-test" default="tests"> + + <import file="${common.xml.file}"/> + + <!-- SYSTEM PROPERTIES --> + <property environment="env"/> + <property name="test.cargo.home" value="${env.JETTY_6_1_HOME}"/> + + <!-- properties unique per app server --> + <property name="test.server.name" value="Jetty"/> + <property name="test.server.version" value="6.1"/> + <property name="test.remote.server.name" value="RemoteJetty_6_1"/> + <property name="cargo.container.id" value="jetty6x"/> + <!-- end unique properties --> + + <target name="tests" unless="maven.test.skip"> + <antcall target="tests.common"/> + </target> + + <path id="server.libs"> + <path refid="gatein-common-shared"/> + <path refid="jboss-logging"/> + <!-- server specific dependencies --> + <path path="${dependency.gatein-wci-core.jar}"/> + <path path="${dependency.gatein-wci-jetty.jar}"/> + <path path="${dependency.gatein-wci-exo.jar}"/> + + <path path="${dependency.log4j.jar}"/> + <path path="${dependency.activation.jar}"/> + <path path="${dependency.junit.jar}"/> + <path path="${dependency.jboss-serialization.jar}"/> + + <path location="${dependency.concurrent.jar}"/> + </path> + + <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" + wait="${cargo.wait}"> + <extraClasspath> + <path refid="server.libs"/> + </extraClasspath> + <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}"/> + <deployable type="war" file="${cargo.war}"> + <property name="context" value="${cargo.war.context}"/> + </deployable> + + <configfile file="${target.dir}/test-classes/config/server/jetty.xml" todir="etc"/> + <configfile file="${target.dir}/test-classes/config/server/realm.properties" todir="etc"/> + <deployable type="war" file="${dependency.cargo.jetty-deployer}"> + <property name="context" value="cargo-jetty-deployer"/> + </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}"> + </configuration> + </cargo> + </target> + +</project> Added: components/wci/trunk/test/servers/jetty6/src/test/resources/config/remote-jboss-unit.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/config/remote-jboss-unit.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/config/remote-jboss-unit.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/config/server/jetty.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/jetty.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/jetty.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,214 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> + +<!-- =============================================================== --> +<!-- Configure the Jetty Server --> +<!-- --> +<!-- Documentation of this file format can be found at: --> +<!-- http://docs.codehaus.org/display/JETTY/jetty.xml --> +<!-- --> +<!-- =============================================================== --> + + +<Configure id="Server" class="org.mortbay.jetty.Server"> + + <!-- =========================================================== --> + <!-- Server Thread Pool --> + <!-- =========================================================== --> + <Set name="ThreadPool"> + + <New class="org.mortbay.thread.QueuedThreadPool"> + <Set name="minThreads">10</Set> + <Set name="maxThreads">200</Set> + <Set name="lowThreads">20</Set> + <Set name="SpawnOrShrinkAt">2</Set> + </New> + + <!-- Optional Java 5 bounded threadpool with job queue + <New class="org.mortbay.thread.concurrent.ThreadPool"> + <Set name="corePoolSize">50</Set> + <Set name="maximumPoolSize">50</Set> + </New> + --> + </Set> + + + + <!-- =========================================================== --> + <!-- Set connectors --> + <!-- =========================================================== --> + <!-- One of each type! --> + <!-- =========================================================== --> + + <!-- Use this connector for many frequently idle connections + and for threadless continuations. + --> + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.nio.SelectChannelConnector"> + <Set name="host"><SystemProperty name="jetty.host" /></Set> + <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set> + <Set name="maxIdleTime">30000</Set> + <Set name="Acceptors">2</Set> + <Set name="statsOn">false</Set> + <Set name="confidentialPort">8443</Set> + <Set name="lowResourcesConnections">5000</Set> + <Set name="lowResourcesMaxIdleTime">5000</Set> + </New> + </Arg> + </Call> + + <!-- Use this connector if NIO is not available. + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.bio.SocketConnector"> + <Set name="port">8081</Set> + <Set name="maxIdleTime">50000</Set> + <Set name="lowResourceMaxIdleTime">1500</Set> + </New> + </Arg> + </Call> + --> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- To add a HTTPS SSL listener --> + <!-- see jetty-ssl.xml to add an ssl connector. use --> + <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- To allow Jetty to be started from xinetd --> + <!-- mixin jetty-xinetd.xml: --> + <!-- java -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml --> + <!-- --> + <!-- See jetty-xinetd.xml for further instructions. --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <!-- =========================================================== --> + <!-- Set up global session ID manager --> + <!-- =========================================================== --> + <!-- + <Set name="sessionIdManager"> + <New class="org.mortbay.jetty.servlet.HashSessionIdManager"> + <Set name="workerName">node1</Set> + </New> + </Set> + --> + + <!-- =========================================================== --> + <!-- Set handler Collection Structure --> + <!-- =========================================================== --> + <Set name="handler"> + <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection"> + <Set name="handlers"> + <Array type="org.mortbay.jetty.Handler"> + <Item> + <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/> + </Item> + <Item> + <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/> + </Item> + <Item> + <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/> + </Item> + </Array> + </Set> + </New> + </Set> + + <!-- =========================================================== --> + <!-- Configure the context deployer --> + <!-- A context deployer will deploy contexts described in --> + <!-- configuration files discovered in a directory. --> + <!-- The configuration directory can be scanned for hot --> + <!-- deployments at the configured scanInterval. --> + <!-- --> + <!-- This deployer is configured to deploy contexts configured --> + <!-- in the $JETTY_HOME/contexts directory --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.ContextDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="configurationDir"><SystemProperty name="config.home" default="."/>/contexts</Set> + <Set name="scanInterval">5</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure the webapp deployer. --> + <!-- A webapp deployer will deploy standard webapps discovered --> + <!-- in a directory at startup, without the need for additional --> + <!-- configuration files. It does not support hot deploy or --> + <!-- non standard contexts (see ContextDeployer above). --> + <!-- --> + <!-- This deployer is configured to deploy webapps from the --> + <!-- $JETTY_HOME/webapps directory --> + <!-- --> + <!-- Normally only one type of deployer need be used. --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.WebAppDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="webAppDir"><SystemProperty name="config.home" default="."/>/webapps</Set> + <Set name="parentLoaderPriority">false</Set> + <Set name="extract">true</Set> + <Set name="allowDuplicates">false</Set> + <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure Authentication Realms --> + <!-- Realms may be configured for the entire server here, or --> + <!-- they can be configured for a specific web app in a context --> + <!-- configuration (see $(jetty.home)/contexts/test.xml for an --> + <!-- example). --> + <!-- =========================================================== --> + <Set name="UserRealms"> + <Array type="org.mortbay.jetty.security.UserRealm"> + <Item> + <New class="org.mortbay.jetty.security.HashUserRealm"> + <Set name="name">Test Realm</Set> + <Set name="config"><SystemProperty name="config.home" default="."/>/etc/realm.properties</Set> + <Set name="refreshInterval">0</Set> + </New> + </Item> + </Array> + </Set> + + <!-- =========================================================== --> + <!-- Configure Request Log --> + <!-- Request logs may be configured for the entire server here, --> + <!-- or they can be configured for a specific web app in a --> + <!-- contexts configuration (see $(jetty.home)/contexts/test.xml --> + <!-- for an example). --> + <!-- =========================================================== --> + <Ref id="RequestLog"> + <Set name="requestLog"> + <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog"> + <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set> + <Set name="filenameDateFormat">yyyy_MM_dd</Set> + <Set name="retainDays">90</Set> + <Set name="append">true</Set> + <Set name="extended">false</Set> + <Set name="logCookies">false</Set> + <Set name="LogTimeZone">GMT</Set> + </New> + </Set> + </Ref> + + <!-- =========================================================== --> + <!-- extra options --> + <!-- =========================================================== --> + <Set name="stopAtShutdown">true</Set> + <Set name="sendServerVersion">true</Set> + <Set name="sendDateHeader">true</Set> + <Set name="gracefulShutdown">1000</Set> + +</Configure> Added: components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/jetty.xml-bak =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/jetty.xml-bak (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/jetty.xml-bak 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,195 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> + +<!-- =============================================================== --> +<!-- Configure the Jetty Server --> +<!-- --> +<!-- Documentation of this file format can be found at: --> +<!-- http://docs.codehaus.org/display/JETTY/jetty.xml --> +<!-- --> +<!-- =============================================================== --> + +<Configure id="Server" class="org.mortbay.jetty.Server"> + + <!-- =========================================================== --> + <!-- Server Thread Pool --> + <!-- =========================================================== --> + <Set name="ThreadPool"> + <!-- Default bounded blocking threadpool + --> + <New class="org.mortbay.thread.BoundedThreadPool"> + <Set name="minThreads">10</Set> + <Set name="lowThreads">50</Set> + <Set name="maxThreads">250</Set> + </New> + + <!-- Optional Java 5 bounded threadpool with job queue + <New class="org.mortbay.thread.concurrent.ThreadPool"> + <Arg type="int">0</Arg> + <Set name="corePoolSize">10</Set> + <Set name="maximumPoolSize">250</Set> + </New> + --> + </Set> + + <!-- =========================================================== --> + <!-- Set connectors --> + <!-- =========================================================== --> + <!-- One of each type! --> + <!-- =========================================================== --> + + <!-- Use this connector for many frequently idle connections + and for threadless continuations. + --> + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.nio.SelectChannelConnector"> + <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set> + <Set name="maxIdleTime">30000</Set> + <Set name="Acceptors">2</Set> + <Set name="confidentialPort">8443</Set> + </New> + </Arg> + </Call> + + <!-- Use this connector if NIO is not available. + <Call name="addConnector"> + <Arg> + <New class="org.mortbay.jetty.bio.SocketConnector"> + <Set name="port">8081</Set> + <Set name="maxIdleTime">50000</Set> + <Set name="lowResourceMaxIdleTime">1500</Set> + </New> + </Arg> + </Call> + --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- To add a HTTPS SSL listener --> + <!-- see jetty-ssl.xml to add an ssl connector. use --> + <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <!-- =========================================================== --> + <!-- Set up global session ID manager --> + <!-- =========================================================== --> + <!-- + <Set name="sessionIdManager"> + <New class="org.mortbay.jetty.servlet.HashSessionIdManager"> + <Set name="workerName">node1</Set> + </New> + </Set> + --> + + <!-- =========================================================== --> + <!-- Set handler Collection Structure --> + <!-- =========================================================== --> + <Set name="handler"> + <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection"> + <Set name="handlers"> + <Array type="org.mortbay.jetty.Handler"> + <Item> + <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/> + </Item> + <Item> + <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/> + </Item> + <Item> + <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/> + </Item> + </Array> + </Set> + </New> + </Set> + + <!-- =========================================================== --> + <!-- Configure the context deployer --> + <!-- A context deployer will deploy contexts described in --> + <!-- configuration files discovered in a directory. --> + <!-- The configuration directory can be scanned for hot --> + <!-- deployments at the configured scanInterval. --> + <!-- --> + <!-- This deployer is configured to deploy contexts configured --> + <!-- in the $JETTY_HOME/contexts directory --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.ContextDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="configurationDir"><SystemProperty name="config.home" default="."/>/contexts</Set> + <Set name="scanInterval">1</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure the webapp deployer. --> + <!-- A webapp deployer will deploy standard webapps discovered --> + <!-- in a directory at startup, without the need for additional --> + <!-- configuration files. It does not support hot deploy or --> + <!-- non standard contexts (see ContextDeployer above). --> + <!-- --> + <!-- This deployer is configured to deploy webapps from the --> + <!-- $JETTY_HOME/webapps directory --> + <!-- --> + <!-- Normally only one type of deployer need be used. --> + <!-- --> + <!-- =========================================================== --> + <Call name="addLifeCycle"> + <Arg> + <New class="org.mortbay.jetty.deployer.WebAppDeployer"> + <Set name="contexts"><Ref id="Contexts"/></Set> + <Set name="webAppDir"><SystemProperty name="config.home" default="."/>/webapps</Set> + <Set name="parentLoaderPriority">false</Set> + <Set name="extract">true</Set> + <Set name="allowDuplicates">false</Set> + <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set> + </New> + </Arg> + </Call> + + <!-- =========================================================== --> + <!-- Configure Authentication Realms --> + <!-- Realms may be configured for the entire server here, or --> + <!-- they can be configured for a specific web app in a context --> + <!-- configuration (see $(jetty.home)/contexts/test.xml for an --> + <!-- example). --> + <!-- =========================================================== --> + <Set name="UserRealms"> + <Array type="org.mortbay.jetty.security.UserRealm"> + <Item> + <New class="org.mortbay.jetty.security.HashUserRealm"> + <Set name="name">Test Realm</Set> + <Set name="config"><SystemProperty name="config.home" default="."/>/etc/realm.properties</Set> + </New> + </Item> + </Array> + </Set> + + <!-- =========================================================== --> + <!-- Configure Request Log --> + <!-- Request logs may be configured for the entire server here, --> + <!-- or they can be configured for a specific web app in a --> + <!-- contexts configuration (see $(jetty.home)/contexts/test.xml --> + <!-- for an example). --> + <!-- =========================================================== --> + <Ref id="RequestLog"> + <Set name="requestLog"> + <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog"> + <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg> + <Set name="retainDays">90</Set> + <Set name="append">true</Set> + <Set name="extended">false</Set> + <Set name="LogTimeZone">GMT</Set> + </New> + </Set> + </Ref> + + <!-- =========================================================== --> + <!-- extra options --> + <!-- =========================================================== --> + <Set name="stopAtShutdown">true</Set> + <!-- ensure/prevent Server: header being sent to browsers --> + <Set name="sendServerVersion">true</Set> + +</Configure> Added: components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/realm.properties =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/realm.properties (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/config/server/realm.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,23 @@ +# +# This file defines users passwords and roles for a HashUserRealm +# +# The format is +# <username>: <password>[,<rolename> ...] +# +# Passwords may be clear text, obfuscated or checksummed. The class +# org.mortbay.util.Password should be used to generate obfuscated +# passwords or password checksums +# +# If DIGEST Authentication is used, the password must be in a recoverable +# format, either plain text or OBF:. +# +jetty: MD5:164c88b302622e17050af52c89945d44,user +admin: CRYPT:ad1ks..kc.1Ug,server-administrator,content-administrator,admin +other: OBF:1xmk1w261u9r1w1c1xmq +plain: plain +user: password + +admin: admin,manager + +# This entry is for digest auth. The credential is a MD5 hash of username:realmname:password +digest: MD5:6e120743ad67abfbc385bc2bb754e297 Added: components/wci/trunk/test/servers/jetty6/src/test/resources/config/servers.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/config/servers.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/config/servers.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,24 @@ +<servers> + <server> + <server-name>RemoteJetty_6_1</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>jetty6x</name> + <host>localhost</host> + <port>8080</port> + </remote> + <authentication> + <username>admin</username> + <password>admin</password> + </authentication> + </deployer> + </node> + </server> +</servers> Added: components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/support/exo/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/WEB-INF/jboss-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/support/exo/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/support/generic/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/support/native/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jetty6/src/test/resources/support/native/server-war/WEB-INF/jetty-web.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/jetty-web.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/jetty-web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> +<Configure class="org.mortbay.jetty.webapp.WebAppContext"> + + <Get id="serverObject" name="server"/> + + <New id="jettySetup" class="org.gatein.wci.jetty.Jetty6Handler"> + <Arg><Ref id="serverObject"/></Arg> + </New> + +</Configure> + + Added: components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/jetty6/src/test/resources/support/native/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/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>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> +</web-app> Added: components/wci/trunk/test/servers/pom.xml =================================================================== --- components/wci/trunk/test/servers/pom.xml (rev 0) +++ components/wci/trunk/test/servers/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,130 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-parent</artifactId> + <version>2.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-server-parent</artifactId> + <packaging>pom</packaging> + <name>GateIn - WCI test server parent</name> +<!-- + <modules> + <module>tomcat6</module> + <module>jboss42</module> + <module>jboss51</module> + <module>jetty6</module> + </modules> +--> + <properties> + <test.common.xml>${project.build.directory}/common/common.xml</test.common.xml> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.3</version> + <inherited>false</inherited> + <executions> + <execution> + <id>attach-artifact</id> + <phase>package</phase> + <configuration> + <artifacts> + <artifact> + <file>src/common/resources/common.xml</file> + <type>xml</type> + </artifact> + </artifacts> + </configuration> + <goals> + <goal>attach-artifact</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-common-build.xml</id> + <phase>generate-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-test-server-parent</artifactId> + <version>${project.version}</version> + <type>xml</type> + <outputDirectory>${project.build.directory}/common</outputDirectory> + <destFileName>common.xml</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>default-servers</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>tomcat6</module> + <module>jboss42</module> + <module>jboss51</module> + </modules> + </profile> + <profile> + <id>all-servers</id> + <modules> + <module>tomcat6</module> + <module>jboss42</module> + <module>jboss51</module> + <module>jetty6</module> + </modules> + </profile> + <profile> + <id>tomcat</id> + <modules> + <module>tomcat6</module> + </modules> + </profile> + <profile> + <id>jboss42</id> + <modules> + <module>jboss42</module> + </modules> + </profile> + <profile> + <id>jboss51</id> + <modules> + <module>jboss51</module> + </modules> + </profile> + <profile> + <id>jboss</id> + <modules> + <module>jboss42</module> + <module>jboss51</module> + </modules> + </profile> + <profile> + <id>jetty</id> + <modules> + <module>jetty6</module> + </modules> + </profile> + + </profiles> + +</project> Added: components/wci/trunk/test/servers/src/common/resources/common.xml =================================================================== --- components/wci/trunk/test/servers/src/common/resources/common.xml (rev 0) +++ components/wci/trunk/test/servers/src/common/resources/common.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,161 @@ +<project name="common"> + + <!-- PROPERTIES --> + <property name="target.dir" value="${project.build.directory}"/> + <property name="test.dir" value="${target.dir}/integration-tests"/> + <property name="test.cargo.dir" value="${test.dir}/cargo/"/> + <property name="test.apps.dir" value="${test.dir}/test-apps"/> + + <target name="tests.common"> + <antcall target="clean"/> + <antcall target="mkdirs"/> + <antcall target="test-generic"/> + <antcall target="test-native"/> + <antcall target="test-exo"/> + <antcall target="test-endpoint"/> + </target> + + <path id="jboss-logging"> + <path path="${dependency.jboss-logging-spi.jar}"/> + <path path="${dependency.jboss-logging-jdk.jar}"/> + <path path="${dependency.jboss-logging-log4j.jar}"/> + </path> + + <path id="gatein-common-shared"> + <pathelement path="${dependency.gatein-common-common.jar}"/> + </path> + + <target name="mkdirs"> + <mkdir dir="${test.dir}"/> + </target> + + <target name="clean"> + <delete dir="${test.dir}"/> + </target> + + <target name="cargo.setup"> + <property name="cargo.log.dir" value="${test.dir}/cargo-logs"/> + <mkdir dir="${cargo.log.dir}"/> + <taskdef resource="cargo.tasks"> + <classpath> + <pathelement path="${plugin_classpath}"/> + </classpath> + </taskdef> + </target> + + <target name="test-generic" if="test.generic.enable"> + <property name="test.archive.path" value="${test.apps.dir}/${test.server.name}-${test.server.version}-generic"/> + <!-- setup the generic tests --> + <mkdir dir="${test.archive.path}"/> + <copy file="${test.generic.portlet.war}" tofile="${test.archive.path}/test-spi-app.war"/> + <copy file="${test.generic.server.war}" tofile="${test.archive.path}/test-spi-server.war"/> + + <antcall target="tests.execute"> + <param name="test.id" value="${test.remote.server.name}-spi-generic"/> + <param name="test.war" value="${test.generic.server.war}"/> + <param name="test.war.context" value="test-spi-server"/> + <param name="test.archive.path" value="${test.archive.path}"/> + </antcall> + </target> + + <target name="test-native" if="test.native.enable"> + <property name="test.archive.path" value="${test.apps.dir}/${test.server.name}-${test.server.version}-native"/> + <!-- setup the generic tests --> + <mkdir dir="${test.archive.path}"/> + <copy file="${test.native.portlet.war}" tofile="${test.archive.path}/test-spi-app.war"/> + <copy file="${test.native.server.war}" tofile="${test.archive.path}/test-spi-server.war"/> + <copy file="${test.generic.portlet.war}" tofile="${test.archive.path}/test-generic-app.war"/> + <copy file="${test.exo.portlet.war}" tofile="${test.archive.path}/test-exo-app.war"/> + + + <antcall target="tests.execute"> + <param name="test.id" value="${test.remote.server.name}-spi-native"/> + <param name="test.war" value="${test.native.server.war}"/> + <param name="test.war.context" value="test-spi-server"/> + <param name="test.archive.path" value="${test.archive.path}"/> + </antcall> + </target> + + <target name="test-exo" if="test.exo.enable"> + <property name="test.archive.path" value="${test.apps.dir}/${test.server.name}-${test.server.version}-exo"/> + <!-- setup the exo tests --> + <mkdir dir="${test.archive.path}"/> + <copy file="${test.exo.portlet.war}" tofile="${test.archive.path}/test-spi-app.war"/> + <copy file="${test.exo.server.war}" tofile="${test.archive.path}/test-spi-server.war"/> + + + <antcall target="tests.execute"> + <param name="test.id" value="${test.remote.server.name}-spi-exo"/> + <param name="test.war" value="${test.exo.server.war}"/> + <param name="test.war.context" value="test-spi-server"/> + <param name="test.archive.path" value="${test.archive.path}"/> + </antcall> + </target> + + + <target name="test-endpoint" if="test.endpoint.enable"> + <antcall target="tests.execute"> + <param name="test.id" value="${test.remote.server.name}-endpoint-default-servlet-mapping"/> + <param name="test.war" value="${test.endpoint.default.server.mapping.server.war}"/> + <param name="test.war.context" value="default-servlet-mapping"/> + <param name="test.archive.path" value="${test.apps.dir}/"/> + </antcall> + <antcall target="tests.execute"> + <param name="test.id" value="${test.remote.server.name}-endpoint-root-path-mapping"/> + <param name="test.war" value="${test.endpoint.root.mapping.server.war}"/> + <param name="test.war.context" value="root-path-mapping"/> + <param name="test.archive.path" value="${test.apps.dir}"/> + </antcall> + <antcall target="tests.execute"> + <param name="test.id" value="${test.remote.server.name}-endpoint-path-mapping"/> + <param name="test.war" value="${test.endpoint.path.mapping.server.war}"/> + <param name="test.war.context" value="path-mapping"/> + <param name="test.archive.path" value="${test.apps.dir}"/> + </antcall> + </target> + + <target name="tests.execute"> + <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.id} tests"/> + <antcall target="cargo.start"> + <param name="cargo.wait" value="false"/> + <param name="cargo.war" value="${test.war}"/> + <param name="cargo.war.context" value="${test.war.context}"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.remote.server.name" value="${test.remote.server.name}"/> + <param name="test.remote.archive.path" value="${test.archive.path}"/> + </antcall> + <antcall target="cargo.stop"> + </antcall> + </target> + + <target name="tests.remote"> + + <echo message="test.remote.archive.path : ${test.remote.archive.path}"/> + + <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/> + + <jboss-unit> + + <tests config="${target.dir}/test-classes/config/remote-jboss-unit.xml"> + <property name="archivePath" value="${test.archive.path}"/> + <property name="serverName" value="${test.remote.server.name}"/> + </tests> + + <reports> + <xml toDir="${target.dir}/test/reports/${test.id}/xml/local"/> + <html toDir="${target.dir}/test/reports/${test.id}/html/local"/> + </reports> + + <classpath> + <pathelement location="${target.dir}/test-classes/config"/> + <pathelement location="${target.dir}/classes"/> + <pathelement location="${target.dir}/test-classes"/> + + <pathelement path="${test_classpath}"/> + </classpath> + + </jboss-unit> + + </target> +</project> Added: components/wci/trunk/test/servers/tomcat6/.pom.xml.swp =================================================================== (Binary files differ) Property changes on: components/wci/trunk/test/servers/tomcat6/.pom.xml.swp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: components/wci/trunk/test/servers/tomcat6/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/pom.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,350 @@ +<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.0.0-CR1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>wci-test-tomcat6</artifactId> + <packaging>jar</packaging> + <name>GateIn - WCI Tomcat 6 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-tomcat</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> + <!-- 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> + </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> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test-generic</artifactId> + <scope>test</scope> + </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>resolver</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> + + + </dependencies> + + + <build> + <plugins> + <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.codehaus.cargo</groupId> + <artifactId>cargo-core-uberjar</artifactId> + <version>${version.cargo}</version> + <scope>test</scope> + </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.log4j.jar" value="${maven.dependency.apache-log4j.log4j.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-tomcat.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}" /> + + <!-- 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> + </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/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-default-servlet-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,48 @@ +<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-kernel</include> + <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> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-path-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,48 @@ +<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-kernel</include> + <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> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/endpoint-root-path-mapping.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,48 @@ +<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-kernel</include> + <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> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-exo-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,48 @@ +<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-kernel</include> + <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> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-generic-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,48 @@ +<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-kernel</include> + <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> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-lifecycle-listener-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,48 @@ +<assembly> + <id>spi-lifecycle-listener-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-kernel</include> + <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> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/assembly/spi-native-server.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,48 @@ +<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-kernel</include> + <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> + <!-- others --> + <include>apache-log4j:log4j</include> + <include>apache-xerces:xercesImpl</include> + <include>apache-xerces:resolver</include> + <include>apache-xerces:xml-apis</include> + <include>concurrent:concurrent</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> + Added: components/wci/trunk/test/servers/tomcat6/src/integration-tests/build.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/integration-tests/build.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/integration-tests/build.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,72 @@ +<?xml version="1.0"?> +<project name="tomcat-integration-test" default="tests"> + + <import file="${common.xml.file}"/> + + <!-- SYSTEM PROPERTIES --> + <property environment="env"/> + <property name="test.cargo.home" value="${env.TOMCAT_6_0_HOME}"/> + + + <!-- properties unique per app server --> + <property name="test.server.name" value="Tomcat"/> + <property name="test.server.version" value="6.0"/> + <property name="test.remote.server.name" value="RemoteTomcat_6_0"/> + <property name="cargo.container.id" value="tomcat6x"/> + + <!-- end unique properties --> + + <target name="tests" unless="maven.test.skip"> + <antcall target="tests.common"/> + </target> + + <path id="server.libs"> + <path refid="jboss-logging"/> + <path refid="gatein-common-shared"/> + + <!-- tomcat specific dependencies --> + <path path="${dependency.log4j.jar}"/> + <path path="${dependency.activation.jar}"/> + <path path="${dependency.junit.jar}"/> + <path path="${dependency.gatein-wci-core.jar}"/> + <path path="${dependency.gatein-wci-tomcat.jar}"/> + <path path="${dependency.gatein-wci-exo.jar}"/> + <path path="${dependency.jboss-serialization.jar}"/> + </path> + + <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" + 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}"/> + + <file file="${test.temp.lib}/manager" todir="webapps/manager"/> --> + <file file="${target.dir}/test-classes/config/server/tomcat-users.xml" tofile="conf/tomcat-users.xml"/> + <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}"> + </configuration> + </cargo> + </target> + +</project> Added: components/wci/trunk/test/servers/tomcat6/src/test/resources/config/remote-jboss-unit.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/config/remote-jboss-unit.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/config/remote-jboss-unit.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/config/server/tomcat-users.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/config/server/tomcat-users.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/config/server/tomcat-users.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,3 @@ +<tomcat-users> + <user name="manager" password="manager" roles="manager"/> +</tomcat-users> Added: components/wci/trunk/test/servers/tomcat6/src/test/resources/config/servers.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/config/servers.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/config/servers.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,24 @@ +<servers> + <server> + <server-name>RemoteTomcat_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>tomcat6x</name> + <host>localhost</host> + <port>8080</port> + </remote> + <authentication> + <username>manager</username> + <password>manager</password> + </authentication> + </deployer> + </node> + </server> +</servers> Added: components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/default-servlet-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/path-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/endpoint/root-path-mapping-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/exo/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/log4j.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/classes/logging.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/exo/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/generic/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/log4j.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/classes/logging.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/generic/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/log4j.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/classes/logging.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/lifecycle-listener/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -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/jboss/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> + <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/tomcat6/src/test/resources/support/native/server-war/META-INF/context.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/META-INF/context.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/META-INF/context.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,2 @@ +<Context privileged="true" crossContext="true"> +</Context> \ No newline at end of file Added: components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/log4j.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/classes/logging.properties 2009-11-03 20:34:20 UTC (rev 482) @@ -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/tomcat6/src/test/resources/support/native/server-war/WEB-INF/web.xml =================================================================== --- components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/web.xml (rev 0) +++ components/wci/trunk/test/servers/tomcat6/src/test/resources/support/native/server-war/WEB-INF/web.xml 2009-11-03 20:34:20 UTC (rev 482) @@ -0,0 +1,54 @@ +<?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.tomcat.TC6ContainerServlet</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> +</web-app>