geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r449697 [2/4] - in /geronimo/server/branches/sachin: ./ applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/configmanager/ applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/conf...
Date Mon, 25 Sep 2006 14:58:44 GMT
Modified: geronimo/server/branches/sachin/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/pom.xml Mon Sep 25 07:58:35 2006
@@ -43,6 +43,7 @@
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car</j2eeDeployer>
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
+        <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${pom.version}/car</connectorDeployer>
         <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
         <axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
@@ -120,6 +121,8 @@
         <module>client-deployer</module>
         <module>client-security</module>
         <module>client-system</module>
+        <module>client-transaction</module>
+        <module>connector-deployer</module>
         <module>webconsole-jetty</module>
         <module>webconsole-tomcat</module>
         <!-- <module>daytrader-jetty</module> -->
@@ -155,6 +158,7 @@
         <module>system-database</module>
         <module>tomcat</module>
         <module>tomcat-deployer</module>
+        <module>transaction</module>
         <module>uddi-jetty</module>
         <module>uddi-tomcat</module>
         <module>unavailable-client-deployer</module>

Modified: geronimo/server/branches/sachin/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/rmi-naming/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/rmi-naming/pom.xml Mon Sep 25 07:58:35 2006
@@ -112,24 +112,13 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
         </dependency>
-        
+
+        <!-- thread pool has management interface -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -145,37 +134,8 @@
         
         <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-transaction</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-util</artifactId>
             <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.objectweb.howl</groupId>
-            <artifactId>howl</artifactId>
         </dependency>
         
         <!-- remote login -->

Modified: geronimo/server/branches/sachin/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/system-database/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/system-database/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/system-database/pom.xml Mon Sep 25 07:58:35 2006
@@ -41,33 +41,15 @@
             <type>car</type>
         </dependency>
         
-        <!-- make sure all the deployers are available -->
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis-deployer</artifactId>
+            <artifactId>connector-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-derby</artifactId>
             <version>${pom.version}</version>
@@ -106,9 +88,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>tranql</groupId>

Modified: geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml Mon Sep 25 07:58:35 2006
@@ -41,6 +41,14 @@
             <type>car</type>
         </dependency>
         
+        <!--ResourceEnvironmentSetter-->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
         <!-- import classes -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/tomcat-deployer/src/plan/plan.xml Mon Sep 25 07:58:35 2006
@@ -38,6 +38,9 @@
         <reference name="NamingBuilders">
             <name>NamingBuilders</name>
         </reference>
+        <reference name="ResourceEnvironmentSetter">
+            <name>ResourceRefBuilder</name>
+        </reference>
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>

Modified: geronimo/server/branches/sachin/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/tomcat/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/tomcat/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/tomcat/pom.xml Mon Sep 25 07:58:35 2006
@@ -36,24 +36,30 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>rmi-naming</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-tomcat</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction</artifactId>
             <version>${pom.version}</version>
+            <type>car</type>
         </dependency>
-        
-        <!-- this should have come via g-tomcat
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
+            <artifactId>geronimo-tomcat</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        -->
         
     </dependencies>
 

Propchange: geronimo/server/branches/sachin/configs/transaction/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 25 07:58:35 2006
@@ -0,0 +1,7 @@
+ *.iml
+.project
+.classpath
+maven.log
+velocity.log
+junit*.properties
+target

Modified: geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/webconsole-jetty/pom.xml Mon Sep 25 07:58:35 2006
@@ -64,14 +64,6 @@
             <type>car</type>
         </dependency>
 
