Author: bodewig
Date: Thu Jul 17 00:20:44 2008
New Revision: 677518
URL: http://svn.apache.org/viewvc?rev=677518&view=rev
Log:
use configured local DTDs in Iplanet deployment tool. PR 31876. Submitted by
Daniel Henrique.
Modified:
ant/core/trunk/CONTRIBUTORS
ant/core/trunk/WHATSNEW
ant/core/trunk/contributors.xml
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
Modified: ant/core/trunk/CONTRIBUTORS
URL:
http://svn.apache.org/viewvc/ant/core/trunk/CONTRIBUTORS?rev=677518&r1=677517&r2=677518&view=diff
==============================================================================
Binary files - no diff available.
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=677518&r1=677517&r2=677518&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Jul 17 00:20:44 2008
@@ -120,6 +120,9 @@
writing anything.
Bugzilla Report 32200
+ * The IPlanetDeploymentToll didn't use the configured DTD locations.
+ Bugzilla Report 31876.
+
Other changes:
--------------
Modified: ant/core/trunk/contributors.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/contributors.xml?rev=677518&r1=677517&r2=677518&view=diff
==============================================================================
--- ant/core/trunk/contributors.xml (original)
+++ ant/core/trunk/contributors.xml Thu Jul 17 00:20:44 2008
@@ -225,6 +225,10 @@
</name>
<name>
<first>Daniel</first>
+ <last>Henrique</last>
+ </name>
+ <name>
+ <first>Daniel</first>
<last>Ribagnac</last>
</name>
<name>
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java?rev=677518&r1=677517&r2=677518&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
Thu Jul 17 00:20:44 2008
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Hashtable;
+import java.util.Iterator;
import javax.xml.parsers.SAXParser;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -252,6 +253,15 @@
if (iashome != null) {
ejbc.setIasHomeDir(iashome);
}
+ if (getConfig().dtdLocations != null) {
+ for (Iterator i = getConfig().dtdLocations.iterator();
+ i.hasNext(); ) {
+ EjbJar.DTDLocation dtdLocation =
+ (EjbJar.DTDLocation) i.next();
+ ejbc.registerDTD(dtdLocation.getPublicId(),
+ dtdLocation.getLocation());
+ }
+ }
/* Execute the ejbc utility -- stubs/skeletons are rebuilt, if needed
*/
try {
