cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r708883 - in /cxf/sandbox/benson/xmlschema: XmlSchema/ XmlSchema/src/main/java/org/apache/ws/commons/schema/ XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/ XmlSch...
Date Wed, 29 Oct 2008 11:54:17 GMT
Author: bimargulies
Date: Wed Oct 29 04:54:16 2008
New Revision: 708883

URL: http://svn.apache.org/viewvc?rev=708883&view=rev
Log:
A round of changes to use generics and eliminate warnings.

Modified:
    cxf/sandbox/benson/xmlschema/XmlSchema/pom.xml
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnnotationTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnyTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ChoiceTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ConstraintsTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/EncodingTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/FacetsTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/GroupTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/IncludeTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NamespaceContextTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NotationTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/RedefineTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/UnionTest.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
    cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
    cxf/sandbox/benson/xmlschema/cxf/pom.xml

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/pom.xml?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/pom.xml (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/pom.xml Wed Oct 29 04:54:16 2008
@@ -29,7 +29,7 @@
     <version>possible-2.0-SNAPSHOT</version>
     <description>Commons XMLSchema is a light weight schema object model that can be used to manipualte or
         generate a schema. It has a clean, easy to use API and can easily be integrated into an existing project
-        since it has almost no dependancies on third party libraries.</description>
+        since it has almost no dependencies on third party libraries.</description>
     <url>http://ws.apache.org/commons/XmlSchema</url>
     <issueManagement>
         <system>JIRA</system>
@@ -201,14 +201,13 @@
         <url>http://www.apache.org/</url>
     </organization>
     <build>
-
-
+        <defaultGoal>install</defaultGoal>
         <!-- this entry here is for the assembly plugin- For some reason
   		     the assembly plugin cannot override the filter properties (as explained
 			 in the docs) and also does not inherit the maven standard properties. This
 		     is the one that points to a seperare filter props file --> 
-		<filters>
-        	<filter>src/main/assembly/filter.properties</filter>
+	<filters>
+	  <filter>src/main/assembly/filter.properties</filter>
         </filters>
 
         <!-- adding relevant resources to the jar files -->
@@ -228,42 +227,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.2</version>
-                <inherited>false</inherited>
-                <dependencies>
-		  <dependency>
-		    <groupId>ant</groupId>
-		    <artifactId>ant-nodeps</artifactId>
-		    <version>1.6.5</version>
-		  </dependency>
-                    <dependency>
-                        <groupId>ant</groupId>
-                        <artifactId>ant-trax</artifactId>
-                        <version>1.6.5</version>
-                    </dependency>
-                </dependencies>
-
-                <executions>
-                    <execution>
-                        <id>prepareNistTest</id>
-                        <phase>generate-test-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant inheritRefs="true" antfile="${basedir}/build.xml">
-                                    <property value="${basedir}/target" name="build.dir"></property>
-                                    <property value="${maven.test.skip}" name="maven.test.skip"></property>
-                                    <target name="prepareNistTest"></target>
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                  </executions>
-            </plugin>
            <plugin>
                 <artifactId>maven-release-plugin</artifactId>
                 <configuration>
@@ -273,8 +236,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.3</source>
-                    <target>1.3</target>
+                    <source>1.5</source>
+                    <target>1.5</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -301,7 +264,7 @@
                     <descriptors>
                         <descriptor>src/main/assembly/bin.xml</descriptor>
                         <descriptor>src/main/assembly/src.xml</descriptor>
-						<descriptor>src/main/assembly/doc.xml</descriptor>
+			<descriptor>src/main/assembly/doc.xml</descriptor>
                     </descriptors>
                     <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
@@ -349,6 +312,49 @@
                 </plugins>
             </build>
         </profile>
+	<profile>
+            <id>NistTest</id>
+	    <build>
+	    <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.2</version>
+                <inherited>false</inherited>
+                <dependencies>
+		  <dependency>
+		    <groupId>ant</groupId>
+		    <artifactId>ant-nodeps</artifactId>
+		    <version>1.6.5</version>
+		  </dependency>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>prepareNistTest</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant inheritRefs="true" antfile="${basedir}/build.xml">
+                                    <property value="${basedir}/target" name="build.dir"></property>
+                                    <property value="${maven.test.skip}" name="maven.test.skip"></property>
+                                    <target name="prepareNistTest"></target>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                  </executions>
+            </plugin>
+	    </plugins>
+	</build>
+	</profile>
         <profile>
         	<id>DefaultTest</id>
         	<activation>
@@ -481,7 +487,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.2</version>
+            <version>4.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java Wed Oct 29 04:54:16 2008
@@ -27,6 +27,7 @@
 import org.apache.ws.commons.schema.utils.XDOMUtil;
 import org.apache.ws.commons.schema.utils.DOMUtil;
 import org.w3c.dom.*;
+
 import org.xml.sax.InputSource;
 
 import javax.xml.namespace.NamespaceContext;
@@ -77,7 +78,7 @@
      * Clearing of cache is done by calling clearCache() which will clear and nullify resolvedSchemas
      *
      */
-    private static Hashtable resolvedSchemas = null;
+    private static Hashtable<String, SoftReference<XmlSchema>> resolvedSchemas = null;
 
 	/**
 	 * Schema builder constructor
@@ -97,7 +98,7 @@
     
     public static synchronized void initCache() {
         if (resolvedSchemas == null) {
-            resolvedSchemas = new Hashtable();
+            resolvedSchemas = new Hashtable<String, SoftReference<XmlSchema>>();
         }
     }
     
@@ -510,7 +511,7 @@
 			if (unionEl.hasAttribute("memberTypes")) {
 				String memberTypes = unionEl.getAttribute("memberTypes");
 				union.memberTypesSource = memberTypes;
-				Vector v = new Vector();
+				Vector<QName> v = new Vector<QName>();
 				StringTokenizer tokenizer = new StringTokenizer(memberTypes,
 						" ");
 				while (tokenizer.hasMoreTokens()) {
@@ -1294,7 +1295,7 @@
 		}
 
 		NamedNodeMap attrNodes = attrEl.getAttributes();
-		Vector attrs = new Vector();
+		Vector<Attr> attrs = new Vector<Attr>();
 		NodeNamespaceContext ctx = null;
 		for (int i = 0; i < attrNodes.getLength(); i++) {
 			Attr att = (Attr) attrNodes.item(i);
@@ -1325,7 +1326,7 @@
 		}
 
 		if (attrs.size() > 0)
-			attr.setUnhandledAttributes((Attr[]) attrs.toArray(new Attr[0]));
+			attr.setUnhandledAttributes(attrs.toArray(new Attr[0]));
 
 		//process extra attributes and elements
 		processExtensibilityComponents(attr, attrEl);
@@ -1852,7 +1853,7 @@
             // only by a trailing slash.  As it is now, we assume a single character difference
             // means it's a schema that has yet to be resolved.
             schemaKey = Thread.currentThread().getId() + targetNamespace + schemaLocation + baseUri;
-            SoftReference softref = (SoftReference)resolvedSchemas.get(schemaKey);
+            SoftReference softref = resolvedSchemas.get(schemaKey);
             if (softref != null) {
                 XmlSchema resolvedSchema = (XmlSchema)softref.get();
                 if (resolvedSchema != null) {
@@ -1890,7 +1891,7 @@
 				try {
                     XmlSchema readSchema = collection.read(source, null, validator);
                     if (resolvedSchemas != null) {
-                        resolvedSchemas.put(schemaKey, new SoftReference(readSchema));
+                        resolvedSchemas.put(schemaKey, new SoftReference<XmlSchema>(readSchema));
                     }
 					return readSchema;
 				} catch (Exception e) {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java Wed Oct 29 04:54:16 2008
@@ -173,7 +173,7 @@
 
     
     protected XmlSchemaElement getElementByName(QName name, boolean deep,
-			Stack schemaStack) {
+			Stack<XmlSchema> schemaStack) {
 		if (schemaStack != null && schemaStack.contains(this)) {
 			// recursive schema - just return null
 			return null;
@@ -183,7 +183,7 @@
 			if (deep) {
 				if (element == null) {
 					// search the imports
-					for (Iterator includedItems = includes.getIterator(); includedItems
+					for (Iterator<?> includedItems = includes.getIterator(); includedItems
 							.hasNext();) {
 						
 						XmlSchema schema = getSchema(includedItems.next());
@@ -193,7 +193,7 @@
 						// and
 						// use the protected method to process the schema
 						if (schemaStack == null) {
-							schemaStack = new Stack();
+							schemaStack = new Stack<XmlSchema>();
 						}
 						schemaStack.push(this);
 						element = schema.getElementByName(name, deep,
@@ -241,7 +241,7 @@
 	 * @return
 	 */
 	protected XmlSchemaType getTypeByName(QName name, boolean deep,
-			Stack schemaStack) {
+			Stack<XmlSchema> schemaStack) {
 		if (schemaStack != null && schemaStack.contains(this)) {
 			// recursive schema - just return null
 			return null;
@@ -251,7 +251,7 @@
 			if (deep) {
 				if (type == null) {
 					// search the imports
-					for (Iterator includedItems = includes.getIterator(); includedItems
+					for (Iterator<?> includedItems = includes.getIterator(); includedItems
 							.hasNext();) {
 
 						XmlSchema schema = getSchema(includedItems.next());
@@ -260,7 +260,7 @@
 							// create an empty stack - push the current parent
 							// use the protected method to process the schema
 							if (schemaStack == null) {
-								schemaStack = new Stack();
+								schemaStack = new Stack<XmlSchema>();
 							}
 							schemaStack.push(this);
 							type = schema
@@ -396,7 +396,7 @@
      * @param out - the output stream to write to
      * @param options -  a map of options
      */
-    public void write(OutputStream out, Map options) {
+    public void write(OutputStream out, Map<String, String> options) {
     	try {
 	        if (this.inputEncoding!= null &&
 	                !"".equals(this.inputEncoding)){
@@ -415,7 +415,7 @@
      * Serialie the schema to a given writer
      * @param writer - the writer to write this
      */
-    public void write(Writer writer,Map options) {
+    public void write(Writer writer,Map<String, String> options) {
         serialize_internal(this, writer,options);
     }
     /**
@@ -444,7 +444,7 @@
      * @param out
      * @param options
      */
-    private  void serialize_internal(XmlSchema schema, Writer out, Map options) {
+    private  void serialize_internal(XmlSchema schema, Writer out, Map<String, String> options) {
 
         try {
             XmlSchemaSerializer xser = new XmlSchemaSerializer();
@@ -474,13 +474,13 @@
             //property in options
 
             if (options==null){
-                options = new HashMap();
+                options = new HashMap<String, String>();
                 loadDefaultOptions(options);
             }
-            Iterator keys = options.keySet().iterator();
+            Iterator<String> keys = options.keySet().iterator();
             while (keys.hasNext()) {
                 Object key = keys.next();
-                tr.setOutputProperty((String)key, (String)options.get(key));
+                tr.setOutputProperty((String)key, options.get(key));
             }
 
             tr.transform(source, result);
@@ -500,7 +500,7 @@
      * Load the default options
      * @param options  - the map of
      */
-    private void loadDefaultOptions(Map options) {
+    private void loadDefaultOptions(Map<String, String> options) {
         options.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
         options.put(OutputKeys.INDENT, "yes");
     }

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java Wed Oct 29 04:54:16 2008
@@ -121,7 +121,7 @@
     /**
      * Map of included schemas.
      */
-    private Map schemas = new HashMap();
+    private Map<SchemaKey, XmlSchema> schemas = new HashMap<SchemaKey, XmlSchema>();
 
 
     /**
@@ -145,7 +145,7 @@
     /**
      * stack to track imports (to prevent recursion)
      */
-    Stack stack = new Stack();
+    Stack<SchemaKey> stack = new Stack<SchemaKey>();
 
     /**
      * Set the base URI. This is used when schemas need to be
@@ -314,7 +314,7 @@
      * @return
      */
     XmlSchema getSchema(SchemaKey pKey) {
-        return (XmlSchema) schemas.get(pKey);
+        return schemas.get(pKey);
     }
 
     void addSchema(SchemaKey pKey, XmlSchema pSchema) {
@@ -356,9 +356,9 @@
 
     private Document parse_doPriv(final InputSource inputSource, final DocumentBuilder builder, Document doc) throws IOException, SAXException {
         try {
-            doc = (Document) java.security.AccessController.doPrivileged(
-                    new PrivilegedExceptionAction() {
-                        public Object run() throws IOException, SAXException {
+            doc = java.security.AccessController.doPrivileged(
+                    new PrivilegedExceptionAction<Document>() {
+                        public Document run() throws IOException, SAXException {
                             return builder.parse(inputSource);
                         }
                     }
@@ -454,10 +454,9 @@
         if (systemId == null) {
             systemId = "";
         }
-        final List result = new ArrayList();
-        for (Iterator iter = schemas.entrySet().iterator();  iter.hasNext();  ) {
-            Map.Entry entry = (Map.Entry) iter.next();
-            if (((SchemaKey) entry.getKey()).getSystemId().equals(systemId)) {
+        final List<XmlSchema> result = new ArrayList<XmlSchema>();
+        for(Map.Entry<SchemaKey, XmlSchema> entry : schemas.entrySet()) {
+            if (entry.getKey().getSystemId().equals(systemId)) {
                 result.add(entry.getValue());
             }
         }
@@ -469,8 +468,8 @@
      * @return the list of XmlSchema objects
      */
     public XmlSchema[] getXmlSchemas() {
-        Collection c = schemas.values();
-        return (XmlSchema[]) c.toArray(new XmlSchema[c.size()]);
+        Collection<XmlSchema> c = schemas.values();
+        return c.toArray(new XmlSchema[c.size()]);
     }
 
     public XmlSchemaElement getElementByQName(QName qname) {
@@ -501,19 +500,19 @@
         return null;
     }
 
-    Map unresolvedTypes = new HashMap();
+    Map<QName, ArrayList<TypeReceiver>> unresolvedTypes = new HashMap<QName, ArrayList<TypeReceiver>>();
 
     void addUnresolvedType(QName type, TypeReceiver receiver) {
-        ArrayList receivers = (ArrayList)unresolvedTypes.get(type);
+        ArrayList<TypeReceiver> receivers = unresolvedTypes.get(type);
         if (receivers == null) {
-            receivers = new ArrayList();
+            receivers = new ArrayList<TypeReceiver>();
             unresolvedTypes.put(type, receivers);
         }
         receivers.add(receiver);
     }
 
     void resolveType(QName typeName, XmlSchemaType type) {
-        ArrayList receivers = (ArrayList)unresolvedTypes.get(typeName);
+        ArrayList receivers = unresolvedTypes.get(typeName);
         if (receivers == null)
             return;
         for (Iterator i = receivers.iterator(); i.hasNext();) {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObject.java Wed Oct 29 04:54:16 2008
@@ -22,6 +22,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 public abstract class XmlSchemaObject {
     int lineNumber;
     int linePosition;
@@ -33,21 +35,36 @@
      * in memory. will be initialized only if a
      * user attempts
      */
-    private Map metaInfoMap = null;
+    private Map<Object, Object> metaInfoMap = null;
 
     /**
      * returns the metainfo map. may be null
      * if not utilized
      */
-    public Map getMetaInfoMap() {
+    public Map<Object, Object> getMetaInfoMap() {
+        return metaInfoMap;
+    }
+    
+    public Map<Object, Object> getMetaInfoMapForce() {
+        if (metaInfoMap == null) {
+            metaInfoMap = new LinkedHashMap<Object, Object>();
+        }
         return metaInfoMap;
     }
+    
+    public <T> T getMetaInfo(Class<T> tType, Object key) {
+        if(metaInfoMap == null) {
+            return null;
+        }
+        return tType.cast(metaInfoMap.get(key));
+    }
+    
 
     /**
      * Directly set the meta info map into the schema element
      * @param metaInfoMap
      */
-    public void setMetaInfoMap(Map metaInfoMap) {
+    public void setMetaInfoMap(Map<Object, Object> metaInfoMap) {
         this.metaInfoMap = metaInfoMap;
     }
 
@@ -58,9 +75,9 @@
      * @param key
      * @param value
      */
-    public void addMetaInfo(Object key,Object value){
-      if (metaInfoMap==null){
-          metaInfoMap =  new LinkedHashMap();
+    public void addMetaInfo(Object key, Object value) {
+      if (metaInfoMap == null) {
+          metaInfoMap = new LinkedHashMap<Object, Object>();
       }
 
       metaInfoMap.put(key,value);

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectCollection.java Wed Oct 29 04:54:16 2008
@@ -19,7 +19,9 @@
 
 package org.apache.ws.commons.schema;
 
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
 
 /**
@@ -28,13 +30,13 @@
  */
 public class XmlSchemaObjectCollection {
 
-    Vector objects;
+    List<XmlSchemaObject> objects;
 
     /**
      * Creates new XmlSchemaObjectCollection
      */
     public XmlSchemaObjectCollection() {
-        objects = new Vector();
+        objects = new ArrayList<XmlSchemaObject>();
     }
 
     public int getCount() {
@@ -42,15 +44,15 @@
     }
 
     public XmlSchemaObject getItem(int i) {
-        return (XmlSchemaObject) objects.elementAt(i);
+        return (XmlSchemaObject) objects.get(i);
     }
 
     public void setItem(int i, XmlSchemaObject item) {
-        objects.insertElementAt(item, i);
+        objects.add(i, item);
     }
 
     public void add(XmlSchemaObject item) {
-        objects.addElement(item);
+        objects.add(item);
     }
 
     public boolean contains(XmlSchemaObject item) {
@@ -66,7 +68,7 @@
     }
 
     public void removeAt(int index) {
-        objects.removeElementAt(index);
+        objects.remove(index);
     }
 
     public Iterator getIterator() {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaObjectTable.java Wed Oct 29 04:54:16 2008
@@ -33,13 +33,13 @@
 
 public class XmlSchemaObjectTable {
 
-    HashMap collection;
+    HashMap<QName, XmlSchemaObject> collection;
 
     /**
      * Creates new XmlSchemaObjectTable
      */
     public XmlSchemaObjectTable() {
-        this.collection = new HashMap();
+        this.collection = new HashMap<QName, XmlSchemaObject>();
     }
 
     public int getCount() {
@@ -47,14 +47,14 @@
     }
 
     public XmlSchemaObject getItem(QName name) {
-        return (XmlSchemaObject) collection.get(name);
+        return collection.get(name);
     }
 
-    public Iterator getNames() {
+    public Iterator<QName> getNames() {
         return collection.keySet().iterator();
     }
 
-    public Iterator getValues() {
+    public Iterator<XmlSchemaObject> getValues() {
         return collection.values().iterator();
     }
 

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java Wed Oct 29 04:54:16 2008
@@ -46,18 +46,18 @@
     }
 
 
-    private Hashtable schema_ns;
+    private Hashtable<String, Object> schema_ns;
 
     static String xsdPrefix = "xs";
     public static final String xsdNamespace = "http://www.w3.org/2001/XMLSchema";
-    ArrayList docs;
+    ArrayList<Document> docs;
     Element schemaElement;
 
     private static final String XMLNS_NAMESPACE_URI = "http://www.w3.org/2000/xmlns/";
 
     XmlSchemaSerializer() {
-        docs = new ArrayList();
-        schema_ns = new Hashtable();
+        docs = new ArrayList<Document>();
+        schema_ns = new Hashtable<String, Object>();
     }
 
     /**
@@ -1114,7 +1114,7 @@
 
         Attr[] unhandled = attributeObj.getUnhandledAttributes();
 
-        Hashtable namespaces = new Hashtable();
+        Hashtable<String, String> namespaces = new Hashtable<String, String>();
 
         if (unhandled != null) {
 
@@ -1141,7 +1141,7 @@
                 if (value.indexOf(":") > -1 && !nodeName.startsWith("xmlns")) {
                     String prefix = value.substring(0, value.indexOf(":"));
                     String oldNamespace;
-                    if ((oldNamespace = (String) namespaces.get(prefix)) != null) {
+                    if ((oldNamespace = namespaces.get(prefix)) != null) {
                         value = value.substring(value.indexOf(":") + 1);
                         NamespacePrefixList ctx = schema.getNamespaceContext();
                         String[] prefixes = ctx.getDeclaredPrefixes();
@@ -2608,7 +2608,7 @@
                 prefix = Constants.XMLNS_PREFIX;
             } else {
                 int magicNumber = 0;
-                Collection prefixes = schema_ns.values();
+                Collection<Object> prefixes = schema_ns.values();
                 while(prefixes.contains("ns" + magicNumber)){
                     magicNumber++;
                 }

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/DefaultExtensionDeserializer.java Wed Oct 29 04:54:16 2008
@@ -45,51 +45,31 @@
      * extension element itself if for an element or the extension attribute object if
      * it is an attribute
      */
+    @SuppressWarnings("unchecked")
     public void deserialize(XmlSchemaObject schemaObject, QName name, Node node) {
 
         // we just attach the raw node either to the meta map of
         // elements or the attributes
     	
-        Map metaInfoMap =  schemaObject.getMetaInfoMap();
-        if (metaInfoMap==null){
-        	metaInfoMap = new HashMap();
-        }
-
-
-
         if (node.getNodeType()==Node.ATTRIBUTE_NODE){
 
-            Map attribMap; 
-            if (metaInfoMap.containsKey(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES)){
-                attribMap  = (Map)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
-            }else{
-                attribMap = new HashMap();
-                metaInfoMap.put(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES,attribMap);
+            Map<QName, Node> attribMap; 
+            attribMap = schemaObject.getMetaInfo(Map.class, Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES);
+            if(attribMap == null) {
+                attribMap = new HashMap<QName, Node>();
+                schemaObject.addMetaInfo(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES,attribMap);
             }
             attribMap.put(name,node);
 
         }else if (node.getNodeType()==Node.ELEMENT_NODE){
-            Map elementMap;
-            if (metaInfoMap.containsKey(Constants.MetaDataConstants.EXTERNAL_ELEMENTS)){
-                elementMap  = (Map)metaInfoMap.get(Constants.MetaDataConstants.EXTERNAL_ELEMENTS);
-            }else{
-                elementMap = new HashMap();
-                metaInfoMap.put(Constants.MetaDataConstants.EXTERNAL_ELEMENTS,elementMap);
+            Map<QName, Node> elementMap;
+            elementMap = schemaObject.getMetaInfo(Map.class, Constants.MetaDataConstants.EXTERNAL_ELEMENTS);
+            if(elementMap == null) {
+                elementMap = new HashMap<QName, Node>();
+                schemaObject.addMetaInfo(Constants.MetaDataConstants.EXTERNAL_ELEMENTS,elementMap);
             }
             elementMap.put(name,node);
         }
 
-        //subsequent processing takes place only if this map is not empty
-        if (!metaInfoMap.isEmpty()){
-            Map metaInfoMapFromSchemaElement = schemaObject.getMetaInfoMap();
-            if (metaInfoMapFromSchemaElement==null){
-                schemaObject.setMetaInfoMap(metaInfoMap);
-            }else{
-                metaInfoMapFromSchemaElement.putAll(metaInfoMap);
-            }
-
-        }
-
-
     }
 }

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/extensions/ExtensionRegistry.java Wed Oct 29 04:54:16 2008
@@ -37,8 +37,8 @@
     /**
      * Maps for the storage of extension serializers /deserializers
      */
-    private Map extensionSerializers = new HashMap();
-    private Map extensionDeserializers = new HashMap();
+    private Map<Class<?>, ExtensionSerializer> extensionSerializers = new HashMap<Class<?>, ExtensionSerializer>();
+    private Map<QName, ExtensionDeserializer> extensionDeserializers = new HashMap<QName, ExtensionDeserializer>();
 
     /**
      * Default serializer and serializer
@@ -76,7 +76,7 @@
      * @param classOfType  - the class of the object that would be serialized
      * @param serializer - an instance of the deserializer
      */
-    public void registerSerializer(Class classOfType,ExtensionSerializer serializer){
+    public void registerSerializer(Class<?> classOfType,ExtensionSerializer serializer){
         extensionSerializers.put(classOfType,serializer);
     }
 
@@ -95,7 +95,7 @@
      * @param classOfType  - the  the
      * deserializer is associated with
      */
-    public void unregisterDeserializer(Class classOfType){
+    public void unregisterDeserializer(Class<?> classOfType){
         extensionDeserializers.remove(classOfType);
     }
 
@@ -110,7 +110,7 @@
      * serialization mechanism is to create a DOM tree first and serialize it
      */
     public void serializeExtension(XmlSchemaObject parentSchemaObject,
-                             Class classOfType,
+                             Class<?> classOfType,
                              Node node){
         Object serializerObject = extensionSerializers.get(classOfType);
         if (serializerObject!=null){

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java Wed Oct 29 04:54:16 2008
@@ -18,9 +18,11 @@
  */
 package org.apache.ws.commons.schema.utils;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.*;
 
-public class NamespaceMap extends HashMap implements NamespacePrefixList {
+public class NamespaceMap extends HashMap<String, URI> implements NamespacePrefixList {
     
     /**
 	 * 
@@ -30,17 +32,21 @@
 	public NamespaceMap() {
     }
     
-    public NamespaceMap(Map map) {
+    public NamespaceMap(Map<String, URI> map) {
         super(map);
     }
 
     public void add(String prefix, String namespaceURI) {
-        put(prefix, namespaceURI);
+        try {
+            put(prefix, new URI(namespaceURI));
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public String[] getDeclaredPrefixes() {
-        Set keys = keySet();
-        return (String[]) keys.toArray(new String[keys.size()]);
+        Set<String> keys = keySet();
+        return keys.toArray(new String[keys.size()]);
     }
 
     public String getNamespaceURI(String prefix) {
@@ -58,11 +64,9 @@
         return null;
     }
 
-    public Iterator getPrefixes(String namespaceURI) {
-        ArrayList list = new ArrayList();
-        Iterator iterator = entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry entry = (Map.Entry) iterator.next();
+    public Iterator<String> getPrefixes(String namespaceURI) {
+        ArrayList<String> list = new ArrayList<String>();
+        for(Map.Entry<String, URI> entry : entrySet()) {
             if (entry.getValue().toString().equals(namespaceURI)) {
                 list.add(entry.getKey());
             }

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/NodeNamespaceContext.java Wed Oct 29 04:54:16 2008
@@ -32,7 +32,7 @@
     private static final Collection XML_NS_PREFIX_COLLECTION = Collections.singletonList(Constants.XML_NS_PREFIX);
     private static final Collection XMLNS_ATTRIBUTE_COLLECTION = Collections.singletonList(Constants.XMLNS_ATTRIBUTE);
     private Node node;
-    private Map declarations;
+    private Map<String, String> declarations;
     private String[] prefixes;
 
     /**
@@ -42,9 +42,9 @@
         node = pNode;
     }
 
-    private Map getDeclarations() {
+    private Map<String, String> getDeclarations() {
         if (declarations == null) {
-            declarations = new HashMap();
+            declarations = new HashMap<String, String>();
             //FIXME: Do we really need to add this mapping? shows up in the serialized schema as xmlns="" 
             //declarations.put(Constants.DEFAULT_NS_PREFIX, Constants.NULL_NS_URI);
             new PrefixCollector(){
@@ -52,7 +52,7 @@
                     declarations.put(pPrefix, pNamespaceURI);
                 }
             }.searchAllPrefixDeclarations(node);
-            Collection keys = declarations.keySet();
+            Collection<String> keys = declarations.keySet();
             prefixes = (String[]) keys.toArray(new String[keys.size()]);
         }
         return declarations;
@@ -102,9 +102,8 @@
         if (Constants.XMLNS_ATTRIBUTE_NS_URI.equals(pNamespaceURI)) {
             return XMLNS_ATTRIBUTE_COLLECTION.iterator();
         }
-        final List list = new ArrayList();
-        for (Iterator iter = getDeclarations().entrySet().iterator();  iter.hasNext();  ) {
-            Map.Entry entry = (Map.Entry) iter.next();
+        final List<String> list = new ArrayList<String>();
+        for(Map.Entry<String, String> entry : getDeclarations().entrySet()) {
             if (pNamespaceURI.equals(entry.getValue())) {
                 list.add(entry.getKey());
             }

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnnotationTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnnotationTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnnotationTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnnotationTest.java Wed Oct 29 04:54:16 2008
@@ -59,7 +59,7 @@
                                      "emptyAppinfo");
         InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
         XmlSchemaCollection schemaCol = new XmlSchemaCollection();
-        XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+        schemaCol.read(new StreamSource(is), null);
 
         XmlSchemaSimpleType simpleType =
             (XmlSchemaSimpleType)schemaCol.getTypeByQName(TYPE_QNAME);
@@ -71,7 +71,7 @@
         XmlSchemaObjectCollection col = xsa.getItems();
         assertEquals(1, col.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaDocumentation.class.getName());
         for (int i = 0; i < col.getCount(); i++) {
             XmlSchemaObject o = col.getItem(i);
@@ -125,7 +125,7 @@
                                      "emptyDocumentation");
         InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
         XmlSchemaCollection schemaCol = new XmlSchemaCollection();
-        XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+        schemaCol.read(new StreamSource(is), null);
 
         XmlSchemaSimpleType simpleType =
             (XmlSchemaSimpleType)schemaCol.getTypeByQName(TYPE_QNAME);
@@ -137,7 +137,7 @@
         XmlSchemaObjectCollection col = xsa.getItems();
         assertEquals(1, col.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaAppInfo.class.getName());
         for (int i = 0; i < col.getCount(); i++) {
             XmlSchemaObject o = col.getItem(i);
@@ -189,7 +189,7 @@
                                      "emptyAppinfoDocumentation");
         InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
         XmlSchemaCollection schemaCol = new XmlSchemaCollection();
-        XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+        schemaCol.read(new StreamSource(is), null);
 
         XmlSchemaSimpleType simpleType =
             (XmlSchemaSimpleType)schemaCol.getTypeByQName(TYPE_QNAME);
@@ -227,7 +227,7 @@
                                      "annotationTest");
         InputStream is = new FileInputStream(Resources.asURI("annotation.xsd"));
         XmlSchemaCollection schemaCol = new XmlSchemaCollection();
-        XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+        schemaCol.read(new StreamSource(is), null);
 
         XmlSchemaSimpleType simpleType =
             (XmlSchemaSimpleType)schemaCol.getTypeByQName(TYPE_QNAME);
@@ -239,7 +239,7 @@
         XmlSchemaObjectCollection col = xsa.getItems();
         assertEquals(2, col.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaAppInfo.class.getName());
         s.add(XmlSchemaDocumentation.class.getName());
         for (int i = 0; i < col.getCount(); i++) {
@@ -297,7 +297,7 @@
         XmlSchemaObjectCollection col = xsa.getItems();
         assertEquals(2, col.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaAppInfo.class.getName());
         s.add(XmlSchemaDocumentation.class.getName());
         for (int i = 0; i < col.getCount(); i++) {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnyTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnyTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnyTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/AnyTest.java Wed Oct 29 04:54:16 2008
@@ -82,7 +82,7 @@
                                         "department");
         InputStream is = new FileInputStream(Resources.asURI("any.xsd"));
         XmlSchemaCollection schemaCol = new XmlSchemaCollection();
-        XmlSchema schema = schemaCol.read(new StreamSource(is), null);
+        schemaCol.read(new StreamSource(is), null);
 
         verifyAccuracy(ELEMENT_QNAME, schemaCol,5L,10L);
 
@@ -121,7 +121,7 @@
         schema.write(baos);
         
         XmlSchemaCollection schemaCol2 = new XmlSchemaCollection();
-        XmlSchema schema2 = schemaCol2.read(new StreamSource(new ByteArrayInputStream(baos.toByteArray())), null);
+        schemaCol2.read(new StreamSource(new ByteArrayInputStream(baos.toByteArray())), null);
         
         verifyAccuracy(ELEMENT_QNAME, schemaCol2,0,0);
        
@@ -146,7 +146,7 @@
         XmlSchemaObjectCollection c = xss.getItems();
         assertEquals(3, c.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("id");
         s.add("name");
         Object o = null;

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ChoiceTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ChoiceTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ChoiceTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ChoiceTest.java Wed Oct 29 04:54:16 2008
@@ -98,7 +98,7 @@
         XmlSchemaChoice choice = (XmlSchemaChoice)cType.getParticle();
         assertNotNull(choice);
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("desktop");
         s.add("laptop");
         XmlSchemaObjectCollection items = choice.getItems();

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java Wed Oct 29 04:54:16 2008
@@ -109,7 +109,7 @@
 
         XmlSchemaObjectCollection col = xsp.getItems();
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("Name");
         s.add("Description");
         s.add("Parts");

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ConstraintsTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ConstraintsTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ConstraintsTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/ConstraintsTest.java Wed Oct 29 04:54:16 2008
@@ -143,7 +143,7 @@
         XmlSchemaObjectCollection c = elem.getConstraints();
         assertEquals(3, c.getCount());
                              
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaKey.class.getName());
         s.add(XmlSchemaKeyref.class.getName());
         s.add(XmlSchemaUnique.class.getName());

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/EncodingTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/EncodingTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/EncodingTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/EncodingTest.java Wed Oct 29 04:54:16 2008
@@ -60,7 +60,7 @@
            
           //write it back to a stream - re read it and check the encoding
            //we need to explicitly say to have the xml header
-           Map options = new HashMap();
+           Map<String, String> options = new HashMap<String, String>();
            options.put(OutputKeys.OMIT_XML_DECLARATION, "no");
            
            ByteArrayOutputStream baos = new ByteArrayOutputStream();

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/FacetsTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/FacetsTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/FacetsTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/FacetsTest.java Wed Oct 29 04:54:16 2008
@@ -75,7 +75,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(2, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaLengthFacet.class.getName());
         s.add(XmlSchemaPatternFacet.class.getName());
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {
@@ -149,7 +149,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(1, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaPatternFacet.class.getName());
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {
             Object o = i.next();
@@ -215,7 +215,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(1, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaTotalDigitsFacet.class.getName());
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {
             Object o = i.next();
@@ -282,7 +282,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(2, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaMaxInclusiveFacet.class.getName());
         s.add(XmlSchemaMinInclusiveFacet.class.getName());
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {
@@ -357,7 +357,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(2, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaMaxExclusiveFacet.class.getName());
         s.add(XmlSchemaMinExclusiveFacet.class.getName());
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {
@@ -431,7 +431,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(1, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaWhiteSpaceFacet.class.getName());
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {
             Object o = i.next();
@@ -498,7 +498,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(2, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaFractionDigitsFacet.class.getName());
         s.add(XmlSchemaTotalDigitsFacet.class.getName());
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {
@@ -573,7 +573,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(2, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaMinLengthFacet.class.getName());
         s.add(XmlSchemaMaxLengthFacet.class.getName());
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {
@@ -648,7 +648,7 @@
         XmlSchemaObjectCollection collection = r.getFacets();
         assertEquals(2, collection.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("Field");
         s.add("Separator");
         for (Iterator i  = collection.getIterator(); i.hasNext(); ) {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/GroupTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/GroupTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/GroupTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/GroupTest.java Wed Oct 29 04:54:16 2008
@@ -111,7 +111,7 @@
         XmlSchemaObjectTable t = schema.getGroups();
         assertEquals(1, t.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("priceGroup");
         for (Iterator i = t.getNames(); i.hasNext(); ) {
             String name = ((QName)i.next()).getLocalPart();

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/IncludeTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/IncludeTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/IncludeTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/IncludeTest.java Wed Oct 29 04:54:16 2008
@@ -95,7 +95,7 @@
         XmlSchemaObjectCollection c = schema.getIncludes();
         assertEquals(2, c.getCount());
 
-        Set set = new HashSet();
+        Set<String> set = new HashSet<String>();
         set.add(Resources.asURI("include2.xsd"));
         set.add(Resources.asURI("include3.xsd"));
         for (int i = 0; i < c.getCount(); i++) {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NamespaceContextTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NamespaceContextTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NamespaceContextTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NamespaceContextTest.java Wed Oct 29 04:54:16 2008
@@ -40,7 +40,7 @@
         XMLUnit.setIgnoreWhitespace(whitespace);
     }
     public void testNamespaceContext() throws Exception {
-        Map namespaceMapFromWSDL = new HashMap();
+        Map<String,URI> namespaceMapFromWSDL = new HashMap<String,URI>();
         namespaceMapFromWSDL.put("tns", new URI("http://example.org/getBalance/"));
         namespaceMapFromWSDL.put("xsd", new URI("http://www.w3.org/2001/XMLSchema"));
         String schema = "\t\t<xsd:schema targetNamespace=\"http://example.org/getBalance/\"\n" +

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NotationTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NotationTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NotationTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/NotationTest.java Wed Oct 29 04:54:16 2008
@@ -126,7 +126,7 @@
 
         XmlSchemaObjectCollection xsoc = xsstc.getFacets();
         assertEquals(2, xsoc.getCount());
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("tns:teamLogo");
         s.add("tns:teamMascot");
         for (int i = 0; i < xsoc.getCount(); i++) {
@@ -150,7 +150,7 @@
         s.clear();
         s.add("teamMascot");
         s.add("teamLogo");
-        for (Iterator i = xsot.getNames(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getNames(); i.hasNext(); ) {
             String name = ((QName)i.next()).getLocalPart();
             if (!(name.equals("teamLogo")
                    || name.equals("teamMascot"))) {
@@ -166,7 +166,7 @@
         s.clear();
         s.add("teamMascot");
         s.add("teamLogo");
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             XmlSchemaNotation xsn = (XmlSchemaNotation)i.next();
             String name = xsn.getName();
             XmlSchemaAnnotation xsa = xsn.getAnnotation();

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/RedefineTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/RedefineTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/RedefineTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/RedefineTest.java Wed Oct 29 04:54:16 2008
@@ -111,7 +111,7 @@
         assertEquals(1, xsot.getCount());
 
         XmlSchemaElement xse = null;
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             xse = (XmlSchemaElement)i.next();
         }
         assertEquals("vip", xse.getName());
@@ -126,14 +126,14 @@
         xsot = xsr.getSchemaTypes();
         assertEquals(1, xsot.getCount());
 
-        for (Iterator i = xsot.getNames(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getNames(); i.hasNext(); ) {
             QName qname = (QName)i.next();
             assertEquals(new QName("http://soapinterop.org/types",
                                    "person"), qname);
         }
 
         XmlSchemaComplexType xsct = null;
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             xsct = (XmlSchemaComplexType)i.next();
         }
         assertNotNull(xsct);
@@ -219,7 +219,7 @@
         assertEquals(1, xsot.getCount());
 
         XmlSchemaElement xse = null;
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             xse = (XmlSchemaElement)i.next();
         }
         assertEquals("childsizedrink", xse.getName());
@@ -234,14 +234,14 @@
         xsot = xsr.getSchemaTypes();
         assertEquals(1, xsot.getCount());
 
-        for (Iterator i = xsot.getNames(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getNames(); i.hasNext(); ) {
             QName qname = (QName)i.next();
             assertEquals(new QName("http://soapinterop.org/types",
                                    "drinksize"), qname);
         }
 
         XmlSchemaSimpleType xsst = null;
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             xsst = (XmlSchemaSimpleType)i.next();
         }
         assertNotNull(xsst);
@@ -254,10 +254,10 @@
 
         xsoc = xsstr.getFacets();
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaMinInclusiveFacet.class.getName());
         s.add(XmlSchemaMaxInclusiveFacet.class.getName());
-        for (Iterator i  = xsoc.getIterator(); i.hasNext(); ) {
+        for (Iterator<?> i  = xsoc.getIterator(); i.hasNext(); ) {
             Object o = i.next();
             assertTrue(s.remove(o.getClass().getName()));
             if (o instanceof XmlSchemaMinInclusiveFacet) {
@@ -334,12 +334,12 @@
         XmlSchemaObjectTable xsot = xsr.getGroup();
         assertEquals(1, xsot.getCount());
 
-        for (Iterator i = xsot.getNames(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getNames(); i.hasNext(); ) {
             assertEquals("PrologGroup", ((QName)i.next()).getLocalPart());
         }
 
         XmlSchemaGroup xsg = null;
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             xsg = (XmlSchemaGroup)i.next();
         }
 
@@ -348,10 +348,10 @@
         xsoc = xss.getItems();
         assertEquals(2, xsoc.getCount());
         
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add(XmlSchemaGroupRef.class.getName());
         s.add(XmlSchemaElement.class.getName());
-        for (Iterator i  = xsoc.getIterator(); i.hasNext(); ) {
+        for (Iterator<?> i  = xsoc.getIterator(); i.hasNext(); ) {
             Object o = i.next();
             assertTrue(s.remove(o.getClass().getName()));
             if (o instanceof XmlSchemaGroupRef) {
@@ -426,12 +426,12 @@
         XmlSchemaObjectTable xsot = xsr.getAttributeGroup();
         assertEquals(1, xsot.getCount());
 
-        for (Iterator i = xsot.getNames(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getNames(); i.hasNext(); ) {
             assertEquals("AttribGroup", ((QName)i.next()).getLocalPart());
         }
 
         XmlSchemaAttributeGroup xsag = null;
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             xsag = (XmlSchemaAttributeGroup)i.next();
         }
 
@@ -439,10 +439,10 @@
         assertEquals("AttribGroup", (xsag.getName()).getLocalPart());
         xsoc = xsag.getAttributes();
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("type");
         s.add("units");
-        for (Iterator i  = xsoc.getIterator(); i.hasNext(); ) {
+        for (Iterator<?> i  = xsoc.getIterator(); i.hasNext(); ) {
             XmlSchemaAttribute xsa = (XmlSchemaAttribute)i.next();
             assertTrue(s.remove(xsa.getName()));
         }
@@ -547,7 +547,7 @@
         assertEquals(1, xsot.getCount());
 
         XmlSchemaElement xse = null;
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             xse = (XmlSchemaElement)i.next();
         }
         assertEquals("vip", xse.getName());
@@ -562,14 +562,14 @@
         xsot = xsr.getSchemaTypes();
         assertEquals(1, xsot.getCount());
 
-        for (Iterator i = xsot.getNames(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getNames(); i.hasNext(); ) {
             QName qname = (QName)i.next();
             assertEquals(new QName("http://soapinterop.org/types",
                                    "person"), qname);
         }
 
         XmlSchemaComplexType xsct = null;
-        for (Iterator i = xsot.getValues(); i.hasNext(); ) {
+        for (Iterator<?> i = xsot.getValues(); i.hasNext(); ) {
             xsct = (XmlSchemaComplexType)i.next();
         }
         assertNotNull(xsct);

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java Wed Oct 29 04:54:16 2008
@@ -103,7 +103,7 @@
         XmlSchemaObjectCollection xsoc = xssce.getAttributes();
         assertEquals(3, xsoc.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("units");
         s.add("id");
         s.add("desc");

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java Wed Oct 29 04:54:16 2008
@@ -106,7 +106,7 @@
         assertNotNull(xsoc);
         assertEquals(2, xsoc.getCount());
 
-        Set s = new HashSet();
+        Set<String> s = new HashSet<String>();
         s.add("units");
         s.add("id");
         for (int i = 0; i < xsoc.getCount(); i++) {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/UnionTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/UnionTest.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/UnionTest.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/UnionTest.java Wed Oct 29 04:54:16 2008
@@ -91,7 +91,7 @@
         assertNotNull(xsstu);
 
         QName[] qname = xsstu.getMemberTypesQNames();
-        Set s = new HashSet();
+        Set<QName> s = new HashSet<QName>();
         s.add(new QName("http://www.w3.org/2001/XMLSchema", "float"));
         s.add(new QName("http://www.w3.org/2001/XMLSchema", "decimal"));
         for (int i = 0; i < qname.length; i++) {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java Wed Oct 29 04:54:16 2008
@@ -72,12 +72,12 @@
         return suite;
     }
 
-    private static List getTestSetFiles(String testSetsLocation) throws Exception {
+    private static List<File> getTestSetFiles(String testSetsLocation) throws Exception {
         File dir = new File(testSetsLocation);
         if (!dir.isDirectory()) {
             throw new Exception ("testSet files location must be a directory");
         }
-        ArrayList testSetFiles = new ArrayList();
+        ArrayList<File> testSetFiles = new ArrayList<File>();
         File[] files = dir.listFiles();
         for (int i = 0; i < files.length; i++) {
             if (files[i].getAbsolutePath().endsWith("testSet")) {

Modified: cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java (original)
+++ cxf/sandbox/benson/xmlschema/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java Wed Oct 29 04:54:16 2008
@@ -108,8 +108,8 @@
      * @return List of SchemaTest objects describing the schema files to test
      * @throws Exception
      */
-    private static List getSchemaTests(String testSet) throws Exception {
-        List schemaTests = new ArrayList();
+    private static List<SchemaTest> getSchemaTests(String testSet) throws Exception {
+        List<SchemaTest> schemaTests = new ArrayList<SchemaTest>();
         Document doc = getDocument(new InputSource(testSet));
         NodeList testGroups = doc.getElementsByTagName("testGroup");
         for (int i = 0; i < testGroups.getLength(); i++) {

Modified: cxf/sandbox/benson/xmlschema/cxf/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/benson/xmlschema/cxf/pom.xml?rev=708883&r1=708882&r2=708883&view=diff
==============================================================================
--- cxf/sandbox/benson/xmlschema/cxf/pom.xml (original)
+++ cxf/sandbox/benson/xmlschema/cxf/pom.xml Wed Oct 29 04:54:16 2008
@@ -125,7 +125,7 @@
     </organization>
 
     <modules>
-<!--        <module>../XmlSchema</module> -->
+        <module>../XmlSchema</module> 
         <module>buildtools</module>
         <module>maven-plugins/xml2fastinfoset-plugin</module>
         <module>parent</module>



Mime
View raw message