geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1213810 [5/6] - in /geronimo/server/branches/3.0-beta: ./ framework/ framework/configs/karaf-framework/src/main/distribution/text/ framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/ framework/configs/karaf-framework/sr...
Date Tue, 13 Dec 2011 18:00:12 GMT
Modified: geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/pom.xml Tue Dec 13 18:00:08 2011
@@ -33,19 +33,7 @@
     <name>Geronimo Plugins, OpenWebBeans :: OpenWebBeans</name>
     <packaging>car</packaging>
 
-    <description>Geronimo OpenWebBeans 299 integration</description>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>myfaces</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <description>Geronimo OpenWebBeans 299 integration</description>    
 
     <dependencies>
         <dependency>
@@ -63,16 +51,164 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <type>car</type>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openwebbeans</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-naming</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-el_2.2_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-validation_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>commons-digester</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>commons-discovery</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>myfaces-bundle</artifactId>
+            <artifactId>scannotation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-spi</artifactId>           
+        </dependency>         
+    
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-web</artifactId>         
+        </dependency>              
+
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-resource</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-ee</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>

Modified: geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/openwebbeans/openwebbeans/src/main/plan/plan.xml Tue Dec 13 18:00:08 2011
@@ -20,6 +20,6 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="OWBSingletonServiceInitializer" class="org.apache.geronimo.openejb.cdi.SingletonServiceInitializerGBean"/>
+    <gbean name="OWBSingletonServiceInitializer" class="org.apache.geronimo.openwebbeans.OpenWebBeansSystemInitializer"/>
 
 </module>

Modified: geronimo/server/branches/3.0-beta/plugins/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/openwebbeans/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/openwebbeans/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/openwebbeans/pom.xml Tue Dec 13 18:00:08 2011
@@ -91,9 +91,9 @@
     </dependencyManagement>
 
     <modules>
-        <!--<module>geronimo-openwebbeans</module>-->
+        <module>geronimo-openwebbeans</module>
         <module>geronimo-openwebbeans-builder</module>
-        <!--<module>openwebbeans</module>-->
+        <module>openwebbeans</module>
         <module>openwebbeans-deployer</module>
     </modules>
 

