geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r881743 - in /geronimo/server/trunk: ./ plugins/ plugins/clustering/clustering-it/customer-jetty/src/main/plan/ plugins/hotdeploy/hot-deployer/src/main/history/ plugins/monitoring/agent-car-ejb/src/main/history/ plugins/monitoring/agent-ds/...
Date Wed, 18 Nov 2009 12:14:06 GMT
Author: rickmcguire
Date: Wed Nov 18 12:14:05 2009
New Revision: 881743

URL: http://svn.apache.org/viewvc?rev=881743&view=rev
Log:
some management plugin cleanup

Modified:
    geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml
    geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml

Modified: geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/customer-jetty/src/main/plan/plan.xml
Wed Nov 18 12:14:05 2009
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
      http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
 <!-- $Rev$ $Date$ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <!--<attribute name="testSQL">select * from customer</attribute>-->
         <attribute name="path">CustomerService.sql</attribute>
         <reference name="DataSource">

Modified: geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/hotdeploy/hot-deployer/src/main/history/dependencies.xml
Wed Nov 18 12:14:05 2009
@@ -31,4 +31,9 @@
         <artifactId>geronimo-hot-deploy</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/history/dependencies.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/history/dependencies.xml
Wed Nov 18 12:14:05 2009
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>agent</artifactId>
+        <artifactId>agent-car-ejb</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>

Modified: geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml Wed Nov 18 12:14:05
2009
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-    
+
        http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
 <!-- $Rev$ $Date$ -->
 
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
-    
+
     <resourceadapter>
         <outbound-resourceadapter>
             <!-- Pool for Active Statistics -->
@@ -62,16 +62,16 @@
             </connection-definition>
         </outbound-resourceadapter>
     </resourceadapter>
-    
+
     <!-- These two GBeans will create the tables for the database automatically -->
-    <gbean name="ActiveDSGBean" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    <gbean name="ActiveDSGBean" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='statistics'</attribute>
         <attribute name="path">META-INF/database/derby/createTables.sql</attribute>
         <reference name="DataSource">
             <name>jdbc/ActiveDS</name>
         </reference>
     </gbean>
-    <gbean name="ArchiveDSGBean" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    <gbean name="ArchiveDSGBean" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='statistics'</attribute>
         <attribute name="path">META-INF/database/derby/createTables.sql</attribute>
         <reference name="DataSource">

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Wed Nov 18 12:14:05 2009
@@ -164,6 +164,7 @@
         System.setProperty("duct tape", "");
         System.setProperty("admin.disabled", "true");
         System.setProperty("openejb.logger.external", "true");
+        System.setProperty("openejb.log.factory", "org.apache.openejb.util.PaxLogStreamFactory");
 
         setDefaultProperty("openejb.deploymentId.format", "{moduleId}/{ejbName}");
         setDefaultProperty("openejb.jndiname.strategy.class", "org.apache.openejb.assembler.classic.JndiBuilder$TemplatedStrategy");
@@ -171,7 +172,6 @@
         setDefaultProperty("openejb.jndiname.failoncollision", "false");
 
         System.setProperty("openejb.naming", "xbean");
-
     }
 
     public void doStart() throws Exception {

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Wed Nov 18 12:14:05 2009
@@ -49,6 +49,12 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Nov 18 12:14:05 2009
@@ -108,7 +108,7 @@
         <module>derby</module>
         <!--<module>dojo</module>-->
         <!--<module>debugviews</module>-->
-        <!--<module>hotdeploy</module>-->
+        <module>hotdeploy</module>
         <module>j2ee</module>
         <module>jasper</module>
         <module>javamail</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Nov 18 12:14:05 2009
@@ -76,7 +76,7 @@
         <tomcatVersion>6.0.20.0</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
-        <openejbVersion>3.1.2-SNAPSHOT</openejbVersion>
+        <openejbVersion>3.1.3-SNAPSHOT</openejbVersion>
         <openjpaVersion>2.0.0-M3</openjpaVersion>
         <derbyVersion>10.4.2.0</derbyVersion>
         <cxfVersion>2.1.4</cxfVersion>

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml
(original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-ejb-ear/src/main/resources/ConcurrentPool.xml
Wed Nov 18 12:14:05 2009
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -56,7 +56,7 @@
         </resourceadapter>
 
 <!--
-    <gbean name="CreateDatabaseGBean" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    <gbean name="CreateDatabaseGBean" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='concurrent'</attribute>
         <attribute name="path">ConcurrentDB.sql</attribute>
         <reference name="DataSource">

Modified: geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml?rev=881743&r1=881742&r2=881743&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml
(original)
+++ geronimo/server/trunk/testsuite/concurrent-testsuite/concurrent-basic/concurrent-web-ear/src/main/resources/ConcurrentPool.xml
Wed Nov 18 12:14:05 2009
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -56,7 +56,7 @@
         </resourceadapter>
 
 <!--
-    <gbean name="CreateDatabaseGBean" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+    <gbean name="CreateDatabaseGBean" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='concurrent'</attribute>
         <attribute name="path">ConcurrentDB.sql</attribute>
         <reference name="DataSource">



Mime
View raw message