From scm-return-43974-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Wed Sep 08 12:21:54 2010 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 61225 invoked from network); 8 Sep 2010 12:21:53 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Sep 2010 12:21:53 -0000 Received: (qmail 91379 invoked by uid 500); 8 Sep 2010 12:21:53 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 91243 invoked by uid 500); 8 Sep 2010 12:21:51 -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 91236 invoked by uid 99); 8 Sep 2010 12:21:50 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Sep 2010 12:21:50 +0000 X-ASF-Spam-Status: No, hits=-1999.4 required=10.0 tests=ALL_TRUSTED,HK_RANDOM_ENVFROM 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, 08 Sep 2010 12:21:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E638238897D; Wed, 8 Sep 2010 12:21:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r995018 - in /geronimo/server/trunk/plugins: aries/aries-deployer/src/main/history/ bval/bval-deployer/src/main/plan/ clustering/plugin-farm/src/main/history/ j2ee/j2ee-server/src/main/history/ jetty8/jetty8-deployer/src/main/history/ opene... Date: Wed, 08 Sep 2010 12:21:08 -0000 To: scm@geronimo.apache.org From: rickmcguire@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100908122108.4E638238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickmcguire Date: Wed Sep 8 12:21:07 2010 New Revision: 995018 URL: http://svn.apache.org/viewvc?rev=995018&view=rev Log: restore default environment to the BValNamingBuilder, remove extraneous setAttribute() for PersistenceUnitGBean Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=995018&r1=995017&r2=995018&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Wed Sep 8 12:21:07 2010 @@ -7,6 +7,16 @@ car + asm + asm-all + jar + + + commons-cli + commons-cli + jar + + org.apache.aries org.apache.aries.util jar @@ -37,6 +47,36 @@ jar + org.apache.felix + org.apache.felix.bundlerepository + jar + + + org.apache.felix + org.apache.felix.configadmin + jar + + + org.apache.geronimo.bundles + jaxb-impl + jar + + + org.apache.geronimo.bundles + sxc-jaxb + jar + + + org.apache.geronimo.bundles + sxc-runtime + jar + + + org.apache.geronimo.bundles + woodstox + jar + + org.apache.geronimo.components geronimo-jaspi jar @@ -48,6 +88,21 @@ org.apache.geronimo.framework + geronimo-cli + jar + + + org.apache.geronimo.framework + geronimo-common + jar + + + org.apache.geronimo.framework + geronimo-crypto + jar + + + org.apache.geronimo.framework geronimo-deploy-config jar @@ -58,6 +113,16 @@ org.apache.geronimo.framework + geronimo-kernel + jar + + + org.apache.geronimo.framework + geronimo-main + jar + + + org.apache.geronimo.framework geronimo-management jar @@ -68,6 +133,11 @@ org.apache.geronimo.framework + geronimo-pax-logging + jar + + + org.apache.geronimo.framework geronimo-security jar @@ -78,8 +148,8 @@ org.apache.geronimo.framework - j2ee-system - car + geronimo-system + jar org.apache.geronimo.modules @@ -108,6 +178,11 @@ org.apache.geronimo.specs + geronimo-activation_1.1_spec + jar + + + org.apache.geronimo.specs geronimo-annotation_1.1_spec jar @@ -143,6 +218,11 @@ org.apache.geronimo.specs + geronimo-jaxb_2.2_spec + jar + + + org.apache.geronimo.specs geronimo-jaxrpc_1.1_spec jar @@ -168,6 +248,11 @@ org.apache.geronimo.specs + geronimo-osgi-registry + jar + + + org.apache.geronimo.specs geronimo-saaj_1.3_spec jar @@ -177,12 +262,32 @@ jar + org.apache.geronimo.specs + geronimo-stax-api_1.2_spec + jar + + org.apache.openejb openejb-jee jar org.apache.servicemix.bundles + org.apache.servicemix.bundles.cglib + jar + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.commons-jexl + jar + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.commons-lang + jar + + + org.apache.servicemix.bundles org.apache.servicemix.bundles.howl jar @@ -197,8 +302,38 @@ jar + org.apache.servicemix.bundles + org.apache.servicemix.bundles.xpp3 + jar + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.xstream + jar + + + org.apache.xbean + xbean-bundleutils + jar + + + org.apache.xbean + xbean-finder + jar + + org.apache.xbean xbean-naming jar + + org.apache.xbean + xbean-reflect + jar + + + org.ops4j.pax.logging + pax-logging-api + jar + Modified: geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml?rev=995018&r1=995017&r2=995018&view=diff ============================================================================== --- geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml (original) +++ geronimo/server/trunk/plugins/bval/bval-deployer/src/main/plan/plan.xml Wed Sep 8 12:21:07 2010 @@ -19,21 +19,19 @@ - - - - - - - - - - - - - + + + + + ${pom.groupId} + geronimo-bval + jar + + + javax.validation + + - Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml?rev=995018&r1=995017&r2=995018&view=diff ============================================================================== --- geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml Wed Sep 8 12:21:07 2010 @@ -7,6 +7,16 @@ car + commons-beanutils + commons-beanutils + jar + + + org.apache.bval + org.apache.bval.bundle + jar + + org.apache.geronimo.configs openjpa2 car @@ -28,6 +38,11 @@ org.apache.geronimo.modules + geronimo-bval + jar + + + org.apache.geronimo.modules geronimo-farm jar @@ -41,4 +56,9 @@ geronimo-plugin-farm jar + + org.apache.geronimo.specs + geronimo-validation_1.0_spec + jar + Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=995018&r1=995017&r2=995018&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Wed Sep 8 12:21:07 2010 @@ -27,33 +27,8 @@ jar - org.apache.geronimo.specs - geronimo-osgi-registry - jar - - org.apache.servicemix.bundles org.apache.servicemix.bundles.howl jar - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.xpp3 - jar - - - org.apache.xbean - xbean-bundleutils - jar - - - org.apache.xbean - xbean-finder - jar - - - org.apache.xbean - xbean-reflect - jar - Modified: geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml?rev=995018&r1=995017&r2=995018&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml Wed Sep 8 12:21:07 2010 @@ -26,29 +26,4 @@ geronimo-jetty8-builder jar - - org.apache.geronimo.modules - geronimo-web - jar - - - org.apache.geronimo.specs - geronimo-jacc_1.4_spec - jar - - - org.apache.geronimo.specs - geronimo-jaspic_1.0_spec - jar - - - org.apache.geronimo.specs - geronimo-osgi-locator - jar - - - org.apache.xbean - xbean-bundleutils - jar - Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=995018&r1=995017&r2=995018&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Wed Sep 8 12:21:07 2010 @@ -7,6 +7,16 @@ car + commons-beanutils + commons-beanutils + jar + + + org.apache.bval + org.apache.bval.bundle + jar + + org.apache.commons commons-math jar @@ -48,6 +58,11 @@ org.apache.geronimo.modules + geronimo-bval + jar + + + org.apache.geronimo.modules geronimo-openejb jar Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=995018&r1=995017&r2=995018&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java (original) +++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Wed Sep 8 12:21:07 2010 @@ -241,7 +241,6 @@ public class PersistenceUnitBuilder impl gbeanData.setReferencePattern("NonJtaDataSourceWrapper", defaultNonJtaDataSourceName); } - gbeanData.setAttribute("moduleName", module.getModuleName()); gbeanData.setAttribute("mappingFileNames", new ArrayList()); gbeanData.setAttribute("excludeUnlistedClasses", false); gbeanData.setAttribute("managedClassNames", new ArrayList()); Modified: geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=995018&r1=995017&r2=995018&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml Wed Sep 8 12:21:07 2010 @@ -7,6 +7,21 @@ car + commons-beanutils + commons-beanutils + jar + + + commons-collections + commons-collections + jar + + + org.apache.bval + org.apache.bval.bundle + jar + + org.apache.geronimo.configs j2ee-deployer car @@ -18,6 +33,11 @@ org.apache.geronimo.modules + geronimo-bval + jar + + + org.apache.geronimo.modules geronimo-persistence-jpa20 jar @@ -26,4 +46,9 @@ geronimo-persistence-jpa20-builder jar + + org.apache.geronimo.specs + geronimo-validation_1.0_spec + jar +