diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index 152ce12d7..4b19164f5 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -1037,6 +1037,15 @@ define this as META-INF/Customer-weblogic-cmp-rdbms-jar.xml.</p>
                      Use this if you prefer to run ejbc at deployment time.</td>
     <td valign="top" align="center">No.</td>
   </tr>
+  <tr>
+    <td valign="top">ejbcclass</td>
+    <td valign="top">Specifies the classname of the ejbc compiler. Normally ejbjar determines
+                     the appropriate class based on the DTD used for the EJB. The EJB 2.0 compiler
+                     featured in weblogic 6 has, however, been deprecated in version 7. When
+                     using with version 7 this attribute should be set to 
+                     &quot;weblogic.ejbc&quot; to avoid the deprecation warning.</td>
+    <td valign="top" align="center">No.</td>
+  </tr>
 </table>
 
 <p>The weblogic nested element itself supports two nested elements &lt;classpath&gt; and
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index 76d283299..5f388bce9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -85,6 +85,8 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
          = "-//BEA Systems, Inc.//DTD WebLogic 5.1.0 EJB//EN";
     public static final String PUBLICID_WEBLOGIC_EJB600
          = "-//BEA Systems, Inc.//DTD WebLogic 6.0.0 EJB//EN";
+    public static final String PUBLICID_WEBLOGIC_EJB700
+         = "-//BEA Systems, Inc.//DTD WebLogic 7.0.0 EJB//EN";
 
     protected static final String DEFAULT_WL51_EJB11_DTD_LOCATION
          = "/weblogic/ejb/deployment/xml/ejb-jar.dtd";
@@ -99,6 +101,8 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
          = "/weblogic/ejb20/dd/xml/weblogic510-ejb-jar.dtd";
     protected static final String DEFAULT_WL60_DTD_LOCATION
          = "/weblogic/ejb20/dd/xml/weblogic600-ejb-jar.dtd";
+    protected static final String DEFAULT_WL70_DTD_LOCATION
+         = "/weblogic/ejb20/dd/xml/weblogic700-ejb-jar.dtd";
 
     protected static final String DEFAULT_COMPILER = "default";
 
@@ -338,6 +342,7 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
         handler.registerDTD(PUBLICID_WEBLOGIC_EJB510, DEFAULT_WL51_DTD_LOCATION);
         handler.registerDTD(PUBLICID_WEBLOGIC_EJB510, DEFAULT_WL60_51_DTD_LOCATION);
         handler.registerDTD(PUBLICID_WEBLOGIC_EJB600, DEFAULT_WL60_DTD_LOCATION);
+        handler.registerDTD(PUBLICID_WEBLOGIC_EJB700, DEFAULT_WL70_DTD_LOCATION);
         handler.registerDTD(PUBLICID_WEBLOGIC_EJB510, weblogicDTD);
         handler.registerDTD(PUBLICID_WEBLOGIC_EJB600, weblogicDTD);
 
@@ -391,9 +396,8 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool {
                 DescriptorHandler handler = getWeblogicDescriptorHandler(ejbDescriptor.getParentFile());
 
                 saxParser.parse(new InputSource
-                    (new FileInputStream
-                    (weblogicDD)),
-                    handler);
+                    (new FileInputStream(weblogicDD)),
+                        handler);
 
                 Hashtable ht = handler.getFiles();
                 Enumeration e = ht.keys();