[jboss-cvs] JBossAS SVN: r86882 - in projects/webbeans-ri-int/trunk: deployer and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 6 17:52:51 EDT 2009
Author: petemuir
Date: 2009-04-06 17:52:51 -0400 (Mon, 06 Apr 2009)
New Revision: 86882
Added:
projects/webbeans-ri-int/trunk/deployer/resources/
projects/webbeans-ri-int/trunk/deployer/resources/org/
projects/webbeans-ri-int/trunk/deployer/resources/webbeans/
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/
projects/webbeans-ri-int/trunk/deployer/src/main/java/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeanDiscovery.java
projects/webbeans-ri-int/trunk/deployer/src/test/
projects/webbeans-ri-int/trunk/deployer/src/test/java/
projects/webbeans-ri-int/trunk/deployer/src/test/resources/
Removed:
projects/webbeans-ri-int/trunk/deployer/resources/org/
projects/webbeans-ri-int/trunk/deployer/resources/webbeans/
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/
projects/webbeans-ri-int/trunk/deployer/src/main/resources/
projects/webbeans-ri-int/trunk/deployer/src/test/java/
projects/webbeans-ri-int/trunk/deployer/src/test/resources/
projects/webbeans-ri-int/trunk/jbossas/
projects/webbeans-ri-int/trunk/microcontainer/
Modified:
projects/webbeans-ri-int/trunk/deployer/pom.xml
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/assembly.xml
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java
projects/webbeans-ri-int/trunk/ejb/pom.xml
projects/webbeans-ri-int/trunk/pom.xml
Log:
remove microcontainer and jbossas projects
Modified: projects/webbeans-ri-int/trunk/deployer/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/pom.xml 2009-04-06 21:37:24 UTC (rev 86881)
+++ projects/webbeans-ri-int/trunk/deployer/pom.xml 2009-04-06 21:52:51 UTC (rev 86882)
@@ -2,14 +2,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-ri-int</artifactId>
+ <artifactId>webbeans-jboss-int</artifactId>
<version>5.2.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-ri-int-deployer</artifactId>
+ <artifactId>webbeans-jboss-int-deployer</artifactId>
<version>5.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>Web Beans JBoss AS Deployer</name>
<description>Web Beans deployer for JBoss AS</description>
@@ -44,15 +44,213 @@
<dependencies>
<dependency>
- <groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-ri-int-jbossas</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core</artifactId>
- <optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans.integration</groupId>
+ <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>jsr299-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </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>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Copied: projects/webbeans-ri-int/trunk/deployer/resources (from rev 86827, projects/webbeans-ri-int/trunk/microcontainer/src/test/resources)
Copied: projects/webbeans-ri-int/trunk/deployer/resources/org (from rev 86881, projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org)
Copied: projects/webbeans-ri-int/trunk/deployer/resources/webbeans (from rev 86881, projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans)
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/assembly.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/assembly.xml 2009-04-06 21:37:24 UTC (rev 86881)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/assembly.xml 2009-04-06 21:52:51 UTC (rev 86882)
@@ -14,22 +14,22 @@
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>src/main/assembly/resources</directory>
<outputDirectory></outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
- <useProjectArtifact>false</useProjectArtifact>
+ <useProjectArtifact>true</useProjectArtifact>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.jboss.webbeans:jsr299-api</include>
<include>org.jboss.webbeans:webbeans-api</include>
<include>org.jboss.webbeans:webbeans-spi</include>
<include>org.jboss.webbeans:webbeans-logging</include>
- <include>org.jboss.webbeans.integration:webbeans-ri-int-jboss-ejb</include>
- <include>org.jboss.webbeans.integration:webbeans-ri-int-microcontainer</include>
+ <include>org.jboss.webbeans.integration:webbeans-jboss-int-jboss-ejb</include>
+ <include>org.jboss.webbeans.integration:webbeans-jboss-int-deployer</include>
</includes>
</dependencySet>
<dependencySet>
@@ -38,7 +38,6 @@
<outputDirectory>lib-int</outputDirectory>
<includes>
<include>org.jboss.webbeans:webbeans-core</include>
- <include>org.jboss.webbeans.integration:webbeans-ri-int-jbossas</include>
</includes>
</dependencySet>
</dependencySets>
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources (from rev 86827, projects/webbeans-ri-int/trunk/deployer/src/main/resources)
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF (from rev 86881, projects/webbeans-ri-int/trunk/deployer/src/main/resources/META-INF)
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java (from rev 86827, projects/webbeans-ri-int/trunk/microcontainer/src/main/java)
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java/org (from rev 86881, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org)
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java 2009-04-06 21:37:24 UTC (rev 86881)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
@@ -38,7 +38,6 @@
Set<URL> urls = new HashSet<URL>(2);
urls.add(new URL(libOpt + "webbeans-core.jar"));
- urls.add(new URL(libOpt + "webbeans-ri-int-jbossas.jar"));
return urls;
}
catch (MalformedURLException e)
Copied: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeanDiscovery.java (from rev 86827, projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/JBossWebBeanDiscovery.java)
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeanDiscovery.java (rev 0)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeanDiscovery.java 2009-04-06 21:52:51 UTC (rev 86882)
@@ -0,0 +1,27 @@
+package org.jboss.webbeans.integration.microcontainer.deployer.env;
+
+import java.net.URL;
+
+import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
+
+public class JBossWebBeanDiscovery implements WebBeanDiscovery
+{
+
+ protected final WebBeanDiscoveryEnvironment environment;
+
+ public JBossWebBeanDiscovery(WebBeanDiscoveryEnvironment environment)
+ {
+ this.environment = environment;
+ }
+
+ public Iterable<Class<?>> discoverWebBeanClasses()
+ {
+ return environment.getWebBeanClasses();
+ }
+
+ public Iterable<URL> discoverWebBeansXml()
+ {
+ return environment.getWebBeansXml();
+ }
+
+}
\ No newline at end of file
Property changes on: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeanDiscovery.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java 2009-04-06 21:37:24 UTC (rev 86881)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeansBootstrapDeployer.java 2009-04-06 21:52:51 UTC (rev 86882)
@@ -53,7 +53,7 @@
{
String unitName = unit.getName();
String envName = unitName + "_JBossWebBeanDiscovery";
- BeanMetaDataBuilder envWrapper = BeanMetaDataBuilder.createBuilder(envName, "org.jboss.webbeans.integration.jbossas.bootstrap.JBossWebBeanDiscovery");
+ BeanMetaDataBuilder envWrapper = BeanMetaDataBuilder.createBuilder(envName, "org.jboss.webbeans.integration.microcontainer.deployer.env.JBossWebBeanDiscovery");
envWrapper.addConstructorParameter(WebBeanDiscoveryEnvironment.class.getName(), env);
unit.addAttachment(envName + "_" + BeanMetaData.class.getSimpleName(), envWrapper.getBeanMetaData());
Copied: projects/webbeans-ri-int/trunk/deployer/src/test (from rev 86827, projects/webbeans-ri-int/trunk/microcontainer/src/test)
Copied: projects/webbeans-ri-int/trunk/deployer/src/test/java (from rev 86881, projects/webbeans-ri-int/trunk/microcontainer/src/test/java)
Copied: projects/webbeans-ri-int/trunk/deployer/src/test/resources (from rev 86881, projects/webbeans-ri-int/trunk/microcontainer/src/test/resources)
Modified: projects/webbeans-ri-int/trunk/ejb/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/pom.xml 2009-04-06 21:37:24 UTC (rev 86881)
+++ projects/webbeans-ri-int/trunk/ejb/pom.xml 2009-04-06 21:52:51 UTC (rev 86882)
@@ -1,11 +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.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-ri-int</artifactId>
+ <artifactId>webbeans-jboss-int</artifactId>
<version>5.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>webbeans-ri-int-jboss-ejb</artifactId>
+ <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
<version>5.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Web Beans JBoss EJB3 Integration</name>
Modified: projects/webbeans-ri-int/trunk/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/pom.xml 2009-04-06 21:37:24 UTC (rev 86881)
+++ projects/webbeans-ri-int/trunk/pom.xml 2009-04-06 21:52:51 UTC (rev 86882)
@@ -6,7 +6,7 @@
<version>4</version>
</parent>
<groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-ri-int</artifactId>
+ <artifactId>webbeans-jboss-int</artifactId>
<version>5.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Web Beans JBoss AS Integration Aggregator</name>
@@ -17,8 +17,6 @@
</scm>
<modules>
- <module>jbossas</module>
- <module>microcontainer</module>
<module>ejb</module>
<module>deployer</module>
</modules>
@@ -192,19 +190,9 @@
<dependency>
<groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-ri-int-microcontainer</artifactId>
+ <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-ri-int-jbossas</artifactId>
- <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.webbeans.integration</groupId>
- <artifactId>webbeans-ri-int-jboss-ejb</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
More information about the jboss-cvs-commits
mailing list