geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r513564 [2/3] - in /geronimo/server/trunk/modules: geronimo-axis-builder/src/test/java/org/apache/geronimo/axis/builder/ geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/ geronimo-connector-builder/src/main/java/org/...
Date Fri, 02 Mar 2007 00:49:52 GMT
Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ResourceAnnotationHelper.java Thu Mar  1 16:49:50 2007
@@ -17,27 +17,17 @@
 
 package org.apache.geronimo.j2ee.deployment.annotation;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Generated;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+
 import javax.annotation.Resource;
 import javax.annotation.Resources;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.DenyAll;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.annotation.security.RunAs;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.xbeans.javaee.DescriptionType;
 import org.apache.geronimo.xbeans.javaee.EnvEntryType;
@@ -46,16 +36,13 @@
 import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
 import org.apache.geronimo.xbeans.javaee.JavaIdentifierType;
 import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.ListenerType;
 import org.apache.geronimo.xbeans.javaee.MessageDestinationRefType;
 import org.apache.geronimo.xbeans.javaee.MessageDestinationTypeType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
-import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceRefType;
 import org.apache.geronimo.xbeans.javaee.ResAuthType;
 import org.apache.geronimo.xbeans.javaee.ResSharingScopeType;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
+import org.apache.geronimo.xbeans.javaee.ResourceRefType;
+import org.apache.geronimo.xbeans.javaee.ServiceRefType;
 import org.apache.geronimo.xbeans.javaee.XsdAnyURIType;
 import org.apache.geronimo.xbeans.javaee.XsdStringType;
 import org.apache.xbean.finder.ClassFinder;
@@ -63,26 +50,25 @@
 
 /**
  * Static helper class used to encapsulate all the functions related to the translation of
- *
- * @EJB and @EBJs annotations to deployment descriptor tags. The ResourceAnnotationHelper class can be
- * used as part of the deployment of a module into the Geronimo server. It performs the following
- * major functions:
- *
+ * <strong>@Resource</strong> and <strong>@Resources</strong> annotations to deployment descriptor
+ * tags. The ResourceAnnotationHelper class can be used as part of the deployment of a module into
+ * the Geronimo server. It performs the following major functions:
+ * <p/>
  * <ol>
- *      <li>Translates annotations into corresponding deployment descriptor elements (so that the
- *      actual deployment descriptor in the module can be updated or even created if necessary)
+ * <li>Translates annotations into corresponding deployment descriptor elements (so that the
+ * actual deployment descriptor in the module can be updated or even created if necessary)
  * </ol>
- *
+ * <p/>
  * <p><strong>Note(s):</strong>
  * <ul>
- *      <li>The user is responsible for invoking change to metadata-complete
- *      <li>This helper class will validate any changes it makes to the deployment descriptor. An
- *      exception will be thrown if it fails to parse
+ * <li>The user is responsible for invoking change to metadata-complete
+ * <li>This helper class will validate any changes it makes to the deployment descriptor. An
+ * exception will be thrown if it fails to parse
  * </ul>
- *
+ * <p/>
  * <p><strong>Remaining ToDo(s):</strong>
  * <ul>
- *      <li>How to determine Session/Entity remote/local for @EJB
+ * <li>None
  * </ul>
  *
  * @version $Rev$ $Date$
@@ -91,7 +77,7 @@
 public final class ResourceAnnotationHelper {
 
     // Private instance variables
-    private static final Log log = LogFactory.getLog( ResourceAnnotationHelper.class );
+    private static final Log log = LogFactory.getLog(ResourceAnnotationHelper.class);
 
     // Private constructor to prevent instantiation
     private ResourceAnnotationHelper() {
@@ -103,9 +89,9 @@
      *
      * @return true or false
      */