-        <!-- for login module manager -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-        </dependency>
-        
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-core</artifactId>
@@ -98,36 +90,18 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-deploy-config</artifactId>-->
-            <!--<version>${pom.version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-test-ddbean</artifactId>-->
-            <!--<version>${pom.version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-util</artifactId>-->
-            <!--<version>${pom.version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-gbean</artifactId>
@@ -174,9 +148,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.console</groupId>

Modified: geronimo/server/branches/sachin/configs/webconsole-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/webconsole-jetty/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/webconsole-jetty/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/webconsole-jetty/src/plan/plan.xml Mon Sep 25 07:58:35 2006
@@ -32,6 +32,14 @@
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
             <context-root>/console-standard</context-root>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
+            <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+                <reference name="ServerInfo">
+                    <name>ServerInfo</name>
+                </reference>
+                <reference name="LoginModule">
+                    <name>properties-login</name>
+                </reference>
+            </gbean>
         </web-app>
     </module>
 
@@ -49,20 +57,19 @@
     </security>
 
     <!-- Console specific server info -->
-    <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-        <reference name="LoginModule">
-            <name>properties-login</name>
-        </reference>
-    </gbean>
+    <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
+        <!--<reference name="ServerInfo">-->
+            <!--<name>ServerInfo</name>-->
+        <!--</reference>-->
+        <!--<reference name="LoginModule">-->
+            <!--<name>properties-login</name>-->
+        <!--</reference>-->
+    <!--</gbean>-->
 
     <!-- Keystore configuration -->
     <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
         <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
-        <attribute name="keyStoreType">jks</attribute>
-        <attribute name="keyStoreProvider">SUN</attribute>
+        <attribute name="keyStoreType">PKCS12</attribute>
         <attribute name="keyStorePassword">password</attribute>
         <reference name="serverInfo">
             <name>ServerInfo</name>

Modified: geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/webconsole-tomcat/pom.xml Mon Sep 25 07:58:35 2006
@@ -55,19 +55,18 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
-        <!-- we use it... and need its xmlbeans copy in our cl -->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <artifactId>dojo-tomcat</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-
-        <!-- for login module manager -->
+        
+        <!-- we use it... and need its xmlbeans copy in our cl -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
+            <artifactId>j2ee-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -98,37 +97,18 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-deploy-config</artifactId>-->
-            <!--<version>${pom.version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-test-ddbean</artifactId>-->
-            <!--<version>${pom.version}</version>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.modules</groupId>-->
-            <!--<artifactId>geronimo-util</artifactId>-->
-            <!--<version>${pom.version}</version>-->
-        <!--</dependency>-->
-
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-gbean</artifactId>
@@ -175,9 +155,9 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${clientDeployer}</deploymentConfig>-->
+                        <!--<deploymentConfig>${openejbDeployer}</deploymentConfig>-->
+                        <!--<deploymentConfig>${axisDeployer}</deploymentConfig>-->
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.console</groupId>

Modified: geronimo/server/branches/sachin/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/webconsole-tomcat/src/plan/plan.xml Mon Sep 25 07:58:35 2006
@@ -34,6 +34,14 @@
             <context-root>/console-standard</context-root>
             <cross-context/>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
+            <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+                <reference name="ServerInfo">
+                    <name>ServerInfo</name>
+                </reference>
+                <reference name="LoginModule">
+                    <name>properties-login</name>
+                </reference>
+            </gbean>
         </web-app>
     </module>
 
@@ -55,20 +63,19 @@
     </security>
 
     <!-- Console specific server info -->
-    <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-        <reference name="LoginModule">
-            <name>properties-login</name>
-        </reference>
-    </gbean>
+    <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
+        <!--<reference name="ServerInfo">-->
+            <!--<name>ServerInfo</name>-->
+        <!--</reference>-->
+        <!--<reference name="LoginModule">-->
+            <!--<name>properties-login</name>-->
+        <!--</reference>-->
+    <!--</gbean>-->
 
     <!-- Keystore configuration -->
     <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
         <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
-        <attribute name="keyStoreType">jks</attribute>
-        <attribute name="keyStoreProvider">SUN</attribute>
+        <attribute name="keyStoreType">PKCS12</attribute>
         <attribute name="keyStorePassword">password</attribute>
         <reference name="serverInfo">
             <name>ServerInfo</name>

Modified: geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java Mon Sep 25 07:58:35 2006
@@ -73,19 +73,27 @@
 import org.apache.geronimo.xbeans.j2ee.JavaXmlTypeMappingType;
 import org.apache.geronimo.xbeans.j2ee.ServiceEndpointInterfaceMappingType;
 import org.apache.geronimo.xbeans.j2ee.ServiceEndpointMethodMappingType;
+import org.apache.geronimo.deployment.util.DeploymentUtil;
 
 /**
  * @version $Rev$ $Date$
  */
 public class AxisBuilder implements WebServiceBuilder {
-//    private static final Class[] SERVICE_CONSTRUCTOR_TYPES = new Class[]{Map.class, Map.class};
 
     private static final SOAPConstants SOAP_VERSION = SOAPConstants.SOAP11_CONSTANTS;
 
-    //WebServiceBuilder
-
-    public Map parseWebServiceDescriptor(URL wsDDUrl, DeployableModule deployableModule, boolean isEJB, Map servletLocations) throws DeploymentException {
-        return WSDescriptorParser.parseWebServiceDescriptor(wsDDUrl, deployableModule, isEJB, servletLocations);
+    public Map findWebServices(DeployableModule moduleFile, boolean isEJB, Map servletLocations) throws DeploymentException {
+        final String path = isEJB ? "META-INF/webservices.xml" : "WEB-INF/webservices.xml";
+        try {
+            URL wsDDUrl = DeploymentUtil.createJarURL(moduleFile, path);
+            Map result = WSDescriptorParser.parseWebServiceDescriptor(wsDDUrl, moduleFile, isEJB, servletLocations);
+            if (result != null) {
+                return result;
+            }
+        } catch (MalformedURLException e) {
+            // The webservices.xml file doesn't exist.
+        }
+        return Collections.EMPTY_MAP;
     }
 
     public void configurePOJO(GBeanData targetGBean, DeployableModule deployableModule, Object portInfoObject, String seiClassName, ClassLoader classLoader) throws DeploymentException {

Modified: geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java Mon Sep 25 07:58:35 2006
@@ -94,8 +94,9 @@
         Map schemaTypeKeyToSchemaTypeMap = schemaInfoBuilder.getSchemaTypeKeyToSchemaTypeMap();
 
         JavaServiceDesc serviceDesc = new JavaServiceDesc();
-
+        String serviceName =  portInfo.getPortQName().toString();
         String location = getAddressLocation(port);
+        serviceDesc.setName(serviceName);
         serviceDesc.setEndpointURL(location);
         serviceDesc.setWSDLFile(portInfo.getWsdlLocation());
         Binding binding = port.getBinding();

Modified: geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/server/AxisWebServiceContainer.java Mon Sep 25 07:58:35 2006
@@ -17,6 +17,7 @@
 package org.apache.geronimo.axis.server;
 
 import java.io.InputStream;
+import java.io.IOException;
 import java.net.URI;
 import java.util.Iterator;
 import java.util.Map;
@@ -120,7 +121,15 @@
 
                 responseMessage = messageContext.getResponseMessage();
             } catch (AxisFault fault) {
-                responseMessage = handleFault(fault, res, messageContext);
+                
+               	if(req.getMethod() == req.GET && req.getParameters().isEmpty()){
+               		String serviceName = req.getURI().getRawPath();
+                    serviceName = serviceName.substring(serviceName.lastIndexOf("/")+1);
+               		printServiceInfo(res,serviceName);
+               		return;
+               	}else{
+               		responseMessage = handleFault(fault, res, messageContext);
+               	}
 
             } catch (Exception e) {
                 responseMessage = handleException(messageContext, res, e);
@@ -265,4 +274,49 @@
         }
         return new AxisWebServiceContainer(location, wsdlLocation, service, wsdlMap, classLoader);
     }
+
+    /**
+     * print a snippet of service info.
+     * @param response response
+     * @param serviceName Name of the service
+     */
+
+    private void printServiceInfo(Response response,String serviceName) throws IOException{
+        response.setContentType("text/html; charset=utf-8");
+        StringBuffer output = new StringBuffer("<h1>")
+                .append(serviceName).append("</h1>\n");
+
+        output.append("<p>").append(Messages.getMessage("axisService00"))
+                .append("</p>\n");
+        output.append(
+                "<i>").append(
+                Messages.getMessage("perhaps00") ).append(
+                "</i>\n");
+        response.getOutputStream().write(output.toString().getBytes());
+    }
+
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Modified: geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Mon Sep 25 07:58:35 2006
@@ -62,6 +62,7 @@
 import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource;
 import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
+import org.apache.geronimo.j2ee.deployment.ConnectorModule;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.J2EEAppClientModuleImpl;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
@@ -103,6 +104,8 @@
     private final NamespaceDrivenBuilderCollection serviceBuilder;
     private final NamingBuilderCollection namingBuilders;
 
+    private final Collection repositories;
+
     private static final String GERAPPCLIENT_NAMESPACE = GerApplicationClientDocument.type.getDocumentElementName().getNamespaceURI();
 
     public AppClientModuleBuilder(Environment defaultClientEnvironment,
@@ -110,6 +113,7 @@
             AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
+            Collection repositories,
             ModuleBuilder connectorModuleBuilder,
             NamespaceDrivenBuilder securityBuilder,
             NamespaceDrivenBuilder serviceBuilder,
@@ -119,7 +123,7 @@
                 transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
-                new SingleElementCollection(connectorModuleBuilder),
+                repositories, new SingleElementCollection(connectorModuleBuilder),
                 new SingleElementCollection(securityBuilder),
                 serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
                 namingBuilders == null ? Collections.EMPTY_SET : namingBuilders);
@@ -128,6 +132,7 @@
     public AppClientModuleBuilder(AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
+            Collection repositories,
             Collection connectorModuleBuilder,
             Collection securityBuilder,
             Collection serviceBuilder,
@@ -139,7 +144,7 @@
                 transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
-                new SingleElementCollection(connectorModuleBuilder),
+                repositories, new SingleElementCollection(connectorModuleBuilder),
                 new SingleElementCollection(securityBuilder),
                 serviceBuilder,
                 namingBuilders);
@@ -150,6 +155,7 @@
             AbstractNameQuery transactionManagerObjectName,
             AbstractNameQuery connectionTrackerObjectName,
             AbstractNameQuery corbaGBeanObjectName,
+            Collection repositories,
             SingleElementCollection connectorModuleBuilder,
             SingleElementCollection securityBuilder,
             Collection serviceBuilder, Collection namingBuilders) {
@@ -158,6 +164,7 @@
         this.corbaGBeanObjectName = corbaGBeanObjectName;
         this.transactionManagerObjectName = transactionManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
+        this.repositories = repositories;
         this.connectorModuleBuilder = connectorModuleBuilder;
         this.securityBuilder = securityBuilder;
         this.serviceBuilder = new NamespaceDrivenBuilderCollection(serviceBuilder);
@@ -250,8 +257,48 @@
         } else {
             moduleName = naming.createChildName(earName, targetPath, NameFactory.APP_CLIENT_MODULE);
         }
+        AbstractName clientBaseName = naming.createRootName(clientEnvironment.getConfigId(), clientEnvironment.getConfigId().toString(), NameFactory.J2EE_APPLICATION);
+
+        //start installing the resource adapters in the client.
+        Collection resourceModules = new ArrayList();
+        GerResourceType[] resources = gerAppClient.getResourceArray();
+        for (int i = 0; i < resources.length; i++) {
+            GerResourceType resource = resources[i];
+            String path;
+            JarFile connectorFile;
+            if (resource.isSetExternalRar()) {
+                path = resource.getExternalRar().trim();
+                Artifact artifact = Artifact.create(path);
+                File file = null;
+                for (Iterator iterator = repositories.iterator(); iterator.hasNext();) {
+                    Repository repository = (Repository) iterator.next();
+                    if (repository.contains(artifact)) {
+                        file = repository.getLocation(artifact);
+                        break;
+                    }
+                }
+                if (file == null) {
+                    throw new DeploymentException("Missing rar in repositories: " + path);
+                }
+                try {
+                    connectorFile = new JarFile(file);
+                } catch (IOException e) {
+                    throw new DeploymentException("Could not access rar contents", e);
+                }
+            } else {
+                path = resource.getInternalRar();
+                try {
+                    connectorFile = new NestedJarFile(moduleFile, path);
+                } catch (IOException e) {
+                    throw new DeploymentException("Could not locate connector inside ear", e);
+                }
+            }
+            XmlObject connectorPlan = resource.getConnector();
+            Module connectorModule = getConnectorModuleBuilder().createModule(connectorPlan, connectorFile, path, null, clientEnvironment, null, clientBaseName, naming, idBuilder);
+            resourceModules.add(connectorModule);
+        }
 
-        return new AppClientModule(standAlone, moduleName, serverEnvironment, clientEnvironment, moduleFile, targetPath, appClient, gerAppClient, specDD);
+        return new AppClientModule(standAlone, moduleName, clientBaseName, serverEnvironment, clientEnvironment, moduleFile, targetPath, appClient, gerAppClient, specDD, resourceModules);
     }
 
     GerApplicationClientType getGeronimoAppClient(Object plan, JarFile moduleFile, boolean standAlone, String targetPath, ApplicationClientType appClient, Environment environment) throws DeploymentException {
@@ -334,13 +381,12 @@
         appClientModule.setEarFile(earFile);
         //create the ear context for the app client.
         Environment clientEnvironment = appClientModule.getClientEnvironment();
-        if (!appClientModule.isStandAlone() || clientEnvironment.getConfigId() == null) {
-            Artifact earConfigId = earContext.getConfigID();
-            Artifact configId = new Artifact(earConfigId.getGroupId(), earConfigId.getArtifactId() + "_" + module.getTargetPath(), earConfigId.getVersion(), "car");
-            clientEnvironment.setConfigId(configId);
-        }
+//        if (!appClientModule.isStandAlone() || clientEnvironment.getConfigId() == null) {
+//            Artifact earConfigId = earContext.getConfigID();
+//            Artifact configId = new Artifact(earConfigId.getGroupId(), earConfigId.getArtifactId() + "_" + module.getTargetPath(), earConfigId.getVersion(), "car");
+//            clientEnvironment.setConfigId(configId);
+//        }
 
-        AbstractName clientBaseName = earContext.getNaming().createRootName(clientEnvironment.getConfigId(), clientEnvironment.getConfigId().toString(), NameFactory.J2EE_APPLICATION);
         File appClientDir;
         try {
             appClientDir = targetConfigurationStore.createNewConfigurationDir(clientEnvironment.getConfigId());
@@ -349,16 +395,17 @@
         }
 
         // construct the app client deployment context... this is the same class used by the ear context
+        EARContext appClientDeploymentContext;
         try {
 
-            EARContext appClientDeploymentContext = new EARContext(appClientDir,
+            appClientDeploymentContext = new EARContext(appClientDir,
                     null,
                     clientEnvironment,
                     ConfigurationModuleType.CAR,
                     earContext.getNaming(),
                     earContext.getConfigurationManager(),
                     null, //no server name needed on client
-                    clientBaseName,
+                    appClientModule.getAppClientName(),
                     transactionManagerObjectName,
                     connectionTrackerObjectName,
                     null,
@@ -371,10 +418,19 @@
             cleanupAppClientDir(appClientDir);
             throw e;
         }
+        for (Iterator resources = appClientModule.getResourceModules().iterator(); resources.hasNext();) {
+            ConnectorModule connectorModule = (ConnectorModule) resources.next();
+            getConnectorModuleBuilder().installModule(connectorModule.getModuleFile(), appClientDeploymentContext, connectorModule, configurationStores, targetConfigurationStore, repositories);
+        }
 
     }
 
-    public void initContext(EARContext earContext, Module clientModule, ClassLoader cl) {
+    public void initContext(EARContext earContext, Module clientModule, ClassLoader cl) throws DeploymentException {
+        AppClientModule appClientModule = ((AppClientModule) clientModule);
+        for (Iterator resources = appClientModule.getResourceModules().iterator(); resources.hasNext();) {
+            ConnectorModule connectorModule = (ConnectorModule) resources.next();
+            getConnectorModuleBuilder().initContext(appClientModule.getEarContext(), connectorModule, cl);
+        }
     }
 
     public void addGBeans(EARContext earContext, Module module, ClassLoader earClassLoader, Collection repositories) throws DeploymentException {
@@ -387,7 +443,6 @@
         // get the app client main class
         JarFile moduleFile = module.getModuleFile();
         String mainClasss;
-//        String classPath = null;
         try {
             Manifest manifest = moduleFile.getManifest();
             if (manifest == null) {
@@ -428,7 +483,6 @@
         }
 
         EARContext appClientDeploymentContext = appClientModule.getEarContext();
-//        ConfigurationData appClientConfigurationData = null;
 
         // Create a Module ID Builder defaulting to similar settings to use for any children we create
         ModuleIDBuilder idBuilder = new ModuleIDBuilder();
@@ -457,66 +511,15 @@
                 if (geronimoAppClient != null) {
                     serviceBuilder.build(geronimoAppClient, appClientDeploymentContext, appClientDeploymentContext);
                     //deploy the resource adapters specified in the geronimo-application.xml
-                    Collection resourceModules = new ArrayList();
-                    try {
-                        GerResourceType[] resources = geronimoAppClient.getResourceArray();
-                        for (int i = 0; i < resources.length; i++) {
-                            GerResourceType resource = resources[i];
-                            String path;
-                            JarFile connectorFile;
-                            if (resource.isSetExternalRar()) {
-                                path = resource.getExternalRar().trim();
-                                Artifact artifact = Artifact.create(path);
-                                File file = null;
-                                for (Iterator iterator = repositories.iterator(); iterator.hasNext();) {
-                                    Repository repository = (Repository) iterator.next();
-                                    if (repository.contains(artifact)) {
-                                        file = repository.getLocation(artifact);
-                                        break;
-                                    }
-                                }
-                                if (file == null) {
-                                    throw new DeploymentException("Missing rar in repositories: " + path);
-                                }
-                                try {
-                                    connectorFile = new JarFile(file);
-                                } catch (IOException e) {
-                                    throw new DeploymentException("Could not access rar contents", e);
-                                }
-                            } else {
-                                path = resource.getInternalRar();
-                                try {
-                                    connectorFile = new NestedJarFile(appClientModule.getEarFile(), path);
-                                } catch (IOException e) {
-                                    throw new DeploymentException("Could not locate connector inside ear", e);
-                                }
-                            }
-                            XmlObject connectorPlan = resource.getConnector();
-                            Module connectorModule = getConnectorModuleBuilder().createModule(connectorPlan, connectorFile, path, null, appClientModule.getClientEnvironment(), null, appClientDeploymentContext.getModuleName(), earContext.getNaming(), idBuilder);
-                            resourceModules.add(connectorModule);
-                            //TODO configStore == null is fishy, consider moving these stages for connectors into the corresponding stages for this module.
-                            getConnectorModuleBuilder().installModule(connectorFile, appClientDeploymentContext, connectorModule, null, null, repositories);
-                        }
-                        //the install step could have added more dependencies... we need a new cl.
-                        appClientClassLoader = appClientDeploymentContext.getClassLoader();
-                        for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();) {
-                            Module connectorModule = (Module) iterator.next();
-                            getConnectorModuleBuilder().initContext(appClientDeploymentContext, connectorModule, appClientClassLoader);
-                        }
-
-                        for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();) {
-                            Module connectorModule = (Module) iterator.next();
-                            getConnectorModuleBuilder().addGBeans(appClientDeploymentContext, connectorModule, appClientClassLoader, repositories);
-                        }
-                    } finally {
-                        for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();) {
-                            Module connectorModule = (Module) iterator.next();
-                            connectorModule.close();
-                        }
+
+                    for (Iterator resources = appClientModule.getResourceModules().iterator(); resources.hasNext();) {
+                        ConnectorModule connectorModule = (ConnectorModule) resources.next();
+                        getConnectorModuleBuilder().addGBeans(appClientDeploymentContext, connectorModule, appClientClassLoader, repositories);
                     }
                 }
 
                 // add the app client static jndi provider
+                //TODO track resource ref shared and app managed security
                 AbstractName jndiContextName = earContext.getNaming().createChildName(appClientDeploymentContext.getModuleName(), "StaticJndiContext", "StaticJndiContext");
                 GBeanData jndiContextGBeanData = new GBeanData(jndiContextName, StaticJndiContextPlugin.GBEAN_INFO);
                 try {
@@ -530,7 +533,6 @@
                 appClientDeploymentContext.addGBean(jndiContextGBeanData);
 
                 // finally add the app client container
-//                AbstractName appClientContainerName = earContext.getNaming().createChildName(appClientDeploymentContext.getModuleName(), "ClientContainer", "ClientContainer");
                 AbstractName appClientContainerName = appClientDeploymentContext.getModuleName();
                 GBeanData appClientContainerGBeanData = new GBeanData(appClientContainerName, AppClientContainer.GBEAN_INFO);
                 try {
@@ -691,6 +693,7 @@
         infoBuilder.addAttribute("transactionManagerObjectName", AbstractNameQuery.class, true);
         infoBuilder.addAttribute("connectionTrackerObjectName", AbstractNameQuery.class, true);
         infoBuilder.addAttribute("corbaGBeanObjectName", AbstractNameQuery.class, true);
+        infoBuilder.addReference("Repositories", Repository.class, "Repository");
         infoBuilder.addReference("ConnectorModuleBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("SecurityBuilder", SecurityBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
@@ -701,6 +704,7 @@
         infoBuilder.setConstructor(new String[]{"transactionManagerObjectName",
                 "connectionTrackerObjectName",
                 "corbaGBeanObjectName",
+                "Repositories",
                 "ConnectorModuleBuilder",
                 "SecurityBuilder",
                 "ServiceBuilders",

Modified: geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java Mon Sep 25 07:58:35 2006
@@ -1,6 +1,7 @@
 package org.apache.geronimo.client.builder;
 
 import java.io.File;
+import java.util.Collections;
 
 import org.apache.geronimo.testsupport.TestSupport;
 
@@ -19,7 +20,7 @@
     private AppClientModuleBuilder builder;
 
     protected void setUp() throws Exception {
-        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, null, null, null);
+        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, Collections.EMPTY_LIST, null, null, null, null);
     }
 
     public void testResourceRef() throws Exception {

Modified: geronimo/server/branches/sachin/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java Mon Sep 25 07:58:35 2006
@@ -105,6 +105,7 @@
 
     public void main(final String[] args) throws Exception {
         //TODO reorganize this so it makes more sense.  maybe use an interceptor stack.
+        //TODO track resource ref shared and app managed security
         Thread thread = Thread.currentThread();
 
         ClassLoader oldClassLoader = thread.getContextClassLoader();

Modified: geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/pom.xml?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-clustering-wadi/pom.xml Mon Sep 25 07:58:35 2006
@@ -99,10 +99,6 @@
             <artifactId>wadi-tribes</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.codehaus.wadi</groupId>
-            <artifactId>wadi-tribes</artifactId>
-        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Mon Sep 25 07:58:35 2006
@@ -41,7 +41,6 @@
 import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefDocument;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
-import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
 import org.apache.geronimo.xbeans.j2ee.MessageDestinationRefType;
 import org.apache.geronimo.xbeans.j2ee.MessageDestinationType;
 import org.apache.geronimo.xbeans.j2ee.ResourceEnvRefType;
@@ -49,27 +48,28 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class AdminObjectRefBuilder extends AbstractNamingBuilder {
-    private static final String J2EE_NAMESPACE = ConnectorDocument.type.getDocumentElementName().getNamespaceURI();
-    private static final QName ADMIN_OBJECT_REF_QNAME = new QName(J2EE_NAMESPACE, "resource-env-ref");
-    private static final QNameSet ADMIN_OBJECT_REF_QNAME_SET = QNameSet.singleton(ADMIN_OBJECT_REF_QNAME);
-    private static final QName MESSAGE_DESTINATION_REF_QNAME = new QName(J2EE_NAMESPACE, "message-destination-ref");
-//    private static final QNameSet ADMIN_OBJECT_REF_QNAME_SET = QNameSet.singleton(ADMIN_OBJECT_REF_QNAME);
+    private  final QNameSet adminOjbectRefQNameSet;
+    private final QNameSet messageDestinationQNameSet;
+    private final QNameSet messageDestinationRefQNameSet;
+
     private static final QName GER_ADMIN_OBJECT_REF_QNAME = GerResourceEnvRefDocument.type.getDocumentElementName();
     private static final QNameSet GER_ADMIN_OBJECT_REF_QNAME_SET = QNameSet.singleton(GER_ADMIN_OBJECT_REF_QNAME);
-    private static final QName MESSAGE_DESTINATION_REF = new QName(J2EE_NAMESPACE, "message-destination");
-    private static final QNameSet MESSAGE_DESTINATION_QNAME_SET = QNameSet.singleton(MESSAGE_DESTINATION_REF);
     private static final QName GER_MESSAGE_DESTINATION_QNAME = GerMessageDestinationDocument.type.getDocumentElementName();
     private static final QNameSet GER_MESSAGE_DESTINATION_QNAME_SET = QNameSet.singleton(GER_MESSAGE_DESTINATION_QNAME);
 
-
-    public void buildEnvironment(XmlObject specDD, XmlObject plan, Environment environment) {
+    public AdminObjectRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) {
+        super(defaultEnvironment);
+        adminOjbectRefQNameSet = buildQNameSet(eeNamespaces, "resource-env-ref");
+        messageDestinationQNameSet = buildQNameSet(eeNamespaces, "message-destination");
+        messageDestinationRefQNameSet = buildQNameSet(eeNamespaces, "message-destination-ref");
     }
 
+
     public void initContext(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module) throws DeploymentException {
-        XmlObject[] specDestinations = specDD.selectChildren(MESSAGE_DESTINATION_QNAME_SET);
+        XmlObject[] specDestinations = convert(specDD.selectChildren(messageDestinationQNameSet), J2EE_CONVERTER, MessageDestinationType.type);
         XmlObject[] gerDestinations = plan.selectChildren(GER_MESSAGE_DESTINATION_QNAME_SET);
             Map nameMap = new HashMap();
             for (int i = 0; i < gerDestinations.length; i++) {
@@ -78,7 +78,7 @@
                 nameMap.put(name, destination);
                 boolean found = false;
                 for (int j = 0; j < specDestinations.length; j++) {
-                    MessageDestinationType specDestination = (MessageDestinationType) specDestinations[j].copy().changeType(MessageDestinationType.type);
+                    MessageDestinationType specDestination = (MessageDestinationType) specDestinations[j];
                     if (specDestination.getMessageDestinationName().getStringValue().trim().equals(name)) {
                         found = true;
                         break;
@@ -93,7 +93,7 @@
 
 
     public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException {
-        XmlObject[] resourceEnvRefsUntyped = specDD.selectChildren(ADMIN_OBJECT_REF_QNAME_SET);
+        XmlObject[] resourceEnvRefsUntyped = convert(specDD.selectChildren(adminOjbectRefQNameSet), J2EE_CONVERTER, ResourceEnvRefType.type);
         ClassLoader cl = localConfiguration.getConfigurationClassLoader();
         XmlObject[] gerResourceEnvRefsUntyped = plan == null? NO_REFS: plan.selectChildren(GER_ADMIN_OBJECT_REF_QNAME_SET);
         Map refMap = mapResourceEnvRefs(gerResourceEnvRefsUntyped);
@@ -118,10 +118,10 @@
         }
 
         //message-destination-refs
-        XmlObject[] messageDestinationRefsUntyped = specDD.selectChildren(MESSAGE_DESTINATION_REF_QNAME);
+        XmlObject[] messageDestinationRefsUntyped = convert(specDD.selectChildren(messageDestinationRefQNameSet), J2EE_CONVERTER, MessageDestinationRefType.type);
 
         for (int i = 0; i < messageDestinationRefsUntyped.length; i++) {
-            MessageDestinationRefType messageDestinationRef = (MessageDestinationRefType) messageDestinationRefsUntyped[i].copy().changeType(MessageDestinationRefType.type);
+            MessageDestinationRefType messageDestinationRef = (MessageDestinationRefType) messageDestinationRefsUntyped[i];
             String name = getStringValue(messageDestinationRef.getMessageDestinationRefName());
             String linkName = getStringValue(messageDestinationRef.getMessageDestinationLink());
             String type = getStringValue(messageDestinationRef.getMessageDestinationType());
@@ -235,7 +235,7 @@
     }
 
     public QNameSet getSpecQNameSet() {
-        return ADMIN_OBJECT_REF_QNAME_SET;
+        return adminOjbectRefQNameSet;
     }
 
     public QNameSet getPlanQNameSet() {
@@ -246,6 +246,10 @@
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AdminObjectRefBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
+        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+
+        infoBuilder.setConstructor(new String[] {"defaultEnvironment", "eeNamespaces"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Modified: geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Mon Sep 25 07:58:35 2006
@@ -22,6 +22,8 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
 
 import javax.naming.Reference;
 import javax.xml.namespace.QName;
@@ -31,40 +33,42 @@
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
+import org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder;
+import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter;
 import org.apache.geronimo.naming.reference.ResourceReference;
 import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefDocument;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
-import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
 import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
-public class ResourceRefBuilder extends AbstractNamingBuilder {
-    private static final String J2EE_NAMESPACE = ConnectorDocument.type.getDocumentElementName().getNamespaceURI();
-    private static final QName RESOURCE_REF_QNAME = new QName(J2EE_NAMESPACE, "resource-ref");
-    private static final QNameSet RESOURCE_REF_QNAME_SET = QNameSet.singleton(RESOURCE_REF_QNAME);
+public class ResourceRefBuilder extends AbstractNamingBuilder implements ResourceEnvironmentSetter {
     private static final QName GER_RESOURCE_REF_QNAME = GerResourceRefDocument.type.getDocumentElementName();
     private static final QNameSet GER_RESOURCE_REF_QNAME_SET = QNameSet.singleton(GER_RESOURCE_REF_QNAME);
 
+    private  final QNameSet resourceRefQNameSet;
+
     private static final String JAXR_CONNECTION_FACTORY_CLASS = "javax.xml.registry.ConnectionFactory";
     private static final String JAVAX_MAIL_SESSION_CLASS = "javax.mail.Session";
 
+    public ResourceRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) {
+        super(defaultEnvironment);
 
-    public void buildEnvironment(XmlObject specDD, XmlObject plan, Environment environment) {
+        resourceRefQNameSet = buildQNameSet(eeNamespaces, "resource-ref");
     }
 
     public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException {
-        XmlObject[] resourceRefsUntyped = specDD.selectChildren(RESOURCE_REF_QNAME_SET);
+        XmlObject[] resourceRefsUntyped = convert(specDD.selectChildren(resourceRefQNameSet), J2EE_CONVERTER, ResourceRefType.type);
         XmlObject[] gerResourceRefsUntyped = plan == null? NO_REFS: plan.selectChildren(GER_RESOURCE_REF_QNAME_SET);
         Map refMap = mapResourceRefs(gerResourceRefsUntyped);
         ClassLoader cl = localConfiguration.getConfigurationClassLoader();
@@ -139,6 +143,35 @@
 
     }
 
+    public void setResourceEnvironment(ResourceEnvironmentBuilder builder, XmlObject[] resourceRefs, GerResourceRefType[] gerResourceRefs) {
+        resourceRefs = convert(resourceRefs, J2EE_CONVERTER, ResourceRefType.type);
+        Map refMap = mapResourceRefs(gerResourceRefs);
+        Set unshareableResources = new HashSet();
+        Set applicationManagedSecurityResources = new HashSet();
+        for (int i = 0; i < resourceRefs.length; i++) {
+            ResourceRefType resourceRefType = (ResourceRefType) resourceRefs[i];
+
+            String type = resourceRefType.getResType().getStringValue().trim();
+
+            if (!URL.class.getName().equals(type)
+                    && !"javax.mail.Session".equals(type)
+                    && !JAXR_CONNECTION_FACTORY_CLASS.equals(type)) {
+
+                GerResourceRefType gerResourceRef = (GerResourceRefType) refMap.get(resourceRefType.getResRefName().getStringValue());
+                AbstractNameQuery containerId = getResourceContainerId(getStringValue(resourceRefType.getResRefName()), NameFactory.JCA_MANAGED_CONNECTION_FACTORY, null, gerResourceRef);
+
+                if ("Unshareable".equals(getStringValue(resourceRefType.getResSharingScope()))) {
+                    unshareableResources.add(containerId);
+                }
+                if ("Application".equals(getStringValue(resourceRefType.getResAuth()))) {
+                    applicationManagedSecurityResources.add(containerId);
+                }
+            }
+        }
+        builder.setUnshareableResources(unshareableResources);
+        builder.setApplicationManagedSecurityResources(applicationManagedSecurityResources);
+    }
+
     private Map mapResourceRefs(XmlObject[] refs) {
         Map refMap = new HashMap();
         if (refs != null) {
@@ -166,7 +199,7 @@
     }
 
     public QNameSet getSpecQNameSet() {
-        return RESOURCE_REF_QNAME_SET;
+        return resourceRefQNameSet;
     }
 
     public QNameSet getPlanQNameSet() {
@@ -177,6 +210,10 @@
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ResourceRefBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
+        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+
+        infoBuilder.setConstructor(new String[] {"defaultEnvironment", "eeNamespaces"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Modified: geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java Mon Sep 25 07:58:35 2006
@@ -49,6 +49,8 @@
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.kernel.repository.Version;
+import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
+import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
@@ -61,7 +63,7 @@
     private static final Naming naming = new Jsr77Naming();
     Configuration configuration;
     AbstractName baseName;
-    AdminObjectRefBuilder adminObjectRefBuilder = new AdminObjectRefBuilder();
+    AdminObjectRefBuilder adminObjectRefBuilder = new AdminObjectRefBuilder(null, new String[] {SchemaConversionUtils.J2EE_NAMESPACE});
     Module module;
 
     Map componentContext = new HashMap();

Modified: geronimo/server/branches/sachin/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=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/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 Mon Sep 25 07:58:35 2006
@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.jar.JarFile;
 
 import org.apache.geronimo.deployment.DeploymentContext;
@@ -35,12 +36,14 @@
 public class AppClientModule extends Module {
     private final Environment clientEnvironment;
     private DeployableModule ear;
-    private Collection resourceModules;
+    private final AbstractName appClientName;
+    private final Collection resourceModules;
 
-
-    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);
+    public AppClientModule(boolean standAlone, AbstractName moduleName, AbstractName appClientName, Environment serverEnvironment, Environment clientEnvironment, DeployableModule deployableModule, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, Collection resourceModules) {
+        super(standAlone, moduleName, serverEnvironment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
         this.clientEnvironment = clientEnvironment;
+        this.appClientName = appClientName;
+        this.resourceModules = resourceModules;
     }
 
     public ConfigurationModuleType getType() {
@@ -59,17 +62,28 @@
         this.ear = ear;
     }
 
-    public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
-        context.addClass(location, fqcn, bytes);
+    public AbstractName getAppClientName() {
+        return appClientName;
     }
 
-    public void setResourceModules(Collection resourceModules) {
-        this.resourceModules = resourceModules;
+    public void addClass(URI location, String fqcn, byte[] bytes, DeploymentContext context) throws IOException, URISyntaxException {
+        context.addClass(location, fqcn, bytes);
     }
 
     public Collection getResourceModules() {
         return resourceModules;
     }
+
+    public void close() {
+        if (resourceModules != null) {
+            for (Iterator iterator = resourceModules.iterator(); iterator.hasNext();) {
+                ConnectorModule connectorModule = (ConnectorModule) iterator.next();
+                connectorModule.close();
+            }
+        }
+        super.close();
+    }
+
 }
 
 

Modified: geronimo/server/branches/sachin/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=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/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 Mon Sep 25 07:58:35 2006
@@ -82,8 +82,10 @@
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerModuleType;
 import org.apache.geronimo.xbeans.j2ee.ApplicationType;
 import org.apache.geronimo.xbeans.j2ee.ModuleType;
+import org.apache.geronimo.xbeans.j2ee.ApplicationDocument;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlCursor;
 
 /**
  * @version $Rev$ $Date$
@@ -301,7 +303,7 @@
             //we found something called application.xml in the right place, if we can't parse it it's an error
             try {
                 XmlObject xmlObject = XmlBeansUtil.parse(specDD);
-                application = SchemaConversionUtils.convertToApplicationSchema(xmlObject).getApplication();
+                application = convertToApplicationSchema(xmlObject).getApplication();
             } catch (XmlException e) {
                 throw new DeploymentException("Could not parse application.xml", e);
             }
@@ -406,6 +408,34 @@
         return gerApplication;
     }
 
+    static ApplicationDocument convertToApplicationSchema(XmlObject xmlObject) throws XmlException {
+        if (ApplicationDocument.type.equals(xmlObject.schemaType())) {
+            XmlBeansUtil.validateDD(xmlObject);
+            return (ApplicationDocument) xmlObject;
+        }
+        XmlCursor cursor = xmlObject.newCursor();
+        XmlCursor moveable = xmlObject.newCursor();
+        String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";
+        String version = "1.4";
+        try {
+            SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version);
+            cursor.toStartDoc();
+            cursor.toChild(SchemaConversionUtils.J2EE_NAMESPACE, "application");
+            cursor.toFirstChild();
+            SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.J2EE_NAMESPACE, cursor, moveable);
+        } finally {
+            cursor.dispose();
+            moveable.dispose();
+        }
+        XmlObject result = xmlObject.changeType(ApplicationDocument.type);
+        if (result != null) {
+            XmlBeansUtil.validateDD(result);
+            return (ApplicationDocument) result;
+        }
+        XmlBeansUtil.validateDD(xmlObject);
+        return (ApplicationDocument) xmlObject;
+    }
+
     public Artifact getConfigurationID(Object plan, DeployableModule module, ModuleIDBuilder idBuilder) throws IOException, DeploymentException {
         ApplicationInfo applicationInfo = (ApplicationInfo) plan;
         Artifact test = applicationInfo.getEnvironment().getConfigId();
@@ -938,4 +968,5 @@
     public static GBeanInfo getGBeanInfo() {
         return GBEAN_INFO;
     }
+
 }

Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java?view=diff&rev=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java Mon Sep 25 07:58:35 2006
@@ -35,7 +35,7 @@
 import org.apache.xmlbeans.XmlObject;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class NamingBuilderCollection implements NamingBuilder {
 
@@ -72,15 +72,26 @@
 
     private void addBuilder(Object builder) {
         QNameSet builderSpecQNames = ((NamingBuilder)builder).getSpecQNameSet();
+        QNameSet builderPlanQNames = ((NamingBuilder)builder).getPlanQNameSet();
+        if (builderSpecQNames == null) {
+            throw new IllegalStateException("Builder " + builder + " is missing spec qnames");
+        }
+        if (builderPlanQNames == null) {
+            throw new IllegalStateException("Builder " + builder + " is missing plan qnames");
+        }
         if (!specQNames.isDisjoint(builderSpecQNames)) {
             throw new IllegalArgumentException("Duplicate builderSpecQNames in builder set: " + builderSpecQNames);
         }
-        specQNames = specQNames.union(builderSpecQNames);
-        QNameSet builderPlanQNames = ((NamingBuilder)builder).getPlanQNameSet();
         if (!planQNames.isDisjoint(builderPlanQNames)) {
             throw new IllegalArgumentException("Duplicate builderPlanQNames in builder set: " + builderPlanQNames);
         }
-        planQNames = planQNames.union(builderPlanQNames);
+        try {
+            specQNames = specQNames.union(builderSpecQNames);
+            planQNames = planQNames.union(builderPlanQNames);
+        } catch (NullPointerException e) {
+            throw (IllegalArgumentException)new IllegalArgumentException("could not merge qnamesets for builder " + builder).initCause(e);
+
+        }
         //really?
         XmlBeansUtil.registerSubstitutionGroupElements(basePlanElementName, builderPlanQNames);
     }

Modified: geronimo/server/branches/sachin/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=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/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 Mon Sep 25 07:58:35 2006
@@ -33,8 +33,8 @@
  */
 public class UnavailableWebServiceBuilder implements WebServiceBuilder {
 
-    public Map parseWebServiceDescriptor(URL wsDDUrl, DeployableModule moduleFile, boolean isEJB, Map correctedPortLocations) throws DeploymentException {
-        return new HashMap();
+    public Map findWebServices(DeployableModule moduleFile, boolean isEJB, Map correctedPortLocations) throws DeploymentException {
+        return  Collections.EMPTY_MAP;
     }
 
     public void configurePOJO(GBeanData targetGBean, DeployableModule moduleFile, Object portInfo, String seiClassName, ClassLoader classLoader) throws DeploymentException {

Modified: geronimo/server/branches/sachin/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=449697&r1=449696&r2=449697
==============================================================================
--- geronimo/server/branches/sachin/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 Mon Sep 25 07:58:35 2006
@@ -29,8 +29,19 @@
  */
 public interface WebServiceBuilder {
 
-    Map parseWebServiceDescriptor(URL wsDDUrl, DeployableModule deployableModule, boolean isEJB, Map correctedPortLocations) throws DeploymentException;
-
+   /**
+    * Introspects on the module file to locate web service for deployment.
+    *
+    * @param moduleFile J2EE module
+    * @param isEJB is this an EJB archive?
+    * @param correctedPortLocations mapping between port locations and paths.
+    * @return Mapping of servlet names to port information, or an
+    * empty map if no web services found.  Port information is opaque
+    * to all except the WebServiceBuilder itself.
+    * @throws DeploymentException if error encountered while introspecting the module.
+    */
+   Map findWebServices(DeployableModule deployableModule, boolean isEJB, Map correctedPortLocations) throws DeploymentException;
+    
     //obviously these need the deployment descriptors, but I'm not sure in what form yet.
     /**
      * configure the supplied GBeanData to implement the POJO web service described in the deployment descriptor.



Mime
View raw message