geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r440336 [2/3] - in /geronimo/server/branches/sachin: ./ applications/geronimo-uddi-server/ applications/geronimo-welcome/ configs/client-corba/ configs/client-deployer/ configs/client-security/ configs/client-system/ configs/client/ maven-p...
Date Tue, 05 Sep 2006 12:58:22 GMT
Modified: geronimo/server/branches/sachin/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-corba/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/configs/client-corba/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client-corba/pom.xml Tue Sep  5 05:58:05 2006
@@ -20,18 +20,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>client-corba</artifactId>
     <name>Geronimo Configs :: Corba J2EE Client</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
         
         <!-- parent config -->
@@ -42,6 +42,11 @@
             <type>car</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+
         <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -56,9 +61,9 @@
             <groupId>org.openejb</groupId>
             <artifactId>openejb-core</artifactId>
         </dependency>
-        
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -71,9 +76,9 @@
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                 </configuration>
+                </configuration>
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/server/branches/sachin/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-deployer/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/configs/client-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client-deployer/pom.xml Tue Sep  5 05:58:05 2006
@@ -33,6 +33,7 @@
     <packaging>car</packaging>
     
     <dependencies>
+        
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -40,13 +41,6 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
-        <!--
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-        </dependency>
-        -->
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/sachin/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-security/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/configs/client-security/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client-security/pom.xml Tue Sep  5 05:58:05 2006
@@ -20,18 +20,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>client-security</artifactId>
     <name>Geronimo Configs :: J2EE Client Security</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
         
         <!-- parent -->
@@ -50,7 +50,12 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        </dependency>
+            
         <!-- not needed in m1 -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -71,9 +76,9 @@
             <version>${pom.version}</version>
         </dependency>
         -->
-        
+
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -88,5 +93,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/server/branches/sachin/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-system/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/configs/client-system/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client-system/pom.xml Tue Sep  5 05:58:05 2006
@@ -21,7 +21,7 @@
 <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.apache.geronimo.configs</groupId>
         <artifactId>configs</artifactId>
@@ -32,27 +32,32 @@
     <artifactId>client-system</artifactId>
     <name>Geronimo Configs :: Client System</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xmlParserAPIs</artifactId>
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>

Modified: geronimo/server/branches/sachin/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/configs/client/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client/pom.xml Tue Sep  5 05:58:05 2006
@@ -40,7 +40,7 @@
             <artifactId>client-system</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-        </dependency> 
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -71,18 +71,19 @@
             <artifactId>geronimo-common</artifactId>
             <version>${pom.version}</version>
         </dependency> -->
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.version}</version>
         </dependency>
+
         <!-- should be transitive dependency of geronimo-j2ee -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -95,19 +96,19 @@
             <artifactId>geronimo-transaction</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
         <!-- ??? 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
         </dependency> -->
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-client</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis</artifactId>
@@ -119,12 +120,22 @@
             <artifactId>geronimo-webservices</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </dependency>
+            
         <!-- geronimo-spec-corba, geronimo-j2ee_1.4_spec -->
         <!-- openejb-core, tranql, asm, activemq, activeio, scout, juddi, 
              concurrent, jdom -->
-        
-         <dependency>
+
+        <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>
@@ -142,11 +153,7 @@
             <artifactId>geronimo-spec-corba</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee_1.4_spec</artifactId>
-        </dependency>
-        
+
     </dependencies>
-    
+
 </project>

Modified: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java Tue Sep  5 05:58:05 2006
@@ -16,7 +16,19 @@
 
 package org.apache.geronimo.plugin.car;
 