Modified: geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java Tue Dec 13 18:00:08 2011
@@ -61,33 +61,45 @@ public class GetArchiveHandler extends A
 
     public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model)
             throws PortletException, IOException {
-        FileItem fileItem = (FileItem) getUploadFiles().get(MODULE_URI_PARAMETER);
-        String fileName = fileItem.getName();
-        if (fileName != null && fileName.length() > 0) {
-            File uploadedFile = uploadFile(fileItem);
-            ApplicationInfo applicationInfo = JSR88_Util.createApplicationInfo(request, uploadedFile);
-            ConfigurationModuleType applicationType = applicationInfo.getType();
-            if (ConfigurationModuleType.WAR == applicationType) {
-                WARConfigData data = setNewWARSessionData(request);
-                data.setUploadedWarUri(uploadedFile.toURI().toString());
-                data.parseWeb((WebModule) (applicationInfo.getModules().toArray()[0]));
-                return ENVIRONMENT_MODE + "-before";
-            }
-            if (ConfigurationModuleType.EAR == applicationType) {
-                EARConfigData earConfigData = setNewEARSessionData(request);
-                earConfigData.parseEAR(applicationInfo);
-                return EAR_MODE + "-before";
-            }
-            if (ConfigurationModuleType.EJB == applicationType) {
-                EjbConfigData ejbJarConfigData = setNewEjbJarSessionData(request);
-                ejbJarConfigData.parseEjbJar((EjbModule) (applicationInfo.getModules().toArray()[0]));
-                return EJB_MODE + "-before";
+        String errorMsg = portlet.getLocalizedString(request, "errorMsg01");
+        try {
+            FileItem fileItem = (FileItem) getUploadFiles().get(MODULE_URI_PARAMETER);
+            String fileName = fileItem.getName();
+            if (fileName != null && fileName.length() > 0) {
+                File uploadedFile = uploadFile(fileItem);
+                ApplicationInfo applicationInfo = JSR88_Util.createApplicationInfo(request, uploadedFile);
+                ConfigurationModuleType applicationType = applicationInfo.getType();
+                if (ConfigurationModuleType.WAR == applicationType) {
+                    WARConfigData data = setNewWARSessionData(request);
+                    data.setUploadedWarUri(uploadedFile.toURI().toString());
+                    data.parseWeb((WebModule) (applicationInfo.getModules().toArray()[0]));
+                    return ENVIRONMENT_MODE + "-before";
+                }
+                if (ConfigurationModuleType.EAR == applicationType) {
+                    EARConfigData earConfigData = setNewEARSessionData(request);
+                    earConfigData.parseEAR(applicationInfo);
+                    return EAR_MODE + "-before";
+                }
+                if (ConfigurationModuleType.EJB == applicationType) {
+                    EjbConfigData ejbJarConfigData = setNewEjbJarSessionData(request);
+                    ejbJarConfigData.parseEjbJar((EjbModule) (applicationInfo.getModules().toArray()[0]));
+                    return EJB_MODE + "-before";
+                }
             }
+        } catch(Throwable e) {
+            errorMsg = getRootCause(e).getMessage();
         }
-        portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg01"));
+        portlet.addErrorMessage(request, errorMsg);
         return getMode();
     }
-
+    
+    private Throwable getRootCause(Throwable e) {
+        while(e.getCause() != null && e.getCause() != e) {
+            e = e.getCause();
+        }
+        return e;
+    }
+    
     private File uploadFile(FileItem fileItem) throws PortletException, IOException {
         File tempDir = File.createTempFile("geronimo-planCreator", ".tmpdir");
         tempDir.delete();

Modified: geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java Tue Dec 13 18:00:08 2011
@@ -83,7 +83,9 @@ public class JSR88_Util {
             command.setCommandContext(commandContext);
             command.doDeploy(targets[0], true);
         } catch (Exception e) {
-            // ignore exceptions
+            // Any better ideas?
+            if(EARConfigBuilder.appInfo.get() == null) throw new RuntimeException(e);
+            
         } finally {
             EARConfigBuilder.createPlanMode.set(Boolean.FALSE);
             applicationInfo = EARConfigBuilder.appInfo.get();

Modified: geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml Tue Dec 13 18:00:08 2011
@@ -402,6 +402,14 @@ limitations under the License.
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-sqlserver2005-xa//rar</attribute>
     </gbean>
+    <gbean name="Database283" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">SQL Server 2008 XA</attribute>
+        <attribute name="URLPrototype">null</attribute>
+        <attribute name="driverClassName">null</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="specific">true</attribute>
+        <attribute name="RARName">org.tranql/tranql-connector-sqlserver2008-xa//rar</attribute>
+    </gbean>
     <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">SQL Server (jTDS)</attribute>
         <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>

Modified: geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml Tue Dec 13 18:00:08 2011
@@ -403,6 +403,14 @@ limitations under the License.
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-sqlserver2005-xa//rar</attribute>
     </gbean>
+    <gbean name="Database283" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">SQL Server 2008 XA</attribute>
+        <attribute name="URLPrototype">null</attribute>
+        <attribute name="driverClassName">null</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="specific">true</attribute>
+        <attribute name="RARName">org.tranql/tranql-connector-sqlserver2008-xa//rar</attribute>
+    </gbean>
     <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">SQL Server (jTDS)</attribute>
         <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>

Modified: geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties (original)
+++ geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties Tue Dec 13 18:00:08 2011
@@ -371,6 +371,23 @@ dbwizard.tranql-connector-sqlserver2005-
 dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp             = The case-insensitive username used to connect to your SQL Server database.
 dbwizard.tranql-connector-sqlserver2005-xa.PreparedStatementCacheSize = PreparedStatement Cache Size
 dbwizard.tranql-connector-sqlserver2005-xa.PreparedStatementCacheSizeExp = The value of PreparedStatementCacheSize. PreparedStatementCacheSize tells the driver how many prepared statements should be associated with each connection.  The default is no statement caching.
+
+dbwizard.tranql-connector-sqlserver2008-xa.DatabaseName            = Database Name
+dbwizard.tranql-connector-sqlserver2008-xa.DatabaseNameExp         = The name of the SQL Server database to connect to.
+dbwizard.tranql-connector-sqlserver2008-xa.Password                = Password
+dbwizard.tranql-connector-sqlserver2008-xa.PasswordExp             = The case-insensitive password used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2008-xa.PortNumber              = Port Number
+dbwizard.tranql-connector-sqlserver2008-xa.PortNumberExp           = The TCP port of the SQL Server, the default is 1433.
+dbwizard.tranql-connector-sqlserver2008-xa.SelectMethod            = SelectMethod
+dbwizard.tranql-connector-sqlserver2008-xa.SelectMethodExp         = SelectMethod={cursor | direct}. Refer to Microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
+dbwizard.tranql-connector-sqlserver2008-xa.SendStringParameters    = SendStringParameters
+dbwizard.tranql-connector-sqlserver2008-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Refer to Microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slightly slower under some circumstances.
+dbwizard.tranql-connector-sqlserver2008-xa.ServerName              = Server Name
+dbwizard.tranql-connector-sqlserver2008-xa.ServerNameExp           = The IP address of the SQL Server.
+dbwizard.tranql-connector-sqlserver2008-xa.UserName                = User Name
+dbwizard.tranql-connector-sqlserver2008-xa.UserNameExp             = The case-insensitive username used to connect to your SQL Server database.
+dbwizard.tranql-connector-sqlserver2008-xa.PreparedStatementCacheSize = PreparedStatement Cache Size
+dbwizard.tranql-connector-sqlserver2008-xa.PreparedStatementCacheSizeExp = The value of PreparedStatementCacheSize. PreparedStatementCacheSize tells the driver how many prepared statements should be associated with each connection.  The default is no statement caching.
 dbwizard.tranql-connector-db2ISeries-xa.DatabaseName               = Database Name
 dbwizard.tranql-connector-db2ISeries-xa.DatabaseNameExp            = Specifies the name for the database server. This name is used as the database portion of the connection URL.
 dbwizard.tranql-connector-db2ISeries-xa.Secure                     = Secure
@@ -382,7 +399,7 @@ dbwizard.tranql-connector-db2ISeries-xa.
 dbwizard.tranql-connector-db2ISeries-xa.Password                   = Password
 dbwizard.tranql-connector-db2ISeries-xa.PasswordExp                = The case-insensitive password used to connect to your DB2 Server database.
 dbwizard.tranql-connector-db2ISeries-xa.DataSourceName             = DataSource Name
-dbwizard.tranql-connector-db2ISeries-xa.DataSourceExp              = Specifies the DataSource Name.
+dbwizard.tranql-connector-db2ISeries-xa.DataSourceNameExp              = Specifies the DataSource Name.
 dbwizard.tranql-connector-db2ISeries-xa.PreparedStatementCacheSize = PreparedStatement Cache Size
 dbwizard.tranql-connector-db2ISeries-xa.PreparedStatementCacheSizeExp = PreparedStatementCacheSize specifies the driver how many prepared statements should be associated with each connection. The default is no statement caching.
 dbwizard.tranql-connector-db2ISeries-xa.Libraries                  = Libraries

Modified: geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Tue Dec 13 18:00:08 2011
@@ -232,6 +232,7 @@ public class DatabasePoolPortlet extends
         rarPathMap.put("TranQL XA Resource Adapter for PostgreSQL", "tranql-connector-postgresql-xa");
         rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2000", "tranql-connector-sqlserver2000-xa");
         rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2005", "tranql-connector-sqlserver2005-xa");
+        rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2008", "tranql-connector-sqlserver2008-xa");
     }
 
     public void destroy() {
@@ -1165,7 +1166,7 @@ public class DatabasePoolPortlet extends
                                 entry.getValue());
                     }
                 }
-                /*Make pool setting effective after server restart                
+                /*Make pool setting effective after server restart*/         
                 Jsr77Naming naming = new Jsr77Naming();
                 AbstractName connectionManagerName = naming.createChildName(new AbstractName(URI.create(data.getAbstractName())), data.getName(), NameFactory.JCA_CONNECTION_MANAGER);
                 PoolingAttributes pool = (PoolingAttributes) PortletManager.getManagedBean(request, connectionManagerName);
@@ -1179,7 +1180,7 @@ public class DatabasePoolPortlet extends
                                 data.blockingTimeout));
                 pool.setIdleTimeoutMinutes(
                         data.idleTimeout == null || data.idleTimeout.equals("") ? 15 : Integer.parseInt(
-                                data.idleTimeout));*/
+                                data.idleTimeout));
                                 
             } catch (Exception e) {
                 log.error("Unable to save connection pool", e);

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Tue Dec 13 18:00:08 2011
@@ -219,22 +219,18 @@ public class TomcatModuleBuilder extends
         if (specDDUrl == null) {
             webApp = new WebApp();
         } else {
+            InputStream in = null;
             try {
                 specDD = JarUtils.readAll(specDDUrl);
-
-                InputStream in = specDDUrl.openStream();
-                try {
-                    webApp = (WebApp) JaxbJavaee.unmarshalJavaee(WebApp.class, in);
-                } finally {
-                    in.close();
-                }
-
+                in = specDDUrl.openStream();
+                webApp = (WebApp) JaxbJavaee.unmarshalJavaee(WebApp.class, in);
             } catch (Exception e) {
                 throw new DeploymentException("Error reading web.xml for " + bundle.getSymbolicName(), e);
+            } finally {
+                IOUtils.close(in);
             }
         }
 
-        AbstractName earName = null;
         String targetPath = ".";
         boolean standAlone = true;
 
@@ -251,13 +247,8 @@ public class TomcatModuleBuilder extends
 
         idBuilder.resolve(environment, bundle.getSymbolicName(), "wab");
 
-        AbstractName moduleName;
-        if (earName == null) {
-            earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
-            moduleName = naming.createChildName(earName, environment.getConfigId().toString(), NameFactory.WEB_MODULE);
-        } else {
-            moduleName = naming.createChildName(earName, targetPath, NameFactory.WEB_MODULE);
-        }
+        AbstractName earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
+        AbstractName moduleName = naming.createChildName(earName, environment.getConfigId().toString(), NameFactory.WEB_MODULE);
 
         String name = webApp.getModuleName();
         if (name == null) {
@@ -288,24 +279,24 @@ public class TomcatModuleBuilder extends
             // on the J2ee management object
             specDD = JarUtils.readAll(specDDUrl);
 
-            InputStream in = null;
 
             // firstly validate the DD xml file, if it is defined by a schema.
             if (identifySpecDDSchemaVersion(specDD) >= 2.4f){
-                in = specDDUrl.openStream();
+                InputStream in = null;
                 try {
+                    in = specDDUrl.openStream();
                     JaxbJavaee.validateJavaee(JavaeeSchema.WEB_APP_3_0, in);
                 } catch (Exception e) {
                     throw new DeploymentException("Error validate web.xml for " + targetPath, e);
                 } finally {
-                    if (in != null)
-                        IOUtils.close(in);
+                    IOUtils.close(in);
                 }
             }
 
             // we found web.xml, if it won't parse that's an error.
-            in = specDDUrl.openStream();
+            InputStream in = null;
             try {
+                in = specDDUrl.openStream();
                 webApp = (WebApp) JaxbJavaee.unmarshalJavaee(WebApp.class, in);
             } catch (Exception e) {
                 // Output the target path in the error to make it clearer to the user which webapp
@@ -313,8 +304,7 @@ public class TomcatModuleBuilder extends
                 // value such as C:\geronimo-1.1\var\temp\geronimo-deploymentUtil22826.tmpdir
                 throw new DeploymentException("Error unmarshal web.xml for " + targetPath, e);
             } finally {
-                if (in != null)
-                    IOUtils.close(in);
+                IOUtils.close(in);
             }
 
         } catch (Exception e) {
@@ -708,11 +698,6 @@ public class TomcatModuleBuilder extends
 //                    webModuleData.setReferencePattern("SharedOwbContext", name);
 //                }
 //            }
-            //This shares a single OWB context for the whole ear
-            AbstractName name = EARContext.APPINFO_GBEAN_NAME_KEY.get(earContext.getGeneralData());
-            if (name != null) {
-                webModuleData.setReferencePattern("SharedOwbContext", name);
-            }
 
             if(tomcatWebApp.isSetSecurityRealmName()) {
                 webModuleData.setReferencePattern("applicationPolicyConfigurationManager", EARContext.JACC_MANAGER_NAME_KEY.get(earContext.getGeneralData()));

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/pom.xml Tue Dec 13 18:00:08 2011
@@ -60,35 +60,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jsf</artifactId>
-            <version>${openwebbeansVersion}</version>
-            <scope>test</scope>
-        </dependency-->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-web</artifactId>
-            <version>${openwebbeansVersion}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-ejb</artifactId>
-            <version>${openwebbeansVersion}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-bundleutils</artifactId>
         </dependency>

Propchange: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 18:00:08 2011
@@ -1,2 +1,3 @@
 /geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:948864,951792
+/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:1184839-1213689
 /tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java:742915

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java Tue Dec 13 18:00:08 2011
@@ -73,9 +73,9 @@ import org.apache.catalina.ha.CatalinaCl
 import org.apache.catalina.valves.ValveBase;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.GeronimoSecurityException;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.util.FileUtils;
 import org.apache.geronimo.kernel.util.IOUtils;
-import org.apache.geronimo.openejb.cdi.OpenWebBeansWebInitializer;
 import org.apache.geronimo.osgi.web.WebApplicationUtils;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.jaas.ConfigurationFactory;
@@ -86,7 +86,6 @@ import org.apache.geronimo.tomcat.interc
 import org.apache.geronimo.tomcat.interceptor.BeforeAfterContext;
 import org.apache.geronimo.tomcat.interceptor.ComponentContextBeforeAfter;
 import org.apache.geronimo.tomcat.interceptor.InstanceContextBeforeAfter;
-import org.apache.geronimo.tomcat.interceptor.OWBBeforeAfter;
 import org.apache.geronimo.tomcat.interceptor.PolicyContextBeforeAfter;
 import org.apache.geronimo.tomcat.interceptor.UserTransactionBeforeAfter;
 import org.apache.geronimo.tomcat.interceptor.WebApplicationIdentityBeforeAfter;
@@ -96,6 +95,7 @@ import org.apache.geronimo.tomcat.util.S
 import org.apache.geronimo.tomcat.valve.GeronimoBeforeAfterValve;
 import org.apache.geronimo.tomcat.valve.ProtectedTargetValve;
 import org.apache.geronimo.web.WebApplicationConstants;
+import org.apache.geronimo.web.WebModuleListener;
 import org.apache.geronimo.web.info.WebAppInfo;
 import org.apache.geronimo.web.security.SpecSecurityBuilder;
 import org.apache.geronimo.web.security.WebSecurityConstraintStore;
@@ -105,11 +105,12 @@ import org.apache.geronimo.webservices.W
 import org.apache.naming.resources.FileDirContext;
 import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.util.IntrospectionUtils;
-import org.apache.webbeans.config.WebBeansContext;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -121,6 +122,8 @@ public class GeronimoStandardContext ext
 
     private static final boolean allowLinking = Boolean.getBoolean("org.apache.geronimo.tomcat.GeronimoStandardContext.allowLinking");
 
+    private static final Logger logger = LoggerFactory.getLogger(GeronimoStandardContext.class);
+
     private Subject defaultSubject = null;
     private RunAsSource runAsSource = RunAsSource.NULL;
 
@@ -140,6 +143,8 @@ public class GeronimoStandardContext ext
     private Bundle bundle;
     private ServiceRegistration serviceRegistration;
 
+    private List webModuleListeners;
+
     private ThreadLocal<Stack<BeforeAfterContext>> beforeAfterContexts = new ThreadLocal<Stack<BeforeAfterContext>>() {
 
         @Override
@@ -256,6 +261,25 @@ public class GeronimoStandardContext ext
                     }
                 }
             }
+
+            //Get WebModuleListener List
+            List<String> webModuleListenerClassNames = (List<String>) tomcatWebAppContext.getDeploymentAttribute(WebApplicationConstants.WEB_MODULE_LISTENERS);
+            if (webModuleListenerClassNames != null && webModuleListenerClassNames.size() > 0) {
+                webModuleListeners = new ArrayList(webModuleListenerClassNames.size());
+                for (String webModuleListenerClassName : webModuleListenerClassNames) {
+                    try {
+                        Class<?> cls = bundle.loadClass(webModuleListenerClassName);
+                        Object webModuleListener = cls.newInstance();
+                        webModuleListeners.add(webModuleListener);
+                    } catch (ClassNotFoundException e) {
+                        logger.warn("Unable to load the listener class" + webModuleListenerClassName, e);
+                    } catch (InstantiationException e) {
+                        logger.warn("Unable to create the listener instance " + webModuleListenerClassName, e);
+                    } catch (IllegalAccessException e) {
+                        logger.warn("Unable to create the listener instance " + webModuleListenerClassName, e);
+                    }
+                }
+            }
         }
 
         int index = 0;
