Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 12021 invoked from network); 18 Nov 2009 12:14:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Nov 2009 12:14:30 -0000 Received: (qmail 52782 invoked by uid 500); 18 Nov 2009 12:14:29 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 52710 invoked by uid 500); 18 Nov 2009 12:14:29 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 52701 invoked by uid 99); 18 Nov 2009 12:14:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Nov 2009 12:14:29 +0000 X-ASF-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Nov 2009 12:14:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5D0E923888C2; Wed, 18 Nov 2009 12:14:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: rickmcguire@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091118121406.5D0E923888C2@eris.apache.org> 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 @@ - + CustomerService.sql 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 @@ geronimo-hot-deploy jar + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + jar + 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 @@ org.apache.geronimo.plugins.monitoring - agent + agent-car-ejb 3.0-SNAPSHOT car 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 @@ - + @@ -62,16 +62,16 @@ - + - + SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='statistics' META-INF/database/derby/createTables.sql jdbc/ActiveDS - + SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='statistics' META-INF/database/derby/createTables.sql 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 @@ org.apache.geronimo.specs geronimo-jms_1.1_spec + + + org.ops4j.pax.logging + pax-logging-api + + org.apache.openejb openejb-core 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 @@ derby - + hotdeploy j2ee jasper javamail 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 @@ 6.0.20.0 org.apache.geronimo.ext.tomcat - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT 2.0.0-M3 10.4.2.0 2.1.4 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 @@