[jboss-cvs] JBossAS SVN: r80488 - in projects/jboss-deployers/tags: 2.0.0.CR4 and 21 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 4 08:04:23 EST 2008
Author: alesj
Date: 2008-11-04 08:04:22 -0500 (Tue, 04 Nov 2008)
New Revision: 80488
Added:
projects/jboss-deployers/tags/2.0.0.CR4/
projects/jboss-deployers/tags/2.0.0.CR4/build/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-client-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-client/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-core-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-core/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-impl/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-structure-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/support/
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuperAnnotated.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuperAnnotated.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/resources/structure/explicit/comparator.jar/
projects/jboss-deployers/tags/2.0.0.CR4/pom.xml
Removed:
projects/jboss-deployers/tags/2.0.0.CR4/build/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-client-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-client/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-core-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-core/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-impl/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-structure-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs-spi/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/pom.xml
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java
projects/jboss-deployers/tags/2.0.0.CR4/pom.xml
Log:
[maven-release-plugin] copy for tag 2.0.0.CR4
Copied: projects/jboss-deployers/tags/2.0.0.CR4 (from rev 80034, projects/jboss-deployers/branches/Branch_2_0)
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/build/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/build/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/build/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,18 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-dist</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Deployers Distribution Build</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>
- The JBoss Deployment Distribution Build.
- </description>
-
-</project>
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/build/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/build/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/build/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/build/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,18 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-dist</artifactId>
+ <version>2.0.0.CR4</version>
+ <packaging>pom</packaging>
+ <name>JBoss Deployers Distribution Build</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>
+ The JBoss Deployment Distribution Build.
+ </description>
+
+</project>
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-client/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-client/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-client/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,65 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-client</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers Client</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers Client</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-client/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-client/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-client/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-client/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,65 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-client</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers Client</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers Client</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-client-spi/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-client-spi/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-client-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,40 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers Client SPI</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers Client SPI</description>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <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>
- </dependencies>
-</project>
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-client-spi/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-client-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-client-spi/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-client-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,40 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers Client SPI</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers Client SPI</description>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <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>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-core/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-core/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-core/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,60 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-core</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers Core</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers Core</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <!-- Do not add version information here, use ../build/pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-core/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-core/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-core/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-core/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,60 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-core</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers Core</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers Core</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <!-- Do not add version information here, use ../build/pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-core-spi/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-core-spi/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-core-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,40 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers Core SPI</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers Core SPI</description>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <!-- Global dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-slide</groupId>
- <artifactId>webdavlib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-core-spi/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-core-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-core-spi/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-core-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,40 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers Core SPI</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers Core SPI</description>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <!-- Global dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-impl/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-impl/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,186 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-impl</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers Impl</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers Impl</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <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 ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- <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.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <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.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <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>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-impl/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-impl/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-impl/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-impl/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,186 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers Impl</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers Impl</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <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 ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <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.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <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.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <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>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-spi/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-spi/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,21 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-spi</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers SPI</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers SPI</description>
- <!-- Do not add version information here, use ../build/pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-spi/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-spi/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,21 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers SPI</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers SPI</description>
+ <!-- Do not add version information here, use ../build/pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-structure-spi/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-structure-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,132 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers Structure SPI</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers Structure SPI</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <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.integration</groupId>
- <artifactId>jboss-classloading-spi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-structure-spi/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-structure-spi/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-structure-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,132 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers Structure SPI</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers Structure SPI</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <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.integration</groupId>
+ <artifactId>jboss-classloading-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,166 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-vfs</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers VFS</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers VFS</description>
-
- <build>
- <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 ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading-vfs</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <exclusions>
- <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>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <exclusions>
- <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.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,166 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers VFS</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers VFS</description>
+
+ <build>
+ <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 ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <exclusions>
+ <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>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <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.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,193 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.deployers.vfs.deployer.kernel;
-
-import java.util.Collection;
-
-import org.jboss.beans.metadata.plugins.AbstractClassLoaderMetaData;
-import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
-import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ScopeInfo;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.metadata.spi.scope.Scope;
-import org.jboss.metadata.spi.scope.ScopeKey;
-
-/**
- * BeanMetaDataDeployer.<p>
- *
- * This deployer is responsible for deploying all metadata of
- * type {@link org.jboss.beans.metadata.spi.BeanMetaData}.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class BeanMetaDataDeployer extends AbstractSimpleRealDeployer<BeanMetaData>
-{
- /** The controller */
- private Controller controller;
-
- /**
- * Create a new BeanDeployer.
- *
- * @param kernel the kernel
- * @throws IllegalArgumentException for a null kernel
- * @deprecated use other constructor
- */
- public BeanMetaDataDeployer(Kernel kernel)
- {
- super(BeanMetaData.class);
- if (kernel == null)
- throw new IllegalArgumentException("Null kernel");
- init(kernel.getController());
- }
-
- /**
- * Create a new BeanDeployer.
- *
- * @param controller the controller
- * @throws IllegalArgumentException for a null controller
- */
- public BeanMetaDataDeployer(Controller controller)
- {
- super(BeanMetaData.class);
- init(controller);
- }
-
- /**
- * Simple init.
- *
- * @param controller the controller
- */
- protected void init(Controller controller)
- {
- if (controller == null)
- throw new IllegalArgumentException("Null controller");
- this.controller = controller;
- setComponentsOnly(true);
- setUseUnitName(true);
- }
-
- @Override
- public void deploy(DeploymentUnit unit, BeanMetaData deployment) throws DeploymentException
- {
- // No explicit classloader, use the deployment's classloader
- if (deployment.getClassLoader() == null)
- {
- try
- {
- // Check the unit has a classloader
- unit.getClassLoader();
- // TODO clone the metadata?
- deployment.setClassLoader(new DeploymentClassLoaderMetaData(unit));
- }
- catch (Exception e)
- {
- log.debug("Unable to retrieve classloader for deployment: " + unit.getName() + " reason=" + e.toString());
- }
- }
- KernelControllerContext context = new AbstractKernelControllerContext(null, deployment, null);
- ScopeInfo scopeInfo = context.getScopeInfo();
- if (scopeInfo != null)
- {
- mergeScopes(scopeInfo.getScope(), unit.getScope());
- mergeScopes(scopeInfo.getMutableScope(), unit.getMutableScope());
- }
- try
- {
- controller.install(context);
- }
- catch (Throwable t)
- {
- throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + deployment.getName(), t);
- }
- }
-
- /**
- * Merge scope keys.
- *
- * @param contextKey the context key
- * @param unitKey the unit key
- */
- protected static void mergeScopes(ScopeKey contextKey, ScopeKey unitKey)
- {
- if (contextKey == null)
- return;
- if (unitKey == null)
- return;
-
- Collection<Scope> unitScopes = unitKey.getScopes();
- if (unitScopes == null || unitScopes.isEmpty())
- return;
-
- for (Scope scope : unitScopes)
- contextKey.addScope(scope);
- }
-
- @Override
- public void undeploy(DeploymentUnit unit, BeanMetaData deployment)
- {
- controller.uninstall(deployment.getName());
-
- // Remove any classloader metadata we added (not necessary if we clone above)
- ClassLoaderMetaData classLoader = deployment.getClassLoader();
- if (classLoader instanceof DeploymentClassLoaderMetaData)
- deployment.setClassLoader(null);
- }
-
- /**
- * DeploymentClassLoaderMetaData.
- */
- private class DeploymentClassLoaderMetaData extends AbstractClassLoaderMetaData
- {
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
- /** The deployment unit */
- private DeploymentUnit unit;
-
- /**
- * Create a new DeploymentClassLoaderMetaData.
- *
- * @param unit the deployment unit
- */
- public DeploymentClassLoaderMetaData(DeploymentUnit unit)
- {
- if (unit == null)
- throw new IllegalArgumentException("Null unit");
- this.unit = unit;
- }
-
- @Override
- public ValueMetaData getClassLoader()
- {
- return new AbstractValueMetaData(unit.getClassLoader());
- }
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,190 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.deployers.vfs.deployer.kernel;
+
+import java.util.Collection;
+
+import org.jboss.beans.metadata.plugins.AbstractClassLoaderMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
+import org.jboss.beans.metadata.spi.ValueMetaData;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ScopeInfo;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.metadata.spi.scope.Scope;
+import org.jboss.metadata.spi.scope.ScopeKey;
+
+/**
+ * BeanMetaDataDeployer.<p>
+ *
+ * This deployer is responsible for deploying all metadata of
+ * type {@link org.jboss.beans.metadata.spi.BeanMetaData}.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class BeanMetaDataDeployer extends AbstractSimpleRealDeployer<BeanMetaData>
+{
+ /** The controller */
+ private Controller controller;
+
+ /**
+ * Create a new BeanDeployer.
+ *
+ * @param kernel the kernel
+ * @throws IllegalArgumentException for a null kernel
+ * @deprecated use other constructor
+ */
+ public BeanMetaDataDeployer(Kernel kernel)
+ {
+ super(BeanMetaData.class);
+ if (kernel == null)
+ throw new IllegalArgumentException("Null kernel");
+ init(kernel.getController());
+ }
+
+ /**
+ * Create a new BeanDeployer.
+ *
+ * @param controller the controller
+ * @throws IllegalArgumentException for a null controller
+ */
+ public BeanMetaDataDeployer(Controller controller)
+ {
+ super(BeanMetaData.class);
+ init(controller);
+ }
+
+ /**
+ * Simple init.
+ *
+ * @param controller the controller
+ */
+ protected void init(Controller controller)
+ {
+ if (controller == null)
+ throw new IllegalArgumentException("Null controller");
+ this.controller = controller;
+ setComponentsOnly(true);
+ setUseUnitName(true);
+ }
+
+ @Override
+ public void deploy(DeploymentUnit unit, BeanMetaData deployment) throws DeploymentException
+ {
+ // No explicit classloader, use the deployment's classloader
+ if (deployment.getClassLoader() == null)
+ {
+ try
+ {
+ // Check the unit has a classloader
+ unit.getClassLoader();
+ // TODO clone the metadata?
+ deployment.setClassLoader(new DeploymentClassLoaderMetaData(unit));
+ }
+ catch (Exception e)
+ {
+ log.debug("Unable to retrieve classloader for deployment: " + unit.getName() + " reason=" + e.toString());
+ }
+ }
+ KernelControllerContext context = new AbstractKernelControllerContext(null, deployment, null);
+ ScopeInfo scopeInfo = context.getScopeInfo();
+ scopeInfo.setScope(unit.getScope());
+ scopeInfo.setMutableScope(unit.getMutableScope());
+ try
+ {
+ controller.install(context);
+ }
+ catch (Throwable t)
+ {
+ throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + deployment.getName(), t);
+ }
+ }
+
+ /**
+ * Merge scope keys.
+ *
+ * @param contextKey the context key
+ * @param unitKey the unit key
+ */
+ protected static void mergeScopes(ScopeKey contextKey, ScopeKey unitKey)
+ {
+ if (contextKey == null)
+ return;
+ if (unitKey == null)
+ return;
+
+ Collection<Scope> unitScopes = unitKey.getScopes();
+ if (unitScopes == null || unitScopes.isEmpty())
+ return;
+
+ for (Scope scope : unitScopes)
+ contextKey.addScope(scope);
+ }
+
+ @Override
+ public void undeploy(DeploymentUnit unit, BeanMetaData deployment)
+ {
+ controller.uninstall(deployment.getName());
+
+ // Remove any classloader metadata we added (not necessary if we clone above)
+ ClassLoaderMetaData classLoader = deployment.getClassLoader();
+ if (classLoader instanceof DeploymentClassLoaderMetaData)
+ deployment.setClassLoader(null);
+ }
+
+ /**
+ * DeploymentClassLoaderMetaData.
+ */
+ private class DeploymentClassLoaderMetaData extends AbstractClassLoaderMetaData
+ {
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ /** The deployment unit */
+ private DeploymentUnit unit;
+
+ /**
+ * Create a new DeploymentClassLoaderMetaData.
+ *
+ * @param unit the deployment unit
+ */
+ public DeploymentClassLoaderMetaData(DeploymentUnit unit)
+ {
+ if (unit == null)
+ throw new IllegalArgumentException("Null unit");
+ this.unit = unit;
+ }
+
+ @Override
+ public ValueMetaData getClassLoader()
+ {
+ return new AbstractValueMetaData(unit.getClassLoader());
+ }
+ }
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,129 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.deployers.vfs.deployer.kernel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
-
-/**
- * BeanMetaDataVisitor.<p>
- *
- * @param <T> exact attachment type
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public abstract class BeanMetaDataFactoryVisitor<T> implements DeploymentVisitor<T>
-{
- private Logger log = Logger.getLogger(getClass());
-
- /**
- * Add bean component.
- *
- * @param unit the deployment unit
- * @param bean the bean metadata
- */
- protected static void addBeanComponent(DeploymentUnit unit, BeanMetaData bean)
- {
- DeploymentUnit component = unit.addComponent(bean.getName());
- component.addAttachment(BeanMetaData.class.getName(), bean);
- }
-
- /**
- * Remove bean component.
- *
- * @param unit the deployment unit
- * @param bean the bean metadata
- */
-
- protected static void removeBeanComponent(DeploymentUnit unit, BeanMetaData bean)
- {
- unit.removeComponent(bean.getName());
- }
-
- /**
- * Ignore all error during component removal.
- *
- * @param unit the deployment unit
- * @param bean the bean metadata
- */
- protected void safeRemoveBeanComponent(DeploymentUnit unit, BeanMetaData bean)
- {
- try
- {
- removeBeanComponent(unit, bean);
- }
- catch (Throwable ignored)
- {
- log.warn("Error during component removal: " + unit.getName(), ignored);
- }
- }
-
- /**
- * Get beans from deployment.
- *
- * @param deployment the deployment
- * @return list of beans
- */
- protected abstract List<BeanMetaData> getBeans(T deployment);
-
- public void deploy(DeploymentUnit unit, T deployment) throws DeploymentException
- {
- List<BeanMetaData> beans = getBeans(deployment);
- if (beans != null && beans.isEmpty() == false)
- {
- List<BeanMetaData> visited = new ArrayList<BeanMetaData>();
- try
- {
- for (BeanMetaData bean : beans)
- {
- addBeanComponent(unit, bean);
- visited.add(bean);
- }
- }
- catch (Throwable t)
- {
- for (int i = visited.size()-1; i >= 0; --i)
- {
- safeRemoveBeanComponent(unit, visited.get(i));
- }
- throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + unit.getName(), t);
- }
- }
- }
-
- public void undeploy(DeploymentUnit unit, T deployment)
- {
- List<BeanMetaData> beans = getBeans(deployment);
- if (beans != null && beans.isEmpty() == false)
- {
- for (BeanMetaData bean : beans)
- {
- safeRemoveBeanComponent(unit, bean);
- }
- }
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataFactoryVisitor.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,152 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.deployers.vfs.deployer.kernel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.DeploymentVisitor;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.spi.scope.CommonLevels;
+
+/**
+ * BeanMetaDataVisitor.<p>
+ *
+ * @param <T> exact attachment type
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class BeanMetaDataFactoryVisitor<T> implements DeploymentVisitor<T>
+{
+ private Logger log = Logger.getLogger(getClass());
+
+ /**
+ * Add bean component.
+ *
+ * @param unit the deployment unit
+ * @param bean the bean metadata
+ */
+ protected static void addBeanComponent(DeploymentUnit unit, BeanMetaData bean)
+ {
+ DeploymentUnit component = unit.addComponent(bean.getName());
+ component.addAttachment(BeanMetaData.class.getName(), bean);
+ String className = bean.getBean();
+ if (className != null)
+ {
+ Object qualifier;
+ if (bean.getClassLoader() == null)
+ {
+ ClassLoader cl = unit.getClassLoader();
+ try
+ {
+ qualifier = cl.loadClass(className);
+ }
+ catch (Exception e)
+ {
+ throw new IllegalArgumentException("Exception loading class for ScopeKey addition.", e);
+ }
+ }
+ else
+ {
+ qualifier = className;
+ }
+ component.getScope().addScope(CommonLevels.CLASS, qualifier);
+ }
+ }
+
+ /**
+ * Remove bean component.
+ *
+ * @param unit the deployment unit
+ * @param bean the bean metadata
+ */
+
+ protected static void removeBeanComponent(DeploymentUnit unit, BeanMetaData bean)
+ {
+ unit.removeComponent(bean.getName());
+ }
+
+ /**
+ * Ignore all error during component removal.
+ *
+ * @param unit the deployment unit
+ * @param bean the bean metadata
+ */
+ protected void safeRemoveBeanComponent(DeploymentUnit unit, BeanMetaData bean)
+ {
+ try
+ {
+ removeBeanComponent(unit, bean);
+ }
+ catch (Throwable ignored)
+ {
+ log.warn("Error during component removal: " + unit.getName(), ignored);
+ }
+ }
+
+ /**
+ * Get beans from deployment.
+ *
+ * @param deployment the deployment
+ * @return list of beans
+ */
+ protected abstract List<BeanMetaData> getBeans(T deployment);
+
+ public void deploy(DeploymentUnit unit, T deployment) throws DeploymentException
+ {
+ List<BeanMetaData> beans = getBeans(deployment);
+ if (beans != null && beans.isEmpty() == false)
+ {
+ List<BeanMetaData> visited = new ArrayList<BeanMetaData>();
+ try
+ {
+ for (BeanMetaData bean : beans)
+ {
+ addBeanComponent(unit, bean);
+ visited.add(bean);
+ }
+ }
+ catch (Throwable t)
+ {
+ for (int i = visited.size()-1; i >= 0; --i)
+ {
+ safeRemoveBeanComponent(unit, visited.get(i));
+ }
+ throw DeploymentException.rethrowAsDeploymentException("Error deploying: " + unit.getName(), t);
+ }
+ }
+ }
+
+ public void undeploy(DeploymentUnit unit, T deployment)
+ {
+ List<BeanMetaData> beans = getBeans(deployment);
+ if (beans != null && beans.isEmpty() == false)
+ {
+ for (BeanMetaData bean : beans)
+ {
+ safeRemoveBeanComponent(unit, bean);
+ }
+ }
+ }
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,216 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.deployers.vfs.plugins.annotations;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javassist.ClassPath;
-import javassist.ClassPool;
-import javassist.LoaderClassPath;
-import org.jboss.classloading.spi.dependency.Module;
-import org.jboss.deployers.plugins.annotations.GenericAnnotationResourceVisitor;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * A POST_CLASSLOADER deployer which creates AnnotationEnvironment for sub-deployments.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class AnnotationEnvironmentDeployer extends AbstractOptionalVFSRealDeployer<Module>
-{
- private boolean forceAnnotations;
- private boolean keepAnnotations;
- private boolean checkInterfaces;
-
- public AnnotationEnvironmentDeployer()
- {
- super(Module.class);
- setStage(DeploymentStages.POST_CLASSLOADER);
- setOutput(AnnotationEnvironment.class);
- checkInterfaces = true;
- }
-
- /**
- * Should we force all annotations to be available.
- *
- * @param forceAnnotations the force annotations flag
- */
- public void setForceAnnotations(boolean forceAnnotations)
- {
- this.forceAnnotations = forceAnnotations;
- }
-
- /**
- * Set the keep annotations flag.
- *
- * @param keepAnnotations the keep annotations flag
- */
- public void setKeepAnnotations(boolean keepAnnotations)
- {
- this.keepAnnotations = keepAnnotations;
- }
-
- /**
- * Should we check interfaces for annotations as well.
- *
- * @param checkInterfaces the check interfaces flag
- */
- public void setCheckInterfaces(boolean checkInterfaces)
- {
- this.checkInterfaces = checkInterfaces;
- }
-
- /**
- * Create GenericAnnotationResourceVisitor.
- *
- * Can be used change existing GARV's filter.
- * Or determin if we need to force/keep annotations.
- *
- * @param unit the deployment unit
- * @param pool the class pool
- * @param classLoader the classloader
- * @return new generic annotation visitor
- */
- protected GenericAnnotationResourceVisitor createGenericAnnotationResourceVisitor(DeploymentUnit unit, ClassPool pool, ClassLoader classLoader)
- {
- GenericAnnotationResourceVisitor visitor = new GenericAnnotationResourceVisitor(pool, classLoader);
- visitor.setForceAnnotations(forceAnnotations);
- visitor.setKeepAnnotations(keepAnnotations);
- visitor.setCheckInterfaces(checkInterfaces);
- return visitor;
- }
-
- /**
- * Create class pool.
- *
- * @param classLoader the class loader
- * @return javassist class pool
- */
- protected ClassPool createClassPool(ClassLoader classLoader)
- {
- ClassPool pool = new ClassPool();
- ClassPath classPath = new LoaderClassPath(classLoader);
- pool.insertClassPath(classPath);
- return pool;
- }
-
- /**
- * Visit module.
- *
- * Util method to add some behavior to Module
- * before we visit it.
- *
- * @param unit the deployment unit
- * @param module the module
- * @param visitor the resource visitor
- * @throws DeploymentException for any error
- */
- protected void visitModule(VFSDeploymentUnit unit, Module module, GenericAnnotationResourceVisitor visitor) throws DeploymentException
- {
- try
- {
- module.visit(visitor, visitor.getFilter(), null, getUrls(unit));
- }
- catch (Exception e)
- {
- throw DeploymentException.rethrowAsDeploymentException("Exception visiting module", e);
- }
- }
-
- /**
- * Get the matching urls.
- *
- * @param unit the deployment unit
- * @return matching urls
- * @throws Exception for any error
- */
- protected URL[] getUrls(VFSDeploymentUnit unit) throws Exception
- {
- List<VirtualFile> classpath = unit.getClassPath();
- if (classpath != null && classpath.isEmpty() == false)
- {
- List<URL> urls = new ArrayList<URL>();
- VirtualFile root = unit.getRoot();
- for (VirtualFile cp : classpath)
- {
- VirtualFile check = cp;
- while(check != null && check.equals(root) == false)
- check = check.getParent();
-
- if (check != null)
- urls.add(cp.toURL());
- }
- if (urls.isEmpty() == false)
- {
- if (log.isTraceEnabled())
- log.trace("Explicit urls: " + urls);
-
- return urls.toArray(new URL[urls.size()]);
- }
- }
- return new URL[0];
- }
-
- public void deploy(VFSDeploymentUnit unit, Module module) throws DeploymentException
- {
- if (module == null)
- {
- VFSDeploymentUnit parent = unit.getParent();
- while(parent != null && module == null)
- {
- module = parent.getAttachment(Module.class);
- parent = parent.getParent();
- }
- if (module == null)
- throw new IllegalArgumentException("No module in deployment unit's hierarchy: " + unit.getName());
- }
-
- if (log.isTraceEnabled())
- log.trace("Creating AnnotationEnvironment for " + unit.getName() + ", module: " + module + ", force annotations: " + forceAnnotations);
-
- ClassLoader classLoader = unit.getClassLoader();
- ClassPool pool = createClassPool(classLoader);
- GenericAnnotationResourceVisitor visitor = createGenericAnnotationResourceVisitor(unit, pool, classLoader);
-
- // something in javassist uses TCL
- ClassLoader tcl = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(classLoader);
- try
- {
- visitModule(unit, module, visitor);
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(tcl);
- }
-
- unit.addAttachment(AnnotationEnvironment.class, visitor.getEnv());
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,234 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.deployers.vfs.plugins.annotations;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javassist.ClassPath;
+import javassist.ClassPool;
+import javassist.LoaderClassPath;
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.deployers.plugins.annotations.GenericAnnotationResourceVisitor;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * A POST_CLASSLOADER deployer which creates AnnotationEnvironment for sub-deployments.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AnnotationEnvironmentDeployer extends AbstractOptionalVFSRealDeployer<Module>
+{
+ private boolean forceAnnotations;
+ private boolean keepAnnotations;
+ private boolean checkInterfaces;
+
+ public AnnotationEnvironmentDeployer()
+ {
+ super(Module.class);
+ setStage(DeploymentStages.POST_CLASSLOADER);
+ setOutput(AnnotationEnvironment.class);
+ checkInterfaces = true;
+ }
+
+ /**
+ * Should we force all annotations to be available.
+ *
+ * @param forceAnnotations the force annotations flag
+ */
+ public void setForceAnnotations(boolean forceAnnotations)
+ {
+ this.forceAnnotations = forceAnnotations;
+ }
+
+ /**
+ * Set the keep annotations flag.
+ *
+ * @param keepAnnotations the keep annotations flag
+ */
+ public void setKeepAnnotations(boolean keepAnnotations)
+ {
+ this.keepAnnotations = keepAnnotations;
+ }
+
+ /**
+ * Should we check interfaces for annotations as well.
+ *
+ * @param checkInterfaces the check interfaces flag
+ */
+ public void setCheckInterfaces(boolean checkInterfaces)
+ {
+ this.checkInterfaces = checkInterfaces;
+ }
+
+ /**
+ * Create GenericAnnotationResourceVisitor.
+ *
+ * Can be used change existing GARV's filter.
+ * Or determin if we need to force/keep annotations.
+ *
+ * @param unit the deployment unit
+ * @param pool the class pool
+ * @param classLoader the classloader
+ * @return new generic annotation visitor
+ */
+ protected GenericAnnotationResourceVisitor createGenericAnnotationResourceVisitor(DeploymentUnit unit, ClassPool pool, ClassLoader classLoader)
+ {
+ GenericAnnotationResourceVisitor visitor = new GenericAnnotationResourceVisitor(pool, classLoader);
+ visitor.setForceAnnotations(forceAnnotations);
+ visitor.setKeepAnnotations(keepAnnotations);
+ visitor.setCheckInterfaces(checkInterfaces);
+ return visitor;
+ }
+
+ /**
+ * Create class pool.
+ *
+ * @param classLoader the class loader
+ * @return javassist class pool
+ */
+ @Deprecated
+ protected ClassPool createClassPool(ClassLoader classLoader)
+ {
+ ClassPool pool = new ClassPool();
+ ClassPath classPath = new LoaderClassPath(classLoader);
+ pool.insertClassPath(classPath);
+ return pool;
+ }
+
+ /**
+ * Create class pool.
+ *
+ * @param unit the deployment unit
+ * @return javassist class pool
+ */
+ protected ClassPool createClassPool(VFSDeploymentUnit unit)
+ {
+ ClassPool pool = new ClassPool();
+ ClassPath deploymentPath = new DeploymentUnitClassPath(unit);
+ pool.appendClassPath(deploymentPath);
+ // fall back to classloader classpath
+ ClassPath classPath = new LoaderClassPath(unit.getClassLoader());
+ pool.appendClassPath(classPath);
+ return pool;
+ }
+
+ /**
+ * Visit module.
+ *
+ * Util method to add some behavior to Module
+ * before we visit it.
+ *
+ * @param unit the deployment unit
+ * @param module the module
+ * @param visitor the resource visitor
+ * @throws DeploymentException for any error
+ */
+ protected void visitModule(VFSDeploymentUnit unit, Module module, GenericAnnotationResourceVisitor visitor) throws DeploymentException
+ {
+ try
+ {
+ module.visit(visitor, visitor.getFilter(), null, getUrls(unit));
+ }
+ catch (Exception e)
+ {
+ throw DeploymentException.rethrowAsDeploymentException("Exception visiting module", e);
+ }
+ }
+
+ /**
+ * Get the matching urls.
+ *
+ * @param unit the deployment unit
+ * @return matching urls
+ * @throws Exception for any error
+ */
+ protected URL[] getUrls(VFSDeploymentUnit unit) throws Exception
+ {
+ List<VirtualFile> classpath = unit.getClassPath();
+ if (classpath != null && classpath.isEmpty() == false)
+ {
+ List<URL> urls = new ArrayList<URL>();
+ VirtualFile root = unit.getRoot();
+ for (VirtualFile cp : classpath)
+ {
+ VirtualFile check = cp;
+ while(check != null && check.equals(root) == false)
+ check = check.getParent();
+
+ if (check != null)
+ urls.add(cp.toURL());
+ }
+ if (urls.isEmpty() == false)
+ {
+ if (log.isTraceEnabled())
+ log.trace("Explicit urls: " + urls);
+
+ return urls.toArray(new URL[urls.size()]);
+ }
+ }
+ return new URL[0];
+ }
+
+ public void deploy(VFSDeploymentUnit unit, Module module) throws DeploymentException
+ {
+ if (module == null)
+ {
+ VFSDeploymentUnit parent = unit.getParent();
+ while(parent != null && module == null)
+ {
+ module = parent.getAttachment(Module.class);
+ parent = parent.getParent();
+ }
+ if (module == null)
+ throw new IllegalArgumentException("No module in deployment unit's hierarchy: " + unit.getName());
+ }
+
+ if (log.isTraceEnabled())
+ log.trace("Creating AnnotationEnvironment for " + unit.getName() + ", module: " + module + ", force annotations: " + forceAnnotations);
+
+ ClassLoader classLoader = unit.getClassLoader();
+ ClassPool pool = createClassPool(unit);
+ GenericAnnotationResourceVisitor visitor = createGenericAnnotationResourceVisitor(unit, pool, classLoader);
+
+ // something in javassist uses TCL
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader(classLoader);
+ try
+ {
+ visitModule(unit, module, visitor);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(tcl);
+ }
+
+ unit.addAttachment(AnnotationEnvironment.class, visitor.getEnv());
+ }
+}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/DeploymentUnitClassPath.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,136 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.deployers.vfs.plugins.annotations;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javassist.ClassPath;
+import javassist.NotFoundException;
+import org.jboss.classloader.plugins.ClassLoaderUtils;
+import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.util.collection.SoftValueHashMap;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Javassist ClassPath impl based on deployment unit
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class DeploymentUnitClassPath implements ClassPath
+{
+ private VFSDeploymentUnit unit;
+ @SuppressWarnings("unchecked")
+ private Map<String, VirtualFile> cache = Collections.synchronizedMap(new SoftValueHashMap());
+ /** By default exclude jdk classes */
+ private ClassFilter excludeFilter = ClassFilter.JAVA_ONLY;
+
+ public DeploymentUnitClassPath(VFSDeploymentUnit unit)
+ {
+ if (unit == null)
+ throw new IllegalArgumentException("Null deployment unit.");
+ this.unit = unit;
+ }
+
+ /**
+ * Set exclude filter.
+ *
+ * @param excludeFilter the exclude filter
+ */
+ public void setExcludeFilter(ClassFilter excludeFilter)
+ {
+ this.excludeFilter = excludeFilter;
+ }
+
+ /**
+ * Find file.
+ *
+ * @param className the classname we're looking for
+ * @return virtual file or null if not found
+ * @throws IOException for any exception
+ */
+ protected VirtualFile findFile(String className) throws IOException
+ {
+ if (excludeFilter != null && excludeFilter.matchesClassName(className))
+ return null;
+
+ VirtualFile file = cache.get(className);
+ if (file != null)
+ return file;
+
+ List<VirtualFile> classPath = unit.getClassPath();
+ if (classPath != null && classPath.isEmpty() == false)
+ {
+ String path = ClassLoaderUtils.classNameToPath(className);
+ for (VirtualFile cp : classPath)
+ {
+ file = cp.getChild(path);
+ if (file != null)
+ {
+ cache.put(className, file);
+ return file;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public InputStream openClassfile(String className) throws NotFoundException
+ {
+ try
+ {
+ VirtualFile file = findFile(className);
+ if (file != null)
+ return file.openStream();
+ }
+ catch (IOException e)
+ {
+ throw new NotFoundException("Exception finding file: " + className, e);
+ }
+ throw new NotFoundException("ClassName '" + className + "' not found in deployment unit: " + unit);
+ }
+
+ public URL find(String className)
+ {
+ try
+ {
+ VirtualFile file = findFile(className);
+ if (file != null)
+ return file.toURL();
+ }
+ catch (Exception ignored)
+ {
+ }
+ return null;
+ }
+
+ public void close()
+ {
+ cache.clear();
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,62 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.deployers.vfs.plugins.annotations;
-
-import javassist.ClassPool;
-import javassist.scopedpool.ScopedClassPoolRepository;
-
-/**
- * Scoped class pool usage annotation environment deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ScopedAnnotationEnvironmentDeployer extends AnnotationEnvironmentDeployer
-{
- private ScopedClassPoolRepository repository;
-
- public ScopedAnnotationEnvironmentDeployer()
- {
- }
-
- public ScopedAnnotationEnvironmentDeployer(ScopedClassPoolRepository repository)
- {
- this.repository = repository;
- }
-
- /**
- * Set scoped class pool repository.
- *
- * @param repository the scoped class pool repository
- */
- public void setRepository(ScopedClassPoolRepository repository)
- {
- this.repository = repository;
- }
-
- protected ClassPool createClassPool(ClassLoader classLoader)
- {
- if (repository != null)
- return repository.findClassPool(classLoader);
-
- return super.createClassPool(classLoader);
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScopedAnnotationEnvironmentDeployer.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,72 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.deployers.vfs.plugins.annotations;
+
+import javassist.ClassPool;
+import javassist.scopedpool.ScopedClassPoolRepository;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+
+/**
+ * Scoped class pool usage annotation environment deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ScopedAnnotationEnvironmentDeployer extends AnnotationEnvironmentDeployer
+{
+ private ScopedClassPoolRepository repository;
+
+ public ScopedAnnotationEnvironmentDeployer()
+ {
+ }
+
+ public ScopedAnnotationEnvironmentDeployer(ScopedClassPoolRepository repository)
+ {
+ this.repository = repository;
+ }
+
+ /**
+ * Set scoped class pool repository.
+ *
+ * @param repository the scoped class pool repository
+ */
+ public void setRepository(ScopedClassPoolRepository repository)
+ {
+ this.repository = repository;
+ }
+
+ @Deprecated
+ protected ClassPool createClassPool(ClassLoader classLoader)
+ {
+ if (repository != null)
+ return repository.findClassPool(classLoader);
+
+ return super.createClassPool(classLoader);
+ }
+
+ protected ClassPool createClassPool(VFSDeploymentUnit unit)
+ {
+ if (repository != null)
+ return repository.findClassPool(unit.getClassLoader());
+
+ return super.createClassPool(unit);
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,128 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.deployers.vfs.plugins.structure.explicit;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-
-import org.jboss.deployers.plugins.structure.ClassPathEntryImpl;
-import org.jboss.deployers.plugins.structure.ContextInfoImpl;
-import org.jboss.deployers.plugins.structure.StructureMetaDataImpl;
-import org.jboss.deployers.spi.structure.ClassPathEntry;
-import org.jboss.deployers.spi.structure.ModificationType;
-import org.jboss.xb.binding.ObjectModelFactory;
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.xml.sax.Attributes;
-
-/**
- * An ObjectModelFactory for the jboss-structure.xml descriptor.
- *
- * @author Scott.Stark at jboss.org
- * @author Ales.Justin at jboss.org
- * @version $Revision:$
- */
-public class StructureMetaDataObjectFactory implements ObjectModelFactory
-{
- public StructureMetaDataImpl newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- StructureMetaDataImpl metaData;
- if (root != null)
- metaData = (StructureMetaDataImpl) root;
- else
- metaData = new StructureMetaDataImpl();
-
- return metaData;
- }
-
- public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
- {
- return root;
- }
-
- public Object newChild(StructureMetaDataImpl parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- if (localName.equals("context"))
- {
- ContextInfoImpl child = new ContextInfoImpl("", null);
- String modificationType = attrs.getValue("modification");
- if (modificationType != null)
- child.setModificationType(ModificationType.getModificationType(modificationType));
- return child;
- }
- return null;
- }
-
- public Object newChild(ContextInfoImpl parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- Object child = null;
- if("path".equals(localName))
- {
- String path = attrs.getValue("name");
- parent.setPath(path);
- }
- else if ("metaDataPath".equals(localName))
- child = new LinkedHashSet<String>();
- else if (localName.equals("classpath"))
- child = new ArrayList<ClassPathEntry>();
-
- return child;
- }
-
- public Object newChild(LinkedHashSet<String> parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- Object child = null;
- if("path".equals(localName))
- {
- String path = attrs.getValue("name");
- parent.add(path);
- }
- return child;
- }
-
- public Object newChild(ArrayList<ClassPathEntry> parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
- {
- Object child = null;
- if("path".equals(localName))
- {
- String name = attrs.getValue("name");
- String suffixes = attrs.getValue("suffixes");
- ClassPathEntry path = new ClassPathEntryImpl(name, suffixes);
- parent.add(path);
- }
- return child;
- }
-
- public void addChild(StructureMetaDataImpl parent, ContextInfoImpl context, UnmarshallingContext navigator, String namespaceURI, String localName)
- {
- parent.addContext(context);
- }
-
- public void addChild(ContextInfoImpl context, LinkedHashSet<String> metaDataPath, UnmarshallingContext navigator, String namespaceURI, String localName)
- {
- context.setMetaDataPath(new ArrayList<String>(metaDataPath));
- }
-
- public void addChild(ContextInfoImpl context, ArrayList<ClassPathEntry> classpath, UnmarshallingContext navigator, String namespaceURI, String localName)
- {
- context.setClassPath(classpath);
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,131 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.deployers.vfs.plugins.structure.explicit;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+
+import org.jboss.deployers.plugins.structure.ClassPathEntryImpl;
+import org.jboss.deployers.plugins.structure.ContextInfoImpl;
+import org.jboss.deployers.plugins.structure.StructureMetaDataImpl;
+import org.jboss.deployers.spi.structure.ClassPathEntry;
+import org.jboss.deployers.spi.structure.ModificationType;
+import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+/**
+ * An ObjectModelFactory for the jboss-structure.xml descriptor.
+ *
+ * @author Scott.Stark at jboss.org
+ * @author Ales.Justin at jboss.org
+ * @version $Revision:$
+ */
+public class StructureMetaDataObjectFactory implements ObjectModelFactory
+{
+ public StructureMetaDataImpl newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ {
+ StructureMetaDataImpl metaData;
+ if (root != null)
+ metaData = (StructureMetaDataImpl) root;
+ else
+ metaData = new StructureMetaDataImpl();
+
+ return metaData;
+ }
+
+ public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name)
+ {
+ return root;
+ }
+
+ public Object newChild(StructureMetaDataImpl parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ {
+ if (localName.equals("context"))
+ {
+ ContextInfoImpl child = new ContextInfoImpl("", null);
+ String modificationType = attrs.getValue("modification");
+ if (modificationType != null)
+ child.setModificationType(ModificationType.getModificationType(modificationType));
+ String comparator = attrs.getValue("comparator");
+ if (comparator != null)
+ child.setComparatorClassName(comparator);
+ return child;
+ }
+ return null;
+ }
+
+ public Object newChild(ContextInfoImpl parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ {
+ Object child = null;
+ if("path".equals(localName))
+ {
+ String path = attrs.getValue("name");
+ parent.setPath(path);
+ }
+ else if ("metaDataPath".equals(localName))
+ child = new LinkedHashSet<String>();
+ else if (localName.equals("classpath"))
+ child = new ArrayList<ClassPathEntry>();
+
+ return child;
+ }
+
+ public Object newChild(LinkedHashSet<String> parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ {
+ Object child = null;
+ if("path".equals(localName))
+ {
+ String path = attrs.getValue("name");
+ parent.add(path);
+ }
+ return child;
+ }
+
+ public Object newChild(ArrayList<ClassPathEntry> parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ {
+ Object child = null;
+ if("path".equals(localName))
+ {
+ String name = attrs.getValue("name");
+ String suffixes = attrs.getValue("suffixes");
+ ClassPathEntry path = new ClassPathEntryImpl(name, suffixes);
+ parent.add(path);
+ }
+ return child;
+ }
+
+ public void addChild(StructureMetaDataImpl parent, ContextInfoImpl context, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ parent.addContext(context);
+ }
+
+ public void addChild(ContextInfoImpl context, LinkedHashSet<String> metaDataPath, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ context.setMetaDataPath(new ArrayList<String>(metaDataPath));
+ }
+
+ public void addChild(ContextInfoImpl context, ArrayList<ClassPathEntry> classpath, UnmarshallingContext navigator, String namespaceURI, String localName)
+ {
+ context.setClassPath(classpath);
+ }
+}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/support (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/support)
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.annotations.support.jar;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class JarMarkOnClass
-{
-}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.annotations.support.jar;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class JarMarkOnClass extends JarMarkOnClassSuper
+{
+}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.annotations.support.jar;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class JarMarkOnClassSuper extends JarMarkOnClassSuperAnnotated
+{
+}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuperAnnotated.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuperAnnotated.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuperAnnotated.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuperAnnotated.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.annotations.support.jar;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class JarMarkOnClassSuperAnnotated
+{
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.annotations.support.war;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class WebMarkOnClass
-{
-}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.annotations.support.war;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class WebMarkOnClass extends WebMarkOnClassSuper
+{
+}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.annotations.support.war;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class WebMarkOnClassSuper extends WebMarkOnClassSuperAnnotated
+{
+}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuperAnnotated.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuperAnnotated.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuperAnnotated.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuperAnnotated.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.annotations.support.war;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class WebMarkOnClassSuperAnnotated
+{
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,113 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.annotations.test;
-
-import java.util.Set;
-
-import junit.framework.Test;
-import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.test.deployers.BootstrapDeployersTest;
-import org.jboss.test.deployers.vfs.annotations.support.jar.JarMarkOnClass;
-import org.jboss.test.deployers.vfs.annotations.support.util.Util;
-import org.jboss.test.deployers.vfs.annotations.support.war.WebMarkOnClass;
-import org.jboss.test.deployers.vfs.annotations.support.ext.External;
-import org.jboss.virtual.AssembledDirectory;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class AnnotationsScanningUnitTestCase extends BootstrapDeployersTest
-{
- public AnnotationsScanningUnitTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(AnnotationsScanningUnitTestCase.class);
- }
-
- public void testBasicScanning() throws Throwable
- {
- AssembledDirectory ear = createTopLevelWithUtil();
-
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, JarMarkOnClass.class);
- addPath(jar, "/annotations/basic-scan/jar", "META-INF");
-
- AssembledDirectory war = ear.mkdir("simple.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, WebMarkOnClass.class);
- addPath(war, "/annotations/basic-scan/web", "WEB-INF");
-
- enableTrace("org.jboss.deployers");
-
- VFSDeploymentUnit unit = assertDeploy(ear);
- assertAnnotations(unit, 1, 1, 1);
- try
- {
- DeploymentUnit jarUnit = assertChild(unit, "simple.jar");
- assertAnnotations(jarUnit, 1, 1, 1);
- DeploymentUnit webUnit = assertChild(unit, "simple.war");
- assertAnnotations(webUnit, 1, 1, 1);
- }
- finally
- {
- undeploy(unit);
- }
- }
-
- @SuppressWarnings("unchecked")
- protected void assertAnnotations(DeploymentUnit unit, int onClass, int onMethod, int onFiled)
- {
- AnnotationEnvironment env = unit.getAttachment(AnnotationEnvironment.class);
- assertNotNull(env);
-
- Set classes = env.classIsAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
- assertNotNull(classes);
- assertEquals(onClass, classes.size());
-
- Set methods = env.classHasMethodAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
- assertNotNull(methods);
- assertEquals(onMethod, methods.size());
-
- Set fields = env.classHasFieldAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
- assertNotNull(fields);
- assertEquals(onFiled, fields.size());
- }
-
- protected AssembledDirectory createTopLevelWithUtil() throws Exception
- {
- AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(topLevel, "/annotations/basic-scan", "META-INF");
- AssembledDirectory earLib = topLevel.mkdir("lib");
- AssembledDirectory util = earLib.mkdir("util.jar");
- addPackage(util, Util.class);
- AssembledDirectory ext = earLib.mkdir("ext.jar");
- addPackage(ext, External.class);
- return topLevel;
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,113 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.annotations.test;
+
+import java.util.Set;
+
+import junit.framework.Test;
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.test.deployers.BootstrapDeployersTest;
+import org.jboss.test.deployers.vfs.annotations.support.jar.JarMarkOnClass;
+import org.jboss.test.deployers.vfs.annotations.support.util.Util;
+import org.jboss.test.deployers.vfs.annotations.support.war.WebMarkOnClass;
+import org.jboss.test.deployers.vfs.annotations.support.ext.External;
+import org.jboss.virtual.AssembledDirectory;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AnnotationsScanningUnitTestCase extends BootstrapDeployersTest
+{
+ public AnnotationsScanningUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(AnnotationsScanningUnitTestCase.class);
+ }
+
+ public void testBasicScanning() throws Throwable
+ {
+ AssembledDirectory ear = createTopLevelWithUtil();
+
+ AssembledDirectory jar = ear.mkdir("simple.jar");
+ addPackage(jar, JarMarkOnClass.class);
+ addPath(jar, "/annotations/basic-scan/jar", "META-INF");
+
+ AssembledDirectory war = ear.mkdir("simple.war");
+ AssembledDirectory webinf = war.mkdir("WEB-INF");
+ AssembledDirectory classes = webinf.mkdir("classes");
+ addPackage(classes, WebMarkOnClass.class);
+ addPath(war, "/annotations/basic-scan/web", "WEB-INF");
+
+ enableTrace("org.jboss.deployers");
+
+ VFSDeploymentUnit unit = assertDeploy(ear);
+ assertAnnotations(unit, 1, 1, 1);
+ try
+ {
+ DeploymentUnit jarUnit = assertChild(unit, "simple.jar");
+ assertAnnotations(jarUnit, 2, 1, 1);
+ DeploymentUnit webUnit = assertChild(unit, "simple.war");
+ assertAnnotations(webUnit, 2, 1, 1);
+ }
+ finally
+ {
+ undeploy(unit);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ protected void assertAnnotations(DeploymentUnit unit, int onClass, int onMethod, int onFiled)
+ {
+ AnnotationEnvironment env = unit.getAttachment(AnnotationEnvironment.class);
+ assertNotNull(env);
+
+ Set classes = env.classIsAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
+ assertNotNull(classes);
+ assertEquals(onClass, classes.size());
+
+ Set methods = env.classHasMethodAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
+ assertNotNull(methods);
+ assertEquals(onMethod, methods.size());
+
+ Set fields = env.classHasFieldAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
+ assertNotNull(fields);
+ assertEquals(onFiled, fields.size());
+ }
+
+ protected AssembledDirectory createTopLevelWithUtil() throws Exception
+ {
+ AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(topLevel, "/annotations/basic-scan", "META-INF");
+ AssembledDirectory earLib = topLevel.mkdir("lib");
+ AssembledDirectory util = earLib.mkdir("util.jar");
+ addPackage(util, Util.class);
+ AssembledDirectory ext = earLib.mkdir("ext.jar");
+ addPackage(ext, External.class);
+ return topLevel;
+ }
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,103 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.bean.test;
-
-import java.util.Arrays;
-
-import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.spi.attachments.MutableAttachments;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-import org.jboss.test.deployers.vfs.deployer.bean.support.SimpleAnnotated;
-
-/**
- * AbstractAnnotationBeansTest.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public abstract class AbstractAnnotationBeansTest extends AbstractDeployerUnitTest
-{
- protected AbstractAnnotationBeansTest(String name) throws Throwable
- {
- super(name);
- }
-
- protected void addDeployers(Kernel kernel)
- {
- KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
- BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel.getController());
- addDeployer(main, kernelDeploymentDeployer);
- addDeployer(main, beanMetaDataDeployer);
- }
-
- protected abstract BeanMetaDataFactory getConstructorTester();
- protected abstract BeanMetaDataFactory getInjectionTester();
- protected abstract BeanMetaDataFactory getStartTester();
- protected abstract BeanMetaDataFactory getAliasTester();
-
- public void testAnnotatedBeans() throws Exception
- {
- Deployment context = createSimpleDeployment("KernelDeployerTest");
-
- AbstractKernelDeployment deployment = new AbstractKernelDeployment();
- deployment.setName("KernelDeployerTest");
- BeanMetaDataFactory md1 = getConstructorTester();
- BeanMetaDataFactory md2 = getInjectionTester();
- BeanMetaDataFactory md3 = getStartTester();
- BeanMetaDataFactory md4 = getAliasTester();
- deployment.setBeanFactories(Arrays.asList(md1, md2, md3, md4));
- MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
- attachments.addAttachment("KernelDeployerTest", deployment);
-
- assertDeploy(context);
- try
- {
- assertSimpleAnnotated("Constructor");
- assertSimpleAnnotated("Injection");
- assertSimpleAnnotated("Start");
- assertSimpleAnnotated("Alias");
- }
- finally
- {
- assertUndeploy(context);
- }
-
- assertNull(controller.getContext("Constructor", null));
- assertNull(controller.getContext("Injection", null));
- assertNull(controller.getContext("Start", null));
- assertNull(controller.getContext("SomeRandomName", null));
- }
-
- protected void assertSimpleAnnotated(Object name)
- {
- ControllerContext context = controller.getInstalledContext(name);
- assertNotNull("No such context: " + name, context);
- Object target = context.getTarget();
- SimpleAnnotated annotated = assertInstanceOf(target, SimpleAnnotated.class);
- assertSame(controller, annotated.getController());
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AbstractAnnotationBeansTest.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,106 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.bean.test;
+
+import java.util.Arrays;
+
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.vfs.deployer.bean.support.SimpleAnnotated;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+
+/**
+ * AbstractAnnotationBeansTest.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractAnnotationBeansTest extends AbstractDeployerUnitTest
+{
+ protected AbstractAnnotationBeansTest(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ TCCLClassLoaderDeployer tcclDeployer = new TCCLClassLoaderDeployer();
+ KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel.getController());
+ addDeployer(main, tcclDeployer);
+ addDeployer(main, kernelDeploymentDeployer);
+ addDeployer(main, beanMetaDataDeployer);
+ }
+
+ protected abstract BeanMetaDataFactory getConstructorTester();
+ protected abstract BeanMetaDataFactory getInjectionTester();
+ protected abstract BeanMetaDataFactory getStartTester();
+ protected abstract BeanMetaDataFactory getAliasTester();
+
+ public void testAnnotatedBeans() throws Exception
+ {
+ Deployment context = createSimpleDeployment("KernelDeployerTest");
+
+ AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+ deployment.setName("KernelDeployerTest");
+ BeanMetaDataFactory md1 = getConstructorTester();
+ BeanMetaDataFactory md2 = getInjectionTester();
+ BeanMetaDataFactory md3 = getStartTester();
+ BeanMetaDataFactory md4 = getAliasTester();
+ deployment.setBeanFactories(Arrays.asList(md1, md2, md3, md4));
+ MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
+ attachments.addAttachment("KernelDeployerTest", deployment);
+
+ assertDeploy(context);
+ try
+ {
+ assertSimpleAnnotated("Constructor");
+ assertSimpleAnnotated("Injection");
+ assertSimpleAnnotated("Start");
+ assertSimpleAnnotated("Alias");
+ }
+ finally
+ {
+ assertUndeploy(context);
+ }
+
+ assertNull(controller.getContext("Constructor", null));
+ assertNull(controller.getContext("Injection", null));
+ assertNull(controller.getContext("Start", null));
+ assertNull(controller.getContext("SomeRandomName", null));
+ }
+
+ protected void assertSimpleAnnotated(Object name)
+ {
+ ControllerContext context = controller.getInstalledContext(name);
+ assertNotNull("No such context: " + name, context);
+ Object target = context.getTarget();
+ SimpleAnnotated annotated = assertInstanceOf(target, SimpleAnnotated.class);
+ assertSame(controller, annotated.getController());
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,198 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.bean.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.deployers.vfs.deployer.kernel.AliasDeploymentDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.DeploymentAliasMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.kernel.Kernel;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-
-/**
- * AliasDeployerUnitTestCase.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public class AliasDeployerUnitTestCase extends AbstractDeployerUnitTest
-{
- public static Test suite()
- {
- return new TestSuite(AliasDeployerUnitTestCase.class);
- }
-
- public AliasDeployerUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- protected void addDeployers(Kernel kernel)
- {
- BeanDeployer beanDeployer = new BeanDeployer();
- KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
- AliasDeploymentDeployer aliasDeploymentDeployer = new AliasDeploymentDeployer();
- BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
- DeploymentAliasMetaDataDeployer aliasMetaDataDeployer = new DeploymentAliasMetaDataDeployer(kernel.getController());
- addDeployer(main, beanDeployer);
- addDeployer(main, kernelDeploymentDeployer);
- addDeployer(main, aliasDeploymentDeployer);
- addDeployer(main, beanMetaDataDeployer);
- addDeployer(main, aliasMetaDataDeployer);
- }
-
- public void testAliasSuccessful() throws Exception
- {
- VFSDeployment context = createDeployment("/alias", "toplevel/my-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test"));
-
- VFSDeployment alias = createDeployment("/alias", "toplevel/aliases-beans.xml");
- assertDeploy(alias);
- assertNotNull("Missing Test bean.", controller.getInstalledContext("MyAlias"));
- assertEquals(controller.getInstalledContext("MyAlias"), controller.getInstalledContext("Test"));
- assertNotNull("Missing Injectee bean.", controller.getInstalledContext("Injectee"));
-
- assertUndeploy(alias);
- assertNull(controller.getContext("Injectee", null));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- assertNull(controller.getContext("MyAlias", null));
- }
-
- public void testJoinedSuccessful() throws Exception
- {
- VFSDeployment context = createDeployment("/alias", "toplevel/joined-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test"));
- assertNotNull(controller.getInstalledContext("MyAlias"));
- assertEquals(controller.getInstalledContext("MyAlias"), controller.getInstalledContext("Test"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("MyAlias", null));
- assertNull(controller.getContext("Test", null));
- }
-
- public void testAliasMissing() throws Exception
- {
- VFSDeployment context = createDeployment("/alias", "toplevel/aliases-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getContext("Injectee", ControllerState.INSTANTIATED));
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- }
-
- public void testJMXAlias() throws Exception
- {
- VFSDeployment context = createDeployment("/alias", "toplevel/mbean-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test"));
-
- VFSDeployment alias = createDeployment("/alias", "toplevel/jmx-beans.xml");
- assertDeploy(alias);
- assertNotNull("Missing Injectee bean.", controller.getInstalledContext("Injectee"));
-
- assertUndeploy(alias);
- assertNull(controller.getContext("Injectee", null));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- }
-
- public void testAliasDemand() throws Exception
- {
- VFSDeployment context = createDeployment("/alias", "toplevel/tomcat-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Tomcat"));
-
- VFSDeployment alias = createDeployment("/alias", "toplevel/servicex-beans.xml");
- assertDeploy(alias);
- assertNotNull(controller.getInstalledContext("ServiceX"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Tomcat", null));
- assertNull(controller.getContext("ServiceX", ControllerState.CREATE));
- assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
-
- assertUndeploy(alias);
- assertNull(controller.getContext("JBossWeb", null));
- assertNull(controller.getContext("ServiceX", null));
- }
-
- public void testAliasDependency() throws Exception
- {
- VFSDeployment alias = createDeployment("/alias", "toplevel/servicex-beans.xml");
- assertDeploy(alias);
- assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
-
- VFSDeployment context = createDeployment("/alias", "toplevel/tomcat-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Tomcat"));
- assertNotNull(controller.getInstalledContext("JBossWeb"));
- assertNotNull(controller.getInstalledContext("ServiceX"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Tomcat", null));
- assertNull(controller.getContext("JBossWeb", null));
- assertNull(controller.getContext("ServiceX", ControllerState.CREATE));
- assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
-
- assertUndeploy(alias);
- assertNull(controller.getContext("ServiceX", null));
- }
-
- public void testRemovingAlias() throws Exception
- {
- VFSDeployment justx = createDeployment("/alias", "toplevel/justx-beans.xml");
- assertDeploy(justx);
- assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
-
- VFSDeployment alias = createDeployment("/alias", "toplevel/tcalias-beans.xml");
- assertDeploy(alias);
-
- VFSDeployment context = createDeployment("/alias", "toplevel/tomcat-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Tomcat"));
- assertNotNull(controller.getInstalledContext("JBossWeb"));
- assertNotNull(controller.getInstalledContext("ServiceX"));
-
- assertUndeploy(alias);
- assertNull(controller.getInstalledContext("JBossWeb"));
- assertNotNull(controller.getInstalledContext("Tomcat"));
- assertNotNull(controller.getInstalledContext("ServiceX"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Tomcat", null));
- assertNull(controller.getContext("ServiceX", ControllerState.CREATE));
- assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
-
- assertUndeploy(justx);
- assertNull(controller.getContext("JBossWeb", null));
- assertNull(controller.getContext("ServiceX", null));
- }
-
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,200 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.bean.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.vfs.deployer.kernel.AliasDeploymentDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.DeploymentAliasMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+
+/**
+ * AliasDeployerUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AliasDeployerUnitTestCase extends AbstractDeployerUnitTest
+{
+ public static Test suite()
+ {
+ return new TestSuite(AliasDeployerUnitTestCase.class);
+ }
+
+ public AliasDeployerUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ BeanDeployer beanDeployer = new BeanDeployer();
+ KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+ AliasDeploymentDeployer aliasDeploymentDeployer = new AliasDeploymentDeployer();
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ DeploymentAliasMetaDataDeployer aliasMetaDataDeployer = new DeploymentAliasMetaDataDeployer(kernel.getController());
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, beanDeployer);
+ addDeployer(main, kernelDeploymentDeployer);
+ addDeployer(main, aliasDeploymentDeployer);
+ addDeployer(main, beanMetaDataDeployer);
+ addDeployer(main, aliasMetaDataDeployer);
+ }
+
+ public void testAliasSuccessful() throws Exception
+ {
+ VFSDeployment context = createDeployment("/alias", "toplevel/my-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test"));
+
+ VFSDeployment alias = createDeployment("/alias", "toplevel/aliases-beans.xml");
+ assertDeploy(alias);
+ assertNotNull("Missing Test bean.", controller.getInstalledContext("MyAlias"));
+ assertEquals(controller.getInstalledContext("MyAlias"), controller.getInstalledContext("Test"));
+ assertNotNull("Missing Injectee bean.", controller.getInstalledContext("Injectee"));
+
+ assertUndeploy(alias);
+ assertNull(controller.getContext("Injectee", null));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ assertNull(controller.getContext("MyAlias", null));
+ }
+
+ public void testJoinedSuccessful() throws Exception
+ {
+ VFSDeployment context = createDeployment("/alias", "toplevel/joined-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test"));
+ assertNotNull(controller.getInstalledContext("MyAlias"));
+ assertEquals(controller.getInstalledContext("MyAlias"), controller.getInstalledContext("Test"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("MyAlias", null));
+ assertNull(controller.getContext("Test", null));
+ }
+
+ public void testAliasMissing() throws Exception
+ {
+ VFSDeployment context = createDeployment("/alias", "toplevel/aliases-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getContext("Injectee", ControllerState.INSTANTIATED));
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ }
+
+ public void testJMXAlias() throws Exception
+ {
+ VFSDeployment context = createDeployment("/alias", "toplevel/mbean-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test"));
+
+ VFSDeployment alias = createDeployment("/alias", "toplevel/jmx-beans.xml");
+ assertDeploy(alias);
+ assertNotNull("Missing Injectee bean.", controller.getInstalledContext("Injectee"));
+
+ assertUndeploy(alias);
+ assertNull(controller.getContext("Injectee", null));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ }
+
+ public void testAliasDemand() throws Exception
+ {
+ VFSDeployment context = createDeployment("/alias", "toplevel/tomcat-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Tomcat"));
+
+ VFSDeployment alias = createDeployment("/alias", "toplevel/servicex-beans.xml");
+ assertDeploy(alias);
+ assertNotNull(controller.getInstalledContext("ServiceX"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Tomcat", null));
+ assertNull(controller.getContext("ServiceX", ControllerState.CREATE));
+ assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
+
+ assertUndeploy(alias);
+ assertNull(controller.getContext("JBossWeb", null));
+ assertNull(controller.getContext("ServiceX", null));
+ }
+
+ public void testAliasDependency() throws Exception
+ {
+ VFSDeployment alias = createDeployment("/alias", "toplevel/servicex-beans.xml");
+ assertDeploy(alias);
+ assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
+
+ VFSDeployment context = createDeployment("/alias", "toplevel/tomcat-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Tomcat"));
+ assertNotNull(controller.getInstalledContext("JBossWeb"));
+ assertNotNull(controller.getInstalledContext("ServiceX"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Tomcat", null));
+ assertNull(controller.getContext("JBossWeb", null));
+ assertNull(controller.getContext("ServiceX", ControllerState.CREATE));
+ assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
+
+ assertUndeploy(alias);
+ assertNull(controller.getContext("ServiceX", null));
+ }
+
+ public void testRemovingAlias() throws Exception
+ {
+ VFSDeployment justx = createDeployment("/alias", "toplevel/justx-beans.xml");
+ assertDeploy(justx);
+ assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
+
+ VFSDeployment alias = createDeployment("/alias", "toplevel/tcalias-beans.xml");
+ assertDeploy(alias);
+
+ VFSDeployment context = createDeployment("/alias", "toplevel/tomcat-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Tomcat"));
+ assertNotNull(controller.getInstalledContext("JBossWeb"));
+ assertNotNull(controller.getInstalledContext("ServiceX"));
+
+ assertUndeploy(alias);
+ assertNull(controller.getInstalledContext("JBossWeb"));
+ assertNotNull(controller.getInstalledContext("Tomcat"));
+ assertNotNull(controller.getInstalledContext("ServiceX"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Tomcat", null));
+ assertNull(controller.getContext("ServiceX", ControllerState.CREATE));
+ assertNotNull(controller.getContext("ServiceX", ControllerState.CONFIGURED));
+
+ assertUndeploy(justx);
+ assertNull(controller.getContext("JBossWeb", null));
+ assertNull(controller.getContext("ServiceX", null));
+ }
+
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,93 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.bean.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.kernel.Kernel;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-
-/**
- * BeanDeployerUnitTestCase.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @version $Revision: 1.1 $
- */
-public class BeanDeployerUnitTestCase extends AbstractDeployerUnitTest
-{
- public static Test suite()
- {
- return new TestSuite(BeanDeployerUnitTestCase.class);
- }
-
- public BeanDeployerUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- protected void addDeployers(Kernel kernel)
- {
- BeanDeployer beanDeployer = new BeanDeployer();
- KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
- BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
- addDeployer(main, beanDeployer);
- addDeployer(main, kernelDeploymentDeployer);
- addDeployer(main, beanMetaDataDeployer);
- }
-
- public void testTopLevelFile() throws Exception
- {
- VFSDeployment context = createDeployment("/bean", "toplevel/my-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- }
-
- public void testMetaInfFile() throws Exception
- {
- VFSDeployment context = createDeployment("/bean", "toplevel/test.jar");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- }
-
- public void testMultipleMatchingFiles() throws Exception
- {
- VFSDeployment context = createDeployment("/bean", "multiple/test.jar");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test1"));
- assertNotNull(controller.getInstalledContext("Test2"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test2", null));
- assertNull(controller.getContext("Test1", null));
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanDeployerUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,95 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.bean.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+
+/**
+ * BeanDeployerUnitTestCase.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ * @version $Revision: 1.1 $
+ */
+public class BeanDeployerUnitTestCase extends AbstractDeployerUnitTest
+{
+ public static Test suite()
+ {
+ return new TestSuite(BeanDeployerUnitTestCase.class);
+ }
+
+ public BeanDeployerUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ BeanDeployer beanDeployer = new BeanDeployer();
+ KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, beanDeployer);
+ addDeployer(main, kernelDeploymentDeployer);
+ addDeployer(main, beanMetaDataDeployer);
+ }
+
+ public void testTopLevelFile() throws Exception
+ {
+ VFSDeployment context = createDeployment("/bean", "toplevel/my-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ }
+
+ public void testMetaInfFile() throws Exception
+ {
+ VFSDeployment context = createDeployment("/bean", "toplevel/test.jar");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ }
+
+ public void testMultipleMatchingFiles() throws Exception
+ {
+ VFSDeployment context = createDeployment("/bean", "multiple/test.jar");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test1"));
+ assertNotNull(controller.getInstalledContext("Test2"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test2", null));
+ assertNull(controller.getContext("Test1", null));
+ }
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers.vfs.deployer.bean.test;
-
-import java.util.Map;
-
-import junit.framework.Test;
-import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.kernel.Kernel;
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.ManagedProperty;
-import org.jboss.managed.api.factory.ManagedObjectFactory;
-import org.jboss.metatype.api.values.CollectionValue;
-import org.jboss.metatype.api.values.GenericValue;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-
-/**
- * Tests of bean deployment ManagedObject/ManagedDeployment creation.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision:$
- */
-public class BeanManagedDeploymentUnitTestCase extends AbstractDeployerUnitTest
-{
- public static Test suite()
- {
- return suite(BeanManagedDeploymentUnitTestCase.class);
- }
-
- public BeanManagedDeploymentUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- /**
- * Basic test of getting ManagedObject/ManagedProperty from a bean deployment.
- * TODO: the root ManagedObject for a KernelDeployment should be coming from a
- * custom {@linkplain org.jboss.managed.spi.factory.InstanceClassFactory}
- * @throws Exception for any error
- */
- public void testBeanManagedObject()
- throws Exception
- {
- super.enableTrace("org.jboss.managed.plugins.factory");
- VFSDeployment context = createDeployment("/managed", "annotated-beans.xml");
- assertDeploy(context);
-
- ManagedObjectFactory.getInstance();
- Map<String, ManagedObject> mos = main.getManagedObjects(context.getName());
- log.info("annotated-beans.xml ManagedObjects: "+mos);
- assertEquals("annotated-beans.xml has 1 ManagedObject", 1, mos.size());
- ManagedObject kdMO = mos.values().iterator().next();
- log.info("KernelDeployment.ManagedProperties: "+kdMO.getProperties());
- ManagedProperty beanFactories = kdMO.getProperty("beanFactories");
- assertNotNull(beanFactories);
- CollectionValue beanFactoriesAV = CollectionValue.class.cast(beanFactories.getValue());
- beanFactoriesAV.getMetaType();
- assertEquals("BeanFactories size", 2, beanFactoriesAV.getSize());
- GenericValue beanFactoriesGV = (GenericValue) beanFactoriesAV.getElements()[0];
- log.info("BeanFactories[0].GV: "+beanFactoriesGV);
- ManagedObject beanFactoriesMO = (ManagedObject) beanFactoriesGV.getValue();
- assertNotNull(beanFactoriesMO);
- log.info("beanFactories.ManagedProperties: "+beanFactoriesMO.getProperties());
- ManagedProperty properties = beanFactoriesMO.getProperty("properties");
- assertNotNull(properties);
- CollectionValue propertiesArray = CollectionValue.class.cast(properties.getValue());
- assertNotNull(propertiesArray);
- }
-
- public void testBeanManagedDeployment()
- throws Exception
- {
- VFSDeployment context = createDeployment("/bean", "toplevel/my-beans.xml");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- }
-
- protected void addDeployers(Kernel kernel)
- {
- BeanDeployer beanDeployer = new BeanDeployer();
- KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
- BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
- addDeployer(main, beanDeployer);
- addDeployer(main, kernelDeploymentDeployer);
- addDeployer(main, beanMetaDataDeployer);
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanManagedDeploymentUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.vfs.deployer.bean.test;
+
+import java.util.Map;
+
+import junit.framework.Test;
+import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.kernel.Kernel;
+import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.ManagedProperty;
+import org.jboss.managed.api.factory.ManagedObjectFactory;
+import org.jboss.metatype.api.values.CollectionValue;
+import org.jboss.metatype.api.values.GenericValue;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+
+/**
+ * Tests of bean deployment ManagedObject/ManagedDeployment creation.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public class BeanManagedDeploymentUnitTestCase extends AbstractDeployerUnitTest
+{
+ public static Test suite()
+ {
+ return suite(BeanManagedDeploymentUnitTestCase.class);
+ }
+
+ public BeanManagedDeploymentUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ /**
+ * Basic test of getting ManagedObject/ManagedProperty from a bean deployment.
+ * TODO: the root ManagedObject for a KernelDeployment should be coming from a
+ * custom {@linkplain org.jboss.managed.spi.factory.InstanceClassFactory}
+ * @throws Exception for any error
+ */
+ public void testBeanManagedObject()
+ throws Exception
+ {
+ super.enableTrace("org.jboss.managed.plugins.factory");
+ VFSDeployment context = createDeployment("/managed", "annotated-beans.xml");
+ assertDeploy(context);
+
+ ManagedObjectFactory.getInstance();
+ Map<String, ManagedObject> mos = main.getManagedObjects(context.getName());
+ log.info("annotated-beans.xml ManagedObjects: "+mos);
+ assertEquals("annotated-beans.xml has 1 ManagedObject", 1, mos.size());
+ ManagedObject kdMO = mos.values().iterator().next();
+ log.info("KernelDeployment.ManagedProperties: "+kdMO.getProperties());
+ ManagedProperty beanFactories = kdMO.getProperty("beanFactories");
+ assertNotNull(beanFactories);
+ CollectionValue beanFactoriesAV = CollectionValue.class.cast(beanFactories.getValue());
+ beanFactoriesAV.getMetaType();
+ assertEquals("BeanFactories size", 2, beanFactoriesAV.getSize());
+ GenericValue beanFactoriesGV = (GenericValue) beanFactoriesAV.getElements()[0];
+ log.info("BeanFactories[0].GV: "+beanFactoriesGV);
+ ManagedObject beanFactoriesMO = (ManagedObject) beanFactoriesGV.getValue();
+ assertNotNull(beanFactoriesMO);
+ log.info("beanFactories.ManagedProperties: "+beanFactoriesMO.getProperties());
+ ManagedProperty properties = beanFactoriesMO.getProperty("properties");
+ assertNotNull(properties);
+ CollectionValue propertiesArray = CollectionValue.class.cast(properties.getValue());
+ assertNotNull(propertiesArray);
+ }
+
+ public void testBeanManagedDeployment()
+ throws Exception
+ {
+ VFSDeployment context = createDeployment("/bean", "toplevel/my-beans.xml");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ BeanDeployer beanDeployer = new BeanDeployer();
+ KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, beanDeployer);
+ addDeployer(main, kernelDeploymentDeployer);
+ addDeployer(main, beanMetaDataDeployer);
+ }
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,59 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.bean.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer;
-import org.jboss.kernel.Kernel;
-import org.jboss.test.deployers.vfs.deployer.bean.support.CustomBMDF;
-import org.jboss.test.deployers.vfs.deployer.bean.support.TestComponentCheckerDeployer;
-
-/**
- * BeanMetaDataFactoryDeployerUnitTestCase.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public class BeanMetaDataFactoryDeployerUnitTestCase extends AbstractBeanMetaDataFactoryDeployerTest
-{
- public static Test suite()
- {
- return new TestSuite(BeanMetaDataFactoryDeployerUnitTestCase.class);
- }
-
- public BeanMetaDataFactoryDeployerUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- protected void addDeployers(Kernel kernel)
- {
- TestComponentCheckerDeployer tccd = new TestComponentCheckerDeployer("Test");
- BeanMetaDataFactoryDeployer<CustomBMDF> bmdfd = new BeanMetaDataFactoryDeployer<CustomBMDF>(CustomBMDF.class);
- BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
-
- addDeployer(main, tccd);
- addDeployer(main, bmdfd);
- addDeployer(main, beanMetaDataDeployer);
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/BeanMetaDataFactoryDeployerUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,61 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.bean.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer;
+import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.bean.support.CustomBMDF;
+import org.jboss.test.deployers.vfs.deployer.bean.support.TestComponentCheckerDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+
+/**
+ * BeanMetaDataFactoryDeployerUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class BeanMetaDataFactoryDeployerUnitTestCase extends AbstractBeanMetaDataFactoryDeployerTest
+{
+ public static Test suite()
+ {
+ return new TestSuite(BeanMetaDataFactoryDeployerUnitTestCase.class);
+ }
+
+ public BeanMetaDataFactoryDeployerUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ TestComponentCheckerDeployer tccd = new TestComponentCheckerDeployer("Test");
+ BeanMetaDataFactoryDeployer<CustomBMDF> bmdfd = new BeanMetaDataFactoryDeployer<CustomBMDF>(CustomBMDF.class);
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, tccd);
+ addDeployer(main, bmdfd);
+ addDeployer(main, beanMetaDataDeployer);
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,99 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.bean.test;
-
-import java.util.Collections;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
-import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.spi.attachments.MutableAttachments;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-import org.jboss.test.deployers.vfs.deployer.bean.support.Simple;
-import org.jboss.test.deployers.vfs.deployer.bean.support.TestBeanDeployer;
-
-/**
- * BeanDeployerUnitTestCase.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class KernelDeployerUnitTestCase extends AbstractDeployerUnitTest
-{
- public static Test suite()
- {
- return new TestSuite(KernelDeployerUnitTestCase.class);
- }
-
- public KernelDeployerUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- protected void addDeployers(Kernel kernel)
- {
- TestBeanDeployer testDeployer = new TestBeanDeployer();
- KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
- BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
- addDeployer(main, testDeployer);
- addDeployer(main, kernelDeploymentDeployer);
- addDeployer(main, beanMetaDataDeployer);
- }
-
- public void testKernelDeployerPredetermined() throws Exception
- {
- Deployment context = createSimpleDeployment("KernelDeployerTest");
-
- AbstractKernelDeployment deployment = new AbstractKernelDeployment();
- deployment.setName("KernelDeployerTest");
-
- BeanMetaDataFactory metaData = new AbstractBeanMetaData("Test", Simple.class.getName());
- deployment.setBeanFactories(Collections.singletonList(metaData));
-
- MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
- attachments.addAttachment("KernelDeployerTest", deployment);
-
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- }
-
- public void testKernelDeployerTransient() throws Exception
- {
- Deployment context = createSimpleDeployment("KernelDeployerTransient");
-
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- }
-
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelDeployerUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,101 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.bean.test;
+
+import java.util.Collections;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.vfs.deployer.bean.support.Simple;
+import org.jboss.test.deployers.vfs.deployer.bean.support.TestBeanDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+
+/**
+ * BeanDeployerUnitTestCase.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class KernelDeployerUnitTestCase extends AbstractDeployerUnitTest
+{
+ public static Test suite()
+ {
+ return new TestSuite(KernelDeployerUnitTestCase.class);
+ }
+
+ public KernelDeployerUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ TestBeanDeployer testDeployer = new TestBeanDeployer();
+ KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, testDeployer);
+ addDeployer(main, kernelDeploymentDeployer);
+ addDeployer(main, beanMetaDataDeployer);
+ }
+
+ public void testKernelDeployerPredetermined() throws Exception
+ {
+ Deployment context = createSimpleDeployment("KernelDeployerTest");
+
+ AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+ deployment.setName("KernelDeployerTest");
+
+ BeanMetaDataFactory metaData = new AbstractBeanMetaData("Test", Simple.class.getName());
+ deployment.setBeanFactories(Collections.singletonList(metaData));
+
+ MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
+ attachments.addAttachment("KernelDeployerTest", deployment);
+
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ }
+
+ public void testKernelDeployerTransient() throws Exception
+ {
+ Deployment context = createSimpleDeployment("KernelDeployerTransient");
+
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ }
+
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,133 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.bean.test;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-import java.util.HashSet;
-
-import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ScopeInfo;
-import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.spi.attachments.MutableAttachments;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
-import org.jboss.metadata.spi.MetaData;
-import org.jboss.metadata.spi.scope.Scope;
-import org.jboss.metadata.spi.scope.ScopeKey;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-import org.jboss.test.deployers.vfs.deployer.bean.support.Simple;
-import org.jboss.test.deployers.vfs.deployer.bean.support.TestInstanceMetaDataBeanDeployer;
-import org.jboss.test.deployers.vfs.deployer.bean.support.TestMetaDataBeanDeployer;
-
-/**
- * BeanDeployerUnitTestCase.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class KernelScopeUnitTestCase extends AbstractDeployerUnitTest
-{
- public static Test suite()
- {
- return suite(KernelScopeUnitTestCase.class);
- }
-
- protected TestMetaDataBeanDeployer testMetaDataDeployer;
-
- protected TestInstanceMetaDataBeanDeployer testInstanceMetaDataDeployer;
-
- public KernelScopeUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- @SuppressWarnings("deprecation")
- protected void addDeployers(Kernel kernel)
- {
- testMetaDataDeployer = new TestMetaDataBeanDeployer();
- testInstanceMetaDataDeployer = new TestInstanceMetaDataBeanDeployer();
- KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
- BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
- addDeployer(main, testMetaDataDeployer);
- addDeployer(main, testInstanceMetaDataDeployer);
- addDeployer(main, kernelDeploymentDeployer);
- addDeployer(main, beanMetaDataDeployer);
- }
-
- public void testKernelScope() throws Exception
- {
- Deployment context = createSimpleDeployment("KernelDeployerTest");
-
- AbstractKernelDeployment deployment = new AbstractKernelDeployment();
- deployment.setName("KernelDeployerTest");
-
- BeanMetaDataFactory metaData = new AbstractBeanMetaData("Test", Simple.class.getName());
- deployment.setBeanFactories(Collections.singletonList(metaData));
-
- MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
- attachments.addAttachment("KernelDeployerTest", deployment);
-
- assertDeploy(context);
- ControllerContext ctx = controller.getInstalledContext("Test");
-
- ScopeInfo scopeInfo = ctx.getScopeInfo();
-
- MainDeployerStructure mds = (MainDeployerStructure) main;
- DeploymentUnit unit = mds.getDeploymentUnit("KernelDeployerTest", true);
- DeploymentUnit component = unit.getComponent("Test");
- assertScopeKeys(component.getScope(), scopeInfo.getScope());
- assertScopeKeys(component.getMutableScope(), scopeInfo.getMutableScope());
-
- MetaData md = ctx.getScopeInfo().getMetaData();
- assertEquals(testMetaDataDeployer, md.getMetaData("test"));
- assertEquals(testInstanceMetaDataDeployer, md.getMetaData("instance"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test", null));
- }
-
- /**
- * Component scopes should be subset of context scopes.
- *
- * @param component the component scope key
- * @param context the context scope key
- */
- protected void assertScopeKeys(ScopeKey component, ScopeKey context)
- {
- Collection<Scope> componentScopes = component.getScopes();
- Collection<Scope> contextScopes = context.getScopes();
-
- Set<Scope> first = new HashSet<Scope>(componentScopes);
- Set<Scope> second = new HashSet<Scope>(contextScopes);
- second.retainAll(first);
- assertEquals(first, second);
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/KernelScopeUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,135 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.bean.test;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.HashSet;
+
+import junit.framework.Test;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ScopeInfo;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
+import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.scope.Scope;
+import org.jboss.metadata.spi.scope.ScopeKey;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.vfs.deployer.bean.support.Simple;
+import org.jboss.test.deployers.vfs.deployer.bean.support.TestInstanceMetaDataBeanDeployer;
+import org.jboss.test.deployers.vfs.deployer.bean.support.TestMetaDataBeanDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+
+/**
+ * BeanDeployerUnitTestCase.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class KernelScopeUnitTestCase extends AbstractDeployerUnitTest
+{
+ public static Test suite()
+ {
+ return suite(KernelScopeUnitTestCase.class);
+ }
+
+ protected TestMetaDataBeanDeployer testMetaDataDeployer;
+
+ protected TestInstanceMetaDataBeanDeployer testInstanceMetaDataDeployer;
+
+ public KernelScopeUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ @SuppressWarnings("deprecation")
+ protected void addDeployers(Kernel kernel)
+ {
+ testMetaDataDeployer = new TestMetaDataBeanDeployer();
+ testInstanceMetaDataDeployer = new TestInstanceMetaDataBeanDeployer();
+ KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, testMetaDataDeployer);
+ addDeployer(main, testInstanceMetaDataDeployer);
+ addDeployer(main, kernelDeploymentDeployer);
+ addDeployer(main, beanMetaDataDeployer);
+ }
+
+ public void testKernelScope() throws Exception
+ {
+ Deployment context = createSimpleDeployment("KernelDeployerTest");
+
+ AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+ deployment.setName("KernelDeployerTest");
+
+ BeanMetaDataFactory metaData = new AbstractBeanMetaData("Test", Simple.class.getName());
+ deployment.setBeanFactories(Collections.singletonList(metaData));
+
+ MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
+ attachments.addAttachment("KernelDeployerTest", deployment);
+
+ assertDeploy(context);
+ ControllerContext ctx = controller.getInstalledContext("Test");
+
+ ScopeInfo scopeInfo = ctx.getScopeInfo();
+
+ MainDeployerStructure mds = (MainDeployerStructure) main;
+ DeploymentUnit unit = mds.getDeploymentUnit("KernelDeployerTest", true);
+ DeploymentUnit component = unit.getComponent("Test");
+ assertScopeKeys(component.getScope(), scopeInfo.getScope());
+ assertScopeKeys(component.getMutableScope(), scopeInfo.getMutableScope());
+
+ MetaData md = ctx.getScopeInfo().getMetaData();
+ assertEquals(testMetaDataDeployer, md.getMetaData("test"));
+ assertEquals(testInstanceMetaDataDeployer, md.getMetaData("instance"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test", null));
+ }
+
+ /**
+ * Component scopes should be subset of context scopes.
+ *
+ * @param component the component scope key
+ * @param context the context scope key
+ */
+ protected void assertScopeKeys(ScopeKey component, ScopeKey context)
+ {
+ Collection<Scope> componentScopes = component.getScopes();
+ Collection<Scope> contextScopes = context.getScopes();
+
+ Set<Scope> first = new HashSet<Scope>(componentScopes);
+ Set<Scope> second = new HashSet<Scope>(contextScopes);
+ second.retainAll(first);
+ assertEquals(first, second);
+ }
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,71 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.merge.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.kernel.Kernel;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-import org.jboss.test.deployers.vfs.deployer.merge.support.TestBeanMergeDeployer;
-
-/**
- * BeanMergeUnitTestCase.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- */
-public class BeanMergeUnitTestCase extends AbstractDeployerUnitTest
-{
- public static Test suite()
- {
- return new TestSuite(BeanMergeUnitTestCase.class);
- }
-
- public BeanMergeUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- protected void addDeployers(Kernel kernel)
- {
- TestBeanMergeDeployer beanDeployer = new TestBeanMergeDeployer();
- KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
- BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
- addDeployer(main, beanDeployer);
- addDeployer(main, kernelDeploymentDeployer);
- addDeployer(main, beanMetaDataDeployer);
- }
-
- public void testMultipleMatchingFiles() throws Exception
- {
- VFSDeployment context = createDeployment("/bean", "multiple/test.jar");
- assertDeploy(context);
- assertNotNull(controller.getInstalledContext("Test1"));
- assertNotNull(controller.getInstalledContext("Test2"));
-
- assertUndeploy(context);
- assertNull(controller.getContext("Test2", null));
- assertNull(controller.getContext("Test1", null));
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/BeanMergeUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,73 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.merge.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.vfs.deployer.merge.support.TestBeanMergeDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+
+/**
+ * BeanMergeUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class BeanMergeUnitTestCase extends AbstractDeployerUnitTest
+{
+ public static Test suite()
+ {
+ return new TestSuite(BeanMergeUnitTestCase.class);
+ }
+
+ public BeanMergeUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ TestBeanMergeDeployer beanDeployer = new TestBeanMergeDeployer();
+ KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel);
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, beanDeployer);
+ addDeployer(main, kernelDeploymentDeployer);
+ addDeployer(main, beanMetaDataDeployer);
+ }
+
+ public void testMultipleMatchingFiles() throws Exception
+ {
+ VFSDeployment context = createDeployment("/bean", "multiple/test.jar");
+ assertDeploy(context);
+ assertNotNull(controller.getInstalledContext("Test1"));
+ assertNotNull(controller.getInstalledContext("Test2"));
+
+ assertUndeploy(context);
+ assertNull(controller.getContext("Test2", null));
+ assertNull(controller.getContext("Test1", null));
+ }
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,101 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.merge.test;
-
-import junit.framework.Test;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-import org.jboss.test.deployers.vfs.deployer.merge.support.MockRarDeployer;
-import org.jboss.test.deployers.vfs.deployer.merge.support.RarDeploymentDeployer;
-import org.jboss.kernel.Kernel;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.dependency.spi.ControllerContext;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class MockRarUnitTestCase extends AbstractDeployerUnitTest
-{
- private MockRarDeployer deployer = new MockRarDeployer();
-
- public MockRarUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(MockRarUnitTestCase.class);
- }
-
- protected void addDeployers(Kernel kernel)
- {
- deployer.setUseSchemaValidation(false);
- try
- {
- controller.install(new AbstractBeanMetaData("rard", MockRarDeployer.class.getName()), deployer);
- }
- catch (Throwable t)
- {
- throw new RuntimeException(t);
- }
- addDeployer(main, deployer);
- addDeployer(main, new RarDeploymentDeployer());
- addDeployer(main, new KernelDeploymentDeployer());
- addDeployer(main, new BeanMetaDataDeployer(kernel));
- }
-
- protected void testRarMerge(String name, boolean spec, boolean jboss, Class<?> clazz) throws Exception
- {
- VFSDeployment deployment = createDeployment("/bean", "multiple/" + name + ".jar");
- assertDeploy(deployment);
-
- assertEquals(spec, deployer.getSpec() != null);
- assertEquals(jboss, deployer.getJboss() != null);
-
- ControllerContext context = controller.getInstalledContext("Test");
- assertNotNull(context);
- Object target = context.getTarget();
- assertNotNull(target);
- assertEquals(clazz, target.getClass());
-
- assertUndeploy(deployment);
- assertNull(controller.getContext("Test", null));
- }
-
- public void testAllRar() throws Exception
- {
- testRarMerge("allrar", true, true, Object.class);
- }
-
- public void testSpecRar() throws Exception
- {
- testRarMerge("specrar", true, false, String.class);
- }
-
- public void testJarRar() throws Exception
- {
- testRarMerge("jbossrar", false, true, StringBuilder.class);
- }
-}
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MockRarUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,103 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.merge.test;
+
+import junit.framework.Test;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.vfs.deployer.merge.support.MockRarDeployer;
+import org.jboss.test.deployers.vfs.deployer.merge.support.RarDeploymentDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+import org.jboss.kernel.Kernel;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.dependency.spi.ControllerContext;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MockRarUnitTestCase extends AbstractDeployerUnitTest
+{
+ private MockRarDeployer deployer = new MockRarDeployer();
+
+ public MockRarUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(MockRarUnitTestCase.class);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ deployer.setUseSchemaValidation(false);
+ try
+ {
+ controller.install(new AbstractBeanMetaData("rard", MockRarDeployer.class.getName()), deployer);
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException(t);
+ }
+ addDeployer(main, deployer);
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, new RarDeploymentDeployer());
+ addDeployer(main, new KernelDeploymentDeployer());
+ addDeployer(main, new BeanMetaDataDeployer(kernel));
+ }
+
+ protected void testRarMerge(String name, boolean spec, boolean jboss, Class<?> clazz) throws Exception
+ {
+ VFSDeployment deployment = createDeployment("/bean", "multiple/" + name + ".jar");
+ assertDeploy(deployment);
+
+ assertEquals(spec, deployer.getSpec() != null);
+ assertEquals(jboss, deployer.getJboss() != null);
+
+ ControllerContext context = controller.getInstalledContext("Test");
+ assertNotNull(context);
+ Object target = context.getTarget();
+ assertNotNull(target);
+ assertEquals(clazz, target.getClass());
+
+ assertUndeploy(deployment);
+ assertNull(controller.getContext("Test", null));
+ }
+
+ public void testAllRar() throws Exception
+ {
+ testRarMerge("allrar", true, true, Object.class);
+ }
+
+ public void testSpecRar() throws Exception
+ {
+ testRarMerge("specrar", true, false, String.class);
+ }
+
+ public void testJarRar() throws Exception
+ {
+ testRarMerge("jbossrar", false, true, StringBuilder.class);
+ }
+}
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,83 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.merge.test;
-
-import junit.framework.Test;
-import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
-import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
-import org.jboss.deployers.vfs.spi.client.VFSDeployment;
-import org.jboss.kernel.Kernel;
-import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
-import org.jboss.test.deployers.vfs.deployer.merge.support.MultiRarDeployer;
-import org.jboss.test.deployers.vfs.deployer.merge.support.RarDeploymentDeployer;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class MultiFilesUnitTestCase extends AbstractDeployerUnitTest
-{
- public MultiFilesUnitTestCase(String name) throws Throwable
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(MultiFilesUnitTestCase.class);
- }
-
- protected void addDeployers(Kernel kernel)
- {
- MultiRarDeployer deployer = new MultiRarDeployer();
- deployer.setUseSchemaValidation(false);
- try
- {
- controller.install(new AbstractBeanMetaData("mrd", MultiRarDeployer.class.getName()), deployer);
- }
- catch (Throwable t)
- {
- throw new RuntimeException(t);
- }
- addDeployer(main, deployer);
- addDeployer(main, new RarDeploymentDeployer());
- addDeployer(main, new KernelDeploymentDeployer());
- addDeployer(main, new BeanMetaDataDeployer(kernel));
- }
-
- public void testMultipleNames() throws Exception
- {
- VFSDeployment deployment = createDeployment("/bean", "multiple/multirar.jar");
- assertDeploy(deployment);
-
- ControllerContext context = controller.getInstalledContext("Test");
- assertNotNull(context);
- context = controller.getInstalledContext("Alias1");
- assertNotNull(context);
- context = controller.getInstalledContext("Alias2");
- assertNotNull(context);
-
- assertUndeploy(deployment);
- assertNull(controller.getContext("Test", null));
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java (from rev 80485, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/test/MultiFilesUnitTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,85 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.merge.test;
+
+import junit.framework.Test;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.kernel.Kernel;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.vfs.deployer.merge.support.MultiRarDeployer;
+import org.jboss.test.deployers.vfs.deployer.merge.support.RarDeploymentDeployer;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MultiFilesUnitTestCase extends AbstractDeployerUnitTest
+{
+ public MultiFilesUnitTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(MultiFilesUnitTestCase.class);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ MultiRarDeployer deployer = new MultiRarDeployer();
+ deployer.setUseSchemaValidation(false);
+ try
+ {
+ controller.install(new AbstractBeanMetaData("mrd", MultiRarDeployer.class.getName()), deployer);
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException(t);
+ }
+ addDeployer(main, deployer);
+ addDeployer(main, new TCCLClassLoaderDeployer());
+ addDeployer(main, new RarDeploymentDeployer());
+ addDeployer(main, new KernelDeploymentDeployer());
+ addDeployer(main, new BeanMetaDataDeployer(kernel));
+ }
+
+ public void testMultipleNames() throws Exception
+ {
+ VFSDeployment deployment = createDeployment("/bean", "multiple/multirar.jar");
+ assertDeploy(deployment);
+
+ ControllerContext context = controller.getInstalledContext("Test");
+ assertNotNull(context);
+ context = controller.getInstalledContext("Alias1");
+ assertNotNull(context);
+ context = controller.getInstalledContext("Alias2");
+ assertNotNull(context);
+
+ assertUndeploy(deployment);
+ assertNull(controller.getContext("Test", null));
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,73 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.vfs.deployer.validate.test;
-
-import java.util.Collections;
-
-import junit.framework.Test;
-import org.jboss.deployers.spi.deployer.Deployer;
-import org.jboss.deployers.spi.structure.StructureMetaData;
-import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentContext;
-import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.test.deployers.BaseDeployersVFSTest;
-import org.jboss.test.deployers.vfs.deployer.validate.support.StructureOMFDeployer;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * Validate omfd deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ObjectMFDTestCase extends BaseDeployersVFSTest
-{
- public ObjectMFDTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(ObjectMFDTestCase.class);
- }
-
- public void testDeployer() throws Exception
- {
- VirtualFile file = getVirtualFile("/structure/explicit", "complex.deployer");
- VFSDeploymentContext deployment = new AbstractVFSDeploymentContext(file, "");
- deployment.setMetaDataPath(Collections.singletonList("META-INF"));
- VFSDeploymentUnit unit = new AbstractVFSDeploymentUnit(deployment);
- Deployer deployer = new StructureOMFDeployer();
-
- deployer.deploy(unit);
- try
- {
- StructureMetaData metaData = unit.getAttachment(StructureMetaData.class);
- assertNotNull(metaData);
- }
- finally
- {
- deployer.undeploy(unit);
- }
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/test/ObjectMFDTestCase.java 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,104 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.validate.test;
+
+import java.util.Collections;
+
+import junit.framework.Test;
+import org.jboss.deployers.spi.deployer.Deployer;
+import org.jboss.deployers.spi.structure.ContextInfo;
+import org.jboss.deployers.spi.structure.StructureMetaData;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentContext;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.test.deployers.BaseDeployersVFSTest;
+import org.jboss.test.deployers.vfs.deployer.validate.support.StructureOMFDeployer;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Validate omfd deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ObjectMFDTestCase extends BaseDeployersVFSTest
+{
+ public ObjectMFDTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(ObjectMFDTestCase.class);
+ }
+
+ public void testDeployer() throws Exception
+ {
+ VirtualFile file = getVirtualFile("/structure/explicit", "complex.deployer");
+ VFSDeploymentContext deployment = new AbstractVFSDeploymentContext(file, "");
+ deployment.setMetaDataPath(Collections.singletonList("META-INF"));
+ VFSDeploymentUnit unit = new AbstractVFSDeploymentUnit(deployment);
+ Deployer deployer = new StructureOMFDeployer();
+
+ deployer.deploy(unit);
+ try
+ {
+ StructureMetaData metaData = unit.getAttachment(StructureMetaData.class);
+ assertNotNull(metaData);
+ }
+ finally
+ {
+ deployer.undeploy(unit);
+ }
+ }
+
+ public void testComparator() throws Exception
+ {
+ VirtualFile file = getVirtualFile("/structure/explicit", "comparator.jar");
+ VFSDeploymentContext deployment = new AbstractVFSDeploymentContext(file, "");
+ deployment.setMetaDataPath(Collections.singletonList("META-INF"));
+ VFSDeploymentUnit unit = new AbstractVFSDeploymentUnit(deployment);
+ Deployer deployer = new StructureOMFDeployer();
+
+ deployer.deploy(unit);
+ try
+ {
+ StructureMetaData metaData = unit.getAttachment(StructureMetaData.class);
+ assertNotNull(metaData);
+ assertComparator(metaData, "", "org.jboss.test.deployment.test.SomeDeploymentComparatorTop");
+ assertComparator(metaData, "sub.jar", "org.jboss.test.deployment.test.SomeDeploymentComparatorSub");
+ assertComparator(metaData, "x.war", "org.jboss.test.deployment.test.SomeDeploymentComparatorX");
+ }
+ finally
+ {
+ deployer.undeploy(unit);
+ }
+ }
+
+ protected void assertComparator(StructureMetaData metaData, String path, String comparator)
+ {
+ ContextInfo ci = metaData.getContext(path);
+ assertNotNull(ci);
+ assertEquals(comparator, ci.getComparatorClassName());
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs/src/test/resources/structure/explicit/comparator.jar (from rev 80486, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/structure/explicit/comparator.jar)
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs-spi/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,76 +0,0 @@
-<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.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <packaging>jar</packaging>
- <name>JBoss Deployers VFS SPI</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Deployers VFS SPI</description>
-
- <!-- Do not add version information here, use ../pom.xml instead -->
- <dependencies>
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <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.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- <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.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <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>stax</groupId>
- <artifactId>stax-api</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs-spi/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs-spi/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/deployers-vfs-spi/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,76 @@
+<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.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <packaging>jar</packaging>
+ <name>JBoss Deployers VFS SPI</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Deployers VFS SPI</description>
+
+ <!-- Do not add version information here, use ../pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <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.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <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.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <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>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Deleted: projects/jboss-deployers/tags/2.0.0.CR4/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/pom.xml 2008-10-24 09:14:52 UTC (rev 80034)
+++ projects/jboss-deployers/tags/2.0.0.CR4/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -1,419 +0,0 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4</version>
- </parent>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Deployers Parent POM</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>
- The JBoss Deployment Framework
- </description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-deployers/branches/Branch_2_0/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/branches/Branch_2_0/</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-deployers/branches/Branch_2_0/</url>
- </scm>
-
- <properties>
- <version.jboss.man>2.0.0.CR1</version.jboss.man>
- <version.jboss.mdr>2.0.0.CR3</version.jboss.mdr>
- <version.jboss.microcontainer>2.0.0.CR2</version.jboss.microcontainer>
- <version.jboss.classloader>2.0.0.CR3</version.jboss.classloader>
- <version.jboss.classloading.spi>5.0.0.CR2</version.jboss.classloading.spi>
- <version.jboss.common.core>2.2.8.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
- <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
- <version.jbossxb>2.0.0.CR14</version.jbossxb>
- <version.jboss.aop>2.0.0.CR18</version.jboss.aop>
- <version.jboss.vfs>2.0.0.CR1</version.jboss.vfs>
- <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
- <version.junit>4.4</version.junit>
- <version.javassist>3.8.1.GA</version.javassist>
- <version.stax.staxapi>1.0</version.stax.staxapi>
- </properties>
-
- <modules>
- <module>deployers-core-spi</module>
- <module>deployers-core</module>
- <module>deployers-client-spi</module>
- <module>deployers-client</module>
- <module>deployers-structure-spi</module>
- <module>deployers-spi</module>
- <module>deployers-impl</module>
- <module>deployers-vfs-spi</module>
- <module>deployers-vfs</module>
- <module>build</module>
- </modules>
-
- <build>
- <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
- <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
- <configuration>
- <generateReleasePoms>false</generateReleasePoms>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <includes>
- <include>org/jboss/test/**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.0.0</version>
- </plugin>
- </plugins>
- </reporting>
- <dependencyManagement>
- <!-- The parent pom manages the inter-dependencies of the modules. -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
- <version>${version.jboss.classloader}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading</artifactId>
- <version>${version.jboss.classloader}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloading-vfs</artifactId>
- <version>${version.jboss.classloader}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-classloading-spi</artifactId>
- <version>${version.jboss.classloading.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>${version.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-metatype</artifactId>
- <version>${version.jboss.man}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.jboss.mdr}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.logging.log4j}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <version>${version.jbossxb}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${version.javassist}</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${version.stax.staxapi}</version>
- <optional>true</optional>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>target/test-classes</microcontainer.testOutputDirectory>
- </properties>
- </profile>
- <profile>
- <id>eclipse</id>
- <build>
- <defaultGoal>process-test-resources</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <executions>
- <execution>
- <id>eclipse</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>eclipse</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <downloadSources>true</downloadSources>
- <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory>
- <microcontainer.testOutputDirectory>eclipse-target/test-classes</microcontainer.testOutputDirectory>
- </properties>
- </profile>
- <profile>
- <id>assembly</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>install</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <finalName>jboss-microcontainer-${project.version}</finalName>
- <descriptors>
- <descriptor>build/assembly/dist.xml</descriptor>
- <descriptor>build/assembly/src.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
\ No newline at end of file
Copied: projects/jboss-deployers/tags/2.0.0.CR4/pom.xml (from rev 80487, projects/jboss-deployers/branches/Branch_2_0/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.CR4/pom.xml (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.CR4/pom.xml 2008-11-04 13:04:22 UTC (rev 80488)
@@ -0,0 +1,419 @@
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
+ </parent>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>2.0.0.CR4</version>
+ <packaging>pom</packaging>
+ <name>JBoss Deployers Parent POM</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>
+ The JBoss Deployment Framework
+ </description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-deployers/tags/2.0.0.CR4</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/tags/2.0.0.CR4</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-deployers/tags/2.0.0.CR4</url>
+ </scm>
+
+ <properties>
+ <version.jboss.man>2.0.0.CR2</version.jboss.man>
+ <version.jboss.mdr>2.0.1.GA</version.jboss.mdr>
+ <version.jboss.microcontainer>2.0.0.CR4</version.jboss.microcontainer>
+ <version.jboss.classloader>2.0.0.CR5</version.jboss.classloader>
+ <version.jboss.classloading.spi>5.0.0.CR2</version.jboss.classloading.spi>
+ <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
+ <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
+ <version.jbossxb>2.0.0.GA</version.jbossxb>
+ <version.jboss.aop>2.0.0.GA</version.jboss.aop>
+ <version.jboss.vfs>2.0.0.CR2</version.jboss.vfs>
+ <version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
+ <version.junit>4.4</version.junit>
+ <version.javassist>3.9.0.GA</version.javassist>
+ <version.stax.staxapi>1.0</version.stax.staxapi>
+ </properties>
+
+ <modules>
+ <module>deployers-core-spi</module>
+ <module>deployers-core</module>
+ <module>deployers-client-spi</module>
+ <module>deployers-client</module>
+ <module>deployers-structure-spi</module>
+ <module>deployers-spi</module>
+ <module>deployers-impl</module>
+ <module>deployers-vfs-spi</module>
+ <module>deployers-vfs</module>
+ <module>build</module>
+ </modules>
+
+ <build>
+ <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <generateReleasePoms>false</generateReleasePoms>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>org/jboss/test/**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ <dependencyManagement>
+ <!-- The parent pom manages the inter-dependencies of the modules. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloader</artifactId>
+ <version>${version.jboss.classloader}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <version>${version.jboss.classloader}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ <version>${version.jboss.classloader}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-classloading-spi</artifactId>
+ <version>${version.jboss.classloading.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ <version>${version.jboss.man}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.jboss.mdr}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.jboss.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging.log4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${version.jbossxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.jboss.aop}</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${version.javassist}</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${version.stax.staxapi}</version>
+ <optional>true</optional>
+ </dependency>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>${version.org.jboss.test}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>target/test-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <defaultGoal>process-test-resources</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>eclipse</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>eclipse-target/test-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+ <profile>
+ <id>assembly</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>install</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>jboss-microcontainer-${project.version}</finalName>
+ <descriptors>
+ <descriptor>build/assembly/dist.xml</descriptor>
+ <descriptor>build/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list