svn commit: r823727 - /tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java

[rf...@apache.org]

Author: rfeng
Date: Fri Oct  9 22:52:54 2009
New Revision: 823727

URL: http://svn.apache.org/viewvc?rev=823727&view=rev
Log:
Use a Set to avoid duplicate definitions.xml resources

Modified:
    tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java

Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java?rev=823727&r1=823726&r2=823727&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java Fri Oct  9 22:52:54 2009
@@ -19,13 +19,14 @@
 
 package org.apache.tuscany.sca.definitions.xml;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -46,7 +47,7 @@
     private static final Logger logger = Logger.getLogger(DefaultDefinitionsExtensionPoint.class.getName());
     private static final URI DEFINITIONS_URI = URI.create("META-INF/definitions.xml");
     private ExtensionPointRegistry registry;
-    private List<URL> documents = new ArrayList<URL>();
+    private Set<URL> documents = new HashSet<URL>();
     private List<Definitions> definitions = new ArrayList<Definitions>();
     private boolean documentsLoaded;
     private boolean loaded;
@@ -83,7 +84,7 @@
         for (ServiceDeclaration definitionsDeclaration : definitionsDeclarations) {
             URL url = definitionsDeclaration.getResource(definitionsDeclaration.getClassName());
             if (url == null) {
-                throw new IllegalArgumentException(new FileNotFoundException(definitionsDeclaration.getClassName()));
+                throw new IllegalArgumentException(definitionsDeclaration.getClassName() + " cannot be found");
             }
             documents.add(url);
         }