[jboss-cvs] JBossAS SVN: r105574 - in trunk: build/docs and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 2 07:31:08 EDT 2010
Author: alesj
Date: 2010-06-02 07:31:05 -0400 (Wed, 02 Jun 2010)
New Revision: 105574
Added:
trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/
trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/HackCEMFBuilder.java
trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/HackTLScanner.java
trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
trunk/server/src/main/java/org/jboss/deployment/ResourceUtilCleanupDeployer.java
trunk/server/src/main/java/org/jboss/deployment/ResourceUtilSetupDeployer.java
trunk/server/src/main/java/org/jboss/deployment/ResourcesIndexDeployer.java
Modified:
trunk/build/build.xml
trunk/build/docs/readme.html
trunk/component-matrix/pom.xml
trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
trunk/main/src/main/java/org/jboss/Main.java
trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java
trunk/server/pom.xml
trunk/server/src/etc/conf/all/bootstrap/deployers.xml
trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
trunk/server/src/main/java/org/jboss/deployment/AltAnnotationMetaDataDeployer.java
trunk/server/src/main/java/org/jboss/deployment/ListDeploymentUnitFilter.java
trunk/server/src/main/java/org/jboss/deployment/OptAnnotationMetaDataDeployer.java
Log:
[JBDEPLOY-8060]; introduce new scanning lib.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/build/build.xml 2010-06-02 11:31:05 UTC (rev 105574)
@@ -321,6 +321,7 @@
<include name="core-naming-jboss-beans.xml"/>
<include name="jbossweb.deployer/**"/>
<include name="metadata-deployer-jboss-beans.xml"/>
+ <include name="scanning-deployers-jboss-beans.xml"/>
<include name="security-deployer-jboss-beans.xml"/>
<include name="jboss-threads.deployer/**"/>
<include name="jboss-logging.deployer/**"/>
@@ -386,6 +387,7 @@
<include name="alias-deployers-jboss-beans.xml"/>
<include name="core-naming-jboss-beans.xml"/>
<include name="metadata-deployer-jboss-beans.xml"/>
+ <include name="scanning-deployers-jboss-beans.xml"/>
<include name="security-deployer-jboss-beans.xml"/>
<exclude name="jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
</fileset>
@@ -2134,8 +2136,9 @@
<fileset refid="javax.enterprise:cdi-api:jar"/>
<fileset refid="javax.mail:mail:jar"/>
<fileset refid="javax.validation:validation-api:jar"/>
+ <fileset refid="org.jboss.scanning:scanning-deployers:jar"/>
<fileset refid="org.jboss.mc-int:jboss-mc-int-servlet:jar"/>
- <fileset refid="org.beanshell:bsh:jar"/>
+ <fileset refid="org.beanshell:bsh:jar"/>
<fileset refid="joesnmp:joesnmp:jar"/>
<fileset refid="wutka-dtdparser:dtdparser:jar"/>
<fileset refid="apache-bsf:bsf:jar"/>
@@ -2233,7 +2236,9 @@
<fileset refid="org.jboss.deployers:jboss-deployers-structure-spi:jar"/>
<fileset refid="org.jboss.deployers:jboss-deployers-vfs:jar"/>
<fileset refid="org.jboss.deployers:jboss-deployers-vfs-spi:jar"/>
- <fileset refid="org.jboss.mcann:mcann-core:jar"/>
+ <fileset refid="org.jboss.scanning:scanning-spi:jar"/>
+ <fileset refid="org.jboss.scanning:scanning-impl:jar"/>
+ <fileset refid="org.jboss.scanning:scanning-plugins:jar"/>
<fileset refid="org.jboss.kernel:jboss-aop-mc-int:jar"/>
<fileset refid="org.jboss.kernel:jboss-dependency:jar"/>
<fileset refid="org.jboss.kernel:jboss-kernel:jar"/>
Modified: trunk/build/docs/readme.html
===================================================================
--- trunk/build/docs/readme.html 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/build/docs/readme.html 2010-06-02 11:31:05 UTC (rev 105574)
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><!-- $Id$ -->
<meta content="text/html" http-equiv="content-type"><meta content="JBoss Inc." name="author"><title>JBoss
5.0.0.CR2 Readme</title></head>
@@ -191,6 +191,7 @@
<li>ear-deployer-jboss-beans.xml - ear deployers</li>
<li>ejb-deployer-jboss-beans.xml - ejb2.x deployers</li>
<li>metadata-deployer-jboss-beans.xml - metadata handlers</li>
+<li>scanning-deployera-jboss-beans.xml - metadata scanning</li>
<li>security-deployer-jboss-beans.xml - security deployers</li>
<li>profileservice-jboss-beans.xml.bak - an example of the repository
based profile service</li>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/component-matrix/pom.xml 2010-06-02 11:31:05 UTC (rev 105574)
@@ -95,14 +95,14 @@
<version.org.jboss.bootstrap>2.1.0-alpha-5</version.org.jboss.bootstrap>
<version.org.jboss.cache.core>3.2.5.GA</version.org.jboss.cache.core>
<version.org.jboss.cache.pojo>3.0.0.GA</version.org.jboss.cache.pojo>
- <version.org.jboss.cl>2.2.0.Alpha4</version.org.jboss.cl>
+ <version.org.jboss.cl>2.2.0.Alpha5</version.org.jboss.cl>
<version.org.jboss.classpool>1.0.0.Alpha5</version.org.jboss.classpool>
<version.org.jboss.cluster.cache.jbc>2.3.0.Final</version.org.jboss.cluster.cache.jbc>
<version.org.jboss.cluster.cache.spi>2.2.0.Final</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.client>1.1.1.GA</version.org.jboss.cluster.client>
<version.org.jboss.cluster.server.api>2.0.0.Alpha3</version.org.jboss.cluster.server.api>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
- <version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
+ <version.org.jboss.deployers>2.2.0.Alpha5</version.org.jboss.deployers>
<version.org.jboss.ejb3.bom>0.1.2</version.org.jboss.ejb3.bom>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
<version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
@@ -115,15 +115,14 @@
<version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
<version.org.jboss.jpa.mcint>1.0.0-alpha-2</version.org.jboss.jpa.mcint>
<version.org.jboss.jpa.spi>1.0.0</version.org.jboss.jpa.spi>
- <version.org.jboss.kernel>2.2.0.Alpha9</version.org.jboss.kernel>
+ <version.org.jboss.kernel>2.2.0.Alpha10</version.org.jboss.kernel>
<version.org.jboss.logging>3.0.0.Beta2</version.org.jboss.logging>
<version.org.jboss.logging-service-metadata>1.0.0.CR8</version.org.jboss.logging-service-metadata>
<version.org.jboss.logmanager>1.2.0.CR2</version.org.jboss.logmanager>
<version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
<version.org.jboss.marshalling>1.3.0.CR3</version.org.jboss.marshalling>
- <version.org.jboss.mcann>1.0.0.Alpha2</version.org.jboss.mcann>
<version.org.jboss.mc-int>2.2.0.Alpha2</version.org.jboss.mc-int>
- <version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
+ <version.org.jboss.mdr>2.2.0.Alpha3</version.org.jboss.mdr>
<version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
<version.org.jboss.metadata.common>2.0.0.Alpha14</version.org.jboss.metadata.common>
<version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
@@ -134,13 +133,14 @@
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
<version.org.jboss.profileservice>0.1.0.Alpha1</version.org.jboss.profileservice>
- <version.org.jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect>
+ <version.org.jboss.reflect>2.2.0.Alpha5</version.org.jboss.reflect>
<version.org.jboss.reloaded.naming>0.1.0</version.org.jboss.reloaded.naming>
<version.org.jboss.reloaded.naming.deployers>0.1.0</version.org.jboss.reloaded.naming.deployers>
<version.org.jboss.resteasy>2.0-beta-2</version.org.jboss.resteasy>
<version.org.jboss.remoting>2.5.2.SP2</version.org.jboss.remoting>
<version.org.jboss.remoting3>3.1.0.Beta2</version.org.jboss.remoting3>
<version.org.jboss.remoting3.metadata>1.0.0.Beta2</version.org.jboss.remoting3.metadata>
+ <version.org.jboss.scanning>1.0.0.Alpha2</version.org.jboss.scanning>
<version.org.jboss.security>3.0.0.Beta4</version.org.jboss.security>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
<version.org.jboss.service.binding>1.1.0.CR1</version.org.jboss.service.binding>
@@ -2485,62 +2485,333 @@
<version>${version.org.jboss.deployers}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.org.jboss.deployers}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-jmx</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <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>org.jboss.scanning</groupId>
+ <artifactId>scanning-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <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>org.jboss.scanning</groupId>
+ <artifactId>scanning-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-jmx</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <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>org.jboss.scanning</groupId>
+ <artifactId>scanning-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-spi</artifactId>
+ <version>${version.org.jboss.scanning}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-impl</artifactId>
+ <version>${version.org.jboss.scanning}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-spi</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.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ <version>${version.org.jboss.scanning}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.vfs</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.kernel</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.weld.integration</groupId>
+ <artifactId>weld-jboss-int-deployer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.mc-int</groupId>
+ <artifactId>jboss-mc-int-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</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>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-deployers</artifactId>
+ <version>${version.org.jboss.scanning}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-impl</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.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.jboss.ejb3.bom</groupId>
<artifactId>bom-as6</artifactId>
Added: trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/HackCEMFBuilder.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/HackCEMFBuilder.java (rev 0)
+++ trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/HackCEMFBuilder.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.as.jpa.scanner;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceUnitInfo;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.jpa.builder.DefaultCEMFBuilder;
+
+import org.hibernate.ejb.packaging.Scanner;
+
+/**
+ * Set scanner to thread local.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class HackCEMFBuilder extends DefaultCEMFBuilder
+{
+ private static ThreadLocal<Scanner> tl = new ThreadLocal<Scanner>();
+
+ public EntityManagerFactory build(DeploymentUnit unit, PersistenceUnitInfo persistenceUnitInfo)
+ {
+ Scanner scanner = unit.getAttachment(Scanner.class);
+ if (scanner != null)
+ tl.set(scanner);
+ try
+ {
+ return super.build(unit, persistenceUnitInfo);
+ }
+ finally
+ {
+ if (scanner != null)
+ tl.remove();
+ }
+ }
+
+ static Scanner getScanner()
+ {
+ return tl.get();
+ }
+}
Added: trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/HackTLScanner.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/HackTLScanner.java (rev 0)
+++ trunk/ejb3/src/main/java/org/jboss/as/jpa/scanner/HackTLScanner.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.as.jpa.scanner;
+
+import java.lang.annotation.Annotation;
+import java.net.URL;
+import java.util.Set;
+
+import org.hibernate.ejb.packaging.NamedInputStream;
+import org.hibernate.ejb.packaging.NativeScanner;
+import org.hibernate.ejb.packaging.Scanner;
+
+/**
+ * Try hack thread local scanner.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class HackTLScanner implements Scanner
+{
+ private Scanner delegate;
+
+ private Scanner getDelegate()
+ {
+ if (delegate == null)
+ {
+ Scanner scanner = HackCEMFBuilder.getScanner();
+ if (scanner != null)
+ delegate = scanner;
+ else
+ delegate = new NativeScanner();
+ }
+ return delegate;
+ }
+
+ public Set<Package> getPackagesInJar(URL jartoScan, Set<Class<? extends Annotation>> annotationsToLookFor)
+ {
+ return getDelegate().getPackagesInJar(jartoScan, annotationsToLookFor);
+ }
+
+ public Set<Class<?>> getClassesInJar(URL jartoScan, Set<Class<? extends Annotation>> annotationsToLookFor)
+ {
+ return getDelegate().getClassesInJar(jartoScan, annotationsToLookFor);
+ }
+
+ public Set<NamedInputStream> getFilesInJar(URL jartoScan, Set<String> filePatterns)
+ {
+ return getDelegate().getFilesInJar(jartoScan, filePatterns);
+ }
+
+ public Set<NamedInputStream> getFilesInClasspath(Set<String> filePatterns)
+ {
+ return getDelegate().getFilesInClasspath(filePatterns);
+ }
+
+ public String getUnqualifiedJarName(URL jarUrl)
+ {
+ return getDelegate().getUnqualifiedJarName(jarUrl);
+ }
+}
\ No newline at end of file
Modified: trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml 2010-06-02 11:31:05 UTC (rev 105574)
@@ -5,7 +5,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- Install the default CEMFBuilder, this will build a JPA 1 compliant
container entity manager factory. -->
- <bean name="CEMFBuilder" class="org.jboss.jpa.builder.DefaultCEMFBuilder"/>
+ <bean name="CEMFBuilder" class="org.jboss.as.jpa.scanner.HackCEMFBuilder"/>
<bean name="DataSourceDependencyResolver" class="org.jboss.as.jpa.resolvers.JBossASDataSourceDependencyResolver"/>
@@ -44,6 +44,10 @@
<property name="defaultPersistenceProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
+ <key>hibernate.ejb.resource_scanner</key>
+ <value>org.jboss.as.jpa.scanner.HackTLScanner</value>
+ </entry>
+ <entry>
<key>hibernate.transaction.manager_lookup_class</key>
<value>org.hibernate.transaction.JBossTransactionManagerLookup</value>
</entry>
Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/main/src/main/java/org/jboss/Main.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -21,26 +21,12 @@
*/
package org.jboss;
-import gnu.getopt.Getopt;
-import gnu.getopt.LongOpt;
-
import java.io.Closeable;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLDecoder;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.net.*;
+import java.util.*;
import org.jboss.bootstrap.api.as.config.JBossASServerConfig;
import org.jboss.bootstrap.api.as.server.JBossASServer;
@@ -48,7 +34,10 @@
import org.jboss.bootstrap.api.lifecycle.LifecycleState;
import org.jboss.bootstrap.spi.as.config.JBossASBasedConfigurationInitializer;
+import gnu.getopt.Getopt;
+import gnu.getopt.LongOpt;
+
/**
* Provides a command line interface to start the JBoss server.
*
@@ -171,11 +160,21 @@
*/
public void boot(final String[] args) throws Exception
{
+ // TODO -- remove this once we have Javassist Reflect performance fixed
+ String tif = System.getProperty("org.jboss.reflect.spi.TypeInfoFactory");
+ if (tif == null)
+ System.setProperty("org.jboss.reflect.spi.TypeInfoFactory", "org.jboss.reflect.plugins.introspection.IntrospectionTypeInfoFactory");
+
// TODO: remove this when JBAS-6744 is fixed
String useUnorderedSequence = System.getProperty("xb.builder.useUnorderedSequence");
if (useUnorderedSequence == null)
System.setProperty("xb.builder.useUnorderedSequence", "true");
+ // TODO -- remove once we know which parsing deployers need this
+ String nim = System.getProperty("org.jboss.deployers.spi.deployer.matchers.NameIgnoreMechanism");
+ if (nim == null)
+ System.setProperty("org.jboss.deployers.spi.deployer.matchers.NameIgnoreMechanism", "org.jboss.deployers.spi.deployer.helpers.DummyNameIgnoreMechanism");
+
// Workaround for http://community.jboss.org/message/532042#532042 // TODO -- remove this after XB update/resolution
System.setProperty("xb.builder.repeatableParticleHandlers", "false");
Modified: trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java
===================================================================
--- trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -1,12 +1,19 @@
package org.jboss.resteasy.integration.deployers;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.ext.Provider;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.mcann.AnnotationRepository;
-import org.jboss.mcann.Element;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.FilterMetaData;
@@ -14,15 +21,9 @@
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrapClasses;
import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
+import org.jboss.scanning.annotations.spi.AnnotationRepository;
+import org.jboss.scanning.annotations.spi.Element;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.ext.Provider;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
/**
* @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/server/pom.xml 2010-06-02 11:31:05 UTC (rev 105574)
@@ -527,10 +527,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.mcann</groupId>
- <artifactId>mcann-core</artifactId>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-deployers</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-06-02 11:31:05 UTC (rev 105574)
@@ -17,7 +17,9 @@
<root>${jboss.lib.url}jboss-deployers-impl.jar</root>
<root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root>
<root>${jboss.lib.url}jboss-deployers-vfs.jar</root>
- <root>${jboss.lib.url}mcann-core.jar</root>
+ <root>${jboss.lib.url}scanning-spi.jar</root>
+ <root>${jboss.lib.url}scanning-impl.jar</root>
+ <root>${jboss.lib.url}scanning-plugins.jar</root>
<!-- JAXB impl here, api is in endorsed -->
<root>${jboss.lib.url}jaxb-impl.jar</root>
Modified: trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml 2010-06-02 11:31:05 UTC (rev 105574)
@@ -11,101 +11,6 @@
-->
<bean name="ReferenceMetaDataResolverDeployer" class="org.jboss.deployment.MappedReferenceMetaDataResolverDeployer"/>
- <!-- Generic scanning deployer - using javassist to do lookup -->
-
- <bean name="EarLibExcludeDeployer" class="org.jboss.deployment.EarLibExcludeDeployer"/>
-
- <bean name="JBossMetaDataDUFilter" class="org.jboss.deployment.JBossMetaDataDeploymentUnitFilter"/>
-
- <bean name="ScanningMetaDataDeployer" class="org.jboss.deployers.vfs.plugins.annotations.ScanningMetaDataDeployer"/>
- <bean name="ScanningMetaDataDUFilter" class="org.jboss.deployers.vfs.plugins.annotations.ScanningDeploymentUnitFilter"/>
-
- <bean name="JBossCustomDeployDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.VirtualFileDeploymentUnitFilter">
- <constructor>
- <parameter>
- <bean class="org.jboss.vfs.util.FileNameVirtualFileFilter">
- <constructor>
- <parameter>
- <map keyClass="java.lang.String" valueClass="java.util.Set">
- <entry>
- <key>jbossweb.sar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>console-mgr.sar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>jbossws.sar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>jmx-remoting.sar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>jboss-local-jdbc.rar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>jboss-xa-jdbc.rar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>jms-ra.rar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>mail-ra.rar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>quartz-ra.rar</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>jmx-console.war</key>
- <value><null/></value>
- </entry>
- <entry>
- <key>admin-console.war</key>
- <value><null/></value>
- </entry>
- </map>
- </parameter>
- </constructor>
- </bean>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="DeploymentProvidedDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.DeploymentProvidedDeploymentUnitFilter" />
-
- <bean name="GenScanDeployer" class="org.jboss.deployers.vfs.plugins.annotations.FilteredAnnotationRepositoryDeployer">
- <property name="filter">
- <bean class="org.jboss.deployment.ListDeploymentUnitFilter">
- <property name="filters">
- <list>
- <inject bean="DeploymentProvidedDUFilter" />
- <inject bean="JBossMetaDataDUFilter"/>
- <inject bean="ScanningMetaDataDUFilter"/>
- <inject bean="JBossCustomDeployDUFilter"/>
- </list>
- </property>
- </bean>
- </property>
- </bean>
-
- <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
- <property name="metaDataCompleteIsDefault">false</property>
- </bean>
-
- <!-- Extract annotations into a standard metadata view
- <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.AnnotationMetaDataDeployer">
- <property name="metaDataCompleteIsDefault">false</property>
- </bean>
- -->
-
<!-- The schema location to JBossXB binding class mappings. We specify the dtd/xsd name
of the schema as the location to work with legacy dtd as well as namespace based
documents.
Copied: trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml (from rev 105269, trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml)
===================================================================
--- trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml (rev 0)
+++ trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml 2010-06-02 11:31:05 UTC (rev 105574)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Scanning configuration
+ $Id$
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Generic scanning deployers -->
+
+ <bean name="EarLibExcludeDeployer" class="org.jboss.deployment.EarLibExcludeDeployer"/>
+
+ <bean name="ResourceErrorHandler" class="org.jboss.scanning.plugins.visitor.IgnoreSetErrorHandler">
+ <install method="addIgnored">
+ <parameter>java.lang.NoClassDefFoundError</parameter>
+ </install>
+ <uninstall method="removeIgnored">
+ <parameter>java.lang.NoClassDefFoundError</parameter>
+ </uninstall>
+ </bean>
+
+ <bean name="ResourceUtilDeployer" class="org.jboss.deployment.ResourceUtilSetupDeployer">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
+ </constructor>
+ <property name="handler"><inject bean="ResourceErrorHandler"/></property>
+ </bean>
+
+ <bean name="ResourceUtilCleanupDeployer" class="org.jboss.deployment.ResourceUtilCleanupDeployer"/>
+
+ <bean name="JBossMetaDataDUFilter" class="org.jboss.deployment.JBossMetaDataDeploymentUnitFilter"/>
+
+ <bean name="ScanningMetaDataDeployer" class="org.jboss.scanning.deployers.metadata.ScanningMetaDataDeployer"/>
+ <bean name="ScanningMetaDataDUFilter" class="org.jboss.scanning.deployers.filter.ScanningDeploymentUnitFilter"/>
+
+ <bean name="JBossCustomDeployDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.VirtualFileDeploymentUnitFilter">
+ <constructor>
+ <parameter>
+ <bean class="org.jboss.vfs.util.FileNameVirtualFileFilter">
+ <constructor>
+ <parameter>
+ <map keyClass="java.lang.String" valueClass="java.util.Set">
+ <entry>
+ <key>jbossweb.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>console-mgr.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jbossws.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jmx-remoting.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jboss-local-jdbc.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jboss-xa-jdbc.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jms-ra.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>mail-ra.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>quartz-ra.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jmx-console.war</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>admin-console.war</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>juddi-service.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>xnio-provider.jar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>mod_cluster.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>ROOT.war</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>http-invoker.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>uuid-key-generator.sar</key>
+ <value><null/></value>
+ </entry>
+ <!-- dirs TODO - fix exact names -->
+ <entry>
+ <key>hornetq</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>security</key>
+ <value><null/></value>
+ </entry>
+ <!-- all -->
+ <entry>
+ <key>cluster</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>snmp-adaptor.sar</key>
+ <value><null/></value>
+ </entry>
+ </map>
+ </parameter>
+ </constructor>
+ </bean>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="DeploymentProvidedDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.DeploymentProvidedDeploymentUnitFilter" />
+
+ <!-- Scanning plugin factories -->
+
+ <bean name="AnnScanningPluginFactory" class="org.jboss.scanning.annotations.plugins.AnnotationsScanningPluginFactory"/>
+ <bean name="HibScanningPluginFactory" class="org.jboss.scanning.hibernate.HibernateScanningPluginFactory">
+ <property name="annotations">
+ <set elementClass="java.lang.Class">
+ <value>javax.persistence.Entity</value>
+ <value>javax.persistence.MappedSuperclass</value>
+ <value>javax.persistence.Embeddable</value>
+ </set>
+ </property>
+ <property name="patterns">
+ <set>
+ <value>**/*.hbm.xml</value>
+ </set>
+ </property>
+ </bean>
+ <bean name="HierarchyScanningPluginFactory" class="org.jboss.scanning.hierarchy.plugins.HierarchyIndexScanningPluginFactory"/>
+ <!-- bean name="WeldScanningPluginFactory" class="org.jboss.scanning.weld.WeldScanningPluginFactory"/ -->
+
+ <bean name="ScanningDeployer" class="org.jboss.scanning.deployers.ScanningDeployer">
+ <property name="filter">
+ <bean class="org.jboss.deployment.ListDeploymentUnitFilter">
+ <property name="filters">
+ <list>
+ <inject bean="DeploymentProvidedDUFilter" />
+ <inject bean="JBossMetaDataDUFilter"/>
+ <inject bean="ScanningMetaDataDUFilter"/>
+ <inject bean="JBossCustomDeployDUFilter"/>
+ </list>
+ </property>
+ </bean>
+ </property>
+ <incallback method="addFactory" state="Configured" whenRequired="Create" />
+ <uncallback method="removeFactory" />
+ </bean>
+
+ <bean name="ResourcesIndexDeployer" class="org.jboss.deployment.ResourcesIndexDeployer"/>
+
+ <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
+ <property name="metaDataCompleteIsDefault">false</property>
+ </bean>
+
+</deployment>
Modified: trunk/server/src/main/java/org/jboss/deployment/AltAnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/AltAnnotationMetaDataDeployer.java 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/server/src/main/java/org/jboss/deployment/AltAnnotationMetaDataDeployer.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -21,43 +21,12 @@
*/
package org.jboss.deployment;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
import javax.annotation.Resources;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.RunAs;
-import javax.ejb.ApplicationException;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.Init;
-import javax.ejb.Local;
-import javax.ejb.LocalHome;
-import javax.ejb.MessageDriven;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
-import javax.ejb.Remote;
-import javax.ejb.RemoteHome;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionManagement;
+import javax.annotation.security.*;
+import javax.ejb.*;
import javax.interceptor.AroundInvoke;
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
@@ -68,9 +37,17 @@
import javax.xml.ws.WebServiceRef;
import javax.xml.ws.WebServiceRefs;
-import org.jboss.mcann.AnnotationRepository;
-import org.jboss.mcann.Element;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.*;
+
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.scanning.annotations.spi.AnnotationRepository;
+import org.jboss.scanning.annotations.spi.Element;
import org.jboss.vfs.VirtualFile;
/**
Modified: trunk/server/src/main/java/org/jboss/deployment/ListDeploymentUnitFilter.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/ListDeploymentUnitFilter.java 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/server/src/main/java/org/jboss/deployment/ListDeploymentUnitFilter.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -23,17 +23,18 @@
import java.util.List;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnitFilter;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnitFilter;
+import org.jboss.deployers.vfs.spi.structure.helpers.VFS2BaseBridgeDeploymentUnitFilter;
/**
* ListDeploymentUnitFilter
*
* @author ales.justin at jboss.org
*/
-public class ListDeploymentUnitFilter implements VFSDeploymentUnitFilter
+public class ListDeploymentUnitFilter extends VFS2BaseBridgeDeploymentUnitFilter
{
- private List<VFSDeploymentUnitFilter> filters;
+ private List<DeploymentUnitFilter> filters;
/**
* Check filters list.
@@ -44,9 +45,10 @@
throw new IllegalArgumentException("Null or empty filters list.");
}
- public boolean accepts(VFSDeploymentUnit unit)
+ @Override
+ protected boolean doAccepts(DeploymentUnit unit)
{
- for (VFSDeploymentUnitFilter filter : filters)
+ for (DeploymentUnitFilter filter : filters)
{
if (filter.accepts(unit) == false)
return false;
@@ -59,7 +61,7 @@
*
* @param filters the filters
*/
- public void setFilters(List<VFSDeploymentUnitFilter> filters)
+ public void setFilters(List<DeploymentUnitFilter> filters)
{
this.filters = filters;
}
Modified: trunk/server/src/main/java/org/jboss/deployment/OptAnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/OptAnnotationMetaDataDeployer.java 2010-06-02 10:51:48 UTC (rev 105573)
+++ trunk/server/src/main/java/org/jboss/deployment/OptAnnotationMetaDataDeployer.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -25,15 +25,8 @@
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
-import org.jboss.mcann.AnnotationRepository;
-import org.jboss.mcann.Element;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.annotation.creator.AbstractCreator;
import org.jboss.metadata.annotation.creator.AnnotationContext;
@@ -46,6 +39,9 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
+import org.jboss.scanning.annotations.spi.AnnotationIndex;
+import org.jboss.scanning.annotations.spi.AnnotationRepository;
+import org.jboss.scanning.annotations.spi.Element;
import org.jboss.vfs.VirtualFile;
/**
@@ -60,7 +56,7 @@
public OptAnnotationMetaDataDeployer()
{
super();
- setInput(AnnotationRepository.class);
+ setInput(AnnotationIndex.class);
}
protected void processMetaData(VFSDeploymentUnit unit, WebMetaData webMetaData, ApplicationClientMetaData clientMetaData, List<VirtualFile> classpath) throws Exception
@@ -138,7 +134,7 @@
{
boolean trace = log.isTraceEnabled();
- AnnotationRepository env = unit.getAttachment(AnnotationRepository.class);
+ AnnotationRepository env = unit.getAttachment(AnnotationIndex.class);
if (env == null)
{
if (trace)
Added: trunk/server/src/main/java/org/jboss/deployment/ResourceUtilCleanupDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/ResourceUtilCleanupDeployer.java (rev 0)
+++ trunk/server/src/main/java/org/jboss/deployment/ResourceUtilCleanupDeployer.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -0,0 +1,54 @@
+/*
+ * 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.deployment;
+
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.scanning.plugins.visitor.CachingReflectProvider;
+import org.jboss.scanning.plugins.visitor.ReflectProvider;
+
+/**
+ * Cleanup scanning resource utils.
+ *
+ * @author ales.justin at jboss.org
+ */
+public class ResourceUtilCleanupDeployer extends AbstractSimpleRealDeployer<Module>
+{
+ public ResourceUtilCleanupDeployer()
+ {
+ super(Module.class);
+ setStage(DeploymentStages.PRE_REAL);
+ }
+
+ public void deploy(DeploymentUnit unit, Module deployment) throws DeploymentException
+ {
+ ReflectProvider provider = unit.removeAttachment(ReflectProvider.class);
+ if (provider != null && provider instanceof CachingReflectProvider)
+ {
+ CachingReflectProvider crp = (CachingReflectProvider)provider;
+ crp.reset();
+ }
+ }
+}
\ No newline at end of file
Copied: trunk/server/src/main/java/org/jboss/deployment/ResourceUtilSetupDeployer.java (from rev 105412, trunk/server/src/main/java/org/jboss/deployment/ListDeploymentUnitFilter.java)
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/ResourceUtilSetupDeployer.java (rev 0)
+++ trunk/server/src/main/java/org/jboss/deployment/ResourceUtilSetupDeployer.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -0,0 +1,86 @@
+/*
+ * 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.deployment;
+
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.kernel.Kernel;
+import org.jboss.scanning.plugins.helpers.ResourceOwnerFinder;
+import org.jboss.scanning.plugins.visitor.CachingReflectProvider;
+import org.jboss.scanning.plugins.visitor.ConfiguratorReflectProvider;
+import org.jboss.scanning.plugins.visitor.ErrorHandler;
+import org.jboss.scanning.plugins.visitor.ReflectProvider;
+
+/**
+ * Setup scanning resource utils.
+ *
+ * @author ales.justin at jboss.org
+ */
+public class ResourceUtilSetupDeployer extends AbstractSimpleRealDeployer<Module>
+{
+ private ReflectProvider provider;
+ private ErrorHandler handler;
+ private ResourceOwnerFinder finder;
+
+ public ResourceUtilSetupDeployer(Kernel kernel)
+ {
+ super(Module.class);
+ if (kernel == null)
+ throw new IllegalArgumentException("Null kernel");
+
+ setStage(DeploymentStages.CLASSLOADER);
+ provider = new ConfiguratorReflectProvider(kernel.getConfigurator());
+ }
+
+ @Override
+ public void deploy(DeploymentUnit unit, Module deployment) throws DeploymentException
+ {
+ unit.addAttachment(ReflectProvider.class, new CachingReflectProvider(provider)); // wrap with cache
+ if (handler != null)
+ unit.addAttachment(ErrorHandler.class, handler);
+ if (finder != null)
+ unit.addAttachment(ResourceOwnerFinder.class, finder);
+ }
+
+ @Override
+ public void undeploy(DeploymentUnit unit, Module deployment)
+ {
+ if (handler != null)
+ unit.removeAttachment(ErrorHandler.class);
+ if (finder != null)
+ unit.removeAttachment(ResourceOwnerFinder.class);
+ unit.removeAttachment(ReflectProvider.class);
+ }
+
+ public void setHandler(ErrorHandler handler)
+ {
+ this.handler = handler;
+ }
+
+ public void setFinder(ResourceOwnerFinder finder)
+ {
+ this.finder = finder;
+ }
+}
\ No newline at end of file
Property changes on: trunk/server/src/main/java/org/jboss/deployment/ResourceUtilSetupDeployer.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/server/src/main/java/org/jboss/deployment/ResourcesIndexDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/ResourcesIndexDeployer.java (rev 0)
+++ trunk/server/src/main/java/org/jboss/deployment/ResourcesIndexDeployer.java 2010-06-02 11:31:05 UTC (rev 105574)
@@ -0,0 +1,66 @@
+/*
+ * 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.deployment;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractOptionalRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.scanning.annotations.spi.AnnotationIndex;
+import org.jboss.scanning.hierarchy.spi.HierarchyIndex;
+import org.jboss.scanning.web.plugins.DefaultResourcesIndex;
+import org.jboss.scanning.web.spi.ResourcesIndex;
+
+/**
+ * Assemble ResourcesIndex.
+ *
+ * Use JBossWebMetaData as optional, as this is our current use case,
+ * which can then be made generic.
+ *
+ * @author ales.justin at jboss.org
+ */
+public class ResourcesIndexDeployer extends AbstractOptionalRealDeployer<JBossWebMetaData>
+{
+ public ResourcesIndexDeployer()
+ {
+ super(JBossWebMetaData.class);
+ addInput(AnnotationIndex.class);
+ addInput(HierarchyIndex.class);
+ setOutput(ResourcesIndex.class);
+ setStage(DeploymentStages.POST_CLASSLOADER);
+ }
+
+ public void deploy(DeploymentUnit unit, JBossWebMetaData deployment) throws DeploymentException
+ {
+ AnnotationIndex ai = unit.getAttachment(AnnotationIndex.class);
+ if (ai == null)
+ return;
+
+ HierarchyIndex hi = unit.getAttachment(HierarchyIndex.class);
+ if (hi == null)
+ return;
+
+ ResourcesIndex ri = new DefaultResourcesIndex(ai, hi);
+ unit.addAttachment(ResourcesIndex.class, ri);
+ }
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list