Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 52259 invoked from network); 2 Aug 2006 19:41:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Aug 2006 19:41:43 -0000 Received: (qmail 36731 invoked by uid 500); 2 Aug 2006 19:41:42 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 36623 invoked by uid 500); 2 Aug 2006 19:41:42 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 36612 invoked by uid 500); 2 Aug 2006 19:41:42 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 36609 invoked by uid 99); 2 Aug 2006 19:41:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Aug 2006 12:41:42 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Aug 2006 12:41:41 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7F9AA1A981A; Wed, 2 Aug 2006 12:41:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r428111 - in /webservices/axis2/trunk/java/modules/core: src/org/apache/axis2/deployment/AxisConfigBuilder.java src/org/apache/axis2/deployment/DeploymentEngine.java test/org/apache/axis2/deployment/BadModuleTest.java Date: Wed, 02 Aug 2006 19:41:20 -0000 To: axis2-cvs@ws.apache.org From: dims@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060802194121.7F9AA1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dims Date: Wed Aug 2 12:41:20 2006 New Revision: 428111 URL: http://svn.apache.org/viewvc?rev=428111&view=rev Log: Trying to reduce coupling between AxisConfigBuilder and DeploymentEngine Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java?rev=428111&r1=428110&r2=428111&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/AxisConfigBuilder.java Wed Aug 2 12:41:20 2006 @@ -40,17 +40,18 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; +import java.util.Collection; public class AxisConfigBuilder extends DescriptionBuilder { protected static final Log log = LogFactory.getLog(AxisConfigBuilder.class); - private DeploymentEngine engine; + private List moduleList = new ArrayList(); - public AxisConfigBuilder(InputStream serviceInputStream, DeploymentEngine engine, + public AxisConfigBuilder(InputStream serviceInputStream, AxisConfiguration axisConfiguration) { super(serviceInputStream, axisConfiguration); - this.engine = engine; } public void populateConfig() throws DeploymentException { @@ -157,9 +158,7 @@ } /** - * Gets the list of modules that is required to be engaged globally. - * - * @param moduleRefs java.util.Iterator + * Update the list of modules that is required to be engaged globally. */ protected void processModuleRefs(Iterator moduleRefs) { while (moduleRefs.hasNext()) { @@ -167,7 +166,7 @@ OMAttribute moduleRefAttribute = moduleref.getAttribute(new QName(TAG_REFERENCE)); String refName = moduleRefAttribute.getAttributeValue(); - engine.addModule(new QName(refName)); + moduleList.add(new QName(refName)); } } @@ -395,5 +394,12 @@ } Class phaseClass = axisConfig.getSystemClassLoader().loadClass(className); return (Phase) phaseClass.newInstance(); + } + + /** + * Gets the list of modules that is required to be engaged globally. + */ + protected Collection getGlobalModules() { + return moduleList; } } Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=428111&r1=428110&r2=428111&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original) +++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Wed Aug 2 12:41:20 2006 @@ -765,7 +765,8 @@ */ public AxisConfiguration populateAxisConfiguration(InputStream in) throws DeploymentException { axisConfig = new AxisConfiguration(); - AxisConfigBuilder builder = new AxisConfigBuilder(in, this, axisConfig); + AxisConfigBuilder builder = new AxisConfigBuilder(in, axisConfig); + moduleList.addAll(builder.getGlobalModules()); builder.populateConfig(); try { if (in != null) { Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java?rev=428111&r1=428110&r2=428111&view=diff ============================================================================== --- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java (original) +++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/deployment/BadModuleTest.java Wed Aug 2 12:41:20 2006 @@ -36,7 +36,7 @@ InputStream in = new FileInputStream( getTestResourceFile("deployment/Badmodule.xml")); AxisConfiguration glabl = new AxisConfiguration(); - AxisConfigBuilder builder =new AxisConfigBuilder(in,null,glabl); + AxisConfigBuilder builder =new AxisConfigBuilder(in, glabl); builder.populateConfig(); fail( "this must failed gracefully with DeploymentException or FileNotFoundException"); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org