-import org.apache.geronimo.plugin.MojoSupport;
+import java.io.File;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.BufferedOutputStream;
+
+import java.util.Set;
+import java.util.List;
+import java.util.Iterator;
+import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import org.apache.geronimo.genesis.MojoSupport;
 
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
@@ -29,18 +41,6 @@
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Exclusion;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.BufferedOutputStream;
-
-import java.util.Set;
-import java.util.List;
-import java.util.Iterator;
-import java.util.HashSet;
-import java.util.ArrayList;
-import java.util.Properties;
 
 /**
  * Support for <em>packaging</em> Mojos.

Modified: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java Tue Sep  5 05:58:05 2006
@@ -16,7 +16,7 @@
 
 package org.apache.geronimo.plugin.car;
 
-import org.apache.geronimo.plugin.ArtifactItem;
+import org.apache.geronimo.genesis.ArtifactItem;
 
 /**
  * Represents a Maven-artifact with additional classparh prefix details to build a jar's Manifest Class-Path.

Modified: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java Tue Sep  5 05:58:05 2006
@@ -18,7 +18,8 @@
 
 import org.apache.geronimo.kernel.repository.WriteableRepository;
 import org.apache.geronimo.system.repository.Maven2Repository;
-import org.apache.geronimo.plugin.ArtifactItem;
+
+import org.apache.geronimo.genesis.ArtifactItem;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.artifact.Artifact;

Modified: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java Tue Sep  5 05:58:05 2006
@@ -46,7 +46,8 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.plugin.ArtifactItem;
+
+import org.apache.geronimo.genesis.ArtifactItem;
 
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java Tue Sep  5 05:58:05 2006
@@ -26,7 +26,8 @@
 import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
 
 import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
-import org.apache.geronimo.plugin.MojoSupport;
+
+import org.apache.geronimo.genesis.MojoSupport;
 
 //
 // TODO: Rename to AbstractDeploymentMojo

Modified: geronimo/server/branches/sachin/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/pom.xml (original)
+++ geronimo/server/branches/sachin/maven-plugins/pom.xml Tue Sep  5 05:58:05 2006
@@ -59,6 +59,8 @@
     <modules>
         <module>car-maven-plugin</module>
         <module>geronimo-deployment-plugin</module>
+        <module>geronimo-maven-plugin</module>
+        <module>selenium-maven-plugin</module>
     </modules>
     
     <reporting>
@@ -123,12 +125,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.0.1</version>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clover-plugin</artifactId>
-                <version>2.2</version>
             </plugin>
             
             <plugin>

Modified: geronimo/server/branches/sachin/modules/geronimo-activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activation/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activation/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activation/pom.xml Tue Sep  5 05:58:05 2006
@@ -48,13 +48,6 @@
             <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activemq-gbean-management/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activemq-gbean-management/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activemq-gbean-management/pom.xml Tue Sep  5 05:58:05 2006
@@ -39,13 +39,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-activemq-gbean/pom.xml Tue Sep  5 05:58:05 2006
@@ -75,13 +75,6 @@
             <version>3.0-beta3</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <!--

Modified: geronimo/server/branches/sachin/modules/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis-builder/pom.xml Tue Sep  5 05:58:05 2006
@@ -99,13 +99,6 @@
             <artifactId>wsdl4j</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/branches/sachin/modules/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis/pom.xml Tue Sep  5 05:58:05 2006
@@ -109,13 +109,6 @@
             <artifactId>wsdl4j</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-client-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-client-builder/pom.xml Tue Sep  5 05:58:05 2006
@@ -51,13 +51,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/branches/sachin/modules/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-client/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-client/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-client/pom.xml Tue Sep  5 05:58:05 2006
@@ -73,13 +73,6 @@
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-common/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-common/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-common/pom.xml Tue Sep  5 05:58:05 2006
@@ -39,13 +39,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector-builder/pom.xml Tue Sep  5 05:58:05 2006
@@ -62,13 +62,6 @@
             <artifactId>tranql</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/branches/sachin/modules/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector/pom.xml Tue Sep  5 05:58:05 2006
@@ -117,13 +117,6 @@
             <artifactId>regexp</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
     
     <!--

Modified: geronimo/server/branches/sachin/modules/geronimo-converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-converter/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-converter/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-converter/pom.xml Tue Sep  5 05:58:05 2006
@@ -45,13 +45,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-core/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-core/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-core/pom.xml Tue Sep  5 05:58:05 2006
@@ -45,13 +45,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-deploy-config/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-deploy-config/pom.xml Tue Sep  5 05:58:05 2006
@@ -54,13 +54,6 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-deploy-jsr88/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-deploy-jsr88/pom.xml Tue Sep  5 05:58:05 2006
@@ -69,13 +69,6 @@
             <artifactId>mx4j-remote</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
 
     <build>

Modified: geronimo/server/branches/sachin/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-deploy-tool/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-deploy-tool/pom.xml Tue Sep  5 05:58:05 2006
@@ -73,13 +73,6 @@
             <artifactId>jline</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-deployment/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-deployment/pom.xml Tue Sep  5 05:58:05 2006
@@ -54,13 +54,6 @@
             <artifactId>xml-resolver</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-derby/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-derby/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-derby/pom.xml Tue Sep  5 05:58:05 2006
@@ -57,13 +57,6 @@
             <artifactId>derbynet</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
 
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-directory/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-directory/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-directory/pom.xml Tue Sep  5 05:58:05 2006
@@ -150,13 +150,6 @@
             <artifactId>stax-api</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/server/branches/sachin/modules/geronimo-hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-hot-deploy/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-hot-deploy/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-hot-deploy/pom.xml Tue Sep  5 05:58:05 2006
@@ -68,13 +68,6 @@
             <artifactId>stax-api</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-interceptor/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-interceptor/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-interceptor/pom.xml Tue Sep  5 05:58:05 2006
@@ -30,16 +30,5 @@
     
     <artifactId>geronimo-interceptor</artifactId>
     <name>Geronimo :: Interceptor</name>
-    
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-    
+
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/pom.xml?view=diff&rev=440336&r1=440335&r2=440336
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/pom.xml Tue Sep  5 05:58:05 2006
@@ -51,82 +51,110 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-testsupport</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>
-        <!--
-        FIXME: Convert module to m2 standard layout
-        -->
-        
-        <sourceDirectory>src/java</sourceDirectory>
-        <testSourceDirectory>src/test</testSourceDirectory>
-
-        <resources>
-            <resource>
-                <directory>src/resources</directory>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>src/test-data</directory>
-            </testResource>
-
-            <testResource>
-                <directory>src/test-resources</directory>
-            </testResource>
-        </testResources>
-        
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-test-deployments</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.testsupport</groupId>
+                                    <artifactId>test-ear-j2ee_1.3</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>ear</type>
+                                    <destFileName>test-ear-j2ee_1.3.ear</destFileName>
+                                </artifactItem>
+                                
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.testsupport</groupId>
+                                    <artifactId>test-ear-j2ee_1.3</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>ear</type>
+                                    <!--
+                                    FIXME: need to remove the geronimo-application.xml file from this ear.
+                                    -->
+                                    <destFileName>test-ear-j2ee_1.3-naked.ear</destFileName>
+                                </artifactItem>
+                                
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.testsupport</groupId>
+                                    <artifactId>test-ear-j2ee_1.4</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>ear</type>
+                                    <destFileName>test-ear-j2ee_1.4.ear</destFileName>
+                                </artifactItem>
+                                
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.testsupport</groupId>
+                                    <artifactId>test-ear-j2ee_1.4</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>ear</type>
+                                    <!--
+                                    FIXME: need to remove the geronimo-application.xml file from this ear.
+                                    -->
+                                    <destFileName>test-ear-j2ee_1.4-naked.ear</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <!--
-                    HACK: Copy the generated XmlBeans bits for clover
+                    NOTE: Unpack some deployment to test unpacked deployemnts... may want
+                          to create full unpacked archives to unpack with the dependency plugin/
                     -->
                     <execution>
-                        <id>generate-resources</id>
-                        <phase>generate-resources</phase>
+                        <id>unpack-test-deployments</id>
+                        <phase>generate-test-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
-                                <copy todir="${pom.basedir}/target/clover/classes">
-                                    <fileset dir="${pom.basedir}/target/classes">
-                                        <include name="schemaorg_apache_xmlbeans/**"/>
-                                    </fileset>
-                                </copy>
+                                <mkdir dir="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear"/>
+                                <unzip src="${project.build.directory}/test-ear-j2ee_1.4.ear"
+                                    dest="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear"/>
+                                
+                                <mkdir dir="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear"/>
+                                <unzip src="${project.build.directory}/test-ear-j2ee_1.4-naked.ear"
+                                    dest="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear"/>
                             </tasks>
                         </configuration>
                     </execution>
                     
                     <!--
-                    FIXME: WTF is this for?  Document or remove
+                    HACK: Copy the generated XmlBeans bits for clover
                     -->
                     <execution>
-                        <id>process-test-resources</id>
-                        <phase>process-test-resources</phase>
+                        <id>generate-resources</id>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <tasks>
-                                <echo message="classpath=${project.compileClasspathElements}"
-                                      file="classpath.properties"/>
-                                <ant antfile="${basedir}/src/test/test-setup.xml">
-                                    <property name="maven.compile.source" value="1.4"/>
-                                    <property name="maven.compile.target" value="1.4"/>
-                                </ant>
-                                <delete file="classpath.properties" failonerror="false"/>
+                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
+                                <copy todir="${pom.basedir}/target/clover/classes">
+                                    <fileset dir="${pom.basedir}/target/classes">
+                                        <include name="schemaorg_apache_xmlbeans/**"/>
+                                    </fileset>
+                                </copy>
                             </tasks>
                         </configuration>
                     </execution>
@@ -137,13 +165,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
                 <configuration>
-                    <!--
-                    FIXME: Remove when using m2 layout
-                    -->
-                    <schemaDirectory>${pom.basedir}/src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">${pom.basedir}/src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
                     <sourceSchemas>geronimo-application-1.2.xsd</sourceSchemas>
                 </configuration>
             </plugin>

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Tue Sep  5 05:58:05 2006
@@ -23,6 +23,7 @@
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.DeployableModule;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -33,12 +34,12 @@
  */
 public class AppClientModule extends Module {
     private final Environment clientEnvironment;
-    private JarFile earFile;
+    private DeployableModule ear;
     private Collection resourceModules;
 
 
-    public AppClientModule(boolean standAlone, AbstractName moduleName, Environment serverEnvironment, Environment clientEnvironment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
-        super(standAlone, moduleName, serverEnvironment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
+    public AppClientModule(boolean standAlone, AbstractName moduleName, Environment serverEnvironment, Environment clientEnvironment, DeployableModule deployableModule, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
+        super(standAlone, moduleName, serverEnvironment, deployableModule, targetPath, specDD, vendorDD, originalSpecDD, null);
         this.clientEnvironment = clientEnvironment;
     }
 
@@ -50,12 +51,12 @@
         return clientEnvironment;
     }
 
-    public JarFile getEarFile() {
-        return earFile;
+    public DeployableModule getEar() {
+        return ear;
     }
 
-    public void setEarFile(JarFile earFile) {
-        this.earFile = earFile;
+    public void setEar(DeployableModule ear) {
+        this.ear = ear;
     }
 
     public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java Tue Sep  5 05:58:05 2006
@@ -22,6 +22,7 @@
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.DeployableModule;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -31,8 +32,8 @@
  * @version $Rev$ $Date$
  */
 public class ConnectorModule extends Module {
-    public ConnectorModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
-        super(standAlone, moduleName, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
+    public ConnectorModule(boolean standAlone, AbstractName moduleName, Environment environment, DeployableModule deployableModule, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
+        super(standAlone, moduleName, environment, deployableModule, targetPath, specDD, vendorDD, originalSpecDD, null);
     }
 
     public ConfigurationModuleType getType() {

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Tue Sep  5 05:58:05 2006
@@ -41,11 +41,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.ConfigurationBuilder;
-import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.ModuleIDBuilder;
-import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
-import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
+import org.apache.geronimo.deployment.*;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.NestedJarFile;
@@ -269,7 +265,7 @@
         return (ServiceReferenceBuilder) serviceReferenceBuilder.getElement();
     }
 
-    public Object getDeploymentPlan(File planFile, JarFile jarFile, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Object getDeploymentPlan(File planFile, DeployableModule jarFile, ModuleIDBuilder idBuilder) throws DeploymentException {
         if (planFile == null && jarFile == null) {
             return null;
         }
@@ -310,12 +306,12 @@
                 null);
     }
 
-    private ApplicationInfo getEarPlan(File planFile, JarFile earFile, ModuleIDBuilder idBuilder) throws DeploymentException {
+    private ApplicationInfo getEarPlan(File planFile, DeployableModule earFile, ModuleIDBuilder idBuilder) throws DeploymentException {
         String specDD;
         ApplicationType application = null;
         if (earFile != null) {
             try {
-                URL applicationXmlUrl = DeploymentUtil.createJarURL(earFile, "META-INF/application.xml");
+                URL applicationXmlUrl = earFile.resolve("META-INF/application.xml");
                 specDD = DeploymentUtil.readAll(applicationXmlUrl);
             } catch (Exception e) {
                 //no application.xml, not for us
@@ -342,7 +338,7 @@
                         return null;
                     }
                 } else {
-                    URL path = DeploymentUtil.createJarURL(earFile, "META-INF/geronimo-application.xml");
+                    URL path = earFile.resolve("META-INF/geronimo-application.xml");
                     rawPlan = XmlBeansUtil.parse(path, getClass().getClassLoader());
                     gerApplication = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, APPLICATION_QNAME, GerApplicationType.type);
                 }
@@ -360,7 +356,7 @@
 
         EnvironmentType environmentType = gerApplication.getEnvironment();
         Environment environment = EnvironmentBuilder.buildEnvironment(environmentType, defaultEnvironment);
-        idBuilder.resolve(environment, earFile == null ? planFile.getName() : new File(earFile.getName()).getName(), "ear");
+        idBuilder.resolve(environment, earFile == null ? planFile.getName() : earFile.getRoot().getName(), "ear");
         // Make this EAR's settings the default for child modules
         idBuilder.setDefaultGroup(environment.getConfigId().getGroupId());
         idBuilder.setDefaultVersion(environment.getConfigId().getVersion());
@@ -403,7 +399,7 @@
     }
 
 
-    private GerApplicationType createDefaultPlan(ApplicationType application, JarFile module) {
+    private GerApplicationType createDefaultPlan(ApplicationType application, DeployableModule module) {
         // construct the empty geronimo-application.xml
         GerApplicationType gerApplication = GerApplicationType.Factory.newInstance();
         EnvironmentType environmentType = gerApplication.addNewEnvironment();
@@ -414,8 +410,7 @@
         // set the configId
         String id = application.getId();
         if (id == null) {
-            File fileName = new File(module.getName());
-            id = fileName.getName();
+            id = module.getRoot().getName();
             if (id.endsWith(".ear")) {
                 id = id.substring(0, id.length() - 4);
             }
@@ -430,7 +425,7 @@
         return gerApplication;
     }
 
-    public Artifact getConfigurationID(Object plan, JarFile module, ModuleIDBuilder idBuilder) throws IOException, DeploymentException {
+    public Artifact getConfigurationID(Object plan, DeployableModule module, ModuleIDBuilder idBuilder) throws IOException, DeploymentException {
         ApplicationInfo applicationInfo = (ApplicationInfo) plan;
         Artifact test = applicationInfo.getEnvironment().getConfigId();
         if(!test.isResolved()) {
@@ -439,7 +434,7 @@
         return test;
     }
 
-    public DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, Object plan, JarFile earFile, Collection configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException {
+    public DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, Object plan, DeployableModule earFile, Collection configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException {
         assert plan != null;
         ApplicationInfo applicationInfo = (ApplicationInfo) plan;
 
@@ -460,7 +455,7 @@
         try {
             // Create the output ear context
             earContext = new EARContext(configurationDir,
-                    inPlaceDeployment ? DeploymentUtil.toFile(earFile) : null,
+                    inPlaceDeployment && earFile.getRoot().isDirectory() ? earFile.getRoot() : null,
                     applicationInfo.getEnvironment(),
                     applicationType,
                     naming,
@@ -475,24 +470,29 @@
                     corbaGBeanObjectName,
                     new RefContext(getEjbReferenceBuilder(), getResourceReferenceBuilder(), getServiceReferenceBuilder()));
 
-            // Copy over all files that are _NOT_ modules (e.g. META-INF and APP-INF files)
-            Set moduleLocations = applicationInfo.getModuleLocations();
-            if (ConfigurationModuleType.EAR == applicationType && earFile != null) {
-                for (Enumeration e = earFile.entries(); e.hasMoreElements();) {
-                    ZipEntry entry = (ZipEntry) e.nextElement();
-                    String entryName = entry.getName();
-                    boolean addEntry = true;
-                    for (Iterator iter = moduleLocations.iterator(); iter.hasNext();) {
-                        String location = (String) iter.next();
-                        if (entryName.startsWith(location)) {
-                            addEntry = false;
-                            break;
+            if (earFile instanceof DefaultDeployableModule) {
+                JarFile jar = ((DefaultDeployableModule) earFile).getJarFile();
+                // Copy over all files that are _NOT_ modules (e.g. META-INF and APP-INF files)
+                Set moduleLocations = applicationInfo.getModuleLocations();
+                if (ConfigurationModuleType.EAR == applicationType && earFile != null) {
+                    for (Enumeration e = jar.entries(); e.hasMoreElements();) {
+                        ZipEntry entry = (ZipEntry) e.nextElement();
+                        String entryName = entry.getName();
+                        boolean addEntry = true;
+                        for (Iterator iter = moduleLocations.iterator(); iter.hasNext();) {
+                            String location = (String) iter.next();
+                            if (entryName.startsWith(location)) {
+                                addEntry = false;
+                                break;
+                            }
+                        }
+                        if (addEntry) {
+                            earContext.addFile(URI.create(entry.getName()), jar, entry);
                         }
-                    }
-                    if (addEntry) {
-                        earContext.addFile(URI.create(entry.getName()), earFile, entry);
                     }
                 }
+            } else {
+                //TODO GERONIMO-1526
             }
 
             GerApplicationType geronimoApplication = (GerApplicationType) applicationInfo.getVendorDD();
@@ -630,7 +630,7 @@
         return filter;
     }
 
-    private void addModules(JarFile earFile, ApplicationType application, GerApplicationType gerApplication, Set moduleLocations, LinkedHashSet modules, Environment environment, AbstractName earName, ModuleIDBuilder idBuilder) throws DeploymentException {
+    private void addModules(DeployableModule earFile, ApplicationType application, GerApplicationType gerApplication, Set moduleLocations, LinkedHashSet modules, Environment environment, AbstractName earName, ModuleIDBuilder idBuilder) throws DeploymentException {
         Map altVendorDDs = new HashMap();
         try {
             if (earFile != null) {
@@ -732,21 +732,21 @@
                     URL altSpecDD = null;
                     if (moduleXml.isSetAltDd()) {
                         try {
-                            altSpecDD = DeploymentUtil.createJarURL(earFile, moduleXml.getAltDd().getStringValue());
-                        } catch (MalformedURLException e) {
+                            altSpecDD = earFile.resolve(moduleXml.getAltDd().getStringValue());
+                        } catch (IOException e) {
                             throw new DeploymentException("Invalid alt sped dd url: " + moduleXml.getAltDd().getStringValue(), e);
                         }
                     }
 
-                    NestedJarFile moduleFile;
+                    DeployableModule childModule;
                     try {
-                        moduleFile = new NestedJarFile(earFile, modulePath);
+                        childModule = earFile.resolveModule(modulePath);
                     } catch (IOException e) {
                         throw new DeploymentException("Invalid moduleFile: " + modulePath, e);
                     }
 
                     Module module = builder.createModule(altVendorDDs.get(modulePath),
-                            moduleFile,
+                            childModule,
                             modulePath,
                             altSpecDD,
                             environment,
@@ -811,12 +811,11 @@
                 }
                 Object vendorDD = anys[0];
 
-                JarFile moduleFile;
+                DeployableModule deployable;
                 if (gerExtModule.isSetInternalPath()) {
                     String modulePath = gerExtModule.getInternalPath().trim();
-                    moduleLocations.add(modulePath);
                     try {
-                        moduleFile = new NestedJarFile(earFile, modulePath);
+                        deployable = earFile.resolveModule(modulePath);
                     } catch (IOException e) {
                         throw new DeploymentException("Invalid moduleFile: " + modulePath, e);
                     }
@@ -835,7 +834,8 @@
                         throw new DeploymentException(moduleTypeName + " is missing in repositories: " + path);
                     }
                     try {
-                        moduleFile = new JarFile(location);
+                        deployable = DeployableModuleFactory.createDeployableModule(location, null);
+                        new JarFile(location);
                     } catch (IOException e) {
                         throw new DeploymentException("Could not access contents of " + moduleTypeName, e);
                     }
@@ -855,7 +855,7 @@
 
 
                 Module module = builder.createModule(vendorDD,
-                        moduleFile,
+                        deployable,
                         moduleName,
                         altSpecDD,
                         environment,

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EJBModule.java Tue Sep  5 05:58:05 2006
@@ -22,6 +22,7 @@
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.DeployableModule;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -33,8 +34,8 @@
 public class EJBModule extends Module {
     private AbstractName moduleCmpEngineName;
 
-    public EJBModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
-        super(standAlone, moduleName, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
+    public EJBModule(boolean standAlone, AbstractName moduleName, Environment environment, DeployableModule deployableModule, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
+        super(standAlone, moduleName, environment, deployableModule, targetPath, specDD, vendorDD, originalSpecDD, null);
     }
 
     public ConfigurationModuleType getType() {

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/Module.java Tue Sep  5 05:58:05 2006
@@ -27,6 +27,7 @@
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.DeployableModule;
 import org.apache.geronimo.gbean.AbstractName;
 
 /**
@@ -39,7 +40,7 @@
     private final String name;
     private final Environment environment;
     private final URI moduleURI;
-    private final JarFile moduleFile;
+    private final DeployableModule deployableModule;
     private final String targetPath;
     private final URI targetPathURI;
     private final XmlObject specDD;
@@ -51,14 +52,14 @@
 
     private URI uniqueModuleLocation;
 
-    protected Module(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String namespace) {
+    protected Module(boolean standAlone, AbstractName moduleName, Environment environment, DeployableModule deployableModule, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String namespace) {
         assert targetPath != null: "targetPath is null";
         assert moduleName != null: "moduleName is null";
 
         this.standAlone = standAlone;
         this.moduleName = moduleName;
         this.environment = environment;
-        this.moduleFile = moduleFile;
+        this.deployableModule = deployableModule;
         this.targetPath = targetPath;
         this.specDD = specDD;
         this.vendorDD = vendorDD;
@@ -98,8 +99,8 @@
         return moduleURI;
     }
 
-    public JarFile getModuleFile() {
-        return moduleFile;
+    public DeployableModule getModuleFile() {
+        return deployableModule;
     }
 
     public String getTargetPath() {
@@ -142,7 +143,7 @@
     }
 
     public void close() {
-        DeploymentUtil.close(moduleFile);
+        deployableModule.cleanup();
     }
 
     public void addClass(String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java Tue Sep  5 05:58:05 2006
@@ -27,16 +27,17 @@
 import org.apache.geronimo.kernel.config.ConfigurationStore;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
 
 /**
  * @version $Rev:386276 $ $Date$
  */
 public interface ModuleBuilder {
-    Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException;
+    Module createModule(File plan, DeployableModule moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException;
 
-    Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException;
+    Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException;
 
-    void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException;
+    void installModule(DeployableModule earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException;
 
     void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException;
 

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Tue Sep  5 05:58:05 2006
@@ -19,6 +19,7 @@
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.ReferenceCollection;
@@ -40,7 +41,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.jar.JarFile;
 
 /**
  * @version $Rev:386276 $ $Date$
@@ -82,7 +82,7 @@
         this.defaultNamespace = defaultNamespace;
     }
 
-    public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Module createModule(File plan, DeployableModule deployableModule, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         String namespace;
         if (plan == null) {
             namespace = defaultNamespace;
@@ -91,7 +91,7 @@
         }
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
         if (builder != null) {
-            return builder.createModule(plan, moduleFile, naming, idBuilder);
+            return builder.createModule(plan, deployableModule, naming, idBuilder);
         } else {
             return null;
         }
@@ -134,20 +134,20 @@
         return builder;
     }
 
-    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Module createModule(Object plan, DeployableModule deployableModule, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         String namespace = getNamespaceFromPlan(plan);
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
         if (builder != null) {
-            return builder.createModule(plan, moduleFile, targetPath, specDDUrl, environment, moduleContextInfo, earName, naming, idBuilder);
+            return builder.createModule(plan, deployableModule, targetPath, specDDUrl, environment, moduleContextInfo, earName, naming, idBuilder);
         } else {
             return null;
         }
     }
 
-    public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
+    public void installModule(DeployableModule ear, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
         String namespace = module.getNamespace();
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
-        builder.installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repositories);
+        builder.installModule(ear, earContext, module, configurationStores, targetConfigurationStore, repositories);
     }
 
     public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableModuleBuilder.java Tue Sep  5 05:58:05 2006
@@ -14,21 +14,22 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
 
 /**
  * @version $Rev$ $Date$
  */
 public class UnavailableModuleBuilder implements ModuleBuilder {
 
-    public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Module createModule(File plan, DeployableModule deployableModule, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
             return null;
     }
 
-    public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+    public Module createModule(Object plan, DeployableModule deployableModule, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
             return null;
     }
 
-    public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
+    public void installModule(DeployableModule earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
         throw new DeploymentException("Module type unavailable");
     }
 

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/UnavailableWebServiceBuilder.java Tue Sep  5 05:58:05 2006
@@ -26,21 +26,22 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.deployment.DeployableModule;
 
 /**
  * @version $Rev$ $Date$
  */
 public class UnavailableWebServiceBuilder implements WebServiceBuilder {
 
-    public Map parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, boolean isEJB, Map correctedPortLocations) throws DeploymentException {
+    public Map parseWebServiceDescriptor(URL wsDDUrl, DeployableModule moduleFile, boolean isEJB, Map correctedPortLocations) throws DeploymentException {
         return new HashMap();
     }
 
-    public void configurePOJO(GBeanData targetGBean, JarFile moduleFile, Object portInfo, String seiClassName, ClassLoader classLoader) throws DeploymentException {
+    public void configurePOJO(GBeanData targetGBean, DeployableModule moduleFile, Object portInfo, String seiClassName, ClassLoader classLoader) throws DeploymentException {
         throw new DeploymentException("Web services are not available in this configuration");
     }
 
-    public void configureEJB(GBeanData targetGBean, JarFile moduleFile, Object portInfoObject, ClassLoader classLoader) throws DeploymentException {
+    public void configureEJB(GBeanData targetGBean, DeployableModule moduleFile, Object portInfoObject, ClassLoader classLoader) throws DeploymentException {
         throw new DeploymentException("Web services are not available in this configuration");
     }
 

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebModule.java Tue Sep  5 05:58:05 2006
@@ -23,6 +23,7 @@
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.DeployableModule;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
@@ -35,8 +36,8 @@
     private final String contextRoot;
     private final Map portMap;
 
-    public WebModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String contextRoot, Map portMap, String namespace) {
-        super(standAlone, moduleName, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, namespace);
+    public WebModule(boolean standAlone, AbstractName moduleName, Environment environment, DeployableModule deployableModule, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String contextRoot, Map portMap, String namespace) {
+        super(standAlone, moduleName, environment, deployableModule, targetPath, specDD, vendorDD, originalSpecDD, namespace);
         this.contextRoot = contextRoot;
         this.portMap = portMap;
     }

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/WebServiceBuilder.java Tue Sep  5 05:58:05 2006
@@ -18,6 +18,8 @@
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.deployment.DeployableModule;
+
 import java.util.jar.JarFile;
 import java.util.Map;
 import java.net.URL;
@@ -27,7 +29,7 @@
  */
 public interface WebServiceBuilder {
 
-    Map parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, boolean isEJB, Map correctedPortLocations) throws DeploymentException;
+    Map parseWebServiceDescriptor(URL wsDDUrl, DeployableModule deployableModule, boolean isEJB, Map correctedPortLocations) throws DeploymentException;
 
     //obviously these need the deployment descriptors, but I'm not sure in what form yet.
     /**
@@ -35,21 +37,21 @@
      * The GBeanData will be for a ServletHolder like gbean that is adapted to holding a ws stack that talks to a
      * POJO web service.  The web deployer is responsible for filling in the standard servlet info such as init params.
      * @param targetGBean
-     * @param moduleFile
+     * @param deployableModule
      * @param portInfo
      * @param seiClassName
      * @throws DeploymentException
      */
-    void configurePOJO(GBeanData targetGBean, JarFile moduleFile, Object portInfo, String seiClassName, ClassLoader classLoader) throws DeploymentException;
+    void configurePOJO(GBeanData targetGBean, DeployableModule deployableModule, Object portInfo, String seiClassName, ClassLoader classLoader) throws DeploymentException;
 
     /**
      * configure the supplied EJBContainer gbeandata to implement the ejb web service described in the deployment descriptor
      * N.B. this method is a complete guess and should be replaced by something useable right away!
      * @param targetGBean
-     * @param moduleFile
+     * @param deployableModule
      * @param classLoader
      * @throws DeploymentException
      */
-    void configureEJB(GBeanData targetGBean, JarFile moduleFile, Object portInfo, ClassLoader classLoader) throws DeploymentException;
+    void configureEJB(GBeanData targetGBean, DeployableModule deployableModule, Object portInfo, ClassLoader classLoader) throws DeploymentException;
 
 }

Copied: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java (from r440332, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java?view=diff&rev=440336&p1=geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java&r1=440332&p2=geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java&r2=440336
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java Tue Sep  5 05:58:05 2006
@@ -1,22 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/**
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * Copyright 2004 The Apache Software Foundation
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
-
 package org.apache.geronimo.j2ee.deployment;
 
 import java.net.URI;



Mime
View raw message