[jboss-cvs] JBossAS SVN: r73015 - in projects/jboss-deployers/tags: 2.0.0.Beta15 and 19 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri May 2 08:24:37 EDT 2008


Author: alesj
Date: 2008-05-02 08:24:37 -0400 (Fri, 02 May 2008)
New Revision: 73015

Added:
   projects/jboss-deployers/tags/2.0.0.Beta15/
   projects/jboss-deployers/tags/2.0.0.Beta15/build/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassSignaturePair.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/WeakClassLoaderHolder.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoader.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoaderSystemDeployer.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/TestAnnotation.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/Element.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-structure-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/pom.xml
Removed:
   projects/jboss-deployers/tags/2.0.0.Beta15/build/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-structure-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs-spi/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs/pom.xml
   projects/jboss-deployers/tags/2.0.0.Beta15/pom.xml
Log:
[maven-release-plugin]  copy for tag 2.0.0.Beta15

Copied: projects/jboss-deployers/tags/2.0.0.Beta15 (from rev 72857, projects/jboss-deployers/trunk)

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/build/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/build/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/build/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,359 +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</groupId>
-    <artifactId>jboss-parent</artifactId>
-    <version>4-beta-2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.jboss.deployers</groupId>
-  <artifactId>jboss-deployers</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>JBoss Deployers Build</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/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/trunk/</developerConnection>
-    <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-deployers/trunk/</url>
-  </scm>
-
-  <properties>
-    <version.jboss.man>2.0.0.Beta12</version.jboss.man>
-    <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
-    <version.jboss.classloader>2.0.0-SNAPSHOT</version.jboss.classloader>
-    <version.jboss.common.core>2.2.4.GA</version.jboss.common.core>
-    <version.jboss.common.logging.spi>2.0.4.GA</version.jboss.common.logging.spi>
-    <version.jboss.common.logging.log4j>2.0.4.GA</version.jboss.common.logging.log4j>
-    <version.jbossxb>2.0.0.CR8</version.jbossxb>
-    <version.jboss.aop>2.0.0.CR8</version.jboss.aop>
-    <version.jboss.vfs>2.0.0-SNAPSHOT</version.jboss.vfs>
-    <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
-    <version.junit>4.4</version.junit>
-  </properties>
-
-  <build>
-    <sourceDirectory>src/main</sourceDirectory>
-    <testSourceDirectory>src/tests</testSourceDirectory>
-    <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
-    <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
-    <finalName>${artifactId}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <showDeprecation>true</showDeprecation>
-          <showWarnings>true</showWarnings>
-          <optimize>true</optimize>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.jboss.maven.plugins</groupId>
-        <artifactId>maven-jboss-deploy-plugin</artifactId>
-        <version>1.6</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>jboss-deploy</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
-        </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.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-common-core</artifactId>
-        <version>${version.jboss.common.core}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss</groupId>
-        <artifactId>jboss-common-logging-spi</artifactId>
-        <version>${version.jboss.common.logging.spi}</version>
-      </dependency>
-      <dependency>
-        <groupId>jboss</groupId>
-        <artifactId>jboss-common-logging-log4j</artifactId>
-        <version>${version.jboss.common.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>
-      <!-- test dependencies -->
-      <dependency>
-        <groupId>org.jboss</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/tests-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/tests-classes</microcontainer.testOutputDirectory>
-      </properties>
-    </profile>
-  </profiles>
-</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/build/pom.xml (from rev 73014, projects/jboss-deployers/trunk/build/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/build/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/build/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,365 @@
+<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</groupId>
+    <artifactId>jboss-parent</artifactId>
+    <version>4-beta-2</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.deployers</groupId>
+  <artifactId>jboss-deployers</artifactId>
+  <version>2.0.0.Beta15</version>
+  <packaging>pom</packaging>
+  <name>JBoss Deployers Build</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.Beta15</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/tags/2.0.0.Beta15</developerConnection>
+    <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-deployers/tags/2.0.0.Beta15</url>
+  </scm>
+
+  <properties>
+    <version.jboss.man>2.0.0.Beta12</version.jboss.man>
+    <version.jboss.microcontainer>2.0.0.Beta14</version.jboss.microcontainer>
+    <version.jboss.classloader>2.0.0.Beta12</version.jboss.classloader>
+    <version.jboss.common.core>2.2.4.GA</version.jboss.common.core>
+    <version.jboss.common.logging.spi>2.0.4.GA</version.jboss.common.logging.spi>
+    <version.jboss.common.logging.log4j>2.0.4.GA</version.jboss.common.logging.log4j>
+    <version.jbossxb>2.0.0.CR8</version.jbossxb>
+    <version.jboss.aop>2.0.0.CR8</version.jboss.aop>
+    <version.jboss.vfs>2.0.0.Beta11</version.jboss.vfs>
+    <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
+    <version.junit>4.4</version.junit>
+    <version.javassist>3.7.1.GA</version.javassist>
+  </properties>
+
+  <build>
+    <sourceDirectory>src/main</sourceDirectory>
+    <testSourceDirectory>src/tests</testSourceDirectory>
+    <outputDirectory>${microcontainer.outputDirectory}</outputDirectory>
+    <testOutputDirectory>${microcontainer.testOutputDirectory}</testOutputDirectory>
+    <finalName>${artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <showDeprecation>true</showDeprecation>
+          <showWarnings>true</showWarnings>
+          <optimize>true</optimize>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.jboss.maven.plugins</groupId>
+        <artifactId>maven-jboss-deploy-plugin</artifactId>
+        <version>1.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jboss-deploy</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+        </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.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-common-core</artifactId>
+        <version>${version.jboss.common.core}</version>
+      </dependency>
+      <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-common-logging-spi</artifactId>
+        <version>${version.jboss.common.logging.spi}</version>
+      </dependency>
+      <dependency>
+        <groupId>jboss</groupId>
+        <artifactId>jboss-common-logging-log4j</artifactId>
+        <version>${version.jboss.common.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>org.jboss</groupId>
+        <artifactId>javassist</artifactId>
+        <version>${version.javassist}</version>
+      </dependency>
+      <!-- test dependencies -->
+      <dependency>
+        <groupId>org.jboss</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/tests-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/tests-classes</microcontainer.testOutputDirectory>
+      </properties>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-client/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,107 +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 ../build/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>jboss</groupId>
-      <artifactId>jboss-common-logging-log4j</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-test</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss.profiler.jvmti</groupId>
-          <artifactId>jboss-profiler-jvmti</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant-junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>  
-</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-client/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,107 @@
+<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.Beta15</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 ../build/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>jboss</groupId>
+      <artifactId>jboss-common-logging-log4j</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss.profiler.jvmti</groupId>
+          <artifactId>jboss-profiler-jvmti</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant-junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>  
+</project>
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client-spi/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-client-spi/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,39 +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 ../build/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>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>  
-</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client-spi/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-client-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client-spi/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-client-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,39 @@
+<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.Beta15</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 ../build/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>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>  
+</project>
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-core/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,104 +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>jboss</groupId>
-      <artifactId>jboss-common-logging-spi</artifactId>
-    </dependency>
-     <!-- Test dependencies -->
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common-logging-log4j</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-test</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss.profiler.jvmti</groupId>
-          <artifactId>jboss-profiler-jvmti</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant-junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>  
-</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-core/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,104 @@
+<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.Beta15</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>jboss</groupId>
+      <artifactId>jboss-common-logging-spi</artifactId>
+    </dependency>
+     <!-- Test dependencies -->
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-common-logging-log4j</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss.profiler.jvmti</groupId>
+          <artifactId>jboss-profiler-jvmti</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant-junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>  
+</project>
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core-spi/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-core-spi/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,39 +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 ../build/pom.xml instead -->
-  <!-- Global dependencies -->
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-common-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-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.Beta15/deployers-core-spi/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-core-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core-spi/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-core-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,39 @@
+<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.Beta15</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 ../build/pom.xml instead -->
+  <!-- Global dependencies -->
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-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.Beta15/deployers-impl/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,203 +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-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-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>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.microcontainer</groupId>
-          <artifactId>jboss-dependency</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>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-      <artifactId>jboss-common-logging-log4j</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-test</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss.profiler.jvmti</groupId>
-          <artifactId>jboss-profiler-jvmti</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant-junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>  
-</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-impl/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,207 @@
+<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.Beta15</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-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-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>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.microcontainer</groupId>
+          <artifactId>jboss-dependency</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>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+      <artifactId>jboss-common-logging-log4j</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss.profiler.jvmti</groupId>
+          <artifactId>jboss-profiler-jvmti</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant-junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>  
+</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassSignaturePair.java (from rev 72891, projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassSignaturePair.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassSignaturePair.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ClassSignaturePair.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,75 @@
+/*
+* 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.plugins.annotations;
+
+import org.jboss.metadata.spi.signature.Signature;
+import org.jboss.util.JBossObject;
+
+/**
+ * Class name and signature pair.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ClassSignaturePair extends JBossObject
+{
+   private String className;
+   private Signature signature;
+
+   public ClassSignaturePair(String className, Signature signature)
+   {
+      if (className == null)
+         throw new IllegalArgumentException("Null class name");
+
+      this.className = className;
+      this.signature = signature;
+   }
+
+   public String getClassName()
+   {
+      return className;
+   }
+
+   public Signature getSignature()
+   {
+      return signature;
+   }
+
+   protected int getHashCode()
+   {
+      int hash = className.hashCode();
+      if (signature != null)
+         hash += 7 * signature.hashCode();
+      return hash;
+   }
+
+   public boolean equals(Object obj)
+   {
+      if (obj instanceof ClassSignaturePair == false)
+         return false;
+
+      ClassSignaturePair csPair = (ClassSignaturePair)obj;
+      if (className.equals(csPair.getClassName()))
+         return equals(signature, csPair.getSignature());
+      else
+         return false;
+   }
+}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java (from rev 72906, projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,172 @@
+/*
+* 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.plugins.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.spi.annotations.Element;
+import org.jboss.metadata.spi.signature.Signature;
+import org.jboss.util.collection.CollectionsFactory;
+
+/**
+ * DefaultAnnotationEnvironment.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class DefaultAnnotationEnvironment extends WeakClassLoaderHolder implements AnnotationEnvironment
+{
+   private Map<Class<? extends Annotation>, Map<ElementType, Set<ClassSignaturePair>>> env;
+
+   public DefaultAnnotationEnvironment(ClassLoader classLoader)
+   {
+      super(classLoader);
+      this.env = new HashMap<Class<? extends Annotation>, Map<ElementType, Set<ClassSignaturePair>>>();
+   }
+
+   /**
+    * Put the annotation info.
+    *
+    * @param annClass the annotation class
+    * @param type the annotation type
+    * @param className the class name
+    * @param signature the signature
+    */
+   void putAnnotation(Class<? extends Annotation> annClass, ElementType type, String className, Signature signature)
+   {
+      Map<ElementType, Set<ClassSignaturePair>> elements = env.get(annClass);
+      if (elements == null)
+      {
+         elements = new HashMap<ElementType, Set<ClassSignaturePair>>();
+         env.put(annClass, elements);
+      }
+      Set<ClassSignaturePair> classes = elements.get(type);
+      if (classes == null)
+      {
+         classes = CollectionsFactory.createLazySet();
+         elements.put(type, classes);
+      }
+      classes.add(new ClassSignaturePair(className, signature));
+   }
+
+   /**
+    * Get matching cs pairs.
+    *
+    * @param annClass the annotation class
+    * @param type the annotation type
+    * @return class names
+    */
+   protected Set<ClassSignaturePair> getCSPairs(Class<? extends Annotation> annClass, ElementType type)
+   {
+      Set<ClassSignaturePair> pairs = null;
+
+      Map<ElementType, Set<ClassSignaturePair>> elements = env.get(annClass);
+      if (elements != null)
+         pairs = elements.get(type);
+
+      return (pairs != null) ? pairs : Collections.<ClassSignaturePair>emptySet();
+   }
+
+   /**
+    * Transform class names into classes.
+    *
+    * @param pairs the cs pairs
+    * @return classes
+    */
+   protected Set<Class<?>> transformToClasses(Set<ClassSignaturePair> pairs)
+   {
+      if (pairs.isEmpty())
+         return Collections.emptySet();
+
+      Set<Class<?>> classes = new HashSet<Class<?>>(pairs.size());
+      for (ClassSignaturePair pair : pairs)
+         classes.add(loadClass(pair.getClassName()));
+      return classes;
+   }
+
+   /**
+    * Transform class names into classes.
+    *
+    * @param type the annotation type
+    * @param annClass the annotation class
+    * @param aoClass the ao class
+    * @return classes
+    */
+   protected <A extends Annotation, M extends AccessibleObject> Set<Element<A, M>> transformToElements(
+         ElementType type,
+         Class<A> annClass,
+         Class<M> aoClass
+   )
+   {
+      Set<ClassSignaturePair> pairs = getCSPairs(annClass, type);
+      if (pairs.isEmpty())
+         return Collections.emptySet();
+
+      ClassLoader classLoader = getClassLoader();
+      Set<Element<A, M>> elements = new HashSet<Element<A, M>>();
+      for (ClassSignaturePair pair : pairs)
+      {
+         Element<A, M> element;
+         if (type == ElementType.PARAMETER)
+            element = new ParametersElement<A,M>(classLoader, pair.getClassName(), pair.getSignature(), annClass, aoClass);
+         else
+            element = new DefaultElement<A,M>(classLoader, pair.getClassName(), pair.getSignature(), annClass, aoClass);
+         elements.add(element);
+      }
+      return elements;
+   }
+
+   public Set<Class<?>> classIsAnnotatedWith(Class<? extends Annotation> annotation)
+   {
+      return transformToClasses(getCSPairs(annotation, ElementType.TYPE));
+   }
+
+   public <A extends Annotation> Set<Element<A, Constructor>> classHasConstructorAnnotatedWith(Class<A> annotation)
+   {
+      return transformToElements(ElementType.CONSTRUCTOR, annotation, Constructor.class);
+   }
+
+   public <A extends Annotation> Set<Element<A, Field>> classHasFieldAnnotatedWith(Class<A> annotation)
+   {
+      return transformToElements(ElementType.FIELD, annotation, Field.class);
+   }
+
+   public <A extends Annotation> Set<Element<A, Method>> classHasMethodAnnotatedWith(Class<A> annotation)
+   {
+      return transformToElements(ElementType.METHOD, annotation, Method.class);
+   }
+
+   public <A extends Annotation> Set<Element<A, AccessibleObject>> classHasParameterAnnotatedWith(Class<A> annotation)
+   {
+      return transformToElements(ElementType.PARAMETER, annotation, AccessibleObject.class);
+   }
+}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java (from rev 72920, projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/DefaultElement.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,127 @@
+/*
+* 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.plugins.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.ref.SoftReference;
+import java.lang.reflect.AccessibleObject;
+
+import org.jboss.deployers.spi.annotations.Element;
+import org.jboss.metadata.spi.signature.ConstructorParametersSignature;
+import org.jboss.metadata.spi.signature.ConstructorSignature;
+import org.jboss.metadata.spi.signature.FieldSignature;
+import org.jboss.metadata.spi.signature.MethodSignature;
+import org.jboss.metadata.spi.signature.Signature;
+import org.jboss.metadata.spi.signature.MethodParametersSignature;
+import org.jboss.reflect.plugins.introspection.ReflectionUtils;
+
+/**
+ * Default annotations element.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class DefaultElement<A extends Annotation, M extends AccessibleObject> extends WeakClassLoaderHolder implements Element<A, M>
+{
+   protected String className;
+   protected Signature signature;
+   protected Class<A> annClass;
+   protected Class<M> aoClass;
+
+   private SoftReference<Class<?>> classRef;
+
+   public DefaultElement(ClassLoader classLoader, String className, Signature signature, Class<A> annClass, Class<M> aoClass)
+   {
+      super(classLoader);
+
+      if (className == null)
+         throw new IllegalArgumentException("Null className");
+      if (signature == null)
+         throw new IllegalArgumentException("Null signature");
+      if (annClass == null)
+         throw new IllegalArgumentException("Null annotation class");
+      if (aoClass == null)
+         throw new IllegalArgumentException("Null ao class");
+
+      this.className = className;
+      this.signature = signature;
+      this.annClass = annClass;
+      this.aoClass = aoClass;
+   }
+
+   public Class<?> getOwner()
+   {
+      if (classRef != null)
+      {
+         Class<?> clazz = classRef.get();
+         if (clazz != null)
+            return clazz;
+      }
+
+      Class<?> clazz = loadClass(className);
+      classRef = new SoftReference<Class<?>>(clazz);
+      return clazz;
+   }
+
+   public A getAnnotation()
+   {
+      AccessibleObject accessibleObject = getAccessibleObject();
+      return accessibleObject.getAnnotation(annClass);
+   }
+
+   public M getAccessibleObject()
+   {
+      AccessibleObject result = null;
+
+      Class<?> clazz = getOwner();
+      if (signature instanceof ConstructorSignature || signature instanceof ConstructorParametersSignature)
+      {
+         try
+         {
+            result = clazz.getConstructor(signature.getParametersTypes(clazz));
+         }
+         catch (NoSuchMethodException ignored)
+         {
+         }
+      }
+      else if (signature instanceof MethodSignature || signature instanceof MethodParametersSignature)
+      {
+         try
+         {
+            result = clazz.getMethod(signature.getName(), signature.getParametersTypes(clazz));
+         }
+         catch (NoSuchMethodException ignored)
+         {
+         }
+      }
+      else if (signature instanceof FieldSignature)
+      {
+         result = ReflectionUtils.findField(clazz, signature.getName());
+      }
+
+      if (result == null)
+         throw new IllegalArgumentException("Expected accessible object " + className + "." + signature);
+      if (aoClass.isInstance(result) == false)
+         throw new IllegalArgumentException("Expected accessible object " + className + "." + signature + " of type " + aoClass);
+
+      return aoClass.cast(result);
+   }
+}

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,53 +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.plugins.annotations;
-
-import org.jboss.deployers.plugins.classloading.AbstractResourceVisitorDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.classloading.spi.visitor.ResourceVisitor;
-
-/**
- * Generic annotation scanner deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class GenericAnnotationDeployer extends AbstractResourceVisitorDeployer
-{
-   private boolean forceAnnotations;
-
-   /**
-    * Should we force all annotations to be available.
-    *
-    * @param forceAnnotations the force annotations flag
-    */
-   public void setForceAnnotations(boolean forceAnnotations)
-   {
-      this.forceAnnotations = forceAnnotations;
-   }
-
-   protected ResourceVisitor createVisitor(DeploymentUnit unit)
-   {
-      GenericAnnotationResourceVisitor visitor = new GenericAnnotationResourceVisitor(unit);
-      visitor.setForceAnnotations(forceAnnotations);
-      return visitor;
-   }
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java (from rev 72906, projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationDeployer.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,77 @@
+/*
+* 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.plugins.annotations;
+
+import javassist.ClassPool;
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * Generic annotation scanner deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class GenericAnnotationDeployer extends AbstractSimpleRealDeployer<Module>
+{
+   private boolean forceAnnotations;
+
+   public GenericAnnotationDeployer()
+   {
+      super(Module.class);
+   }
+
+   /**
+    * Should we force all annotations to be available.
+    *
+    * @param forceAnnotations the force annotations flag
+    */
+   public void setForceAnnotations(boolean forceAnnotations)
+   {
+      this.forceAnnotations = forceAnnotations;
+   }
+
+   public void deploy(DeploymentUnit unit, Module module) throws DeploymentException
+   {
+      ClassPool pool = ClassPool.getDefault();
+      ClassLoader classLoader = unit.getClassLoader();
+
+      GenericAnnotationResourceVisitor visitor = new GenericAnnotationResourceVisitor(pool, classLoader);
+      visitor.setForceAnnotations(forceAnnotations);
+
+      ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+      // TODO - any other way?
+      Thread.currentThread().setContextClassLoader(classLoader);
+      try
+      {
+         module.visit(visitor);
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(tcl);
+      }
+
+      unit.addAttachment(AnnotationEnvironment.class, visitor.getEnv());
+   }
+}

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,161 +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.plugins.annotations;
-
-import java.lang.annotation.ElementType;
-
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMember;
-import javassist.NotFoundException;
-import org.jboss.classloading.spi.visitor.ClassFilter;
-import org.jboss.classloading.spi.visitor.ResourceContext;
-import org.jboss.classloading.spi.visitor.ResourceFilter;
-import org.jboss.classloading.spi.visitor.ResourceVisitor;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
-
-/**
- * Generic annotation scanner deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class GenericAnnotationResourceVisitor implements ResourceVisitor
-{
-   private static final Logger log = Logger.getLogger(GenericAnnotationResourceVisitor.class);
-   private static final ClassPool pool = ClassPool.getDefault();
-
-   private DeploymentUnit unit;
-   private boolean forceAnnotations;
-
-   public GenericAnnotationResourceVisitor(DeploymentUnit unit)
-   {
-      if (unit == null)
-         throw new IllegalArgumentException("Null deployment unit");
-      this.unit = unit;
-   }
-
-   public ResourceFilter getFilter()
-   {
-      return ClassFilter.INSTANCE;
-   }
-
-   public void visit(ResourceContext resource)
-   {
-      try
-      {
-         CtClass ctClass = pool.makeClass(resource.getInputStream());
-         try
-         {
-            handleCtClass(ctClass, resource);
-         }
-         finally
-         {
-            ctClass.detach();               
-         }
-      }
-      catch (ClassNotFoundException e)
-      {
-         if (forceAnnotations)
-            throw new RuntimeException(e);
-         else if (log.isTraceEnabled())
-            log.trace("Exception reading resource: " + resource.getResourceName(), e);
-      }
-      catch (Throwable t)
-      {
-         if (log.isTraceEnabled())
-            log.trace("Exception reading resource: " + resource.getResourceName(), t);
-      }
-   }
-
-   /**
-    * Handle CtClass for annotations.
-    *
-    * @param ctClass the ct class instance
-    * @param resource the resource we're visiting
-    * @throws ClassNotFoundException for any annotations lookup problems
-    * @throws NotFoundException for any annotations lookup problems
-    */
-   protected void handleCtClass(CtClass ctClass, ResourceContext resource) throws ClassNotFoundException, NotFoundException
-   {
-      Object[] annotations = forceAnnotations ? ctClass.getAnnotations() : ctClass.getAvailableAnnotations();
-      handleAnnotations(ElementType.TYPE, annotations, resource);
-      handleCtMembers(ElementType.CONSTRUCTOR, ctClass.getDeclaredConstructors(), resource);
-      handleCtMembers(ElementType.METHOD, ctClass.getDeclaredMethods(), resource);
-      handleCtMembers(ElementType.FIELD, ctClass.getDeclaredFields(), resource);
-
-      // interfaces
-      CtClass[] interfaces = ctClass.getInterfaces();
-      if (interfaces != null && interfaces.length > 0)
-      {
-         for (CtClass intf : interfaces)
-            handleCtClass(intf, resource);
-      }
-
-      // super class
-      ctClass = ctClass.getSuperclass();
-      if (ctClass != null)
-         handleCtClass(ctClass, resource);
-   }
-
-   /**
-    * Handle CtMembers for annotations.
-    *
-    * @param type where we found the annotations
-    * @param members the ct member instances
-    * @param resource the resource we're visiting
-    * @throws ClassNotFoundException for any annotations lookup problems
-    */
-   protected void handleCtMembers(ElementType type, CtMember[] members, ResourceContext resource) throws ClassNotFoundException
-   {
-      if (members != null && members.length > 0)
-      {
-         for (CtMember member : members)
-         {
-            Object[] annotations = forceAnnotations ? member.getAnnotations() : member.getAvailableAnnotations();
-            handleAnnotations(type, annotations, resource);
-         }
-      }
-   }
-
-   /**
-    * Handle annotations.
-    *
-    * @param type where we found the annotations
-    * @param annotations the actual annotations
-    * @param resource the resource we're visiting
-    */
-   protected void handleAnnotations(ElementType type, Object[] annotations, ResourceContext resource)
-   {
-      // todo
-   }
-
-   /**
-    * Should we force all annotations to be available.
-    *
-    * @param forceAnnotations the force annotations flag
-    */
-   public void setForceAnnotations(boolean forceAnnotations)
-   {
-      this.forceAnnotations = forceAnnotations;
-   }
-}
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java (from rev 72906, projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,252 @@
+/*
+* 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.plugins.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+
+import javassist.ClassPool;
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.CtMember;
+import javassist.NotFoundException;
+import javassist.CtConstructor;
+import javassist.CtMethod;
+import org.jboss.classloading.spi.visitor.ClassFilter;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.spi.signature.Signature;
+import org.jboss.metadata.spi.signature.javassist.JavassistSignatureFactory;
+import org.jboss.metadata.spi.signature.javassist.JavassistConstructorParametersSignature;
+import org.jboss.metadata.spi.signature.javassist.JavassistMethodParametersSignature;
+
+/**
+ * Generic annotation scanner deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class GenericAnnotationResourceVisitor implements ResourceVisitor
+{
+   private static final Logger log = Logger.getLogger(GenericAnnotationResourceVisitor.class);
+
+   private ClassPool pool;
+   private boolean forceAnnotations;
+   private DefaultAnnotationEnvironment env;
+
+   public GenericAnnotationResourceVisitor(ClassPool pool, ClassLoader classLoader)
+   {
+      if (pool == null)
+         throw new IllegalArgumentException("Null pool");
+      if (classLoader == null)
+         throw new IllegalArgumentException("Null classloader");
+
+      this.pool = pool;
+      this.env = new DefaultAnnotationEnvironment(classLoader);
+   }
+
+   public ResourceFilter getFilter()
+   {
+      return ClassFilter.INSTANCE;
+   }
+
+   public void visit(ResourceContext resource)
+   {
+      try
+      {
+         CtClass ctClass = pool.makeClass(resource.getInputStream());
+         try
+         {
+            handleCtClass(ctClass, resource);
+         }
+         finally
+         {
+            ctClass.detach();               
+         }
+      }
+      catch (ClassNotFoundException e)
+      {
+         if (forceAnnotations)
+            throw new RuntimeException(e);
+
+         logThrowable(resource, e);
+      }
+      catch (Throwable t)
+      {
+         logThrowable(resource, t);
+      }
+   }
+
+   /**
+    * Log throwable.
+    *
+    * @param resource the resource we're visiting
+    * @param t the throwable
+    */
+   protected void logThrowable(ResourceContext resource, Throwable t)
+   {
+      if (log.isTraceEnabled())
+         log.trace("Exception reading resource: " + resource.getResourceName(), t);
+   }
+
+   /**
+    * Handle CtClass for annotations.
+    *
+    * @param ctClass the ct class instance
+    * @param resource the resource we're visiting
+    * @throws ClassNotFoundException for any annotations lookup problems
+    * @throws NotFoundException for any annotations lookup problems
+    */
+   protected void handleCtClass(CtClass ctClass, ResourceContext resource) throws ClassNotFoundException, NotFoundException
+   {
+      Object[] annotations = forceAnnotations ? ctClass.getAnnotations() : ctClass.getAvailableAnnotations();
+      handleAnnotations(ElementType.TYPE, (Signature)null, annotations, resource);
+      handleCtMembers(ElementType.CONSTRUCTOR, ctClass.getDeclaredConstructors(), resource);
+      handleCtMembers(ElementType.METHOD, ctClass.getDeclaredMethods(), resource);
+      handleCtMembers(ElementType.FIELD, ctClass.getDeclaredFields(), resource);
+
+      // interfaces
+      CtClass[] interfaces = ctClass.getInterfaces();
+      if (interfaces != null && interfaces.length > 0)
+      {
+         for (CtClass intf : interfaces)
+            handleCtClass(intf, resource);
+      }
+
+      // super class
+      ctClass = ctClass.getSuperclass();
+      if (ctClass != null)
+         handleCtClass(ctClass, resource);
+   }
+
+   /**
+    * Handle CtMembers for annotations.
+    *
+    * @param type where we found the annotations
+    * @param members the ct member instances
+    * @param resource the resource we're visiting
+    * @throws ClassNotFoundException for any annotations lookup problems
+    */
+   protected void handleCtMembers(ElementType type, CtMember[] members, ResourceContext resource) throws ClassNotFoundException
+   {
+      if (members != null && members.length > 0)
+      {
+         for (CtMember member : members)
+         {
+            Object[] annotations = forceAnnotations ? member.getAnnotations() : member.getAvailableAnnotations();
+            handleAnnotations(type, member, annotations, resource);
+            if (member instanceof CtBehavior)
+            {
+               CtBehavior behavior = (CtBehavior)member;
+               Object[][] paramAnnotations = forceAnnotations ? behavior.getParameterAnnotations() : behavior.getAvailableParameterAnnotations();
+               for (int index = 0; index < paramAnnotations.length; index++)
+               {
+                  handleAnnotations(ElementType.PARAMETER, getBehaviorSignature(behavior, index), paramAnnotations[index], resource);                  
+               }
+            }
+         }
+      }
+   }
+
+   /**
+    * Get parameters signature.
+    *
+    * @param behavior the ct behavior
+    * @param index the index
+    * @return parameters signature
+    * @throws ClassNotFoundException for any error
+    */
+   protected Signature getBehaviorSignature(CtBehavior behavior, int index) throws ClassNotFoundException
+   {
+      try
+      {
+         if (behavior instanceof CtConstructor)
+            return new JavassistConstructorParametersSignature((CtConstructor)behavior, index);
+         else if (behavior instanceof CtMethod)
+            return new JavassistMethodParametersSignature((CtMethod)behavior, index);
+         else
+            throw new IllegalArgumentException("Unknown ct behavior: " + behavior);
+      }
+      catch (NotFoundException e)
+      {
+         throw new ClassNotFoundException("Exception creating signature: " + behavior, e);
+      }
+   }
+
+   /**
+    * Handle annotations.
+    *
+    * @param type where we found the annotations
+    * @param member the ct member
+    * @param annotations the actual annotations
+    * @param resource the resource we're visiting
+    */
+   protected void handleAnnotations(ElementType type, CtMember member, Object[] annotations, ResourceContext resource)
+   {
+      Signature signature = null;
+      if (member != null)
+         signature = JavassistSignatureFactory.getSignature(member);
+      handleAnnotations(type, signature, annotations, resource);
+   }
+
+   /**
+    * Handle annotations.
+    *
+    * @param type where we found the annotations
+    * @param signature the signature
+    * @param annotations the actual annotations
+    * @param resource the resource we're visiting
+    */
+   protected void handleAnnotations(ElementType type, Signature signature, Object[] annotations, ResourceContext resource)
+   {
+      if (annotations != null && annotations.length > 0)
+      {
+         for (Object annObject : annotations)
+         {
+            Annotation annotation = Annotation.class.cast(annObject);
+            env.putAnnotation(annotation.annotationType(), type, resource.getClassName(), signature);
+         }
+      }
+   }
+
+   /**
+    * Should we force all annotations to be available.
+    *
+    * @param forceAnnotations the force annotations flag
+    */
+   public void setForceAnnotations(boolean forceAnnotations)
+   {
+      this.forceAnnotations = forceAnnotations;
+   }
+
+   /**
+    * Get the built environment.
+    *
+    * @return the annoattion environment
+    */
+   AnnotationEnvironment getEnv()
+   {
+      return env;
+   }
+}
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java (from rev 72920, projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/ParametersElement.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,86 @@
+/*
+* 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.plugins.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+import org.jboss.metadata.spi.signature.ConstructorParametersSignature;
+import org.jboss.metadata.spi.signature.MethodParametersSignature;
+import org.jboss.metadata.spi.signature.Signature;
+
+/**
+ * Parameters annotations element.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ParametersElement<A extends Annotation, M extends AccessibleObject> extends DefaultElement<A, M>
+{
+   public ParametersElement(ClassLoader classLoader, String className, Signature signature, Class<A> annClass, Class<M> aoClass)
+   {
+      super(classLoader, className, signature, annClass, aoClass);
+   }
+
+   public A getAnnotation()
+   {
+      Annotation[] annotations = null;
+      Class<?> clazz = getOwner();
+      if (signature instanceof ConstructorParametersSignature)
+      {
+         ConstructorParametersSignature cps = (ConstructorParametersSignature)signature;
+         try
+         {
+            Constructor constructor = clazz.getConstructor(signature.getParametersTypes(clazz));
+            annotations = constructor.getParameterAnnotations()[cps.getParam()];
+         }
+         catch (NoSuchMethodException ignored)
+         {
+         }
+      }
+      else if (signature instanceof MethodParametersSignature)
+      {
+         MethodParametersSignature mps = (MethodParametersSignature)signature;
+         try
+         {
+            Method method = clazz.getMethod(signature.getName(), signature.getParametersTypes(clazz));
+            annotations = method.getParameterAnnotations()[mps.getParam()];
+         }
+         catch (NoSuchMethodException ignored)
+         {
+         }
+      }
+
+      if (annotations == null || annotations.length == 0)
+         throw new IllegalArgumentException("Expected annotations " + className + "." + signature);
+
+      for(Annotation annotation : annotations)
+      {
+         if (annClass.equals(annotation.annotationType()))
+            return annClass.cast(annotation);
+      }
+
+      throw new IllegalArgumentException("No matching annotation: " + Arrays.asList(annotations));
+   }
+}
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/WeakClassLoaderHolder.java (from rev 72906, projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/WeakClassLoaderHolder.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/WeakClassLoaderHolder.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/WeakClassLoaderHolder.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,74 @@
+/*
+* 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.plugins.annotations;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * ClassLoader holder helper.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+abstract class WeakClassLoaderHolder
+{
+   private WeakReference<ClassLoader> clRef;
+
+   public WeakClassLoaderHolder(ClassLoader classLoader)
+   {
+      if (classLoader == null)
+         throw new IllegalArgumentException("Null classloader");
+
+      clRef = new WeakReference<ClassLoader>(classLoader);
+   }
+
+   /**
+    * Get the classloader from weak ref.
+    *
+    * @return the classloader
+    */
+   protected ClassLoader getClassLoader()
+   {
+      ClassLoader classLoader = clRef.get();
+      if (classLoader == null)
+         throw new IllegalArgumentException("ClassLoader was already garbage collected.");
+
+      return classLoader;
+   }
+
+   /**
+    * Load class from class name.
+    *
+    * @param className the class name
+    * @return loaded class
+    */
+   protected Class<?> loadClass(String className)
+   {
+      try
+      {
+         return Class.forName(className, false, getClassLoader());
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+}
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -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;
-
-import org.jboss.test.deployers.classloading.DeployersClassLoadingTestSuite;
-import org.jboss.test.deployers.deployer.DeployersDeployerTestSuite;
-import org.jboss.test.deployers.managed.DeployersManagedTestSuite;
-import org.jboss.test.deployers.scope.DeployersScopeTestSuite;
-import org.jboss.test.deployers.main.DeployersMainTestSuite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Deployers Impl Test Suite.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 37459 $
- */
-public class DeployersImplTestSuite extends TestSuite
-{
-   public static void main(String[] args)
-   {
-      TestRunner.run(suite());
-   }
-
-   public static Test suite()
-   {
-      TestSuite suite = new TestSuite("Deployers Impl Tests");
-
-      suite.addTest(DeployersDeployerTestSuite.suite());
-      suite.addTest(DeployersManagedTestSuite.suite());
-      suite.addTest(DeployersClassLoadingTestSuite.suite());
-      suite.addTest(DeployersScopeTestSuite.suite());
-      suite.addTest(DeployersMainTestSuite.suite());
-
-      return suite;
-   }
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java (from rev 72864, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/DeployersImplTestSuite.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -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;
+
+import org.jboss.test.deployers.classloading.DeployersClassLoadingTestSuite;
+import org.jboss.test.deployers.deployer.DeployersDeployerTestSuite;
+import org.jboss.test.deployers.managed.DeployersManagedTestSuite;
+import org.jboss.test.deployers.scope.DeployersScopeTestSuite;
+import org.jboss.test.deployers.main.DeployersMainTestSuite;
+import org.jboss.test.deployers.annotations.DeployersAnnotationsTestSuite;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * Deployers Impl Test Suite.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 37459 $
+ */
+public class DeployersImplTestSuite extends TestSuite
+{
+   public static void main(String[] args)
+   {
+      TestRunner.run(suite());
+   }
+
+   public static Test suite()
+   {
+      TestSuite suite = new TestSuite("Deployers Impl Tests");
+
+      suite.addTest(DeployersDeployerTestSuite.suite());
+      suite.addTest(DeployersManagedTestSuite.suite());
+      suite.addTest(DeployersClassLoadingTestSuite.suite());
+      suite.addTest(DeployersScopeTestSuite.suite());
+      suite.addTest(DeployersMainTestSuite.suite());
+      suite.addTest(DeployersAnnotationsTestSuite.suite());
+
+      return suite;
+   }
+}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations (from rev 72864, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations)

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java (from rev 72920, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/AnnotationsHolder.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,43 @@
+/*
+* 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.annotations.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at TestAnnotation("class")
+public class AnnotationsHolder
+{
+   @TestAnnotation("field")
+   private Object object;
+
+   @TestAnnotation("constructor")
+   public AnnotationsHolder(@TestAnnotation("cparameter") Object object)
+   {
+   }
+
+   @TestAnnotation("method")
+   public void something(@TestAnnotation("mparameter") Object object)
+   {
+      System.out.println("object = " + object);
+   }
+}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoader.java (from rev 72921, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoader.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoader.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoader.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.annotations.support;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * InterceptionClassLoader.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class InterceptionClassLoader extends ClassLoader
+{
+   private ClassLoader delegate;
+   private Set<String> loaded = new HashSet<String>();
+
+   public InterceptionClassLoader(ClassLoader delegate)
+   {
+      super();
+
+      if (delegate == null)
+         throw new IllegalArgumentException("Null delegate.");
+      this.delegate = delegate;
+   }
+
+   public Set<String> getLoaded()
+   {
+      return loaded;
+   }
+
+   public ClassLoader getDelegate()
+   {
+      return delegate;
+   }
+
+   public Class<?> loadClass(String name) throws ClassNotFoundException
+   {
+      loaded.add(name);
+      return delegate.loadClass(name);
+   }
+
+   public URL getResource(String name)
+   {
+      return delegate.getResource(name);
+   }
+
+   public Enumeration<URL> getResources(String name) throws IOException
+   {
+      return delegate.getResources(name);
+   }
+
+   public InputStream getResourceAsStream(String name)
+   {
+      return delegate.getResourceAsStream(name);
+   }
+
+   public synchronized void setDefaultAssertionStatus(boolean enabled)
+   {
+      delegate.setDefaultAssertionStatus(enabled);
+   }
+
+   public synchronized void setPackageAssertionStatus(String packageName, boolean enabled)
+   {
+      delegate.setPackageAssertionStatus(packageName, enabled);
+   }
+
+   public synchronized void setClassAssertionStatus(String className, boolean enabled)
+   {
+      delegate.setClassAssertionStatus(className, enabled);
+   }
+
+   public synchronized void clearAssertionStatus()
+   {
+      delegate.clearAssertionStatus();
+   }
+
+   public int hashCode()
+   {
+      return delegate.hashCode();
+   }
+
+   public boolean equals(Object obj)
+   {
+      return delegate.equals(obj);
+   }
+
+   public String toString()
+   {
+      return delegate.toString();
+   }
+}
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoaderSystemDeployer.java (from rev 72924, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoaderSystemDeployer.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoaderSystemDeployer.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/InterceptionClassLoaderSystemDeployer.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.annotations.support;
+
+import org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.ClassLoaderDomain;
+
+/**
+ * InterceptionClassLoaderSystemDeployer.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class InterceptionClassLoaderSystemDeployer extends AbstractLevelClassLoaderSystemDeployer
+{
+   public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception
+   {
+      ClassLoader loader = super.createClassLoader(unit);
+      return new InterceptionClassLoader(loader);
+   }
+
+   @Override
+   public void removeClassLoader(DeploymentUnit unit) throws Exception
+   {
+      Module module = unit.getAttachment(Module.class);
+      if (module == null)
+         return;
+
+      ClassLoader classLoader = unit.getClassLoader();
+      if (classLoader instanceof InterceptionClassLoader)
+      {
+         InterceptionClassLoader icl = (InterceptionClassLoader)classLoader;
+         classLoader = icl.getDelegate();
+      }
+
+      try
+      {
+         try
+         {
+            // Remove the classloader
+            getSystem().unregisterClassLoader(classLoader);
+         }
+         finally
+         {
+            // Try to tidy up empty domains
+            String domainName = module.getDeterminedDomainName();
+            if (ClassLoaderSystem.DEFAULT_DOMAIN_NAME.equals(domainName) == false)
+            {
+               ClassLoaderDomain domain = getSystem().getDomain(domainName);
+               if (domain.hasClassLoaders() == false)
+                  getSystem().unregisterDomain(domain);
+            }
+         }
+      }
+      finally
+      {
+         cleanup(unit, module);
+         module.reset();
+      }
+   }
+}
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/TestAnnotation.java (from rev 72906, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/TestAnnotation.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/TestAnnotation.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/support/TestAnnotation.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,37 @@
+/*
+* 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.annotations.support;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Target({ElementType.TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface TestAnnotation
+{
+   String value() default "";
+}

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java	2008-04-29 14:02:31 UTC (rev 72864)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,47 +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.annotations.test;
-
-import junit.framework.Test;
-
-/**
- * AnnotationEnvTestCase.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class AnnotationEnvTestCase extends AnnotationsTest
-{
-   public AnnotationEnvTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite()
-   {
-      return suite(AnnotationEnvTestCase.class);
-   }
-
-   public void testSimpleUsage() throws Exception
-   {
-      // todo
-   }
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java (from rev 72924, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationEnvTestCase.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,130 @@
+/*
+* 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.annotations.test;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Set;
+
+import junit.framework.Test;
+import org.jboss.classloader.plugins.ClassLoaderUtils;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.spi.annotations.Element;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.annotations.support.AnnotationsHolder;
+import org.jboss.test.deployers.annotations.support.TestAnnotation;
+
+/**
+ * AnnotationEnvTestCase.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AnnotationEnvTestCase extends AnnotationsTest
+{
+   public AnnotationEnvTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite()
+   {
+      return suite(AnnotationEnvTestCase.class);
+   }
+
+   @SuppressWarnings("unchecked")
+   public void testSimpleUsage() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer();
+
+      Deployment deployment = createSimpleDeployment("a");
+      addClassLoadingMetaData(
+            deployment,
+            deployment.getName(),
+            null,
+            ClassLoaderUtils.classNameToPath("org.jboss.test.deployers.annotations.support.AnnotationsHolder"),
+            ClassLoaderUtils.classNameToPath("org.jboss.test.deployers.annotations.support.TestAnnotation")
+      );
+
+      DeploymentUnit unit = assertDeploy(deployer, deployment);
+      try
+      {
+         ClassLoader cl = unit.getClassLoader();
+         Class<TestAnnotation> taClass = (Class<TestAnnotation>)cl.loadClass("org.jboss.test.deployers.annotations.support.TestAnnotation");
+
+         assertNotLoaded(unit, "org.jboss.test.deployers.annotations.support.AnnotationsHolder");
+         // annotations are loaded, OK?
+         assertLoaded(unit, "org.jboss.test.deployers.annotations.support.TestAnnotation");
+
+         AnnotationEnvironment env = getAnnotationEnvironment(unit);
+         Set<Class<?>> classes = env.classIsAnnotatedWith(taClass);
+         assertNotNull(classes);
+         assertEquals(1, classes.size());
+         assertEquals(AnnotationsHolder.class.getName(), classes.iterator().next().getName());
+
+         assertLoaded(unit, "org.jboss.test.deployers.annotations.support.AnnotationsHolder");
+
+         Element<TestAnnotation, Constructor> ec = getSingleton(env.classHasConstructorAnnotatedWith(taClass));
+         Annotation ta = ec.getAnnotation();
+         assertNotNull(ta);
+         assertEquals("constructor", getValue(ta));
+         assertInstanceOf(ec.getAccessibleObject(), Constructor.class, false);
+
+         Element<TestAnnotation, Field> ef = getSingleton(env.classHasFieldAnnotatedWith(taClass));
+         ta = ef.getAnnotation();
+         assertNotNull(ta);
+         assertEquals("field", getValue(ta));
+         assertInstanceOf(ef.getAccessibleObject(), Field.class, false);
+
+         Element<TestAnnotation, Method> em = getSingleton(env.classHasMethodAnnotatedWith(taClass));
+         ta = em.getAnnotation();
+         assertNotNull(ta);
+         assertEquals("method", getValue(ta));
+         assertInstanceOf(em.getAccessibleObject(), Method.class, false);
+
+         Set<Element<TestAnnotation, AccessibleObject>> eps = env.classHasParameterAnnotatedWith(taClass);
+         assertNotNull(eps);
+         assertEquals(2, eps.size());
+         for (Element<TestAnnotation, AccessibleObject> ep : eps)
+         {
+            ta = ep.getAnnotation();
+            assertNotNull(ta);
+            Object value = getValue(ta);
+            AccessibleObject ao = ep.getAccessibleObject();
+            if ("cparameter".equals(value))
+               assertInstanceOf(ao, Constructor.class, false);
+            else if ("mparameter".equals(value))
+               assertInstanceOf(ao, Method.class, false);
+            else
+               fail("Illegal annotation value: " + value);
+         }
+      }
+      finally
+      {
+         assertUndeploy(deployer, deployment);
+      }
+   }
+}

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java	2008-04-29 14:02:31 UTC (rev 72864)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,143 +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.annotations.test;
-
-import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
-import org.jboss.classloader.spi.ClassLoaderSystem;
-import org.jboss.classloader.spi.ParentPolicy;
-import org.jboss.classloading.spi.dependency.ClassLoading;
-import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
-import org.jboss.classloading.spi.metadata.Capability;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
-import org.jboss.classloading.spi.version.Version;
-import org.jboss.deployers.client.spi.DeployerClient;
-import org.jboss.deployers.plugins.classloading.AbstractClassLoaderDescribeDeployer;
-import org.jboss.deployers.plugins.annotations.GenericAnnotationDeployer;
-import org.jboss.deployers.spi.attachments.MutableAttachments;
-import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
-import org.jboss.deployers.spi.deployer.Deployer;
-import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
-import org.jboss.test.deployers.AbstractDeployerTest;
-import org.jboss.test.deployers.classloading.support.MockClassLoaderDescribeDeployer;
-import org.jboss.test.deployers.classloading.support.MockLevelClassLoaderSystemDeployer;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public abstract class AnnotationsTest extends AbstractDeployerTest
-{
-   private static ClassLoadingMetaDataFactory classLoadingMetaDataFactory = ClassLoadingMetaDataFactory.getInstance();
-
-   protected AbstractClassLoaderDescribeDeployer deployer1;
-   protected MockLevelClassLoaderSystemDeployer deployer2;
-
-   protected AnnotationsTest(String name)
-   {
-      super(name);
-   }
-
-   protected static ClassLoadingMetaData addClassLoadingMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, Class<?>... packages)
-   {
-      return addClassLoadingMetaData(deployment, name, version, false, packages);
-   }
-
-   protected static ClassLoadingMetaData addClassLoadingMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, boolean useVersionOnPackages, Class<?>... packages)
-   {
-      ClassLoadingMetaData classLoadingMetaData = createMetaData(deployment, name, version, useVersionOnPackages, packages);
-      addMetaData(deployment, classLoadingMetaData);
-      return classLoadingMetaData;
-   }
-
-   protected static ClassLoadingMetaData createMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, Class<?>... packages)
-   {
-      return createMetaData(deployment, name, version, false, packages);
-   }
-
-   protected static ClassLoadingMetaData createMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, boolean useVersionOnPackages, Class<?>... packages)
-   {
-      MockClassLoadingMetaData classLoadingMetaData = new MockClassLoadingMetaData(name, version);
-
-      classLoadingMetaData.setPaths(packages);
-
-      CapabilitiesMetaData capabilities = classLoadingMetaData.getCapabilities();
-      Capability capability = classLoadingMetaDataFactory.createModule(name, version);
-      capabilities.addCapability(capability);
-
-      if (packages != null)
-      {
-         for (Class<?> pkg : packages)
-         {
-            if (useVersionOnPackages)
-               capability = classLoadingMetaDataFactory.createPackage(pkg.getPackage().getName(), version);
-            else
-               capability = classLoadingMetaDataFactory.createPackage(pkg.getPackage().getName());
-            capabilities.addCapability(capability);
-         }
-      }
-
-      classLoadingMetaData.setCapabilities(capabilities);
-      return classLoadingMetaData;
-   }
-
-   protected static void addMetaData(PredeterminedManagedObjectAttachments attachments, ClassLoadingMetaData md)
-   {
-      MutableAttachments mutable = (MutableAttachments) attachments.getPredeterminedManagedObjects();
-      mutable.addAttachment(ClassLoadingMetaData.class, md);
-   }
-
-   protected AnnotationEnvironment getAnnotationEnvironment(PredeterminedManagedObjectAttachments attachments)
-   {
-      AnnotationEnvironment env = attachments.getPredeterminedManagedObjects().getAttachment(AnnotationEnvironment.class);
-      assertNotNull(env);
-      return env;
-   }
-
-   protected DeployerClient getMainDeployer(Deployer... deployers)
-   {
-      ClassLoading classLoading = new ClassLoading();
-      ClassLoaderSystem system = new DefaultClassLoaderSystem();
-      system.getDefaultDomain().setParentPolicy(ParentPolicy.BEFORE_BUT_JAVA_ONLY);
-
-      deployer1 = new MockClassLoaderDescribeDeployer();
-      deployer1.setClassLoading(classLoading);
-
-      deployer2 = new MockLevelClassLoaderSystemDeployer();
-      deployer2.setClassLoading(classLoading);
-      deployer2.setSystem(system);
-
-      Deployer deployer3 = new GenericAnnotationDeployer();
-
-      if (deployers != null && deployers.length > 0)
-      {
-         Deployer[] allDeployers = new Deployer[deployers.length + 3];
-         allDeployers[0] = deployer1;
-         allDeployers[1] = deployer2;
-         allDeployers[2] = deployer3;
-         System.arraycopy(deployers, 0, allDeployers, 3, deployers.length);
-         return createMainDeployer(allDeployers);
-      }
-
-      return createMainDeployer(deployer1, deployer2, deployer3);
-   }
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java (from rev 72925, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/annotations/test/AnnotationsTest.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,187 @@
+/*
+* 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.annotations.test;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.util.Set;
+
+import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.ParentPolicy;
+import org.jboss.classloading.spi.dependency.ClassLoading;
+import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
+import org.jboss.classloading.spi.metadata.Capability;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
+import org.jboss.classloading.spi.version.Version;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.plugins.annotations.GenericAnnotationDeployer;
+import org.jboss.deployers.plugins.classloading.AbstractClassLoaderDescribeDeployer;
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.spi.annotations.Element;
+import org.jboss.deployers.spi.attachments.Attachments;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
+import org.jboss.deployers.spi.deployer.Deployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.AbstractDeployerTest;
+import org.jboss.test.deployers.annotations.support.InterceptionClassLoader;
+import org.jboss.test.deployers.annotations.support.InterceptionClassLoaderSystemDeployer;
+import org.jboss.test.deployers.classloading.support.MockClassLoaderDescribeDeployer;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AnnotationsTest extends AbstractDeployerTest
+{
+   private static ClassLoadingMetaDataFactory classLoadingMetaDataFactory = ClassLoadingMetaDataFactory.getInstance();
+
+   protected AbstractClassLoaderDescribeDeployer deployer1;
+   protected InterceptionClassLoaderSystemDeployer deployer2;
+
+   protected AnnotationsTest(String name)
+   {
+      super(name);
+   }
+
+   protected static ClassLoadingMetaData addClassLoadingMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, String... paths)
+   {
+      return addClassLoadingMetaData(deployment, name, version, false, paths);
+   }
+
+   protected static ClassLoadingMetaData addClassLoadingMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, boolean useVersionOnPackages, String... paths)
+   {
+      ClassLoadingMetaData classLoadingMetaData = createMetaData(name, version, useVersionOnPackages, paths);
+      addMetaData(deployment, classLoadingMetaData);
+      return classLoadingMetaData;
+   }
+
+   protected static ClassLoadingMetaData createMetaData(String name, Version version, String... paths)
+   {
+      return createMetaData(name, version, false, paths);
+   }
+
+   protected static ClassLoadingMetaData createMetaData(String name, Version version, boolean useVersionOnPackages, String... paths)
+   {
+      MockClassLoadingMetaData classLoadingMetaData = new MockClassLoadingMetaData(name, version);
+
+      classLoadingMetaData.setPaths(paths);
+
+      CapabilitiesMetaData capabilities = classLoadingMetaData.getCapabilities();
+      Capability capability = classLoadingMetaDataFactory.createModule(name, version);
+      capabilities.addCapability(capability);
+
+      if (paths != null)
+      {
+         for (String path : paths)
+         {
+            if (useVersionOnPackages)
+               capability = classLoadingMetaDataFactory.createPackage(path, version);
+            else
+               capability = classLoadingMetaDataFactory.createPackage(path);
+            capabilities.addCapability(capability);
+         }
+      }
+
+      classLoadingMetaData.setCapabilities(capabilities);
+      return classLoadingMetaData;
+   }
+
+   protected static void addMetaData(PredeterminedManagedObjectAttachments attachments, ClassLoadingMetaData md)
+   {
+      MutableAttachments mutable = (MutableAttachments) attachments.getPredeterminedManagedObjects();
+      mutable.addAttachment(ClassLoadingMetaData.class, md);
+   }
+
+   protected AnnotationEnvironment getAnnotationEnvironment(Attachments attachments)
+   {
+      AnnotationEnvironment env = attachments.getAttachment(AnnotationEnvironment.class);
+      assertNotNull(env);
+      return env;
+   }
+
+   protected <A extends Annotation, M extends AccessibleObject> Element<A,M> getSingleton(Set<Element<A,M>> elements)
+   {
+      assertNotNull(elements);
+      assertEquals(1, elements.size());
+      return elements.iterator().next();
+   }
+
+   protected Object getValue(Annotation annotation) throws Exception
+   {
+      assertNotNull(annotation);
+      Class<? extends Annotation> clazz = annotation.annotationType();
+      return clazz.getMethod("value").invoke(annotation);
+   }
+
+   protected void assertNotLoaded(DeploymentUnit unit, String className)
+   {
+      assertCheckLoaded(unit, className, false);
+   }
+
+   protected void assertLoaded(DeploymentUnit unit, String className)
+   {
+      assertCheckLoaded(unit, className, true);      
+   }
+
+   private void assertCheckLoaded(DeploymentUnit unit, String className, boolean checkFlag)
+   {
+      ClassLoader cl = unit.getClassLoader();
+      if (cl instanceof InterceptionClassLoader == false)
+         throw new IllegalArgumentException("Expecting InterceptionClassLoader instance: " + cl);
+
+      InterceptionClassLoader icl = (InterceptionClassLoader)cl;
+      Set<String> loaded = icl.getLoaded();
+      assertNotNull(loaded);
+      assertEquals(loaded.contains(className), checkFlag);
+   }
+
+   protected DeployerClient getMainDeployer(Deployer... deployers)
+   {
+      ClassLoading classLoading = new ClassLoading();
+      ClassLoaderSystem system = new DefaultClassLoaderSystem();
+      system.getDefaultDomain().setParentPolicy(ParentPolicy.BEFORE_BUT_JAVA_ONLY);
+
+      deployer1 = new MockClassLoaderDescribeDeployer();
+      deployer1.setClassLoading(classLoading);
+
+      deployer2 = new InterceptionClassLoaderSystemDeployer();
+      deployer2.setClassLoading(classLoading);
+      deployer2.setSystem(system);
+
+      Deployer deployer3 = new GenericAnnotationDeployer();
+
+      if (deployers != null && deployers.length > 0)
+      {
+         Deployer[] allDeployers = new Deployer[deployers.length + 3];
+         allDeployers[0] = deployer1;
+         allDeployers[1] = deployer2;
+         allDeployers[2] = deployer3;
+         System.arraycopy(deployers, 0, allDeployers, 3, deployers.length);
+         return createMainDeployer(allDeployers);
+      }
+
+      return createMainDeployer(deployer1, deployer2, deployer3);
+   }
+}

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,55 +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.classloading;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.jboss.test.deployers.classloading.test.MockClassLoaderDependenciesUnitTestCase;
-import org.jboss.test.deployers.classloading.test.SubDeploymentMockClassLoaderUnitTestCase;
-import org.jboss.test.deployers.classloading.test.UndeployOrderClassLoaderUnitTestCase;
-
-/**
- * Deployers Deployer Test Suite.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 37459 $
- */
-public class DeployersClassLoadingTestSuite extends TestSuite
-{
-   public static void main(String[] args)
-   {
-      TestRunner.run(suite());
-   }
-
-   public static Test suite()
-   {
-      TestSuite suite = new TestSuite("Deployers ClassLoading Tests");
-
-      suite.addTest(MockClassLoaderDependenciesUnitTestCase.suite());
-      suite.addTest(UndeployOrderClassLoaderUnitTestCase.suite());
-      suite.addTest(SubDeploymentMockClassLoaderUnitTestCase.suite());
-
-      return suite;
-   }
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java (from rev 72861, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,57 @@
+/*
+* 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.classloading;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.jboss.test.deployers.classloading.test.MockClassLoaderDependenciesUnitTestCase;
+import org.jboss.test.deployers.classloading.test.SubDeploymentMockClassLoaderUnitTestCase;
+import org.jboss.test.deployers.classloading.test.UndeployOrderClassLoaderUnitTestCase;
+import org.jboss.test.deployers.classloading.test.MockResourceVisitorDeployerUnitTestCase;
+
+/**
+ * Deployers Deployer Test Suite.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 37459 $
+ */
+public class DeployersClassLoadingTestSuite extends TestSuite
+{
+   public static void main(String[] args)
+   {
+      TestRunner.run(suite());
+   }
+
+   public static Test suite()
+   {
+      TestSuite suite = new TestSuite("Deployers ClassLoading Tests");
+
+      suite.addTest(MockClassLoaderDependenciesUnitTestCase.suite());
+      suite.addTest(UndeployOrderClassLoaderUnitTestCase.suite());
+      suite.addTest(SubDeploymentMockClassLoaderUnitTestCase.suite());
+      suite.addTest(MockResourceVisitorDeployerUnitTestCase.suite());
+
+      return suite;
+   }
+}

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,118 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.classloading.support;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.jboss.classloader.test.support.MockClassLoaderHelper;
-import org.jboss.classloader.test.support.MockClassLoaderPolicy;
-import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.Capability;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
-import org.jboss.deployers.plugins.classloading.AbstractDeploymentClassLoaderPolicyModule;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * MockDeploymentClassLoaderPolicyModule.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class MockDeploymentClassLoaderPolicyModule extends AbstractDeploymentClassLoaderPolicyModule
-{
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-   
-   /**
-    * Create a new MockDeploymentClassLoaderPolicyModule.
-    * 
-    * @param unit the deployment unit
-    * @throws IllegalArgumentException for a null deployment unit
-    */
-   public MockDeploymentClassLoaderPolicyModule(DeploymentUnit unit)
-   {
-      super(unit);
-
-      ClassLoadingMetaData metaData = unit.getAttachment(ClassLoadingMetaData.class);
-      if (metaData == null || (metaData instanceof MockClassLoadingMetaData == false))
-         throw new IllegalArgumentException("MetaData is not mocked: " + metaData);
-   }
-
-   @Override
-   protected List<Capability> determineCapabilities()
-   {
-      List<Capability> capabilities = super.determineCapabilities();
-      if (capabilities != null)
-         return capabilities;
-      
-      // We need to work it out
-      ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
-      capabilities = new CopyOnWriteArrayList<Capability>();
-
-      // We have a module capability
-      Object version = getVersion();
-      Capability capability = factory.createModule(getName(), version);
-      capabilities.add(capability);
-
-      MockClassLoadingMetaData metadata = getClassLoadingMetaData();
-      String[] exported = metadata.getExportedPackages();
-      // Do we determine package capabilities?
-      if (exported != null)
-      {
-         for (String packageName : exported)
-         {
-            capability = factory.createPackage(packageName, version);
-            capabilities.add(capability);
-         }
-      }
-      return capabilities;
-   }
-
-   @Override
-   protected MockClassLoadingMetaData getClassLoadingMetaData()
-   {
-      return (MockClassLoadingMetaData) super.getClassLoadingMetaData();
-   }
-
-   @Override
-   public MockClassLoaderPolicy getPolicy()
-   {
-      return (MockClassLoaderPolicy) super.getPolicy();
-   }
-   
-   @Override
-   protected MockClassLoaderPolicy determinePolicy()
-   {
-      MockClassLoadingMetaData metaData = getClassLoadingMetaData();
-      MockClassLoaderPolicy policy = MockClassLoaderHelper.createMockClassLoaderPolicy(getContextName());
-      policy.setPrefix(metaData.getPrefix());
-      policy.setPackageNames(getPackageNames());
-      policy.setPaths(metaData.getPaths());
-      policy.setIncluded(metaData.getIncludedClasses());
-      policy.setExcluded(metaData.getExcludedClasses());
-      policy.setImportAll(isImportAll());
-      policy.setDelegates(getDelegates());
-      return policy;
-   }
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java (from rev 72861, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,188 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.classloading.support;
+
+import java.util.List;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Arrays;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.net.URL;
+
+import org.jboss.classloader.test.support.MockClassLoaderHelper;
+import org.jboss.classloader.test.support.MockClassLoaderPolicy;
+import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.Capability;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.deployers.plugins.classloading.AbstractDeploymentClassLoaderPolicyModule;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * MockDeploymentClassLoaderPolicyModule.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class MockDeploymentClassLoaderPolicyModule extends AbstractDeploymentClassLoaderPolicyModule
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID = 1L;
+   
+   /**
+    * Create a new MockDeploymentClassLoaderPolicyModule.
+    * 
+    * @param unit the deployment unit
+    * @throws IllegalArgumentException for a null deployment unit
+    */
+   public MockDeploymentClassLoaderPolicyModule(DeploymentUnit unit)
+   {
+      super(unit);
+
+      ClassLoadingMetaData metaData = unit.getAttachment(ClassLoadingMetaData.class);
+      if (metaData == null || (metaData instanceof MockClassLoadingMetaData == false))
+         throw new IllegalArgumentException("MetaData is not mocked: " + metaData);
+   }
+
+   @Override
+   protected List<Capability> determineCapabilities()
+   {
+      List<Capability> capabilities = super.determineCapabilities();
+      if (capabilities != null)
+         return capabilities;
+      
+      // We need to work it out
+      ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
+      capabilities = new CopyOnWriteArrayList<Capability>();
+
+      // We have a module capability
+      Object version = getVersion();
+      Capability capability = factory.createModule(getName(), version);
+      capabilities.add(capability);
+
+      MockClassLoadingMetaData metadata = getClassLoadingMetaData();
+      String[] exported = metadata.getExportedPackages();
+      // Do we determine package capabilities?
+      if (exported != null)
+      {
+         for (String packageName : exported)
+         {
+            capability = factory.createPackage(packageName, version);
+            capabilities.add(capability);
+         }
+      }
+      return capabilities;
+   }
+
+   @Override
+   protected MockClassLoadingMetaData getClassLoadingMetaData()
+   {
+      return (MockClassLoadingMetaData) super.getClassLoadingMetaData();
+   }
+
+   @Override
+   public MockClassLoaderPolicy getPolicy()
+   {
+      return (MockClassLoaderPolicy) super.getPolicy();
+   }
+   
+   @Override
+   protected MockClassLoaderPolicy determinePolicy()
+   {
+      MockClassLoadingMetaData metaData = getClassLoadingMetaData();
+      MockClassLoaderPolicy policy = MockClassLoaderHelper.createMockClassLoaderPolicy(getContextName());
+      policy.setPrefix(metaData.getPrefix());
+      policy.setPackageNames(getPackageNames());
+      policy.setPaths(metaData.getPaths());
+      policy.setIncluded(metaData.getIncludedClasses());
+      policy.setExcluded(metaData.getExcludedClasses());
+      policy.setImportAll(isImportAll());
+      policy.setDelegates(getDelegates());
+      return policy;
+   }
+
+   /**
+    * Get collection from string array.
+    *
+    * @param strings the strings
+    * @return string collection
+    */
+   private static Collection<String> toCollection(String[] strings)
+   {
+      if (strings == null || strings.length == 0)
+         return Collections.emptySet();
+      else
+         return Arrays.asList(strings);
+   }
+
+   /**
+    * Get URL for path param.
+    *
+    * @param path the path
+    * @return path's URL
+    */
+   protected URL getURL(String path)
+   {
+      ClassLoader classLoader = getClassLoader();
+      if (classLoader == null)
+         throw new IllegalStateException("ClassLoader has not been constructed for " + getContextName());
+
+      return classLoader.getResource(path);
+   }
+
+   public void visit(ResourceVisitor visitor, ResourceFilter filter)
+   {
+      MockClassLoadingMetaData mclmd = getClassLoadingMetaData();
+      String[] paths = mclmd.getPaths();
+      if (paths != null && paths.length > 0)
+      {
+         ClassLoader classLoader = getClassLoader();
+         if (classLoader == null)
+            throw new IllegalStateException("ClassLoader has not been constructed for " + getContextName());
+
+         Collection<String> included = toCollection(mclmd.getIncludedClasses());
+         ClassFilter includedFilter = getIncluded();
+         Collection<String> excluded = toCollection(mclmd.getExcludedClasses());
+         ClassFilter excludedFilter = getExcluded();
+
+         for (String path : paths)
+         {
+            if (included.isEmpty() == false && included.contains(path) == false)
+               continue;
+            if (includedFilter != null && includedFilter.matchesResourcePath(path) == false)
+               continue;
+            if (excluded.isEmpty() == false && excluded.contains(path))
+               continue;
+            if (excludedFilter != null && excludedFilter.matchesResourcePath(path))
+               continue;
+
+            ResourceContext context = new ResourceContext(getURL(path), path, classLoader);
+            if (filter == null || filter.accepts(context))
+               visitor.visit(context);
+         }
+      }
+   }
+}

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,235 +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.classloading.test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
-import org.jboss.classloader.spi.ClassLoaderDomain;
-import org.jboss.classloader.spi.ClassLoaderSystem;
-import org.jboss.classloader.spi.ParentPolicy;
-import org.jboss.classloading.spi.dependency.ClassLoading;
-import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
-import org.jboss.classloading.spi.metadata.Capability;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
-import org.jboss.classloading.spi.metadata.Requirement;
-import org.jboss.classloading.spi.metadata.RequirementsMetaData;
-import org.jboss.classloading.spi.version.Version;
-import org.jboss.classloading.spi.version.VersionRange;
-import org.jboss.deployers.client.spi.DeployerClient;
-import org.jboss.deployers.plugins.classloading.AbstractClassLoaderDescribeDeployer;
-import org.jboss.deployers.spi.attachments.MutableAttachments;
-import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.test.deployers.AbstractDeployerTest;
-import org.jboss.test.deployers.classloading.support.MockClassLoaderDescribeDeployer;
-import org.jboss.test.deployers.classloading.support.MockLevelClassLoaderSystemDeployer;
-
-/**
- * ClassLoaderDependenciesTest.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public abstract class ClassLoaderDependenciesTest extends AbstractDeployerTest
-{
-   private static ClassLoadingMetaDataFactory classLoadingMetaDataFactory = ClassLoadingMetaDataFactory.getInstance();
-   
-   private ClassLoaderSystem system;
-   
-   public static final String NameA = "A";
-   public static final String NameB = "B";
-
-   public static final List<String> NONE = Collections.emptyList();
-   public static final List<String> A = makeList(NameA);
-   public static final List<String> B = makeList(NameB);
-   public static final List<String> AB = makeList(NameA, NameB);
-   public static final List<String> BA = makeList(NameB, NameA);
-   public static final List<String> BAA = makeList(NameB, NameA, NameA);
-   public static final List<String> BABA = makeList(NameB, NameA, NameB, NameA);
-
-   @SuppressWarnings("unchecked")
-   protected static <T> List<T> makeList(T... objects)
-   {
-      List<T> result = new ArrayList<T>();
-      for (T object : objects)
-         result.add(object);
-      return result;
-   }
-
-   protected AbstractClassLoaderDescribeDeployer deployer1;
-   protected MockLevelClassLoaderSystemDeployer deployer2;
-
-   protected ClassLoaderDependenciesTest(String name)
-   {
-      super(name);
-   }
-
-   protected Class<?> assertLoadClass(ClassLoader start, Class<?> reference) throws Exception
-   {
-      return assertLoadClass(start, reference, start);
-   }
-
-   protected Class<?> assertLoadClass(ClassLoader start, Class<?> reference, ClassLoader expected) throws Exception
-   {
-      Class<?> clazz = start.loadClass(reference.getName());
-      if (expected != null)
-         assertEquals(expected, clazz.getClassLoader());
-      return clazz;
-   }
-
-   protected void assertLoadClassFail(ClassLoader start, Class<?> reference) throws Exception
-   {
-      try
-      {
-         start.loadClass(reference.getName());
-         fail("Should not be here!");
-      }
-      catch (Exception e)
-      {
-         checkThrowable(ClassNotFoundException.class, e);
-      }
-   }
-
-   protected void assertLoadClassIllegal(ClassLoader start, Class<?> reference) throws Exception
-   {
-      try
-      {
-         start.loadClass(reference.getName());
-         fail("Should not be here!");
-      }
-      catch (Exception e)
-      {
-         checkThrowable(IllegalStateException.class, e);
-      }
-   }
-
-   protected void assertNoClassLoader(DeploymentUnit unit) throws Exception
-   {
-      try
-      {
-         unit.getClassLoader();
-         fail("Should not be here!");
-      }
-      catch (Exception e)
-      {
-         checkThrowable(IllegalStateException.class, e);
-      }
-   }
-
-   protected static ClassLoadingMetaData addClassLoadingMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, Class<?>... packages)
-   {
-      return addClassLoadingMetaData(deployment, name, version, false, packages);
-   }
-
-   protected static ClassLoadingMetaData addClassLoadingMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, boolean useVersionOnPackages, Class<?>... packages)
-   {
-      ClassLoadingMetaData classLoadingMetaData = createMetaData(deployment, name, version, useVersionOnPackages, packages);
-      addMetaData(deployment, classLoadingMetaData);
-      return classLoadingMetaData;
-   }
-
-   protected static ClassLoadingMetaData createMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, Class<?>... packages)
-   {
-      return createMetaData(deployment, name, version, false, packages);
-   }
-
-   protected static ClassLoadingMetaData createMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, boolean useVersionOnPackages, Class<?>... packages)
-   {
-      MockClassLoadingMetaData classLoadingMetaData = new MockClassLoadingMetaData(name, version);
-
-      classLoadingMetaData.setPaths(packages);
-      
-      CapabilitiesMetaData capabilities = classLoadingMetaData.getCapabilities();
-      Capability capability = classLoadingMetaDataFactory.createModule(name, version);
-      capabilities.addCapability(capability);
-
-      if (packages != null)
-      {
-         for (Class<?> pkg : packages)
-         {
-            if (useVersionOnPackages)
-               capability = classLoadingMetaDataFactory.createPackage(pkg.getPackage().getName(), version);
-            else
-               capability = classLoadingMetaDataFactory.createPackage(pkg.getPackage().getName());
-            capabilities.addCapability(capability);
-         }
-      }
-
-      classLoadingMetaData.setCapabilities(capabilities);
-      return classLoadingMetaData;
-   }
-
-   protected static void addRequireModule(ClassLoadingMetaData classLoadingMetaData, String moduleName, VersionRange versionRange)
-   {
-      RequirementsMetaData requirements = classLoadingMetaData.getRequirements();
-
-      Requirement requirement = classLoadingMetaDataFactory.createRequireModule(moduleName, versionRange);
-      requirements.addRequirement(requirement);
-   }
-
-   protected static void addRequirePackage(ClassLoadingMetaData classLoadingMetaData, Class<?> pck, VersionRange versionRange)
-   {
-      RequirementsMetaData requirements = classLoadingMetaData.getRequirements();
-
-      Requirement requirement = classLoadingMetaDataFactory.createRequirePackage(pck.getPackage().getName(), versionRange);
-      requirements.addRequirement(requirement);
-   }
-
-   protected static void addMetaData(PredeterminedManagedObjectAttachments attachments, ClassLoadingMetaData md)
-   {
-      MutableAttachments mutable = (MutableAttachments) attachments.getPredeterminedManagedObjects();
-      mutable.addAttachment(ClassLoadingMetaData.class, md);
-   }
-   
-   protected ClassLoaderDomain assertDomain(String name) throws Exception
-   {
-      ClassLoaderDomain result = system.getDomain(name);
-      assertNotNull("Expected domain " + name, result);
-      return result;
-   }
-   
-   protected void assertNoDomain(String name) throws Exception
-   {
-      assertNull("Did not expect domain " + name, system.getDomain(name));
-   }
-
-   protected DeployerClient getMainDeployer()
-   {
-      ClassLoading classLoading = new ClassLoading();
-      system = new DefaultClassLoaderSystem();
-      system.getDefaultDomain().setParentPolicy(ParentPolicy.BEFORE_BUT_JAVA_ONLY);
-
-      deployer1 = new MockClassLoaderDescribeDeployer();
-      deployer1.setClassLoading(classLoading);
-
-      deployer2 = new MockLevelClassLoaderSystemDeployer();
-      deployer2.setClassLoading(classLoading);
-      deployer2.setSystem(system);
-
-      return createMainDeployer(deployer1, deployer2);
-   }
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java (from rev 72861, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,245 @@
+/*
+* 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.classloading.test;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
+import org.jboss.classloader.spi.ClassLoaderDomain;
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.ParentPolicy;
+import org.jboss.classloading.spi.dependency.ClassLoading;
+import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
+import org.jboss.classloading.spi.metadata.Capability;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
+import org.jboss.classloading.spi.metadata.Requirement;
+import org.jboss.classloading.spi.metadata.RequirementsMetaData;
+import org.jboss.classloading.spi.version.Version;
+import org.jboss.classloading.spi.version.VersionRange;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.plugins.classloading.AbstractClassLoaderDescribeDeployer;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
+import org.jboss.deployers.spi.deployer.Deployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.AbstractDeployerTest;
+import org.jboss.test.deployers.classloading.support.MockClassLoaderDescribeDeployer;
+import org.jboss.test.deployers.classloading.support.MockLevelClassLoaderSystemDeployer;
+
+/**
+ * ClassLoaderDependenciesTest.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class ClassLoaderDependenciesTest extends AbstractDeployerTest
+{
+   private static ClassLoadingMetaDataFactory classLoadingMetaDataFactory = ClassLoadingMetaDataFactory.getInstance();
+   
+   private ClassLoaderSystem system;
+   
+   public static final String NameA = "A";
+   public static final String NameB = "B";
+
+   public static final List<String> NONE = Collections.emptyList();
+   public static final List<String> A = makeList(NameA);
+   public static final List<String> B = makeList(NameB);
+   public static final List<String> AB = makeList(NameA, NameB);
+   public static final List<String> BA = makeList(NameB, NameA);
+   public static final List<String> BAA = makeList(NameB, NameA, NameA);
+   public static final List<String> BABA = makeList(NameB, NameA, NameB, NameA);
+
+   @SuppressWarnings("unchecked")
+   protected static <T> List<T> makeList(T... objects)
+   {
+      List<T> result = new ArrayList<T>();
+      for (T object : objects)
+         result.add(object);
+      return result;
+   }
+
+   protected AbstractClassLoaderDescribeDeployer deployer1;
+   protected MockLevelClassLoaderSystemDeployer deployer2;
+
+   protected ClassLoaderDependenciesTest(String name)
+   {
+      super(name);
+   }
+
+   protected Class<?> assertLoadClass(ClassLoader start, Class<?> reference) throws Exception
+   {
+      return assertLoadClass(start, reference, start);
+   }
+
+   protected Class<?> assertLoadClass(ClassLoader start, Class<?> reference, ClassLoader expected) throws Exception
+   {
+      Class<?> clazz = start.loadClass(reference.getName());
+      if (expected != null)
+         assertEquals(expected, clazz.getClassLoader());
+      return clazz;
+   }
+
+   protected void assertLoadClassFail(ClassLoader start, Class<?> reference) throws Exception
+   {
+      try
+      {
+         start.loadClass(reference.getName());
+         fail("Should not be here!");
+      }
+      catch (Exception e)
+      {
+         checkThrowable(ClassNotFoundException.class, e);
+      }
+   }
+
+   protected void assertLoadClassIllegal(ClassLoader start, Class<?> reference) throws Exception
+   {
+      try
+      {
+         start.loadClass(reference.getName());
+         fail("Should not be here!");
+      }
+      catch (Exception e)
+      {
+         checkThrowable(IllegalStateException.class, e);
+      }
+   }
+
+   protected void assertNoClassLoader(DeploymentUnit unit) throws Exception
+   {
+      try
+      {
+         unit.getClassLoader();
+         fail("Should not be here!");
+      }
+      catch (Exception e)
+      {
+         checkThrowable(IllegalStateException.class, e);
+      }
+   }
+
+   protected static ClassLoadingMetaData addClassLoadingMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, Class<?>... packages)
+   {
+      return addClassLoadingMetaData(deployment, name, version, false, packages);
+   }
+
+   protected static ClassLoadingMetaData addClassLoadingMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, boolean useVersionOnPackages, Class<?>... packages)
+   {
+      ClassLoadingMetaData classLoadingMetaData = createMetaData(deployment, name, version, useVersionOnPackages, packages);
+      addMetaData(deployment, classLoadingMetaData);
+      return classLoadingMetaData;
+   }
+
+   protected static ClassLoadingMetaData createMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, Class<?>... packages)
+   {
+      return createMetaData(deployment, name, version, false, packages);
+   }
+
+   protected static ClassLoadingMetaData createMetaData(PredeterminedManagedObjectAttachments deployment, String name, Version version, boolean useVersionOnPackages, Class<?>... packages)
+   {
+      MockClassLoadingMetaData classLoadingMetaData = new MockClassLoadingMetaData(name, version);
+
+      classLoadingMetaData.setPaths(packages);
+      
+      CapabilitiesMetaData capabilities = classLoadingMetaData.getCapabilities();
+      Capability capability = classLoadingMetaDataFactory.createModule(name, version);
+      capabilities.addCapability(capability);
+
+      if (packages != null)
+      {
+         for (Class<?> pkg : packages)
+         {
+            if (useVersionOnPackages)
+               capability = classLoadingMetaDataFactory.createPackage(pkg.getPackage().getName(), version);
+            else
+               capability = classLoadingMetaDataFactory.createPackage(pkg.getPackage().getName());
+            capabilities.addCapability(capability);
+         }
+      }
+
+      classLoadingMetaData.setCapabilities(capabilities);
+      return classLoadingMetaData;
+   }
+
+   protected static void addRequireModule(ClassLoadingMetaData classLoadingMetaData, String moduleName, VersionRange versionRange)
+   {
+      RequirementsMetaData requirements = classLoadingMetaData.getRequirements();
+
+      Requirement requirement = classLoadingMetaDataFactory.createRequireModule(moduleName, versionRange);
+      requirements.addRequirement(requirement);
+   }
+
+   protected static void addRequirePackage(ClassLoadingMetaData classLoadingMetaData, Class<?> pck, VersionRange versionRange)
+   {
+      RequirementsMetaData requirements = classLoadingMetaData.getRequirements();
+
+      Requirement requirement = classLoadingMetaDataFactory.createRequirePackage(pck.getPackage().getName(), versionRange);
+      requirements.addRequirement(requirement);
+   }
+
+   protected static void addMetaData(PredeterminedManagedObjectAttachments attachments, ClassLoadingMetaData md)
+   {
+      MutableAttachments mutable = (MutableAttachments) attachments.getPredeterminedManagedObjects();
+      mutable.addAttachment(ClassLoadingMetaData.class, md);
+   }
+   
+   protected ClassLoaderDomain assertDomain(String name) throws Exception
+   {
+      ClassLoaderDomain result = system.getDomain(name);
+      assertNotNull("Expected domain " + name, result);
+      return result;
+   }
+   
+   protected void assertNoDomain(String name) throws Exception
+   {
+      assertNull("Did not expect domain " + name, system.getDomain(name));
+   }
+
+   protected DeployerClient getMainDeployer(Deployer... deployers)
+   {
+      ClassLoading classLoading = new ClassLoading();
+      system = new DefaultClassLoaderSystem();
+      system.getDefaultDomain().setParentPolicy(ParentPolicy.BEFORE_BUT_JAVA_ONLY);
+
+      deployer1 = new MockClassLoaderDescribeDeployer();
+      deployer1.setClassLoading(classLoading);
+
+      deployer2 = new MockLevelClassLoaderSystemDeployer();
+      deployer2.setClassLoading(classLoading);
+      deployer2.setSystem(system);
+
+      if (deployers != null && deployers.length > 0)
+      {
+         Deployer[] allDeployers = new Deployer[deployers.length + 2];
+         allDeployers[0] = deployer1;
+         allDeployers[1] = deployer2;
+         System.arraycopy(deployers, 0, allDeployers, 2, deployers.length);
+         return createMainDeployer(allDeployers);
+      }
+      
+      return createMainDeployer(deployer1, deployer2);
+   }
+}

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,237 +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.classloading.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.deployers.client.spi.DeployerClient;
-import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.test.deployers.classloading.support.a.A;
-import org.jboss.test.deployers.classloading.support.b.B;
-
-/**
- * HeuristicAllOrNothingUnitTestCase.
- * 
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class MockClassLoaderDependenciesUnitTestCase extends ClassLoaderDependenciesTest
-{
-   public static Test suite()
-   {
-      return new TestSuite(MockClassLoaderDependenciesUnitTestCase.class);
-   }
-   
-   public MockClassLoaderDependenciesUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public void testSimpleClassLoader() throws Exception
-   {
-      DeployerClient deployer = getMainDeployer();
-
-      Deployment deployment = createSimpleDeployment(NameA);
-      addClassLoadingMetaData(deployment, deployment.getName(), null, A.class);
-      
-      DeploymentUnit unit = assertDeploy(deployer, deployment);
-
-      assertEquals(A, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-      
-      ClassLoader cl = unit.getClassLoader();
-      assertLoadClass(cl, A.class);
-      
-      assertUndeploy(deployer, deployment);
-
-      assertLoadClass(cl, A.class);
-
-      assertEquals(A, deployer2.deployed);
-      assertEquals(A, deployer2.undeployed);
-   }
-
-   public void testADependsUponModuleBCorrectWay() throws Exception
-   {
-      DeployerClient deployer = getMainDeployer();
-
-      Deployment deploymentB = createSimpleDeployment(NameB);
-      addClassLoadingMetaData(deploymentB, deploymentB.getName(), null, B.class);
-      DeploymentUnit unitB = assertDeploy(deployer, deploymentB);
-      
-      ClassLoader clB = unitB.getClassLoader();
-      assertLoadClass(clB, B.class);
-
-      assertEquals(B, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-
-      Deployment deploymentA = createSimpleDeployment(NameA);
-      ClassLoadingMetaData classLoadingMetaData = addClassLoadingMetaData(deploymentA, deploymentA.getName(), null, A.class);
-      addRequireModule(classLoadingMetaData, "B", null);
-      DeploymentUnit unitA = assertDeploy(deployer, deploymentA);
-      
-      ClassLoader clA = unitA.getClassLoader();
-      assertLoadClass(clA, B.class, clB);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-      
-      assertUndeploy(deployer, deploymentA);
-      assertLoadClassIllegal(clA, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(A, deployer2.undeployed);
-      
-      assertUndeploy(deployer, deploymentB);
-      assertLoadClass(clB, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(AB, deployer2.undeployed);
-   }
-
-   public void testADependsUponModuleBWrongWay() throws Exception
-   {
-      DeployerClient deployer = getMainDeployer();
-
-      Deployment deploymentA = createSimpleDeployment(NameA);
-      ClassLoadingMetaData classLoaderMetaData = addClassLoadingMetaData(deploymentA, deploymentA.getName(), null, A.class);
-      addRequireModule(classLoaderMetaData, "B", null);
-      DeploymentUnit unitA = addDeployment(deployer, deploymentA);
-      
-      assertNoClassLoader(unitA);
-
-      assertEquals(NONE, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-
-      Deployment deploymentB = createSimpleDeployment(NameB);
-      addClassLoadingMetaData(deploymentB, deploymentB.getName(), null, B.class);
-      DeploymentUnit unitB = assertDeploy(deployer, deploymentB);
-      
-      ClassLoader clB = unitB.getClassLoader();
-      assertLoadClass(clB, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-
-      ClassLoader clA = unitA.getClassLoader();
-      assertLoadClass(clA, B.class, clB);
-      
-      assertUndeploy(deployer, deploymentA);
-      assertLoadClassIllegal(clA, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(A, deployer2.undeployed);
-      
-      assertUndeploy(deployer, deploymentB);
-      assertLoadClass(clB, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(AB, deployer2.undeployed);
-   }
-
-   public void testADependsUponModuleBRedeployA() throws Exception
-   {
-      DeployerClient deployer = getMainDeployer();
-
-      Deployment deploymentA = createSimpleDeployment(NameA);
-      ClassLoadingMetaData classLoaderMetaData = addClassLoadingMetaData(deploymentA, deploymentA.getName(), null, A.class);
-      addRequireModule(classLoaderMetaData, "B", null);
-      DeploymentUnit unitA = addDeployment(deployer, deploymentA);
-      
-      assertNoClassLoader(unitA);
-
-      assertEquals(NONE, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-
-      Deployment deploymentB = createSimpleDeployment(NameB);
-      addClassLoadingMetaData(deploymentB, deploymentB.getName(), null, B.class);
-      DeploymentUnit unitB = assertDeploy(deployer, deploymentB);
-      
-      ClassLoader clB = unitB.getClassLoader();
-      assertLoadClass(clB, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-
-      ClassLoader clA = unitA.getClassLoader();
-      assertLoadClass(clA, B.class, clB);
-      
-      assertUndeploy(deployer, deploymentA);
-      assertLoadClassIllegal(clA, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(A, deployer2.undeployed);
-      
-      unitA = assertDeploy(deployer, deploymentA);
-      clA = unitA.getClassLoader();
-      assertLoadClass(clA, B.class, clB);
-
-      assertEquals(BAA, deployer2.deployed);
-      assertEquals(A, deployer2.undeployed);
-   }
-
-   public void testADependsUponModuleBRedeployB() throws Exception
-   {
-      DeployerClient deployer = getMainDeployer();
-
-      Deployment deploymentA = createSimpleDeployment(NameA);
-      ClassLoadingMetaData classLoaderMetaData = addClassLoadingMetaData(deploymentA, deploymentA.getName(), null, A.class);
-      addRequireModule(classLoaderMetaData, "B", null);
-      DeploymentUnit unitA = addDeployment(deployer, deploymentA);
-      
-      assertNoClassLoader(unitA);
-
-      assertEquals(NONE, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-
-      Deployment deploymentB = createSimpleDeployment(NameB);
-      addClassLoadingMetaData(deploymentB, deploymentB.getName(), null, B.class);
-      DeploymentUnit unitB = assertDeploy(deployer, deploymentB);
-      
-      ClassLoader clB = unitB.getClassLoader();
-      assertLoadClass(clB, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(NONE, deployer2.undeployed);
-
-      ClassLoader clA = unitA.getClassLoader();
-      assertLoadClass(clA, B.class, clB);
-      
-      enableTrace("org.jboss.deployers");
-      enableTrace("org.jboss.dependency");
-      assertUndeploy(deployer, deploymentB);
-      assertLoadClassIllegal(clA, B.class);
-
-      assertEquals(BA, deployer2.deployed);
-      assertEquals(AB, deployer2.undeployed);
-      
-      unitB = assertDeploy(deployer, deploymentB);
-      clA = unitA.getClassLoader();
-      clB = unitB.getClassLoader();
-      assertLoadClass(clA, B.class, clB);
-
-      assertEquals(BABA, deployer2.deployed);
-      assertEquals(AB, deployer2.undeployed);
-   }
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java (from rev 72861, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,237 @@
+/*
+* 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.classloading.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.classloading.support.a.A;
+import org.jboss.test.deployers.classloading.support.b.B;
+
+/**
+ * MockClassLoaderDependenciesUnitTestCase.
+ * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class MockClassLoaderDependenciesUnitTestCase extends ClassLoaderDependenciesTest
+{
+   public static Test suite()
+   {
+      return new TestSuite(MockClassLoaderDependenciesUnitTestCase.class);
+   }
+   
+   public MockClassLoaderDependenciesUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testSimpleClassLoader() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer();
+
+      Deployment deployment = createSimpleDeployment(NameA);
+      addClassLoadingMetaData(deployment, deployment.getName(), null, A.class);
+      
+      DeploymentUnit unit = assertDeploy(deployer, deployment);
+
+      assertEquals(A, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+      
+      ClassLoader cl = unit.getClassLoader();
+      assertLoadClass(cl, A.class);
+      
+      assertUndeploy(deployer, deployment);
+
+      assertLoadClass(cl, A.class);
+
+      assertEquals(A, deployer2.deployed);
+      assertEquals(A, deployer2.undeployed);
+   }
+
+   public void testADependsUponModuleBCorrectWay() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer();
+
+      Deployment deploymentB = createSimpleDeployment(NameB);
+      addClassLoadingMetaData(deploymentB, deploymentB.getName(), null, B.class);
+      DeploymentUnit unitB = assertDeploy(deployer, deploymentB);
+      
+      ClassLoader clB = unitB.getClassLoader();
+      assertLoadClass(clB, B.class);
+
+      assertEquals(B, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+
+      Deployment deploymentA = createSimpleDeployment(NameA);
+      ClassLoadingMetaData classLoadingMetaData = addClassLoadingMetaData(deploymentA, deploymentA.getName(), null, A.class);
+      addRequireModule(classLoadingMetaData, "B", null);
+      DeploymentUnit unitA = assertDeploy(deployer, deploymentA);
+      
+      ClassLoader clA = unitA.getClassLoader();
+      assertLoadClass(clA, B.class, clB);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+      
+      assertUndeploy(deployer, deploymentA);
+      assertLoadClassIllegal(clA, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(A, deployer2.undeployed);
+      
+      assertUndeploy(deployer, deploymentB);
+      assertLoadClass(clB, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(AB, deployer2.undeployed);
+   }
+
+   public void testADependsUponModuleBWrongWay() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer();
+
+      Deployment deploymentA = createSimpleDeployment(NameA);
+      ClassLoadingMetaData classLoaderMetaData = addClassLoadingMetaData(deploymentA, deploymentA.getName(), null, A.class);
+      addRequireModule(classLoaderMetaData, "B", null);
+      DeploymentUnit unitA = addDeployment(deployer, deploymentA);
+      
+      assertNoClassLoader(unitA);
+
+      assertEquals(NONE, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+
+      Deployment deploymentB = createSimpleDeployment(NameB);
+      addClassLoadingMetaData(deploymentB, deploymentB.getName(), null, B.class);
+      DeploymentUnit unitB = assertDeploy(deployer, deploymentB);
+      
+      ClassLoader clB = unitB.getClassLoader();
+      assertLoadClass(clB, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+
+      ClassLoader clA = unitA.getClassLoader();
+      assertLoadClass(clA, B.class, clB);
+      
+      assertUndeploy(deployer, deploymentA);
+      assertLoadClassIllegal(clA, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(A, deployer2.undeployed);
+      
+      assertUndeploy(deployer, deploymentB);
+      assertLoadClass(clB, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(AB, deployer2.undeployed);
+   }
+
+   public void testADependsUponModuleBRedeployA() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer();
+
+      Deployment deploymentA = createSimpleDeployment(NameA);
+      ClassLoadingMetaData classLoaderMetaData = addClassLoadingMetaData(deploymentA, deploymentA.getName(), null, A.class);
+      addRequireModule(classLoaderMetaData, "B", null);
+      DeploymentUnit unitA = addDeployment(deployer, deploymentA);
+      
+      assertNoClassLoader(unitA);
+
+      assertEquals(NONE, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+
+      Deployment deploymentB = createSimpleDeployment(NameB);
+      addClassLoadingMetaData(deploymentB, deploymentB.getName(), null, B.class);
+      DeploymentUnit unitB = assertDeploy(deployer, deploymentB);
+      
+      ClassLoader clB = unitB.getClassLoader();
+      assertLoadClass(clB, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+
+      ClassLoader clA = unitA.getClassLoader();
+      assertLoadClass(clA, B.class, clB);
+      
+      assertUndeploy(deployer, deploymentA);
+      assertLoadClassIllegal(clA, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(A, deployer2.undeployed);
+      
+      unitA = assertDeploy(deployer, deploymentA);
+      clA = unitA.getClassLoader();
+      assertLoadClass(clA, B.class, clB);
+
+      assertEquals(BAA, deployer2.deployed);
+      assertEquals(A, deployer2.undeployed);
+   }
+
+   public void testADependsUponModuleBRedeployB() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer();
+
+      Deployment deploymentA = createSimpleDeployment(NameA);
+      ClassLoadingMetaData classLoaderMetaData = addClassLoadingMetaData(deploymentA, deploymentA.getName(), null, A.class);
+      addRequireModule(classLoaderMetaData, "B", null);
+      DeploymentUnit unitA = addDeployment(deployer, deploymentA);
+      
+      assertNoClassLoader(unitA);
+
+      assertEquals(NONE, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+
+      Deployment deploymentB = createSimpleDeployment(NameB);
+      addClassLoadingMetaData(deploymentB, deploymentB.getName(), null, B.class);
+      DeploymentUnit unitB = assertDeploy(deployer, deploymentB);
+      
+      ClassLoader clB = unitB.getClassLoader();
+      assertLoadClass(clB, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(NONE, deployer2.undeployed);
+
+      ClassLoader clA = unitA.getClassLoader();
+      assertLoadClass(clA, B.class, clB);
+      
+      enableTrace("org.jboss.deployers");
+      enableTrace("org.jboss.dependency");
+      assertUndeploy(deployer, deploymentB);
+      assertLoadClassIllegal(clA, B.class);
+
+      assertEquals(BA, deployer2.deployed);
+      assertEquals(AB, deployer2.undeployed);
+      
+      unitB = assertDeploy(deployer, deploymentB);
+      clA = unitA.getClassLoader();
+      clB = unitB.getClassLoader();
+      assertLoadClass(clA, B.class, clB);
+
+      assertEquals(BABA, deployer2.deployed);
+      assertEquals(AB, deployer2.undeployed);
+   }
+}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java (from rev 72861, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,134 @@
+/*
+* 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.classloading.test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.classloader.plugins.ClassLoaderUtils;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.plugins.classloading.AbstractResourceVisitorDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.classloading.support.a.A;
+
+/**
+ * MockResourceVisitorDeployerUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MockResourceVisitorDeployerUnitTestCase extends ClassLoaderDependenciesTest
+{
+   private final Set<String> resources = new HashSet<String>();
+   private ResourceVisitor visitor = new ResourceVisitor()
+   {
+      public ResourceFilter getFilter()
+      {
+         return null;
+      }
+
+      public void visit(ResourceContext resource)
+      {
+         resources.add(resource.getResourceName());
+      }
+   };
+
+   public static Test suite()
+   {
+      return new TestSuite(MockResourceVisitorDeployerUnitTestCase.class);
+   }
+
+   public MockResourceVisitorDeployerUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public void testSimpleResourceVisitor() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer(new AbstractResourceVisitorDeployer(visitor));
+      testResourceVisitor(deployer);
+   }
+
+   public void testCreateResourceVisitor() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer(new AbstractResourceVisitorDeployer()
+      {
+         protected ResourceVisitor createVisitor(DeploymentUnit unit)
+         {
+            return visitor;
+         }
+      });
+      testResourceVisitor(deployer);
+   }
+
+   public void testResourceVisitorWithFilter() throws Exception
+   {
+      DeployerClient deployer = getMainDeployer(new AbstractResourceVisitorDeployer()
+      {
+         protected ResourceVisitor createVisitor(DeploymentUnit unit)
+         {
+            return visitor;
+         }
+
+         protected ResourceFilter createFilter(DeploymentUnit unit)
+         {
+            return new ResourceFilter()
+            {
+               public boolean accepts(ResourceContext resource)
+               {
+                  return resource.getResourceName().equals(ClassLoaderUtils.packageNameToPath(A.class.getName()));
+               }
+            };
+         }
+      });
+      testResourceVisitor(deployer);
+   }
+
+   protected void testResourceVisitor(DeployerClient deployer) throws Exception
+   {
+      Deployment deployment = createSimpleDeployment(NameA);
+      addClassLoadingMetaData(deployment, deployment.getName(), null, A.class);
+
+      DeploymentUnit unit = assertDeploy(deployer, deployment);
+      try
+      {
+         assertEquals(A, deployer2.deployed);
+         assertEquals(NONE, deployer2.undeployed);
+
+         ClassLoader cl = unit.getClassLoader();
+         assertLoadClass(cl, A.class);
+
+         String expectedPath = ClassLoaderUtils.packageNameToPath(A.class.getName());
+         assertEquals(expectedPath, resources.iterator().next());
+      }
+      finally
+      {
+         resources.clear();
+         assertUndeploy(deployer, deployment);
+      }
+   }
+}
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -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.Beta15/deployers-spi/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -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.Beta15</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.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations (from rev 72864, projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/annotations)

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java	2008-04-29 14:02:31 UTC (rev 72864)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -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.deployers.spi.annotations;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-/**
- * Information holder about annotation processing.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface AnnotationEnvironment
-{
-   /**
-    * Get all classes annotated with annotation param.
-    *
-    * @param annotation the annotation we're querying for
-    * @return set of matching classes
-    */
-   Set<Class<?>> classIsAnnotatedWith(Class<? extends Annotation> annotation);
-
-   /**
-    * Get all classes who have some constructor annotated with annotation param.
-    *
-    * @param annotation the annotation we're querying for
-    * @return set of matching classes
-    */
-   Set<Class<?>> classHasConstructorAnnotatedWith(Class<? extends Annotation> annotation);
-
-   /**
-    * Get all classes who have some field annotated with annotation param.
-    *
-    * @param annotation the annotation we're querying for
-    * @return set of matching classes
-    */
-   Set<Class<?>> classHasFieldAnnotatedWith(Class<? extends Annotation> annotation);
-
-   /**
-    * Get all classes who have some method annotated with annotation param.
-    *
-    * @param annotation the annotation we're querying for
-    * @return set of matching classes
-    */
-   Set<Class<?>> classHasMethodAnnotatedWith(Class<? extends Annotation> annotation);      
-
-   /**
-    * Get all classes who have some method's/constructor's parameter annotated with annotation param.
-    *
-    * @param annotation the annotation we're querying for
-    * @return set of matching classes
-    */
-   Set<Class<?>> classHasParameterAnnotatedWith(Class<? extends Annotation> annotation);
-}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java (from rev 72891, projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/AnnotationEnvironment.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,77 @@
+/*
+* 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.spi.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Set;
+
+/**
+ * Information holder about annotation processing.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface AnnotationEnvironment
+{
+   /**
+    * Get all classes annotated with annotation param.
+    *
+    * @param annotation the annotation we're querying for
+    * @return set of matching classes
+    */
+   Set<Class<?>> classIsAnnotatedWith(Class<? extends Annotation> annotation);
+
+   /**
+    * Get all classes who have some constructor annotated with annotation param.
+    *
+    * @param annotation the annotation we're querying for
+    * @return set of matching classes
+    */
+   <A extends Annotation> Set<Element<A, Constructor>> classHasConstructorAnnotatedWith(Class<A> annotation);
+
+   /**
+    * Get all classes who have some field annotated with annotation param.
+    *
+    * @param annotation the annotation we're querying for
+    * @return set of matching classes
+    */
+   <A extends Annotation> Set<Element<A, Field>> classHasFieldAnnotatedWith(Class<A> annotation);
+
+   /**
+    * Get all classes who have some method annotated with annotation param.
+    *
+    * @param annotation the annotation we're querying for
+    * @return set of matching classes
+    */
+   <A extends Annotation> Set<Element<A, Method>> classHasMethodAnnotatedWith(Class<A> annotation);
+
+   /**
+    * Get all classes who have some method's/constructor's parameter annotated with annotation param.
+    *
+    * @param annotation the annotation we're querying for
+    * @return set of matching classes
+    */
+   <A extends Annotation> Set<Element<A, AccessibleObject>> classHasParameterAnnotatedWith(Class<A> annotation);
+}

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/Element.java (from rev 72891, projects/jboss-deployers/trunk/deployers-spi/src/main/org/jboss/deployers/spi/annotations/Element.java)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/Element.java	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-spi/src/main/org/jboss/deployers/spi/annotations/Element.java	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,56 @@
+/*
+* 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.spi.annotations;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+
+/**
+ * Annotation holder element.
+ *
+ * @param <A> exact annotation type
+ * @param <M> exact accessible object type
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface Element<A extends Annotation, M extends AccessibleObject>
+{
+   /**
+    * Get the annotation owner class.
+    *
+    * @return the annotation owner class
+    */
+   Class<?> getOwner();
+
+   /**
+    * Get the annotation instance.
+    *
+    * @return the annotation instance
+    */
+   A getAnnotation();
+
+   /**
+    * Get the accessible object that holds the annotation.
+    *
+    * @return the accessible objetc instance
+    */
+   M getAccessibleObject();
+}
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-structure-spi/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-structure-spi/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-structure-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,164 +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 ../build/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>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common-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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common-logging-log4j</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-test</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss.profiler.jvmti</groupId>
-          <artifactId>jboss-profiler-jvmti</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant-junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>  
-</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-structure-spi/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-structure-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-structure-spi/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-structure-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,164 @@
+<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.Beta15</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 ../build/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>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-common-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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-common-logging-log4j</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss.profiler.jvmti</groupId>
+          <artifactId>jboss-profiler-jvmti</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant-junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>  
+</project>
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,210 +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>
-    <testResources>
-      <testResource>
-        <directory>src/resources/tests</directory>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </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-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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-      <artifactId>jboss-common-logging-log4j</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss</groupId>
-      <artifactId>jboss-test</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.jboss</groupId>
-          <artifactId>jboss-common-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss</groupId>
-          <artifactId>jboss-common-logging-log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>jboss.profiler.jvmti</groupId>
-          <artifactId>jboss-profiler-jvmti</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.ant</groupId>
-          <artifactId>ant-junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>  
-</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-vfs/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,210 @@
+<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.Beta15</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>
+    <testResources>
+      <testResource>
+        <directory>src/resources/tests</directory>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </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-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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+      <artifactId>jboss-common-logging-log4j</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-test</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss</groupId>
+          <artifactId>jboss-common-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss</groupId>
+          <artifactId>jboss-common-logging-log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jboss.profiler.jvmti</groupId>
+          <artifactId>jboss-profiler-jvmti</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant-junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>  
+</project>
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs-spi/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs-spi/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,71 +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 ../build/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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-          <artifactId>jboss-common-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>jboss</groupId>
-          <artifactId>jboss-common-logging-spi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>  
-</project>
\ No newline at end of file

Copied: projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs-spi/pom.xml (from rev 73014, projects/jboss-deployers/trunk/deployers-vfs-spi/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs-spi/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/deployers-vfs-spi/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,71 @@
+<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.Beta15</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 ../build/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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+          <artifactId>jboss-common-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>jboss</groupId>
+          <artifactId>jboss-common-logging-spi</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>  
+</project>
\ No newline at end of file

Deleted: projects/jboss-deployers/tags/2.0.0.Beta15/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/pom.xml	2008-04-29 06:54:43 UTC (rev 72857)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -1,85 +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-beta-2</version>
-  </parent>
-  <groupId>org.jboss.deployers</groupId>
-  <artifactId>jboss-deployers-aggregator</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>JBoss Deployers Aggregator</name>
-  <url>http://www.jboss.com/products/jbossmc</url>
-  <description>
-    The JBoss Deployment Framework
-  </description>
-  <scm>
-    <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/trunk</connection>
-  </scm>
-
-  <modules>
-    <module>build</module>
-    <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>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-7</version>
-        <configuration>
-          <generateReleasePoms>true</generateReleasePoms>
-          <tagBase>https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/tags</tagBase>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <profiles>
-    <profile>
-      <id>eclipse</id>
-      <build>
-        <defaultGoal>process-test-resources</defaultGoal>
-      </build>
-    </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.Beta15/pom.xml (from rev 73014, projects/jboss-deployers/trunk/pom.xml)
===================================================================
--- projects/jboss-deployers/tags/2.0.0.Beta15/pom.xml	                        (rev 0)
+++ projects/jboss-deployers/tags/2.0.0.Beta15/pom.xml	2008-05-02 12:24:37 UTC (rev 73015)
@@ -0,0 +1,85 @@
+<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-beta-2</version>
+  </parent>
+  <groupId>org.jboss.deployers</groupId>
+  <artifactId>jboss-deployers-aggregator</artifactId>
+  <version>2.0.0.Beta15</version>
+  <packaging>pom</packaging>
+  <name>JBoss Deployers Aggregator</name>
+  <url>http://www.jboss.com/products/jbossmc</url>
+  <description>
+    The JBoss Deployment Framework
+  </description>
+  <scm>
+    <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-deployers/tags/2.0.0.Beta15</connection>
+  </scm>
+
+  <modules>
+    <module>build</module>
+    <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>
+  </modules>
+
+  <build>
+    <plugins>
+      <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>
+  </build>
+  
+  <profiles>
+    <profile>
+      <id>eclipse</id>
+      <build>
+        <defaultGoal>process-test-resources</defaultGoal>
+      </build>
+    </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