[jboss-cvs] JBossAS SVN: r82502 - in projects/webbeans-ri-int/trunk: jbossas/src/test/java/org/jboss/test and 42 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 23 05:17:22 EST 2008
Author: alesj
Date: 2008-12-23 05:17:22 -0500 (Tue, 23 Dec 2008)
New Revision: 82502
Added:
projects/webbeans-ri-int/trunk/microcontainer/src/test/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/VFSTestSuite.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/crm/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/crm/CrmWebBean.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/BusinessInterface.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/MySLSBean.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ext/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ext/ExternalWebBean.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jar/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jar/PlainJavaBean.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jsf/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jsf/NotWBJsfBean.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ui/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ui/UIWebBean.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/util/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/util/SomeUtil.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/web/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/web/ServletWebBean.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/AbstractWebBeansTest.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/application.properties
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/web.xml
Removed:
projects/webbeans-ri-int/trunk/jbossas/src/test/java/org/jboss/test/deployers/
Modified:
projects/webbeans-ri-int/trunk/microcontainer/pom.xml
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java
projects/webbeans-ri-int/trunk/pom.xml
Log:
Add WB discovery tests.
Upgrade MC libs.
Modified: projects/webbeans-ri-int/trunk/microcontainer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/pom.xml 2008-12-23 09:47:55 UTC (rev 82501)
+++ projects/webbeans-ri-int/trunk/microcontainer/pom.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -11,11 +11,17 @@
<name>Web Beans Int Microcontainer</name>
<description>Web Beans Int Microcontainer</description>
<build>
- <testResources>
- <testResource>
- <directory>src/resources/tests</directory>
- </testResource>
- </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+<!--
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+-->
+ </plugin>
+ </plugins>
</build>
<!-- Do not add version information here, use ../build/pom.xml instead -->
@@ -141,7 +147,33 @@
</dependency>
<!-- Test dependencies -->
+
<dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java 2008-12-23 09:47:55 UTC (rev 82501)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -12,8 +12,6 @@
*
* @param <T> exact input type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- *
- * TODO Move into deployer
*/
public abstract class WebBeansUrlIntegrationDeployer<T> extends PathUrlIntegrationDeployer<T>
{
@@ -21,8 +19,7 @@
{
super(input);
setIntegrationURL(getURL());
- setFiles(new String[]{"META-INF/web-beans.xml", "WEB-INF/web-beans.xml"}
- );
+ setFiles(new String[]{"META-INF/web-beans.xml", "WEB-INF/web-beans.xml"});
}
/**
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/VFSTestSuite.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/VFSTestSuite.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/VFSTestSuite.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+import org.jboss.test.webbeans.deployers.test.WBDiscoveryEnvTestCase;
+
+/**
+ * VFS deployers tests.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class VFSTestSuite extends TestSuite
+{
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("Deployers WebBeans Tests");
+
+ suite.addTest(WBDiscoveryEnvTestCase.suite());
+
+ return suite;
+ }
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/crm/CrmWebBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/crm/CrmWebBean.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/crm/CrmWebBean.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.crm;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class CrmWebBean
+{
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/BusinessInterface.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/BusinessInterface.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/BusinessInterface.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.ejb;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public interface BusinessInterface
+{
+ int add(int x, int y);
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/MySLSBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/MySLSBean.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ejb/MySLSBean.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.ejb;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MySLSBean implements BusinessInterface
+{
+ public int add(int x, int y)
+ {
+ return x + y;
+ }
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ext/ExternalWebBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ext/ExternalWebBean.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ext/ExternalWebBean.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.ext;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ExternalWebBean
+{
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jar/PlainJavaBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jar/PlainJavaBean.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jar/PlainJavaBean.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.jar;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class PlainJavaBean
+{
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jsf/NotWBJsfBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jsf/NotWBJsfBean.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/jsf/NotWBJsfBean.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.jsf;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class NotWBJsfBean
+{
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ui/UIWebBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ui/UIWebBean.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/ui/UIWebBean.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.ui;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class UIWebBean
+{
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/util/SomeUtil.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/util/SomeUtil.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/util/SomeUtil.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.util;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class SomeUtil
+{
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/web/ServletWebBean.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/web/ServletWebBean.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/web/ServletWebBean.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.support.web;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ServletWebBean
+{
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/AbstractWebBeansTest.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/AbstractWebBeansTest.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/AbstractWebBeansTest.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.test;
+
+import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
+import org.jboss.test.deployers.BootstrapDeployersTest;
+import org.jboss.virtual.AssembledDirectory;
+import org.jboss.test.webbeans.deployers.support.crm.CrmWebBean;
+import org.jboss.test.webbeans.deployers.support.ejb.MySLSBean;
+import org.jboss.test.webbeans.deployers.support.ext.ExternalWebBean;
+import org.jboss.test.webbeans.deployers.support.jar.PlainJavaBean;
+import org.jboss.test.webbeans.deployers.support.jsf.NotWBJsfBean;
+import org.jboss.test.webbeans.deployers.support.ui.UIWebBean;
+import org.jboss.test.webbeans.deployers.support.util.SomeUtil;
+import org.jboss.test.webbeans.deployers.support.web.ServletWebBean;
+
+/**
+ * AbstractWebBeansTest.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public abstract class AbstractWebBeansTest extends BootstrapDeployersTest
+{
+ protected AbstractWebBeansTest(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // fix bean deployer to take more restictive suffix
+ // else it's gonna pick up our web-beans.xml
+ BeanDeployer deployer = assertBean("BeanDeployer", BeanDeployer.class);
+ deployer.setSuffix("-jboss-beans.xml");
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ // put the old suffix back
+ BeanDeployer deployer = assertBean("BeanDeployer", BeanDeployer.class);
+ deployer.setSuffix("-beans.xml");
+
+ super.tearDown();
+ }
+
+ protected AssembledDirectory createBasicEar() throws Exception
+ {
+ AssembledDirectory ear = createTopLevelWithUtil();
+
+ AssembledDirectory jar = ear.mkdir("simple.jar");
+ addPackage(jar, PlainJavaBean.class);
+ addPath(jar, "/webbeans/simple/jar", "META-INF");
+
+ AssembledDirectory ejbs = ear.mkdir("ejbs.jar");
+ addPackage(ejbs, MySLSBean.class);
+ addPath(ejbs, "/webbeans/simple/ejb", "META-INF");
+
+ AssembledDirectory war = ear.mkdir("simple.war");
+ AssembledDirectory webinf = war.mkdir("WEB-INF");
+ AssembledDirectory classes = webinf.mkdir("classes");
+ addPackage(classes, ServletWebBean.class);
+ addPath(war, "/webbeans/simple/web", "WEB-INF");
+
+ AssembledDirectory lib = webinf.mkdir("lib");
+
+ AssembledDirectory uijar = lib.mkdir("ui.jar");
+ addPackage(uijar, UIWebBean.class);
+ addPath(uijar, "/webbeans/simple/ui", "META-INF");
+
+ // war w/o web-beans.xml
+
+ war = ear.mkdir("crm.war");
+ webinf = war.mkdir("WEB-INF");
+ classes = webinf.mkdir("classes");
+ addPackage(classes, NotWBJsfBean.class);
+
+ lib = webinf.mkdir("lib");
+
+ uijar = lib.mkdir("crm.jar");
+ addPackage(uijar, CrmWebBean.class);
+ addPath(uijar, "/webbeans/simple/crm", "META-INF");
+
+ enableTrace("org.jboss.deployers");
+
+ return ear;
+ }
+
+ protected AssembledDirectory createTopLevelWithUtil() throws Exception
+ {
+ AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(topLevel, "/webbeans/simple", "META-INF");
+
+ AssembledDirectory earLib = topLevel.mkdir("lib");
+
+ AssembledDirectory util = earLib.mkdir("util.jar");
+ addPackage(util, SomeUtil.class);
+
+ AssembledDirectory ext = earLib.mkdir("ext.jar");
+ addPackage(ext, ExternalWebBean.class);
+ addPath(ext, "/webbeans/simple/ext", "META-INF");
+
+ return topLevel;
+ }
+}
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.test.webbeans.deployers.test;
+
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import junit.framework.Test;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryEnvironment;
+import org.jboss.test.webbeans.deployers.support.crm.CrmWebBean;
+import org.jboss.test.webbeans.deployers.support.ejb.BusinessInterface;
+import org.jboss.test.webbeans.deployers.support.ejb.MySLSBean;
+import org.jboss.test.webbeans.deployers.support.ext.ExternalWebBean;
+import org.jboss.test.webbeans.deployers.support.jar.PlainJavaBean;
+import org.jboss.test.webbeans.deployers.support.ui.UIWebBean;
+import org.jboss.test.webbeans.deployers.support.web.ServletWebBean;
+
+/**
+ * WebBeansDiscovery env test case.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class WBDiscoveryEnvTestCase extends AbstractWebBeansTest
+{
+ public WBDiscoveryEnvTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(WBDiscoveryEnvTestCase.class);
+ }
+
+ public void testSimpleUsage() throws Exception
+ {
+ VirtualFile ear = createBasicEar();
+ VFSDeploymentUnit topUnit = assertDeploy(ear);
+ try
+ {
+ WebBeanDiscoveryEnvironment wbDiscovery = topUnit.getAttachment(WebBeanDiscoveryEnvironment.class);
+ assertNotNull("Null WBDiscoveryEnv.", wbDiscovery);
+
+ Set<String> expected = new HashSet<String>();
+ addExpectedResource(expected, "ejbs.jar");
+ addExpectedResource(expected, "ext.jar");
+ addExpectedResource(expected, "simple.jar");
+ addExpectedResource(expected, "ui.jar");
+ addExpectedResource(expected, "crm.jar");
+ addExpectedResource(expected, "simple.war", "/WEB-INF/web-beans.xml");
+
+ for (URL url : wbDiscovery.getWebBeansXml())
+ {
+ boolean found = false;
+ Iterator<String> iter = expected.iterator();
+ while (iter.hasNext())
+ {
+ String expectedURL = iter.next();
+ if (url.toExternalForm().contains(expectedURL))
+ {
+ iter.remove();
+ found = true;
+ break;
+ }
+ }
+ assertTrue("Unexpected wb url: " + url, found);
+ }
+
+ assertEmpty("Should be emtpy, missing " + expected, expected);
+
+ addExpectedClass(expected, BusinessInterface.class);
+ addExpectedClass(expected, MySLSBean.class);
+ addExpectedClass(expected, ExternalWebBean.class);
+ addExpectedClass(expected, PlainJavaBean.class);
+ addExpectedClass(expected, UIWebBean.class);
+ addExpectedClass(expected, ServletWebBean.class);
+ addExpectedClass(expected, CrmWebBean.class);
+
+ for (Class<?> clazz : wbDiscovery.getWebBeanClasses())
+ assertTrue(expected.remove(clazz.getName()));
+
+ assertEmpty("Should be emtpy, missing " + expected, expected);
+ }
+ finally
+ {
+ undeploy(topUnit);
+ }
+ }
+
+ private static void addExpectedResource(Set<String> expected, String unit)
+ {
+ addExpectedResource(expected, unit, "/META-INF/web-beans.xml");
+ }
+
+ private static void addExpectedResource(Set<String> expected, String unit, String suffix)
+ {
+ expected.add(unit + suffix);
+ }
+
+ private static void addExpectedClass(Set<String> expected, Class<?> clazz)
+ {
+ expected.add(clazz.getName());
+ }
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,9 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
+ <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
+
+ <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.microcontainer.JBossWebBeansMetaDataDeployer"/>
+ <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
+
+</deployment>
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/application.properties
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/application.properties (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/application.properties 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,4 @@
+jar-module=simple.jar
+ejb-module=ejbs.jar
+web-module=simple.war
+crm-module=crm.war
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+<ejb-jar>
+</ejb-jar>
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: hand
+Class-Path: lib/util.jar, lib/ext.jar
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/web.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/web.xml (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/web/WEB-INF/web.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -0,0 +1,2 @@
+<web>
+</web>
\ No newline at end of file
Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml 2008-12-23 09:47:55 UTC (rev 82501)
+++ projects/webbeans-ri-int/trunk/pom.xml 2008-12-23 10:17:22 UTC (rev 82502)
@@ -24,15 +24,15 @@
<properties>
<version.webbeans-ri>1.0.0.ALPHA1</version.webbeans-ri>
- <version.jboss.vfs>2.0.0.CR5</version.jboss.vfs>
- <version.jboss.man>2.0.0.CR4</version.jboss.man>
- <version.jboss.microcontainer>2.0.0.CR5</version.jboss.microcontainer>
- <version.jboss.cl>2.0.0.CR5</version.jboss.cl>
- <version.jboss.deployers>2.0.0.CR5</version.jboss.deployers>
- <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
+ <version.jboss.vfs>2.0.0.GA</version.jboss.vfs>
+ <version.jboss.man>2.0.0.GA</version.jboss.man>
+ <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
+ <version.jboss.cl>2.0.1.GA</version.jboss.cl>
+ <version.jboss.deployers>2.2.0-SNAPSHOT</version.jboss.deployers>
+ <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
<version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
<version.jboss.classloading.spi>5.0.1.GA</version.jboss.classloading.spi>
- <version.jboss.metadata>1.0.0.CR5</version.jboss.metadata>
+ <version.jboss.metadata>1.0.0.CR6</version.jboss.metadata>
<version.jbossxb>2.0.0.GA</version.jbossxb>
<version.jboss.ejb3>1.0.0-Beta4</version.jboss.ejb3>
<version.servlet.api>2.5</version.servlet.api>
@@ -337,6 +337,14 @@
<!-- test dependencies -->
<dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.jboss.deployers}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<version>${version.org.jboss.test}</version>
More information about the jboss-cvs-commits
mailing list