diff --git a/j2ee/src/main/org/apache/maven/j2ee/J2EEEntityResolver.java b/j2ee/src/main/org/apache/maven/j2ee/J2EEEntityResolver.java
index 20af3391..459825f3 100644
--- a/j2ee/src/main/org/apache/maven/j2ee/J2EEEntityResolver.java
+++ b/j2ee/src/main/org/apache/maven/j2ee/J2EEEntityResolver.java
@@ -61,6 +61,8 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -69,34 +71,37 @@ import org.xml.sax.SAXException;
  * A class to resolve external entity definitions for j2ee artifacts.
  *
  * @author  dion
- * @version $Id: J2EEEntityResolver.java,v 1.2 2003/01/30 22:58:06 kaz Exp $
+ * @version $Id: J2EEEntityResolver.java,v 1.3 2003/02/23 11:29:29 dion Exp $
  */
 public class J2EEEntityResolver implements EntityResolver
 {
     /** map of ids to resource names */
     private Map idToResource = new HashMap();
     
+    /** log for debug output */
+    private static final Log LOG = LogFactory.getLog(J2EEEntityResolver.class);
+    
     /** Creates a new instance of EntityResolver */
     public J2EEEntityResolver()
     {
         idToResource.put(
             "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN",
-            "/application-client_1_3.dtd");
+            "/plugin-resources/application-client_1_3.dtd");
         idToResource.put(
             "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN",
-            "/application_1_3.dtd");
+            "/plugin-resources/application_1_3.dtd");
         idToResource.put(
             "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN",
-            "/ejb-jar_2_0.dtd");
+            "/plugin-resources/ejb-jar_2_0.dtd");
         idToResource.put(
             "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN",
-            "/web-app_2_2.dtd");
+            "/plugin-resources/web-app_2_2.dtd");
         idToResource.put(
             "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN",
-            "/web-app_2_3.dtd");
+            "/plugin-resources/web-app_2_3.dtd");
         idToResource.put(
             "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN",
-            "/web-jsptaglibrary_1_2.dtd");
+            "/plugin-resources/web-jsptaglibrary_1_2.dtd");
     }
     
     /** resolve the entity given by the provided Ids
diff --git a/struts/src/main/org/apache/maven/struts/StrutsEntityResolver.java b/struts/src/main/org/apache/maven/struts/StrutsEntityResolver.java
index 7fe1820b..015d51d1 100644
--- a/struts/src/main/org/apache/maven/struts/StrutsEntityResolver.java
+++ b/struts/src/main/org/apache/maven/struts/StrutsEntityResolver.java
@@ -62,7 +62,7 @@ import org.apache.maven.j2ee.J2EEEntityResolver;
  * A class to resolve external entity definitions for struts artifacts.
  *
  * @author  dion
- * @version $Id: StrutsEntityResolver.java,v 1.1 2003/01/24 03:45:53 jvanzyl Exp $
+ * @version $Id: StrutsEntityResolver.java,v 1.2 2003/02/23 11:33:22 dion Exp $
  */
 public class StrutsEntityResolver extends J2EEEntityResolver
 {
@@ -73,9 +73,9 @@ public class StrutsEntityResolver extends J2EEEntityResolver
     {
         getIdToResource().put(
             "-//Apache Software Foundation//DTD Struts Configuration 1.0//EN",
-            "/struts-config_1_0.dtd");
+            "/plugin-resources/struts-config_1_0.dtd");
         getIdToResource().put(
             "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN",
-            "/struts-config_1_1.dtd");
+            "/plugin-resources/struts-config_1_1.dtd");
     }
 }