diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java index f5a236e3b..96cb6507b 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java @@ -159,7 +159,8 @@ public class DefaultDeployer * Creates a deployer for a ClassLoader. */ private Deployment createDeployment( final ClassLoader loader, - final URL jarUrl ) throws Exception + final URL jarUrl ) + throws Exception { // Locate cached deployer, creating it if necessary Deployment deployment = (Deployment)m_classLoaderDeployers.get( loader ); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java index 2f7bce309..b2138de0c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java @@ -76,7 +76,7 @@ class Deployment * 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 @@ class Deployment 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 @@ class Deployment 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() );