@@ -270,17 +294,6 @@ public class GeronimoStandardContext ext
             interceptor = new ComponentContextBeforeAfter(interceptor, index++, enc);
         }
 
-        WebBeansContext owbContext = ctx.getOWBContext();
-        if (owbContext == null) {
-            //hopefully for tests only
-            owbContext = OpenWebBeansWebInitializer.newWebBeansContext(null);
-        }
-        OpenWebBeansWebInitializer.initializeServletContext(owbContext, servletContext);
-        if (getInstanceManager() instanceof TomcatInstanceManager) {
-            ((TomcatInstanceManager) getInstanceManager()).setOWBContext(owbContext);
-        }
-        interceptor = new OWBBeforeAfter(interceptor, index++, servletContext, owbContext);
-
         //Set a PolicyContext BeforeAfter
         SecurityHolder securityHolder = ctx.getSecurityHolder();
         if (securityHolder != null) {
@@ -309,7 +322,7 @@ public class GeronimoStandardContext ext
         //Set a UserTransactionBeforeAfter
         interceptor = new UserTransactionBeforeAfter(interceptor, index++, ctx.getUserTransaction());
 
-        interceptor = new WebApplicationIdentityBeforeAfter(interceptor, index++, ctx.getAbstractName().toString());
+        interceptor = new WebApplicationIdentityBeforeAfter(interceptor, index++, ctx.getAbstractName().getNameProperty(NameFactory.J2EE_NAME));
 
         addValve(new ProtectedTargetValve());
 
@@ -816,7 +829,7 @@ public class GeronimoStandardContext ext
                 return;
             }
             TomcatDeploymentWatcher tomcatDeploymentWatcher = (TomcatDeploymentWatcher) bundleContext.getService(tomcatDeploymentWatcherReference);
-            tomcatDeploymentWatcher.deleteOnUndeployed(tomcatWebAppContext.getAbstractName(), tempDirectory);
+            tomcatDeploymentWatcher.deleteOnUndeployed(bundle, tomcatWebAppContext.getAbstractName(), tempDirectory);
         } catch (Exception e) {
             logger.warn("Unable to add temporary directory " + tempDirectory + "to the Tomcat deployment watcher, that folder will not be delete on the undeployment", e);
         } finally {
@@ -838,6 +851,22 @@ public class GeronimoStandardContext ext
         @Override
         public void invoke(Request request, Response response) throws IOException, ServletException {
             if (request == null && response == null) {
+                //Execute WebModuleListeners
+                ClassLoader oldClassLoader = null;
+                try {
+                    oldClassLoader = bindThread();
+                    if (webModuleListeners != null) {
+                        for (Object webModuleListener : webModuleListeners) {
+                            if (webModuleListener instanceof WebModuleListener) {
+                                ((WebModuleListener) webModuleListener).moduleInitialized(getServletContext());
+                            } else {
+                                logger.warn("Invalid WebModuleListener " + webModuleListener.getClass().getName());
+                            }
+                        }
+                    }
+                } finally {
+                    unbindThread(oldClassLoader);
+                }
                 try {
                     GeronimoStandardContext.super.startInternal();
                 } catch (LifecycleException e) {
@@ -853,6 +882,25 @@ public class GeronimoStandardContext ext
         }
     }
 
+    @Override
+    protected synchronized void stopInternal() throws LifecycleException {
+        super.stopInternal();
+        ClassLoader oldClassLoader = null;
+        try {
+            oldClassLoader = bindThread();
+            if (webModuleListeners != null) {
+                for (Object webModuleListener : webModuleListeners) {
+                    if (webModuleListener instanceof WebModuleListener) {
+                        ((WebModuleListener) webModuleListener).moduleDestoryed(getServletContext());
+                    } else {
+                        logger.warn("Invalid WebModuleListener " + webModuleListener.getClass().getName());
+                    }
+                }
+            }
+        } finally {
+            unbindThread(oldClassLoader);
+        }
+    }
 
     public BeforeAfter getBeforeAfter() {
         return beforeAfter;

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java Tue Dec 13 18:00:08 2011
@@ -16,13 +16,11 @@
  */
 package org.apache.geronimo.tomcat;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
 import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
 import javax.naming.NamingException;
 import javax.security.auth.Subject;
 
@@ -41,8 +39,6 @@ import org.apache.geronimo.gbean.annotat
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
-import org.apache.geronimo.j2ee.annotation.Holder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.management.geronimo.NetworkConnector;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.osgi.web.WABApplicationConstants;
@@ -53,7 +49,6 @@ import org.apache.geronimo.web.WebApplic
 import org.apache.geronimo.web.info.WebAppInfo;
 import org.apache.geronimo.webservices.SoapHandler;
 import org.apache.geronimo.webservices.WebServiceContainer;
-import org.apache.tomcat.InstanceManager;
 import org.apache.xbean.osgi.bundle.util.BundleUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -266,7 +261,7 @@ public class TomcatContainer implements 
      * @see org.apache.catalina.Host
      */
     public void addContext(TomcatContext contextInfo) throws Exception {
-        //Tomcat internally use empty string to represent the root context        
+        //Tomcat internally use empty string to represent the root context
         Context context = createContext(contextInfo.getContextPath().equals("/") ? "" : contextInfo.getContextPath(), contextInfo.getClassLoader(), contextInfo.getWebAppInfo());
         //Was a virtual server defined?
         String virtualServer = contextInfo.getVirtualServer();

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatContext.java Tue Dec 13 18:00:08 2011
@@ -36,7 +36,6 @@ import org.apache.geronimo.tomcat.util.S
 import org.apache.geronimo.web.info.WebAppInfo;
 import org.apache.geronimo.webservices.WebServiceContainer;
 import org.apache.tomcat.InstanceManager;
-import org.apache.webbeans.config.WebBeansContext;
 import org.osgi.framework.Bundle;
 
 /**
@@ -103,7 +102,5 @@ public interface TomcatContext {
 
     Map<String, String> getContextAttributes();
 
-    WebBeansContext getOWBContext();
-
     AbstractName getAbstractName();
 }

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatDeploymentWatcher.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatDeploymentWatcher.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatDeploymentWatcher.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatDeploymentWatcher.java Tue Dec 13 18:00:08 2011
@@ -18,33 +18,124 @@
 package org.apache.geronimo.tomcat;
 
 import java.io.File;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.OsgiService;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.NoSuchAttributeException;
 import org.apache.geronimo.kernel.config.DeploymentWatcher;
+import org.apache.geronimo.kernel.lifecycle.LifecycleAdapter;
+import org.apache.geronimo.kernel.lifecycle.LifecycleListener;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.util.FileUtils;
+import org.apache.geronimo.osgi.web.WebApplicationUtils;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
  */
 @GBean
 @OsgiService
-public class TomcatDeploymentWatcher implements DeploymentWatcher {
+public class TomcatDeploymentWatcher implements DeploymentWatcher, GBeanLifecycle, SynchronousBundleListener {
 
-    private Map<AbstractName, File> abstractNameTempDirectoryMap = new ConcurrentHashMap<AbstractName, File>();
+    private static final Logger logger = LoggerFactory.getLogger(TomcatDeploymentWatcher.class);
+
+    private final Map<AbstractName, File> abstractNameCleanUpDirectoryMap = new ConcurrentHashMap<AbstractName, File>();
+
+    private final Map<Artifact, long[]> ebaArtifactApplicationContentBundleIdsMap = new ConcurrentHashMap<Artifact, long[]>();
+
+    private final Set<Long> embeddedWABBundleIds = Collections.synchronizedSet(new HashSet<Long>());
+
+    private final Kernel kernel;
+
+    private final Map<Long, File> wabBundleIdCleanUpDirectoryMap = new ConcurrentHashMap<Long, File>();
+
+    private final BundleContext bundleContext;
+
+    private final LifecycleListener ebaLifecycleListener = new EBALifecycleListener();
+
+    public TomcatDeploymentWatcher(@ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel, @ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext) {
+        this.kernel = kernel;
+        this.bundleContext = bundleContext;
+    }
+
+    @Override
+    public void bundleChanged(BundleEvent event) {
+        Bundle bundle = event.getBundle();
+        Long bundleId = event.getBundle().getBundleId();
+        if (event.getType() == Bundle.UNINSTALLED && WebApplicationUtils.isWebApplicationBundle(bundle) && !embeddedWABBundleIds.contains(bundleId)) {
+            File cleanUpDirectory = wabBundleIdCleanUpDirectoryMap.remove(bundleId);
+            if (cleanUpDirectory != null) {
+                FileUtils.recursiveDelete(cleanUpDirectory);
+            }
+        }
+    }
+
+    public void deleteOnUndeployed(Bundle bundle, AbstractName abName, File cleanUpDirectory) {
+        if (WebApplicationUtils.isWebApplicationBundle(bundle)) {
+            wabBundleIdCleanUpDirectoryMap.put(bundle.getBundleId(), cleanUpDirectory);
+        } else {
+            abstractNameCleanUpDirectoryMap.put(abName, cleanUpDirectory);
+        }
+    }
 
     @Override
     public void deployed(Artifact artifact) {
     }
 
     @Override
+    public void doFail() {
+        try {
+            doStop();
+        } catch (Exception e) {
+        }
+    }
+
+    @Override
+    public void doStart() throws Exception {
+        kernel.getLifecycleMonitor().addLifecycleListener(ebaLifecycleListener, new AbstractNameQuery("org.apache.geronimo.aries.ApplicationGBean"));
+        bundleContext.addBundleListener(this);
+    }
+
+    @Override
+    public void doStop() throws Exception {
+        kernel.getLifecycleMonitor().removeLifecycleListener(ebaLifecycleListener);
+        bundleContext.removeBundleListener(this);
+    }
+
+    @Override
     public void undeployed(Artifact artifact) {
-        for (Iterator<Map.Entry<AbstractName, File>> it = abstractNameTempDirectoryMap.entrySet().iterator(); it.hasNext();) {
+        //a. EBA Bundle
+        long[] applicationBundleIds = ebaArtifactApplicationContentBundleIdsMap.remove(artifact);
+        if (applicationBundleIds != null) {
+            for (long applicationBundleId : applicationBundleIds) {
+                File cleanUpDirectory = wabBundleIdCleanUpDirectoryMap.remove(applicationBundleId);
+                if (cleanUpDirectory != null) {
+                    embeddedWABBundleIds.remove(applicationBundleId);
+                    FileUtils.recursiveDelete(cleanUpDirectory);
+                }
+            }
+            return;
+        }
+        //b. Common Application
+        for (Iterator<Map.Entry<AbstractName, File>> it = abstractNameCleanUpDirectoryMap.entrySet().iterator(); it.hasNext();) {
             Map.Entry<AbstractName, File> entry = it.next();
             if (entry.getKey().getArtifact().equals(artifact)) {
                 FileUtils.recursiveDelete(entry.getValue());
@@ -53,7 +144,23 @@ public class TomcatDeploymentWatcher imp
         }
     }
 
-    public void deleteOnUndeployed(AbstractName abName, File tempDirectory) {
-        abstractNameTempDirectoryMap.put(abName, tempDirectory);
+    private class EBALifecycleListener extends LifecycleAdapter {
+
+        @Override
+        public void running(AbstractName abName) {
+            try {
+                long[] applicationContentBundleIds = (long[]) kernel.getAttribute(abName, "applicationContentBundleIds");
+                for (long applicationContentBundleId : applicationContentBundleIds) {
+                    embeddedWABBundleIds.add(applicationContentBundleId);
+                }
+                ebaArtifactApplicationContentBundleIdsMap.put(abName.getArtifact(), applicationContentBundleIds);
+            } catch (GBeanNotFoundException e) {
+                logger.error("Unable to find application content bundle Ids from GBean " + abName, e);
+            } catch (NoSuchAttributeException e) {
+                logger.error("Unable to find application content bundle Ids from GBean " + abName, e);
+            } catch (Exception e) {
+                logger.error("Unable to find application content bundle Ids from GBean " + abName, e);
+            }
+        }
     }
 }

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java Tue Dec 13 18:00:08 2011
@@ -56,7 +56,7 @@ public class TomcatEJBWebServiceContext 
 
         //Create a dummy wrapper
         Wrapper wrapper = this.createWrapper();
-        String name = System.currentTimeMillis() + "";
+        String name = String.valueOf(System.currentTimeMillis());
         wrapper.setName(name);
         this.addChild(wrapper);
         this.addServletMapping("/*", name);

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatInstanceManager.java Tue Dec 13 18:00:08 2011
@@ -22,15 +22,12 @@ package org.apache.geronimo.tomcat;
 
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
 
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-import org.apache.tomcat.InstanceManager;
 import org.apache.geronimo.j2ee.annotation.Holder;
-import org.apache.geronimo.openejb.cdi.GeronimoSingletonService;
-import org.apache.webbeans.config.WebBeansContext;
+import org.apache.tomcat.InstanceManager;
 
 /**
  * @version $Rev$ $Date$
@@ -40,7 +37,6 @@ public class TomcatInstanceManager imple
     private final Holder holder;
     private final ClassLoader classLoader;
     private final Context context;
-    private WebBeansContext owbContext ;
 
     public TomcatInstanceManager(Holder holder, ClassLoader classLoader, Context context) {
         this.holder = holder;
@@ -49,9 +45,7 @@ public class TomcatInstanceManager imple
     }
 
     public Object newInstance(String fqcn, ClassLoader classLoader) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException {
-        WebBeansContext oldContext = null;
         try {
-            oldContext = GeronimoSingletonService.contextEntered(owbContext);
             return holder.newInstance(fqcn, classLoader, context);
         } catch (IllegalAccessException e) {
             throw e;
@@ -59,18 +53,14 @@ public class TomcatInstanceManager imple
             throw e;
         } catch (Exception e) {
             throw (InstantiationException) new InstantiationException().initCause(e);
-        } finally {
-            GeronimoSingletonService.contextExited(oldContext);
         }
     }
 
     public Object newInstance(String className) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException {
-        WebBeansContext oldContext = null;
         try {
             //TODO Specification 13.4.1 p125
             //The @ServletSecurity annotation is not applied to the url-patterns of a ServletRegistration created using the addServlet(String, Servlet)  method of the ServletContext interface,
             //unless the Servlet was constructed by the createServlet method of the ServletContext interface.
-            oldContext = GeronimoSingletonService.contextEntered(owbContext);
             return holder.newInstance(className, classLoader, context);
         } catch (IllegalAccessException e) {
             throw e;
@@ -78,20 +68,14 @@ public class TomcatInstanceManager imple
             throw e;
         } catch (Exception e) {
             throw (InstantiationException) new InstantiationException().initCause(e);
-        }finally {
-            GeronimoSingletonService.contextExited(oldContext);
         }
     }
 
     public void destroyInstance(Object o) throws IllegalAccessException, InvocationTargetException {
-        WebBeansContext oldContext = null;
         try {
-            oldContext = GeronimoSingletonService.contextEntered(owbContext);
             holder.destroyInstance(o);
         } catch (Exception e) {
             throw new InvocationTargetException(e, "Attempted to destroy instance");
-        }finally {
-            GeronimoSingletonService.contextExited(oldContext);
         }
     }
 
@@ -102,8 +86,4 @@ public class TomcatInstanceManager imple
         //For a, we should have done the resource injections, for b, we are not need to do the resource injections
         //Correct me if I miss anything !
     }
-
-    public void setOWBContext(WebBeansContext owbContext) {
-        this.owbContext = owbContext;
-    }
 }

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Tue Dec 13 18:00:08 2011
@@ -55,12 +55,10 @@ import org.apache.geronimo.j2ee.jndi.Con
 import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.ObjectNameUtil;
-import org.apache.geronimo.management.J2EEApplication;
 import org.apache.geronimo.management.J2EEServer;
 import org.apache.geronimo.management.StatisticsProvider;
 import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebModule;
-import org.apache.geronimo.openejb.cdi.SharedOwbContext;
 import org.apache.geronimo.security.jaas.ConfigurationFactory;
 import org.apache.geronimo.security.jacc.ApplicationPolicyConfigurationManager;
 import org.apache.geronimo.security.jacc.RunAsSource;
@@ -73,7 +71,6 @@ import org.apache.geronimo.webservices.W
 import org.apache.geronimo.webservices.WebServiceContainerFactory;
 import org.apache.naming.resources.DirContextURLStreamHandler;
 import org.apache.tomcat.InstanceManager;
-import org.apache.webbeans.config.WebBeansContext;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -121,7 +118,7 @@ public class TomcatWebAppContext impleme
     private final Map<String, Object> deploymentAttributes;
     private final ApplicationPolicyConfigurationManager applicationPolicyConfigurationManager;
     private final Map<String,String> contextAttributes;
-    private final WebBeansContext owbContext;
+    //private final WebBeansContext owbContext;
     private final InstanceManager instanceManager;
     private final AbstractName abName;
 
@@ -169,7 +166,6 @@ public class TomcatWebAppContext impleme
             @ParamAttribute(name = "deploymentAttributes") Map<String, Object> deploymentAttributes,
             @ParamAttribute(name = "webAppInfo") WebAppInfo webAppInfo,
             @ParamAttribute(name = "contextAttributes") Map<String, String> contextAttributes,
-            @ParamReference(name = "SharedOwbContext")SharedOwbContext sharedOwbContext,
             @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
             @ParamSpecial(type = SpecialAttributeType.abstractName) AbstractName abName)
             throws Exception {
@@ -284,7 +280,6 @@ public class TomcatWebAppContext impleme
             j2EEServer = null;
             j2EEApplication = null;
         }
-        owbContext = sharedOwbContext == null? null: sharedOwbContext.getOWBContext();
         instanceManager = new TomcatInstanceManager(this.holder, classLoader, componentContext);
     }
 
@@ -355,10 +350,6 @@ public class TomcatWebAppContext impleme
         return docBase;
     }
 
-//    public void setDocBase(String docBase) {
-//        this.docBase = docBase;
-//    }
-
     public UserTransaction getUserTransaction() {
         return userTransaction;
     }
@@ -565,11 +556,6 @@ public class TomcatWebAppContext impleme
         return contextAttributes;
     }
 
-    @Override
-    public WebBeansContext getOWBContext() {
-        return owbContext;
-    }
-
     public void doStart() throws Exception {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         try {
@@ -584,9 +570,12 @@ public class TomcatWebAppContext impleme
                 throw new IllegalStateException("JNDI environment was not set up correctly due to previous error");
             }
             DirContextURLStreamHandler.bind(classLoader, resources);
-            if (context instanceof StandardContext)
+            if (context instanceof StandardContext) {
                 statsProvider = new ModuleStats((StandardContext) context);
-            log.debug("TomcatWebAppContext started for " + contextPath);
+            }
+            if (log.isDebugEnabled()) {
+                log.debug("TomcatWebAppContext started for " + contextPath);
+            }
         } finally {
             Thread.currentThread().setContextClassLoader(cl);
         }

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/WebApplicationIdentityBeforeAfter.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/WebApplicationIdentityBeforeAfter.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/WebApplicationIdentityBeforeAfter.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/interceptor/WebApplicationIdentityBeforeAfter.java Tue Dec 13 18:00:08 2011
@@ -20,7 +20,7 @@ package org.apache.geronimo.tomcat.inter
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.apache.geronimo.web.WebApplicationIdentity;
+import org.apache.geronimo.web.WebApplicationName;
 
 /**
  * @version $Rev$ $Date$
@@ -42,15 +42,15 @@ public class WebApplicationIdentityBefor
     @Override
     public void before(BeforeAfterContext beforeAfterContext, ServletRequest httpRequest, ServletResponse httpResponse, int dispatch) {
         try {
-            beforeAfterContext.contexts[index] = WebApplicationIdentity.getIdentity();
-            WebApplicationIdentity.setIdentity(identity);
+            beforeAfterContext.contexts[index] = WebApplicationName.getName();
+            WebApplicationName.setName(identity);
             beforeAfterContext.clearRequiredFlags[index] = true;
             if (next != null) {
                 next.before(beforeAfterContext, httpRequest, httpResponse, dispatch);
             }
         } catch (RuntimeException e) {
             if (beforeAfterContext.clearRequiredFlags[index]) {
-                WebApplicationIdentity.setIdentity((String) beforeAfterContext.contexts[index]);
+                WebApplicationName.setName((String) beforeAfterContext.contexts[index]);
                 beforeAfterContext.clearRequiredFlags[index] = false;
             }
             throw e;
@@ -65,7 +65,7 @@ public class WebApplicationIdentityBefor
             }
         } finally {
             if (beforeAfterContext.clearRequiredFlags[index]) {
-                WebApplicationIdentity.setIdentity((String) beforeAfterContext.contexts[index]);
+                WebApplicationName.setName((String) beforeAfterContext.contexts[index]);
                 beforeAfterContext.clearRequiredFlags[index] = false;
             }
         }

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Tue Dec 13 18:00:08 2011
@@ -63,7 +63,6 @@ import org.apache.geronimo.web.WebApplic
 import org.apache.geronimo.web.info.ServletInfo;
 import org.apache.geronimo.web.info.WebAppInfo;
 import org.apache.karaf.jaas.boot.ProxyLoginModule;
-import org.apache.webbeans.config.WebBeansFinder;
 import org.osgi.framework.Bundle;
 
 
@@ -94,7 +93,7 @@ public abstract class AbstractWebModuleT
     }
 
     protected TomcatWebAppContext setUpInsecureAppContext(String relativeWebAppRoot, URL configurationBaseURL, SecurityHolder securityHolder, RunAsSource runAsSource, ObjectRetriever tomcatRealm, ValveGBean valveChain, WebAppInfo webAppInfo) throws Exception {
-        WebBeansFinder.clearInstances(getClass().getClassLoader());
+        //WebBeansFinder.clearInstances(getClass().getClassLoader());
         configurationBaseURL = cl.getResource("deployables/");
         //Setup default JSP Factory
         Class.forName("org.apache.jasper.compiler.JspRuntimeContext");
@@ -144,7 +143,6 @@ public abstract class AbstractWebModuleT
                 webAppInfo, //webAppinfo
                 new HashMap<String, String>(), // Map<String,String> contextAttributes;
                 null,
-                null,
                 new AbstractName(new URI("default/test/1.0/war?J2EEApplication=null,j2eeType=WebModule,name=default/test/1.0/war")));  //kernel
         app.doStart();
         return app;

Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/tomcat7/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/tomcat7/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/tomcat7/pom.xml Tue Dec 13 18:00:08 2011
@@ -71,12 +71,12 @@
             <version>${project.version}</version>
         </dependency>
         
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
             <version>${project.version}</version>
             <type>car</type>
-        </dependency>
+        </dependency-->
 
         <!-- Required because tomcat STARTS its default web.xml which has a jasper servlet in it -->
         <dependency>

Propchange: geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 18:00:08 2011
@@ -1,3 +1,4 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:948864,951792
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:887507
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:1184839-1213689

Propchange: geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 18:00:08 2011
@@ -1,3 +1,4 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:948864,951792
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:887507
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:1184839-1213689

Propchange: geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 18:00:08 2011
@@ -1,3 +1,4 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:948864,951792
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:887507
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:1184839-1213689

Propchange: geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 13 18:00:08 2011
@@ -1,3 +1,4 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:948864,951792
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:887507
+/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:1184839-1213689

Modified: geronimo/server/branches/3.0-beta/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/wink/geronimo-wink-builder/src/main/java/org/apache/geronimo/wink/deployment/WinkModuleBuilderExtension.java Tue Dec 13 18:00:08 2011
@@ -58,7 +58,6 @@ import org.apache.wink.server.internal.s
 import org.apache.xbean.finder.BundleAssignableClassFinder;
 import org.apache.xbean.finder.ClassFinder;
 import org.apache.xbean.osgi.bundle.util.BundleClassFinder;
-import org.apache.xbean.osgi.bundle.util.BundleClassLoader;
 import org.apache.xbean.osgi.bundle.util.ClassDiscoveryFilter;
 import org.apache.xbean.osgi.bundle.util.DiscoveryRange;
 import org.osgi.framework.Bundle;
@@ -175,7 +174,7 @@ public class WinkModuleBuilderExtension 
             }
 
         } catch (Exception e) {
-            throw new DeploymentException("Fail to scan javax.ws.rs.core.Application sub classes in application", e);
+            log.warn("Fail to scan javax.ws.rs.core.Application sub classes in application", e);
         } finally {
             bundle.getBundleContext().ungetService(reference);
         }
@@ -195,7 +194,6 @@ public class WinkModuleBuilderExtension 
          * ...
          */
         Class<? extends Application> applicationClass;
-        BundleClassLoader bundleClassLoader = new BundleClassLoader(bundle);
         for (Servlet servlet : webApp.getServlet()) {
             List<ParamValue> params = servlet.getInitParam();
             for (ParamValue parm : params) {
@@ -207,7 +205,7 @@ public class WinkModuleBuilderExtension 
                         applicationClass = clazz;
                         Class<?> servletClass = null;
                         try {
-                            servletClass = bundleClassLoader.loadClass(servlet.getServletClass());
+                            servletClass = bundle.loadClass(servlet.getServletClass());
                         } catch (ClassNotFoundException e) {
                             log.warn("failed to load servlet class:" + servlet.getServletClass());
                         }

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ds-jndi</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
   
   

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ds-jndi</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
   
   

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ds-jndi</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
   
   

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ejb-osgi-service</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
   
   

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ejb-osgi-service</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>  
  
   <artifactId>ejb-eba</artifactId>
@@ -110,7 +111,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${project.groupId}/${project.artifactId}/1.0.0/eba</moduleId>
+                                    <moduleId>application/${project.groupId}.${project.artifactId}/1.0.0/eba</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ejb-osgi-service</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
   
   

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ejb-osgi-service</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
   
  

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>mail-osgi-service</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>  
   
   <artifactId>mail-eba</artifactId>
@@ -100,7 +101,7 @@
                                     <goal>undeploy-module</goal>
                                 </goals>
                                 <configuration>
-                                    <moduleId>${project.groupId}/${project.artifactId}/1.0.0/eba</moduleId>
+                                    <moduleId>application/${project.groupId}.${project.artifactId}/1.0.0/eba</moduleId>
                                 </configuration>
                             </execution>
                         </executions>

Modified: geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml?rev=1213810&r1=1213809&r2=1213810&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml (original)
+++ geronimo/server/branches/3.0-beta/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml Tue Dec 13 18:00:08 2011
@@ -18,12 +18,13 @@
     under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>mail-osgi-service</artifactId>
     <groupId>org.apache.geronimo.testsuite</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>mail-wab</artifactId>



Mime
View raw message