[jboss-cvs] JBossAS SVN: r60555 - branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2007-02-14 20:12:38 -0500 (Wed, 14 Feb 2007)
New Revision: 60555

Modified:
   branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/AspectDeployer.java
   branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
Log:
Tidyup

Modified: branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/AspectDeployer.java
===================================================================
--- branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/AspectDeployer.java	2007-02-15 00:59:07 UTC (rev 60554)
+++ branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/AspectDeployer.java	2007-02-15 01:12:38 UTC (rev 60555)
@@ -333,7 +333,7 @@
          //We are a top-level deployment, check if we are meant to be attaching to a scoped repository
          
          //TODO Use AspectXmlLoader.loadURL once AOP is added to repository 
-         Document doc = loadURL(docUrl);
+         Document doc = AspectXmlLoader.loadURL(docUrl);
          Element top = doc.getDocumentElement();
          NodeList children = top.getChildNodes();
          int childlength = children.getLength();
@@ -393,48 +393,4 @@
       
       return null;
    }
-   
-   //TODO Use AspectXmlLoader.loadURL once AOP is added to repository 
-   public static Document loadURL(URL configURL) throws Exception
-   {
-      InputStream is = configURL != null ? configURL.openStream() : null;
-      if (is == null)
-         throw new IOException("Failed to obtain InputStream from url: " + configURL);
-
-      DocumentBuilderFactory docBuilderFactory = null;
-      docBuilderFactory = DocumentBuilderFactory.newInstance();
-      docBuilderFactory.setValidating(false);
-      InputSource source = new InputSource(is);
-      URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd");
-      source.setSystemId(url.toString());
-      DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-      docBuilder.setEntityResolver(new Resolver());
-      //docBuilder.setErrorHandler(new LocalErrorHandler());
-      Document doc = docBuilder.parse(source);
-      return doc;
-   }
-
-   private static class Resolver implements EntityResolver
-   {
-      public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
-      {
-         if (systemId.endsWith("jboss-aop_1_0.dtd"))
-         {
-            try
-            {
-               URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd");
-               InputStream is = url.openStream();
-               return new InputSource(is);
-            }
-            catch (IOException e)
-            {
-               e.printStackTrace();
-               return null;
-            }
-         }
-         return null;
-      }
-   }
-
-
 }
\ No newline at end of file

Modified: branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
===================================================================
--- branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java	2007-02-15 00:59:07 UTC (rev 60554)
+++ branches/Branch_4_0/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java	2007-02-15 01:12:38 UTC (rev 60555)
@@ -75,8 +75,7 @@
 
    public Object getPerVMAspect(AspectDefinition def)
    {
-      Object aspect = getPerVMAspect(def.getName());
-      return aspect;
+      return getPerVMAspect(def.getName());
    }
 
    public Object getPerVMAspect(String def)