minor changes

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2180 1c488680-804c-0410-94cd-c6b725194a0e
weld · Mar 24, 2009 · 3ff68ce · 3ff68ce
1 parent 3740a1c
commit 3ff68ce
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java b/impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java
@@ -117,14 +117,14 @@ public static void checkRootAttributes(Element root, Map<String, Set<String>> pa
             if (attrVal.startsWith(XmlConstants.URN_PREFIX))
             {
                urn = attrVal;
-               URL namespaceFile = environment.loadFileByUrn(urn, XmlConstants.NAMESPACE_FILE_NAME);
+               URL namespaceFile = loadFile(urn, XmlConstants.NAMESPACE_FILE_NAME);
                if (namespaceFile == null)
                   throw new DefinitionException("Could not find '" + XmlConstants.NAMESPACE_FILE_NAME + "' file according to specified URN '" + urn + "'");
                packagesSet.addAll(parseNamespaceFile(namespaceFile));
             }
             if (attribute.getName().equalsIgnoreCase(XmlConstants.SCHEMA_LOCATION) && attrVal.startsWith(XmlConstants.HTTP_PREFIX) && urn.trim().length() > 0)
             {
-               URL schemaFile = environment.loadFileByUrn(urn, XmlConstants.SCHEMA_FILE_NAME);
+               URL schemaFile = loadFile(urn, XmlConstants.SCHEMA_FILE_NAME);
                if (schemaFile == null)
                   throw new DefinitionException("Could not find '" + XmlConstants.SCHEMA_FILE_NAME + "' file according to specified URN '" + urn + "'");
             }
@@ -146,7 +146,7 @@ public static void checkRootDeclaredNamespaces(Element root, Map<String, Set<Str
          {
             Set<String> packagesSet = new HashSet<String>();
 
-            URL namespaceFile = environment.loadFileByUrn(uri, XmlConstants.NAMESPACE_FILE_NAME);
+            URL namespaceFile = loadFile(uri, XmlConstants.NAMESPACE_FILE_NAME);
             if (namespaceFile != null)
             {
                packagesSet.addAll(parseNamespaceFile(namespaceFile));
@@ -241,4 +241,14 @@ private static void addElementToPackagesMap(Map<String, Set<String>> packagesMap
          packagesMap.put(prefix, packagesSet);
       }
    }
+
+   private static URL loadFile(String urn, String fileName)
+   {
+      char separator = '/';
+      String packageName = urn.replaceFirst(XmlConstants.URN_PREFIX, "");
+      String path = packageName.replace('.', separator);
+      String filePath = separator + path + separator + fileName;
+      URL namespaceFile = ParseXmlHelper.class.getResource(filePath);
+      return namespaceFile;
+   }
 }