-    public static boolean annotationsPresent( ClassFinder classFinder ) {
-        if ( classFinder.isAnnotationPresent(Resource.class) ) return true;
-        if ( classFinder.isAnnotationPresent(Resources.class) ) return true;
+    public static boolean annotationsPresent(ClassFinder classFinder) {
+        if (classFinder.isAnnotationPresent(Resource.class)) return true;
+        if (classFinder.isAnnotationPresent(Resources.class)) return true;
         return false;
     }
 
@@ -113,124 +99,123 @@
      * Process the Resource set of annotations
      *
      * @return Updated deployment descriptor
-     * @exception Exception if parsing or validation error
+     * @throws Exception if parsing or validation error
      */
-    public static WebAppType processAnnotations( WebAppType webApp, ClassFinder classFinder ) throws Exception {
-        processResources( webApp,classFinder );
-        processResource( webApp,classFinder );
-        return webApp;
+    public static void processAnnotations(AnnotatedApp annotatedApp, ClassFinder classFinder) throws Exception {
+        if (annotatedApp != null) {
+            processResources(annotatedApp, classFinder);
+            processResource(annotatedApp, classFinder);
+        }
     }
 
 
     /**
-     *  Process @Resource annotations
+     * Process @Resource annotations
      *
      * @return
-     * @exception Exception
+     * @throws Exception
      */
-    private static void processResource( WebAppType webApp, ClassFinder classFinder ) throws Exception {
-        log.debug( "processResource(): Entry: webApp: " + webApp.toString() );
+    private static void processResource(AnnotatedApp annotatedApp, ClassFinder classFinder) throws Exception {
+        log.debug("processResource(): Entry: AnnotatedApp: " + annotatedApp.toString());
 
         //-----------------------------
         // Save the Resource lists
         //-----------------------------
-        List<Class>  classeswithResource = classFinder.findAnnotatedClasses( Resource.class );
-        List<Method> methodswithResource = classFinder.findAnnotatedMethods( Resource.class );
-        List<Field>  fieldswithResource  = classFinder.findAnnotatedFields ( Resource.class );
+        List<Class> classeswithResource = classFinder.findAnnotatedClasses(Resource.class);
+        List<Method> methodswithResource = classFinder.findAnnotatedMethods(Resource.class);
+        List<Field> fieldswithResource = classFinder.findAnnotatedFields(Resource.class);
 
         //--------------------------
         // Class-level Resource
         //--------------------------
-        for ( Class cls : classeswithResource ) {
-            Resource resource = (Resource)cls.getAnnotation( Resource.class );
-            if ( resource != null ) {
-                addResource( webApp, resource, cls, null, null );
+        for (Class cls : classeswithResource) {
+            Resource resource = (Resource) cls.getAnnotation(Resource.class);
+            if (resource != null) {
+                addResource(annotatedApp, resource, cls, null, null);
             }
         }
 
         //---------------------------
         // Method-level Resource
         //---------------------------
-        for ( Method method : methodswithResource ) {
-            Resource resource = (Resource)method.getAnnotation( Resource.class );
-            if ( resource != null ) {
-                addResource( webApp, resource, null, method, null );
+        for (Method method : methodswithResource) {
+            Resource resource = (Resource) method.getAnnotation(Resource.class);
+            if (resource != null) {
+                addResource(annotatedApp, resource, null, method, null);
             }
         }
 
         //--------------------------
         // Field-level Resource
         //--------------------------
-        for ( Field field : fieldswithResource ) {
-            Resource resource = (Resource)field.getAnnotation( Resource.class );
-            if ( resource != null ) {
-                addResource( webApp, resource, null, null, field );
+        for (Field field : fieldswithResource) {
+            Resource resource = (Resource) field.getAnnotation(Resource.class);
+            if (resource != null) {
+                addResource(annotatedApp, resource, null, null, field);
             }
         }
 
         //--------------------------------------------------------------
         // Validate deployment descriptor to ensure it's still okay
         //--------------------------------------------------------------
-        validateDD( webApp );
+        validateDD(annotatedApp);
 
-        log.debug( "processResource(): Exit: webApp: " + webApp.toString() );
+        log.debug("processResource(): Exit: AnnotatedApp: " + annotatedApp.toString());
     }
 
 
-
     /**
-     *  Process @Resources annotations
+     * Process @Resources annotations
      */
-    private static void processResources( WebAppType webApp, ClassFinder classFinder ) throws Exception {
-        log.debug( "processResources(): Entry" );
+    private static void processResources(AnnotatedApp annotatedApp, ClassFinder classFinder) throws Exception {
+        log.debug("processResources(): Entry");
 
         //-----------------------------
         // Save the Resources list
         //-----------------------------
-        List<Class> classeswithResources = classFinder.findAnnotatedClasses( Resources.class );
+        List<Class> classeswithResources = classFinder.findAnnotatedClasses(Resources.class);
 
         //---------------------------
         // Class-level Resources
         //---------------------------
         List<Resource> ResourceList = new ArrayList<Resource>();
-        for ( Class cls : classeswithResources ) {
-            Resources resources = (Resources) cls.getAnnotation( Resources.class );
-            if ( resources != null ) {
-                ResourceList.addAll( Arrays.asList(resources.value()) );
+        for (Class cls : classeswithResources) {
+            Resources resources = (Resources) cls.getAnnotation(Resources.class);
+            if (resources != null) {
+                ResourceList.addAll(Arrays.asList(resources.value()));
             }
-            for ( Resource resource : ResourceList ) {
-                addResource( webApp, resource, cls, null, null );
+            for (Resource resource : ResourceList) {
+                addResource(annotatedApp, resource, cls, null, null);
             }
             ResourceList.clear();
         }
 
-        log.debug( "processResources(): Exit" );
+        log.debug("processResources(): Exit");
     }
 
 
-
     /**
-     * Add @Resource and @Resources annotations to the deployment descriptor. XMLBeans are used to read and
-     * manipulate the deployment descriptor as necessary. The Resource annotation(s) will be converted to
-     * one of the following deployment descriptors:
-     *
+     * Add @Resource and @Resources annotations to the deployment descriptor. XMLBeans are used to
+     * read and manipulate the deployment descriptor as necessary. The Resource annotation(s) will be
+     * converted to one of the following deployment descriptors:
+     * <p/>
      * <ol>
-     *      <li><env-entry> -- Used to declare an application's environment entry
-     *      <li><service-ref> -- Declares a reference to a Web service
-     *      <li><resource-ref> -- Contains a declaration of a Deployment Component's reference to an
-     *      external resource
-     *      <li><message-destination-ref> -- Contains a declaration of Deployment Component's
-     *      reference to a message destination associated with a resource in Deployment Component's
-     *      environment
-     *      <li><resource-env-ref> -- Contains a declaration of a Deployment Component's reference to
-     *      an administered object associated with a resource in the Deployment Component's
-     *      environment
+     * <li><env-entry> -- Used to declare an application's environment entry
+     * <li><service-ref> -- Declares a reference to a Web service
+     * <li><resource-ref> -- Contains a declaration of a Deployment Component's reference to an
+     * external resource
+     * <li><message-destination-ref> -- Contains a declaration of Deployment Component's
+     * reference to a message destination associated with a resource in Deployment Component's
+     * environment
+     * <li><resource-env-ref> -- Contains a declaration of a Deployment Component's reference to
+     * an administered object associated with a resource in the Deployment Component's
+     * environment
      * </ol>
-     *
+     * <p/>
      * <p><strong>Note(s):</strong>
      * <ul>
-     *      <li>The deployment descriptor is the authoritative source so this method ensures that
-     *      existing elements in it are not overwritten by annoations
+     * <li>The deployment descriptor is the authoritative source so this method ensures that
+     * existing elements in it are not overwritten by annoations
      * </ul>
      *
      * @param annotation @Resource annotation
@@ -238,12 +223,12 @@
      * @param method     Method name with the @Resource annoation
      * @param field      Field name with the @Resource annoation
      */
-    private static void addResource( WebAppType webApp, Resource annotation, Class cls, Method method, Field field ) {
-        log.debug( "addResource( " + webApp.toString() + ","     + '\n' +
-                  annotation.name() + ","                       + '\n' +
-                  (cls!=null?cls.getName():null) + ","          + '\n' +
-                  (method!=null?method.getName():null) + ","    + '\n' +
-                  (field!=null?field.getName():null) + " ): Entry" );
+    private static void addResource(AnnotatedApp annotatedApp, Resource annotation, Class cls, Method method, Field field) {
+        log.debug("addResource( " + annotatedApp.toString() + "," + '\n' +
+                annotation.name() + "," + '\n' +
+                (cls != null ? cls.getName() : null) + "," + '\n' +
+                (method != null ? method.getName() : null) + "," + '\n' +
+                (field != null ? field.getName() : null) + " ): Entry");
 
         //------------------------------------------------------------------------------------------
         // Resource name:
@@ -254,17 +239,16 @@
         //                                              (or as provided on the annotation)
         //------------------------------------------------------------------------------------------
         String resourceName = annotation.name();
-        if ( resourceName.equals("") ) {
-            if ( method != null ) {
-                StringBuilder stringBuilder = new StringBuilder( method.getName().substring(3) );
-                stringBuilder.setCharAt( 0,Character.toLowerCase(stringBuilder.charAt(0)) );
+        if (resourceName.equals("")) {
+            if (method != null) {
+                StringBuilder stringBuilder = new StringBuilder(method.getName().substring(3));
+                stringBuilder.setCharAt(0, Character.toLowerCase(stringBuilder.charAt(0)));
                 resourceName = method.getDeclaringClass().getName() + "/" + stringBuilder.toString();
-            }
-            else if ( field != null ) {
+            } else if (field != null) {
                 resourceName = field.getDeclaringClass().getName() + "/" + field.getName();
             }
         }
-        log.debug( "addResource(): resourceName: " + resourceName );
+        log.debug("addResource(): resourceName: " + resourceName);
 
         //------------------------------------------------------------------------------------------
         // Resource type:
@@ -275,15 +259,14 @@
         //                                              annotation)
         //------------------------------------------------------------------------------------------
         String resourceType = annotation.type().getCanonicalName();
-        if ( resourceType.equals("") || resourceType.equals(Object.class.getName()) ) {
-            if ( method != null ) {
+        if (resourceType.equals("") || resourceType.equals(Object.class.getName())) {
+            if (method != null) {
                 resourceType = method.getParameterTypes()[0].getCanonicalName();
-            }
-            else if ( field != null ) {
+            } else if (field != null) {
                 resourceType = field.getType().getName();
             }
         }
-        log.debug( "addResource(): resourceType: " + resourceType );
+        log.debug("addResource(): resourceType: " + resourceType);
 
         //------------------------------------------------------------------------------------------
         // Method name (for setter-based injection) must follow JavaBeans conventions:
@@ -292,21 +275,19 @@
         // -- Return void
         //------------------------------------------------------------------------------------------
         String injectionJavaType = "";
-        String injectionClass  = null;
-        if ( method != null ) {
+        String injectionClass = null;
+        if (method != null) {
             injectionJavaType = method.getName().substring(3);
-            StringBuilder stringBuilder = new StringBuilder( injectionJavaType );
-            stringBuilder.setCharAt( 0,Character.toLowerCase(stringBuilder.charAt(0)) );
+            StringBuilder stringBuilder = new StringBuilder(injectionJavaType);
+            stringBuilder.setCharAt(0, Character.toLowerCase(stringBuilder.charAt(0)));
             injectionJavaType = stringBuilder.toString();
             injectionClass = method.getDeclaringClass().getName();
-        }
-        else if ( field != null ) {
+        } else if (field != null) {
             injectionJavaType = field.getName();
             injectionClass = field.getDeclaringClass().getName();
         }
-        log.debug( "addResource(): injectionJavaType: " + injectionJavaType );
-        log.debug( "addResource(): injectionClass   : " + injectionClass );
-
+        log.debug("addResource(): injectionJavaType: " + injectionJavaType);
+        log.debug("addResource(): injectionClass   : " + injectionClass);
 
         // 0. exclusions
         //  WebServiceContext
@@ -317,31 +298,31 @@
         //------------------------------------------------------------------------------------------
         // 1. <env-entry>
         //------------------------------------------------------------------------------------------
-        if ( resourceType.equals( "java.lang.String" )      ||
-             resourceType.equals( "java.lang.Character" )   ||
-             resourceType.equals( "java.lang.Integer" )     ||
-             resourceType.equals( "java.lang.Boolean" )     ||
-             resourceType.equals( "java.lang.Double" )      ||
-             resourceType.equals( "java.lang.Byte" )        ||
-             resourceType.equals( "java.lang.Short" )       ||
-             resourceType.equals( "java.lang.Long" )        ||
-             resourceType.equals( "java.lang.Float" ) ) {
+        if (resourceType.equals("java.lang.String") ||
+                resourceType.equals("java.lang.Character") ||
+                resourceType.equals("java.lang.Integer") ||
+                resourceType.equals("java.lang.Boolean") ||
+                resourceType.equals("java.lang.Double") ||
+                resourceType.equals("java.lang.Byte") ||
+                resourceType.equals("java.lang.Short") ||
+                resourceType.equals("java.lang.Long") ||
+                resourceType.equals("java.lang.Float")) {
 
-            log.debug( "addResource(): <env-entry> found");
+            log.debug("addResource(): <env-entry> found");
 
             boolean exists = false;
-            EnvEntryType[] envEntries = webApp.getEnvEntryArray();
-            for ( EnvEntryType envEntry : envEntries ) {
-                if ( envEntry.getEnvEntryName().getStringValue().equals(resourceName) ) {
+            EnvEntryType[] envEntries = annotatedApp.getEnvEntryArray();
+            for (EnvEntryType envEntry : envEntries) {
+                if (envEntry.getEnvEntryName().getStringValue().equals(resourceName)) {
                     exists = true;
                     break;
                 }
             }
-            if ( !exists ) {
+            if (!exists) {
                 try {
 
                     // Doesn't exist in deployment descriptor -- add new
-                    EnvEntryType envEntry = webApp.addNewEnvEntry();
+                    EnvEntryType envEntry = annotatedApp.addNewEnvEntry();
 
                     //------------------------------------------------------------------------------
                     // <env-entry> required elements:
@@ -349,14 +330,13 @@
 
                     // env-entry-name
                     JndiNameType envEntryName = envEntry.addNewEnvEntryName();
-                    envEntryName.setStringValue( resourceName );
+                    envEntryName.setStringValue(resourceName);
 
-                    if ( !resourceType.equals("") ) {
+                    if (!resourceType.equals("")) {
                         // env-entry-type
                         EnvEntryTypeValuesType envEntryType = envEntry.addNewEnvEntryType();
-                        envEntryType.setStringValue( resourceType );
-                    }
-                    else if ( !injectionJavaType.equals("") ) {
+                        envEntryType.setStringValue(resourceType);
+                    } else if (!injectionJavaType.equals("")) {
                         // injectionTarget
                         InjectionTargetType injectionTarget = envEntry.addNewInjectionTarget();
                         configureInjectionTarget(injectionTarget, injectionClass, injectionJavaType);
@@ -364,7 +344,7 @@
 
                     // env-entry-value
                     XsdStringType value = envEntry.addNewEnvEntryValue();
-                    value.setStringValue( annotation.mappedName() );
+                    value.setStringValue(annotation.mappedName());
 
                     //------------------------------------------------------------------------------
                     // <env-entry> optional elements:
@@ -372,14 +352,14 @@
 
                     // description
                     String descriptionAnnotation = annotation.description();
-                    if ( descriptionAnnotation != null && descriptionAnnotation.length() > 0 ) {
+                    if (descriptionAnnotation != null && descriptionAnnotation.length() > 0) {
                         DescriptionType description = envEntry.addNewDescription();
-                        description.setStringValue( descriptionAnnotation );
+                        description.setStringValue(descriptionAnnotation);
                     }
 
                 }
-                catch ( Exception anyException ) {
-                    log.debug( "ResourceAnnotationHelper: Exception caught while processing <env-entry>" );
+                catch (Exception anyException) {
+                    log.debug("ResourceAnnotationHelper: Exception caught while processing <env-entry>");
                 }
             }
         }
@@ -387,23 +367,23 @@
         //------------------------------------------------------------------------------------------
         // 2. <service-ref>
         //------------------------------------------------------------------------------------------
-        else if ( resourceType.equals("javax.xml.rpc.Service") ) {
+        else if (resourceType.equals("javax.xml.rpc.Service")) {
 
-            log.debug( "addResource(): <service-ref> found");
+            log.debug("addResource(): <service-ref> found");
 
             boolean exists = false;
-            ServiceRefType[] serviceRefs = webApp.getServiceRefArray();
-            for ( ServiceRefType serviceRef : serviceRefs ) {
-                if ( serviceRef.getServiceRefName().getStringValue().equals(resourceName) ) {
+            ServiceRefType[] serviceRefs = annotatedApp.getServiceRefArray();
+            for (ServiceRefType serviceRef : serviceRefs) {
+                if (serviceRef.getServiceRefName().getStringValue().equals(resourceName)) {
                     exists = true;
                     break;
                 }
             }
-            if ( !exists ) {
+            if (!exists) {
                 try {
 
                     // Doesn't exist in deployment descriptor -- add new
-                    ServiceRefType serviceRef = webApp.addNewServiceRef();
+                    ServiceRefType serviceRef = annotatedApp.addNewServiceRef();
 
                     //------------------------------------------------------------------------------
                     // <service-ref> required elements:
@@ -411,14 +391,13 @@
 
                     // service-ref-name
                     JndiNameType serviceRefName = serviceRef.addNewServiceRefName();
-                    serviceRefName.setStringValue( resourceName );
+                    serviceRefName.setStringValue(resourceName);
 
-                    if ( !resourceType.equals("") ) {
+                    if (!resourceType.equals("")) {
                         // service-ref-type
                         FullyQualifiedClassType qualifiedClass = serviceRef.addNewServiceInterface();
-                        qualifiedClass.setStringValue( resourceType );
-                    }
-                    else if ( !injectionJavaType.equals("") ) {
+                        qualifiedClass.setStringValue(resourceType);
+                    } else if (!injectionJavaType.equals("")) {
                         // injectionTarget
                         InjectionTargetType injectionTarget = serviceRef.addNewInjectionTarget();
                         configureInjectionTarget(injectionTarget, injectionClass, injectionJavaType);
@@ -430,22 +409,22 @@
 
                     // description
                     String descriptionAnnotation = annotation.description();
-                    if ( descriptionAnnotation.length() > 0 ) {
+                    if (descriptionAnnotation.length() > 0) {
                         DescriptionType description = serviceRef.addNewDescription();
-                        description.setStringValue( descriptionAnnotation );
+                        description.setStringValue(descriptionAnnotation);
                     }
 
                     // WSDL document location
                     String documentAnnotation = annotation.mappedName();
-                    if ( documentAnnotation.length() > 0 ) {
+                    if (documentAnnotation.length() > 0) {
                         XsdAnyURIType wsdlFile = XsdAnyURIType.Factory.newInstance();
-                        wsdlFile.setStringValue( annotation.mappedName() );
-                        serviceRef.setWsdlFile( wsdlFile );
+                        wsdlFile.setStringValue(annotation.mappedName());
+                        serviceRef.setWsdlFile(wsdlFile);
                     }
 
                 }
-                catch ( Exception anyException ) {
-                    log.debug( "ResourceAnnotationHelper: Exception caught while processing <service-ref>" );
+                catch (Exception anyException) {
+                    log.debug("ResourceAnnotationHelper: Exception caught while processing <service-ref>");
                     anyException.printStackTrace();
                 }
             }
@@ -454,31 +433,31 @@
         //------------------------------------------------------------------------------------------
         // 3. <resource-ref>
         //------------------------------------------------------------------------------------------
-        else if ( resourceType.equals("javax.sql.DataSource")                   ||
-                  resourceType.equals("javax.jms.ConnectionFactory")            ||
-                  resourceType.equals("javax.jms.QueueConnectionFactory")       ||
-                  resourceType.equals("javax.jms.TopicConnectionFactory")       ||
-                  resourceType.equals("javax.mail.Session")                     ||
-                  resourceType.equals("java.net.URL")                           ||
-                  resourceType.equals("javax.resource.cci.ConnectionFactory")   ||
-                  resourceType.equals("org.omg.CORBA_2_3.ORB")                  ||
-                  resourceType.endsWith("ConnectionFactory") ) {
+        else if (resourceType.equals("javax.sql.DataSource") ||
+                resourceType.equals("javax.jms.ConnectionFactory") ||
+                resourceType.equals("javax.jms.QueueConnectionFactory") ||
+                resourceType.equals("javax.jms.TopicConnectionFactory") ||
+                resourceType.equals("javax.mail.Session") ||
+                resourceType.equals("java.net.URL") ||
+                resourceType.equals("javax.resource.cci.ConnectionFactory") ||
+                resourceType.equals("org.omg.CORBA_2_3.ORB") ||
+                resourceType.endsWith("ConnectionFactory")) {
 
-            log.debug( "addResource(): <resource-ref> found");
+            log.debug("addResource(): <resource-ref> found");
 
             boolean exists = false;
-            ResourceRefType[] resourceRefs = webApp.getResourceRefArray();
-            for ( ResourceRefType resourceRef : resourceRefs ) {
-                if ( resourceRef.getResRefName().getStringValue().equals(resourceName) ) {
+            ResourceRefType[] resourceRefs = annotatedApp.getResourceRefArray();
+            for (ResourceRefType resourceRef : resourceRefs) {
+                if (resourceRef.getResRefName().getStringValue().equals(resourceName)) {
                     exists = true;
                     break;
                 }
             }
-            if ( !exists ) {
+            if (!exists) {
                 try {
 
                     // Doesn't exist in deployment descriptor -- add new
-                    ResourceRefType resourceRef = webApp.addNewResourceRef();
+                    ResourceRefType resourceRef = annotatedApp.addNewResourceRef();
 
                     //------------------------------------------------------------------------------
                     // <resource-ref> required elements:
@@ -486,27 +465,26 @@
 
                     // resource-ref-name
                     JndiNameType resourceRefName = JndiNameType.Factory.newInstance();
-                    resourceRefName.setStringValue( resourceName );
-                    resourceRef.setResRefName( resourceRefName );
+                    resourceRefName.setStringValue(resourceName);
+                    resourceRef.setResRefName(resourceRefName);
 
-                    if ( !resourceType.equals("") ) {
+                    if (!resourceType.equals("")) {
                         // resource-ref-type
                         FullyQualifiedClassType qualifiedClass = FullyQualifiedClassType.Factory.newInstance();
-                        qualifiedClass.setStringValue( resourceType );
-                        resourceRef.setResType( qualifiedClass );
-                    }
-                    else if ( !injectionJavaType.equals("") ) {
+                        qualifiedClass.setStringValue(resourceType);
+                        resourceRef.setResType(qualifiedClass);
+                    } else if (!injectionJavaType.equals("")) {
                         // injectionTarget
                         InjectionTargetType injectionTarget = InjectionTargetType.Factory.newInstance();
                         FullyQualifiedClassType qualifiedClass = FullyQualifiedClassType.Factory.newInstance();
                         JavaIdentifierType javaType = JavaIdentifierType.Factory.newInstance();
-                        qualifiedClass.setStringValue( injectionClass );
-                        javaType.setStringValue( injectionJavaType );
-                        injectionTarget.setInjectionTargetClass( qualifiedClass );
-                        injectionTarget.setInjectionTargetName( javaType );
+                        qualifiedClass.setStringValue(injectionClass);
+                        javaType.setStringValue(injectionJavaType);
+                        injectionTarget.setInjectionTargetClass(qualifiedClass);
+                        injectionTarget.setInjectionTargetName(javaType);
                         int arraySize = resourceRef.sizeOfInjectionTargetArray();
-                        resourceRef.insertNewInjectionTarget( arraySize );
-                        resourceRef.setInjectionTargetArray( arraySize, injectionTarget );
+                        resourceRef.insertNewInjectionTarget(arraySize);
+                        resourceRef.setInjectionTargetArray(arraySize, injectionTarget);
                     }
 
                     //------------------------------------------------------------------------------
@@ -515,40 +493,39 @@
 
                     // description
                     String descriptionAnnotation = annotation.description();
-                    if ( descriptionAnnotation.length() > 0 ) {
+                    if (descriptionAnnotation.length() > 0) {
                         DescriptionType description = DescriptionType.Factory.newInstance();
-                        description.setStringValue( descriptionAnnotation );
+                        description.setStringValue(descriptionAnnotation);
                         int arraySize = resourceRef.sizeOfDescriptionArray();
-                        resourceRef.insertNewDescription( arraySize );
-                        resourceRef.setDescriptionArray( arraySize,description );
+                        resourceRef.insertNewDescription(arraySize);
+                        resourceRef.setDescriptionArray(arraySize, description);
                     }
 
                     // authentication
                     ResAuthType resAuth = ResAuthType.Factory.newInstance();
-                    if ( annotation.authenticationType() == Resource.AuthenticationType.CONTAINER ) {
-                        resAuth.setStringValue( "Container" );
+                    if (annotation.authenticationType() == Resource.AuthenticationType.CONTAINER) {
+                        resAuth.setStringValue("Container");
+                    } else if (annotation.authenticationType() == Resource.AuthenticationType.APPLICATION) {
+                        resAuth.setStringValue("Application");
                     }
-                    else if ( annotation.authenticationType() == Resource.AuthenticationType.APPLICATION ) {
-                        resAuth.setStringValue( "Application" );
-                    }
-                    resourceRef.setResAuth( resAuth );
+                    resourceRef.setResAuth(resAuth);
 
                     // sharing scope
                     ResSharingScopeType resScope = ResSharingScopeType.Factory.newInstance();
-                    resScope.setStringValue( annotation.shareable() ? "Shareable" : "Unshareable" );
-                    resourceRef.setResSharingScope( resScope );
+                    resScope.setStringValue(annotation.shareable() ? "Shareable" : "Unshareable");
+                    resourceRef.setResSharingScope(resScope);
 
                     // mappedName
                     String mappdedNameAnnotation = annotation.mappedName();
-                    if ( mappdedNameAnnotation.length() > 0 ) {
+                    if (mappdedNameAnnotation.length() > 0) {
                         XsdStringType mappedName = XsdStringType.Factory.newInstance();
-                        mappedName.setStringValue( mappdedNameAnnotation );
-                        resourceRef.setMappedName( mappedName );
+                        mappedName.setStringValue(mappdedNameAnnotation);
+                        resourceRef.setMappedName(mappedName);
                     }
 
                 }
-                catch ( Exception anyException ) {
-                    log.debug( "ResourceAnnotationHelper: Exception caught while processing <resource-ref>" );
+                catch (Exception anyException) {
+                    log.debug("ResourceAnnotationHelper: Exception caught while processing <resource-ref>");
                     anyException.printStackTrace();
                 }
             }
@@ -557,24 +534,24 @@
         //------------------------------------------------------------------------------------------
         // 4. <message-destination-ref>
         //------------------------------------------------------------------------------------------
-        else if ( resourceType.equals("javax.jms.Queue")    ||
-                  resourceType.equals("javax.jms.Topic") ) {
+        else if (resourceType.equals("javax.jms.Queue") ||
+                resourceType.equals("javax.jms.Topic")) {
 
-            log.debug( "addResource(): <message-destination-ref> found");
+            log.debug("addResource(): <message-destination-ref> found");
 
             boolean exists = false;
-            MessageDestinationRefType[] messageDestinationRefs = webApp.getMessageDestinationRefArray();
-            for ( MessageDestinationRefType messageDestinationRef : messageDestinationRefs ) {
-                if ( messageDestinationRef.getMessageDestinationRefName().getStringValue().equals(resourceName) ) {
+            MessageDestinationRefType[] messageDestinationRefs = annotatedApp.getMessageDestinationRefArray();
+            for (MessageDestinationRefType messageDestinationRef : messageDestinationRefs) {
+                if (messageDestinationRef.getMessageDestinationRefName().getStringValue().equals(resourceName)) {
                     exists = true;
                     break;
                 }
             }
-            if ( !exists ) {
+            if (!exists) {
                 try {
 
                     // Doesn't exist in deployment descriptor -- add new
-                    MessageDestinationRefType messageDestinationRef = webApp.addNewMessageDestinationRef();
+                    MessageDestinationRefType messageDestinationRef = annotatedApp.addNewMessageDestinationRef();
 
                     //------------------------------------------------------------------------------
                     // <message-destination-ref> required elements:
@@ -582,27 +559,26 @@
 
                     // message-destination-ref-name
                     JndiNameType messageDestinationRefName = JndiNameType.Factory.newInstance();
-                    messageDestinationRefName.setStringValue( resourceName );
-                    messageDestinationRef.setMessageDestinationRefName( messageDestinationRefName );
+                    messageDestinationRefName.setStringValue(resourceName);
+                    messageDestinationRef.setMessageDestinationRefName(messageDestinationRefName);
 
-                    if ( !resourceType.equals("") ) {
+                    if (!resourceType.equals("")) {
                         // message-destination-ref-type
                         MessageDestinationTypeType msgDestType = MessageDestinationTypeType.Factory.newInstance();
-                        msgDestType.setStringValue( resourceType );
-                        messageDestinationRef.setMessageDestinationType( msgDestType );
-                    }
-                    else if ( !injectionJavaType.equals("") ) {
+                        msgDestType.setStringValue(resourceType);
+                        messageDestinationRef.setMessageDestinationType(msgDestType);
+                    } else if (!injectionJavaType.equals("")) {
                         // injectionTarget
                         InjectionTargetType injectionTarget = InjectionTargetType.Factory.newInstance();
                         FullyQualifiedClassType qualifiedClass = FullyQualifiedClassType.Factory.newInstance();
                         JavaIdentifierType javaType = JavaIdentifierType.Factory.newInstance();
-                        qualifiedClass.setStringValue( injectionClass );
-                        javaType.setStringValue( injectionJavaType );
-                        injectionTarget.setInjectionTargetClass( qualifiedClass );
-                        injectionTarget.setInjectionTargetName( javaType );
+                        qualifiedClass.setStringValue(injectionClass);
+                        javaType.setStringValue(injectionJavaType);
+                        injectionTarget.setInjectionTargetClass(qualifiedClass);
+                        injectionTarget.setInjectionTargetName(javaType);
                         int arraySize = messageDestinationRef.sizeOfInjectionTargetArray();
-                        messageDestinationRef.insertNewInjectionTarget( arraySize );
-                        messageDestinationRef.setInjectionTargetArray( arraySize, injectionTarget );
+                        messageDestinationRef.insertNewInjectionTarget(arraySize);
+                        messageDestinationRef.setInjectionTargetArray(arraySize, injectionTarget);
                     }
 
                     //------------------------------------------------------------------------------
@@ -611,25 +587,25 @@
 
                     // description
                     String descriptionAnnotation = annotation.description();
-                    if ( descriptionAnnotation.length() > 0 ) {
+                    if (descriptionAnnotation.length() > 0) {
                         DescriptionType description = DescriptionType.Factory.newInstance();
-                        description.setStringValue( descriptionAnnotation );
+                        description.setStringValue(descriptionAnnotation);
                         int arraySize = messageDestinationRef.sizeOfDescriptionArray();
-                        messageDestinationRef.insertNewDescription( arraySize );
-                        messageDestinationRef.setDescriptionArray( arraySize,description );
+                        messageDestinationRef.insertNewDescription(arraySize);
+                        messageDestinationRef.setDescriptionArray(arraySize, description);
                     }
 
                     // mappedName
                     String mappdedNameAnnotation = annotation.mappedName();
-                    if ( mappdedNameAnnotation.length() > 0 ) {
+                    if (mappdedNameAnnotation.length() > 0) {
                         XsdStringType mappedName = XsdStringType.Factory.newInstance();
-                        mappedName.setStringValue( mappdedNameAnnotation );
-                        messageDestinationRef.setMappedName( mappedName );
+                        mappedName.setStringValue(mappdedNameAnnotation);
+                        messageDestinationRef.setMappedName(mappedName);
                     }
 
                 }
-                catch ( Exception anyException ) {
-                    log.debug( "ResourceAnnotationHelper: Exception caught while processing <message-destination-ref>" );
+                catch (Exception anyException) {
+                    log.debug("ResourceAnnotationHelper: Exception caught while processing <message-destination-ref>");
                     anyException.printStackTrace();
                 }
             }
@@ -638,24 +614,24 @@
         //------------------------------------------------------------------------------------------
         // 5. Everything else must be a <resource-env-ref>
         //------------------------------------------------------------------------------------------
-        else if ( annotation.type().getCanonicalName().equals("javax.resource.cci.InteractionSpec") ||
-                  annotation.type().getCanonicalName().equals("javax.transaction.UserTransaction")  || true ) {
+        else if (annotation.type().getCanonicalName().equals("javax.resource.cci.InteractionSpec") ||
+                annotation.type().getCanonicalName().equals("javax.transaction.UserTransaction") || true) {
 
-            log.debug( "addResource(): <resource-env-ref> found");
+            log.debug("addResource(): <resource-env-ref> found");
 
             boolean exists = false;
-            ResourceEnvRefType[] resourceEnvRefs = webApp.getResourceEnvRefArray();
-            for ( ResourceEnvRefType resourceEnvRef : resourceEnvRefs ) {
-                if ( resourceEnvRef.getResourceEnvRefName().getStringValue().equals(resourceName) ) {
+            ResourceEnvRefType[] resourceEnvRefs = annotatedApp.getResourceEnvRefArray();
+            for (ResourceEnvRefType resourceEnvRef : resourceEnvRefs) {
+                if (resourceEnvRef.getResourceEnvRefName().getStringValue().equals(resourceName)) {
                     exists = true;
                     break;
                 }
             }
-            if ( !exists ) {
+            if (!exists) {
                 try {
 
                     // Doesn't exist in deployment descriptor -- add new
-                    ResourceEnvRefType resourceEnvRef = webApp.addNewResourceEnvRef();
+                    ResourceEnvRefType resourceEnvRef = annotatedApp.addNewResourceEnvRef();
 
                     //------------------------------------------------------------------------------
                     // <resource-env-ref> required elements:
@@ -663,27 +639,26 @@
 
                     // resource-env-ref-name
                     JndiNameType resourceEnvRefName = JndiNameType.Factory.newInstance();
-                    resourceEnvRefName.setStringValue( resourceName );
-                    resourceEnvRef.setResourceEnvRefName( resourceEnvRefName );
+                    resourceEnvRefName.setStringValue(resourceName);
+                    resourceEnvRef.setResourceEnvRefName(resourceEnvRefName);
 
-                    if ( !resourceType.equals("") ) {
+                    if (!resourceType.equals("")) {
                         // resource-env-ref-type
                         FullyQualifiedClassType classType = FullyQualifiedClassType.Factory.newInstance();
-                        classType.setStringValue( resourceType );
-                        resourceEnvRef.setResourceEnvRefType( classType );
-                    }
-                    else if ( !injectionJavaType.equals("") ) {
+                        classType.setStringValue(resourceType);
+                        resourceEnvRef.setResourceEnvRefType(classType);
+                    } else if (!injectionJavaType.equals("")) {
                         // injectionTarget
                         InjectionTargetType injectionTarget = InjectionTargetType.Factory.newInstance();
                         FullyQualifiedClassType qualifiedClass = FullyQualifiedClassType.Factory.newInstance();
                         JavaIdentifierType javaType = JavaIdentifierType.Factory.newInstance();
-                        qualifiedClass.setStringValue( injectionClass );
-                        javaType.setStringValue( injectionJavaType );
-                        injectionTarget.setInjectionTargetClass( qualifiedClass );
-                        injectionTarget.setInjectionTargetName( javaType );
+                        qualifiedClass.setStringValue(injectionClass);
+                        javaType.setStringValue(injectionJavaType);
+                        injectionTarget.setInjectionTargetClass(qualifiedClass);
+                        injectionTarget.setInjectionTargetName(javaType);
                         int arraySize = resourceEnvRef.sizeOfInjectionTargetArray();
-                        resourceEnvRef.insertNewInjectionTarget( arraySize );
-                        resourceEnvRef.setInjectionTargetArray( arraySize, injectionTarget );
+                        resourceEnvRef.insertNewInjectionTarget(arraySize);
+                        resourceEnvRef.setInjectionTargetArray(arraySize, injectionTarget);
                     }
 
                     //------------------------------------------------------------------------------
@@ -692,53 +667,53 @@
 
                     // description
                     String descriptionAnnotation = annotation.description();
-                    if ( descriptionAnnotation.length() > 0 ) {
+                    if (descriptionAnnotation.length() > 0) {
                         DescriptionType description = DescriptionType.Factory.newInstance();
-                        description.setStringValue( descriptionAnnotation );
+                        description.setStringValue(descriptionAnnotation);
                         int arraySize = resourceEnvRef.sizeOfDescriptionArray();
-                        resourceEnvRef.insertNewDescription( arraySize );
-                        resourceEnvRef.setDescriptionArray( arraySize,description );
+                        resourceEnvRef.insertNewDescription(arraySize);
+                        resourceEnvRef.setDescriptionArray(arraySize, description);
                     }
 
                     // mappedName
                     String mappdedNameAnnotation = annotation.mappedName();
-                    if ( mappdedNameAnnotation.length() > 0 ) {
+                    if (mappdedNameAnnotation.length() > 0) {
                         XsdStringType mappedName = XsdStringType.Factory.newInstance();
-                        mappedName.setStringValue( mappdedNameAnnotation );
-                        resourceEnvRef.setMappedName( mappedName );
+                        mappedName.setStringValue(mappdedNameAnnotation);
+                        resourceEnvRef.setMappedName(mappedName);
                     }
 
                 }
-                catch ( Exception anyException ) {
-                    log.debug( "ResourceAnnotationHelper: Exception caught while processing <resource-env-ref>" );
+                catch (Exception anyException) {
+                    log.debug("ResourceAnnotationHelper: Exception caught while processing <resource-env-ref>");
                     anyException.printStackTrace();
                 }
             }
         }
-        log.debug( "addResource(): Exit" );
+        log.debug("addResource(): Exit");
     }
 
     private static void configureInjectionTarget(InjectionTargetType injectionTarget, String injectionClass, String injectionJavaType) {
         FullyQualifiedClassType qualifiedClass = injectionTarget.addNewInjectionTargetClass();
         JavaIdentifierType javaType = injectionTarget.addNewInjectionTargetName();
-        qualifiedClass.setStringValue( injectionClass );
-        javaType.setStringValue( injectionJavaType );
-        injectionTarget.setInjectionTargetClass( qualifiedClass );
-        injectionTarget.setInjectionTargetName( javaType );
+        qualifiedClass.setStringValue(injectionClass);
+        javaType.setStringValue(injectionJavaType);
+        injectionTarget.setInjectionTargetClass(qualifiedClass);
+        injectionTarget.setInjectionTargetName(javaType);
     }
 
 
     /**
      * Validate deployment descriptor
      *
-     * @param webApp
-     * @exception Exception  thrown if deployment descriptor cannot be parsed
+     * @param AnnotatedApp
+     * @throws Exception thrown if deployment descriptor cannot be parsed
      */
-    private static void validateDD( WebAppType webApp ) throws Exception {
-        log.debug( "validateDD( " + webApp.toString() + " ): Entry" );
+    private static void validateDD(AnnotatedApp annotatedApp) throws Exception {
+        log.debug("validateDD( " + annotatedApp.toString() + " ): Entry");
 
-        XmlBeansUtil.parse( webApp.toString() );
+        XmlBeansUtil.parse(annotatedApp.toString());
 
-        log.debug( "validateDD(): Exit" );
+        log.debug("validateDD(): Exit");
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13NakedTest.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-j2ee_1.3-naked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder13Test.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-j2ee_1.3.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDTest.java Thu Mar  1 16:49:50 2007
@@ -28,10 +28,10 @@
 {
     protected void setUp() throws Exception {
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-j2ee_1.4.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null, null);
     }
 
     protected void tearDown() {

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14AltDDUnpackedTest.java Thu Mar  1 16:49:50 2007
@@ -28,10 +28,10 @@
 {
     protected void setUp() throws Exception {
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-j2ee_1.4-unpacked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null, null);
     }
 
     protected void tearDown() {

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedTest.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-j2ee_1.4-naked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14NakedUnpackedTest.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-j2ee_1.4-naked-unpacked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14Test.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-j2ee_1.4.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder14UnpackedTest.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-j2ee_1.4-unpacked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java Thu Mar  1 16:49:50 2007
@@ -28,10 +28,10 @@
 {
     protected void setUp() throws Exception {
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null, null);
     }
 
     protected void tearDown() {

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java Thu Mar  1 16:49:50 2007
@@ -28,10 +28,10 @@
 {
     protected void setUp() throws Exception {
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5-unpacked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null, null);
     }
 
     protected void tearDown() {

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5-naked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5-naked-unpacked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java Thu Mar  1 16:49:50 2007
@@ -28,12 +28,12 @@
 {
     protected void setUp() throws Exception {
         super.setUp();
-        
+
         earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5-unpacked.ear"));
-        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap, null);
         webConfigBuilder.contextRoot = contextRoot;
-        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
-        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE, null);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null, null);
     }
 
     protected void tearDown() throws Exception {
@@ -41,7 +41,7 @@
         close(ejbConfigBuilder.ejbModule);
         close(webConfigBuilder.webModule);
         close(connectorConfigBuilder.connectorModule);
-        
+
         super.tearDown();
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Thu Mar  1 16:49:50 2007
@@ -47,12 +47,12 @@
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName earName = naming.createRootName(new Artifact("test", "test-war", "", "rar"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
         AbstractName moduleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
-        return new ConnectorModule(true, moduleName, null, moduleFile, "connector", null, null, null);
+        return new ConnectorModule(true, moduleName, null, moduleFile, "connector", null, null, null, null);
     }
 
     public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName moduleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
-        return new ConnectorModule(false, moduleName, null, moduleFile, targetPath, null, null, null);
+        return new ConnectorModule(false, moduleName, null, moduleFile, targetPath, null, null, null, null);
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module connectorModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java Thu Mar  1 16:49:50 2007
@@ -43,12 +43,12 @@
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName earName = naming.createRootName(new Artifact("test", "test-ejb-jar", "", "jar"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
         AbstractName moduleName = naming.createChildName(earName, "ejb-jar", NameFactory.EJB_MODULE);
-        return new EJBModule(true, moduleName, null, moduleFile, "ejb.jar", null, null, null, null);
+        return new EJBModule(true, moduleName, null, moduleFile, "ejb.jar", null, null, null, null, null);
     }
 
     public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName moduleName = naming.createChildName(earName, "ejb-jar", NameFactory.EJB_MODULE);
-        return new EJBModule(false, moduleName, null, moduleFile, targetPath, null, null, null, null);
+        return new EJBModule(false, moduleName, null, moduleFile, targetPath, null, null, null, null, null);
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module ejbModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?view=diff&rev=513564&r1=513563&r2=513564
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java Thu Mar  1 16:49:50 2007
@@ -46,12 +46,12 @@
     public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName earName = naming.createRootName(new Artifact("test", "test-war", "", "war"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
         AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
-        return new WebModule(true, moduleName, null, moduleFile, "war", null, null, null, contextRoot, portMap, namespace);
+        return new WebModule(true, moduleName, null, moduleFile, "war", null, null, null, contextRoot, portMap, namespace, null);
     }
 
     public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
         AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
-        return new WebModule(false, moduleName, null, moduleFile, targetPath, null, null, null, contextRoot, portMap, namespace);
+        return new WebModule(false, moduleName, null, moduleFile, targetPath, null, null, null, contextRoot, portMap, namespace, null);
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module webModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {



Mime
View raw message