Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 80571 invoked from network); 3 Feb 2002 03:40:08 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 3 Feb 2002 03:40:08 -0000 Received: (qmail 20885 invoked by uid 97); 3 Feb 2002 03:40:13 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 20861 invoked by uid 97); 3 Feb 2002 03:40:13 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 20850 invoked by uid 97); 3 Feb 2002 03:40:12 -0000 Date: 3 Feb 2002 03:40:01 -0000 Message-ID: <20020203034001.68946.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer Deployment.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 02/02/02 19:40:01 Modified: proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer Deployment.java Log: Revision Changes Path 1.15 +5 -5 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java Index: Deployment.java =================================================================== RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Deployment.java 3 Feb 2002 00:03:16 -0000 1.14 +++ Deployment.java 3 Feb 2002 03:40:01 -0000 1.15 @@ -76,7 +76,7 @@ * Load the descriptors. Deploys all roles, then loads the descriptors * for, but does not deploy, all the types. */ - public void loadDescriptors( URL jarUrl ) + public void loadDescriptors( final URL jarUrl ) throws Exception { final ArrayList descriptors = new ArrayList(); @@ -185,7 +185,7 @@ throws DeploymentException { final String typeName = typeDef.getName(); - final String roleShorthand = typeDef.getRoleShorthand(); + final String roleShorthand = typeDef.getRole(); final String className = typeDef.getClassname(); if( null == className ) @@ -247,15 +247,15 @@ private List locateResources( final String resource, final URL jarUrl ) throws Exception { - ArrayList urls = new ArrayList(); - if( jarUrl != null ) + final ArrayList urls = new ArrayList(); + if( null != jarUrl ) { final String systemID = "jar:" + jarUrl + "!/" + resource; urls.add( systemID ); } else { - Enumeration enum = m_classLoader.getResources( resource ); + final Enumeration enum = m_classLoader.getResources( resource ); while( enum.hasMoreElements() ) { urls.add( enum.nextElement().toString() ); -- To unsubscribe, e-mail: For additional commands, e-mail: