[213776]: [xslt] URIResolver
https://bugs.eclipse.org/bugs/show_bug.cgi?id=213776
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
index 1c30e43..05c5488 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
@@ -7,5 +7,6 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4";visibility:=reexport
 Export-Package: org.eclipse.wst.xsl.jaxp.debug.debugger,
- org.eclipse.wst.xsl.jaxp.debug.invoker
+ org.eclipse.wst.xsl.jaxp.debug.invoker,
+ org.eclipse.wst.xsl.jaxp.debug.invoker.internal;x-internal:=true
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/PipelineDefinition.java b/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/PipelineDefinition.java
index dd5a08e..5d6d6bc 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/PipelineDefinition.java
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/PipelineDefinition.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (Intalio) - bug 213776 - URI Resolver
  *******************************************************************************/
 package org.eclipse.wst.xsl.jaxp.debug.invoker;
 
@@ -17,7 +18,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -54,8 +54,8 @@
 	private String sourceURL;
 	private String targetFile;
 
-	private final List transformDefs = new ArrayList();
-	private final Set attributes = new HashSet();
+	private final List<TransformDefinition> transformDefs = new ArrayList<TransformDefinition>();
+	private final Set<TypedValue> attributes = new HashSet<TypedValue>();
 	private boolean useEmbedded;
 
 	/**
@@ -129,9 +129,9 @@
 	 */
 	public void configure(IProcessorInvoker invoker)
 			throws ConfigurationException {
-		Map attVals = new ConcurrentHashMap();
-		for (Iterator iter = attributes.iterator(); iter.hasNext();) {
-			TypedValue att = (TypedValue) iter.next();
+		Map<String, Object> attVals = new ConcurrentHashMap<String, Object>();
+		for (Iterator<TypedValue> iter = attributes.iterator(); iter.hasNext();) {
+			TypedValue att = iter.next();
 			Object value;
 			try {
 				value = att.createValue();
@@ -142,9 +142,9 @@
 		}
 		invoker.setAttributes(attVals);
 
-		for (Iterator iter = transformDefs.iterator(); iter.hasNext();) {
-			TransformDefinition tdef = (TransformDefinition) iter.next();
-			Map params = null;
+		for (Iterator<TransformDefinition> iter = transformDefs.iterator(); iter.hasNext();) {
+			TransformDefinition tdef = iter.next();
+			Map<String, Object> params = null;
 			try {
 				params = tdef.getParametersAsMap();
 			} catch (CreationException e) {
@@ -191,7 +191,7 @@
 	 * 
 	 * @return the set of attributes
 	 */
-	public Set getAttributes() {
+	public Set<TypedValue> getAttributes() {
 		return attributes;
 	}
 
@@ -220,7 +220,7 @@
 	 * 
 	 * @return the list of transform definitions
 	 */
-	public List getTransformDefs() {
+	public List<TransformDefinition> getTransformDefs() {
 		return transformDefs;
 	}
 
@@ -279,7 +279,7 @@
 
 		Element attributesEl = doc.createElement("Attributes"); //$NON-NLS-1$
 		rootEl.appendChild(attributesEl);
-		for (Iterator iter = attributes.iterator(); iter.hasNext();) {
+		for (Iterator<TypedValue> iter = attributes.iterator(); iter.hasNext();) {
 			TypedValue attribute = (TypedValue) iter.next();
 			Element attributeEl = doc.createElement("Attribute"); //$NON-NLS-1$
 			attributeEl.setAttribute("name", attribute.name); //$NON-NLS-1$
@@ -292,7 +292,7 @@
 		if (!useEmbedded) {
 			Element transformsEl = doc.createElement("Transforms"); //$NON-NLS-1$
 			rootEl.appendChild(transformsEl);
-			for (Iterator iter = transformDefs.iterator(); iter.hasNext();) {
+			for (Iterator<TransformDefinition> iter = transformDefs.iterator(); iter.hasNext();) {
 				TransformDefinition tdef = (TransformDefinition) iter.next();
 				Element tdefEl = tdef.asXML(doc);
 				transformsEl.appendChild(tdefEl);
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/TransformDefinition.java b/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/TransformDefinition.java
index f51c8bd..5849ad6 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/TransformDefinition.java
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/TransformDefinition.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
+ * Copyright (c) 2007,2010 Chase Technology Ltd - http://www.chasetechnology.co.uk
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (Intalio) - bug 213776 - URI Resolver
  *******************************************************************************/
 package org.eclipse.wst.xsl.jaxp.debug.invoker;
 
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/TypedValue.java b/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/TypedValue.java
index e0eea0e..bf85e2f 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/TypedValue.java
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug/src/org/eclipse/wst/xsl/jaxp/debug/invoker/TypedValue.java
@@ -91,7 +91,7 @@
 			}
 		} else if (TYPE_OBJECT.equals(type)) {
 			try {
-				Class c = Class.forName(value);
+				Class<?> c = Class.forName(value);
 				o = c.newInstance();
 			} catch (ClassNotFoundException e) {
 				throw new CreationException(