Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 20953 invoked from network); 15 Apr 2011 06:50:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 15 Apr 2011 06:50:22 -0000 Received: (qmail 58428 invoked by uid 500); 15 Apr 2011 06:50:22 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 58375 invoked by uid 500); 15 Apr 2011 06:50:21 -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 58264 invoked by uid 99); 15 Apr 2011 06:50:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Apr 2011 06:50:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Fri, 15 Apr 2011 06:50:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D55C523889BB; Fri, 15 Apr 2011 06:49:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1092599 - /geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Date: Fri, 15 Apr 2011 06:49:57 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110415064957.D55C523889BB@eris.apache.org> Author: xuhaihong Date: Fri Apr 15 06:49:57 2011 New Revision: 1092599 URL: http://svn.apache.org/viewvc?rev=1092599&view=rev Log: GERONIMO-5910 Use explicit artifact while setting Axis2ModuleRegistry, as Axis2 environment would not added during the temp deployment. Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java?rev=1092599&r1=1092598&r2=1092599&view=diff ============================================================================== --- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java (original) +++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Fri Apr 15 06:49:57 2011 @@ -48,6 +48,7 @@ import org.apache.geronimo.jaxws.builder import org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator; import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions; import org.apache.geronimo.kernel.config.ConfigurationModuleType; +import org.apache.geronimo.kernel.repository.Artifact; import org.apache.geronimo.kernel.repository.Environment; import org.apache.openejb.jee.HandlerChains; import org.apache.openejb.jee.JaxbJavaee; @@ -207,7 +208,8 @@ public class Axis2Builder extends JAXWSS @Override protected void initialize(GBeanData targetGBean, Class serviceClass, PortInfo portInfo, Module module, Bundle bundle) throws DeploymentException { - targetGBean.setReferencePattern("Axis2ModuleRegistry", new AbstractNameQuery(Axis2ModuleRegistry.class.getName())); + targetGBean.setReferencePattern("Axis2ModuleRegistry", + new AbstractNameQuery(Artifact.create("org.apache.geronimo.configs/axis2//car"), Collections.emptyMap(), Axis2ModuleRegistry.class.getName())); String serviceName = (portInfo.getServiceName() == null ? serviceClass.getName() : portInfo.getServiceName()); String wsdlFile = portInfo.getWsdlFile(); if(wsdlFile != null && wsdlFile.trim().length() > 0) {