You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by da...@apache.org on 2004/02/24 02:17:16 UTC
cvs commit: xml-xmlbeans/v2/src/xmlcomp/org/apache/xmlbeans/impl/tool XMLBean.java
daveremy 2004/02/23 17:17:16
Modified: v1/docs xmlbeantask.html
v1/docs/guide antXmlbean.html
v1/src/xmlcomp/org/apache/xmlbeans/impl/tool XMLBean.java
v2/docs/guide antXmlbean.html
v2/src/xmlcomp/org/apache/xmlbeans/impl/tool XMLBean.java
Log:
Expose a 'ignoreDuplicatesInNamespaces' attribute in the schema compiler.
Submitted by: Mitch Upton
DRTs: passed
Revision Changes Path
1.3 +7 -0 xml-xmlbeans/v1/docs/xmlbeantask.html
Index: xmlbeantask.html
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/docs/xmlbeantask.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmlbeantask.html 14 Feb 2004 10:26:58 -0000 1.2
+++ xmlbeantask.html 24 Feb 2004 01:17:16 -0000 1.3
@@ -260,6 +260,13 @@
Otherwise, the default compiler for the current VM will be used.
<td align="center" valign="top">No</td>
</tr>
+ <tr>
+ <td valign="top">ignoreDuplicatesInNamespaces</td>
+ <td valign="top">Comma separated list of one or more namespaces
+ in which duplicate definitions are to be ignored.
+ </td>
+ <td align="center" valign="top">No</td>
+ </tr>
</tbody>
</table>
1.3 +7 -0 xml-xmlbeans/v1/docs/guide/antXmlbean.html
Index: antXmlbean.html
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/docs/guide/antXmlbean.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- antXmlbean.html 14 Feb 2004 10:26:58 -0000 1.2
+++ antXmlbean.html 24 Feb 2004 01:17:16 -0000 1.3
@@ -253,6 +253,13 @@
will be used.
<td align="center" valign="top">No</td>
</tr>
+ <tr>
+ <td valign="top">ignoreDuplicatesInNamespaces</td>
+ <td valign="top">Comma separated list of one or more namespaces
+ in which duplicate definitions are to be ignored.
+ </td>
+ <td align="center" valign="top">No</td>
+ </tr>
</tbody>
</table>
<h3>Example</h3>
1.4 +33 -1 xml-xmlbeans/v1/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
Index: XMLBean.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v1/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLBean.java 12 Feb 2004 20:06:00 -0000 1.3
+++ XMLBean.java 24 Feb 2004 01:17:16 -0000 1.4
@@ -48,7 +48,9 @@
public class XMLBean extends MatchingTask
{
private ArrayList schemas = new ArrayList();
-
+
+ private Set mdefnamespaces;
+
private Path classpath;
private File destfile,
@@ -218,6 +220,7 @@
params.setDownload(download);
params.setExtensions(extensions);
params.setErrorListener(err);
+ params.setMdefNamespaces(mdefnamespaces);
success = SchemaCompiler.compile(params);
if (success && !srconly) {
@@ -562,6 +565,35 @@
Extension e = new Extension();
extensions.add(e);
return e;
+ }
+
+ /**
+ * One or more namespaces in which duplicate definitions are to be ignored
+ * can be passed in via the <ignoreDuplicatesInNamespaces> subelement.
+ */
+ public void setIgnoreDuplicatesInNamespaces(String namespaces) {
+ mdefnamespaces = new HashSet();
+ StringTokenizer st = new StringTokenizer(namespaces, ",");
+ while (st.hasMoreTokens())
+ {
+ String namespace = st.nextToken().trim();
+ mdefnamespaces.add(namespace);
+ }
+ }
+
+ public String getIgnoreDuplicatesInNamespaces() {
+ if (mdefnamespaces == null) {
+ return null;
+ }
+ StringBuffer buf = new StringBuffer();
+ Iterator i = mdefnamespaces.iterator();
+ while (i.hasNext()) {
+ buf.append((String)i.next());
+ if (i.hasNext()) {
+ buf.append(",");
+ }
+ }
+ return buf.toString();
}
/**
1.2 +9 -2 xml-xmlbeans/v2/docs/guide/antXmlbean.html
Index: antXmlbean.html
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/docs/guide/antXmlbean.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- antXmlbean.html 30 Oct 2003 18:59:47 -0000 1.1
+++ antXmlbean.html 24 Feb 2004 01:17:16 -0000 1.2
@@ -42,7 +42,7 @@
</div>
<blockquote>
<div class="notepara">
- <pre class="notepara"><taskdef name="xmlbean" classname="com.bea.xbean.tool.XMLBean" classpath="path/to/xbean.jar"/></pre>
+ <pre class="notepara"><taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpath="path/to/xbean.jar"/></pre>
</div>
</blockquote>
<div>
@@ -253,13 +253,20 @@
will be used.
<td align="center" valign="top">No</td>
</tr>
+ <tr>
+ <td valign="top">ignoreDuplicatesInNamespaces</td>
+ <td valign="top">Comma separated list of one or more namespaces
+ in which duplicate definitions are to be ignored.
+ </td>
+ <td align="center" valign="top">No</td>
+ </tr>
</tbody>
</table>
<h3>Example</h3>
</div>
<div id=topictext> Be sure to define the task in your script, like this:</div>
<div>
- <pre><taskdef name="xmlbean" classname="com.bea.xbean.tool.XMLBean" classpath="path/to/xbean.jar"</pre>
+ <pre><taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpath="path/to/xbean.jar"</pre>
<p>The following builds all the schemas in the schemas directory and creates
a jar called "Schemas.jar".</p>
</div>
1.4 +32 -0 xml-xmlbeans/v2/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java
Index: XMLBean.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/xmlcomp/org/apache/xmlbeans/impl/tool/XMLBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLBean.java 12 Feb 2004 20:06:25 -0000 1.3
+++ XMLBean.java 24 Feb 2004 01:17:16 -0000 1.4
@@ -50,6 +50,8 @@
{
private ArrayList schemas = new ArrayList();
+ private Set mdefnamespaces;
+
private Path classpath;
private File destfile,
@@ -221,6 +223,7 @@
params.setExtensions(extensions);
params.setErrorListener(err);
params.setCatalogFile(catalog);
+ params.setMdefNamespaces(mdefnamespaces);
success = SchemaCompiler.compile(params);
if (success && !srconly) {
@@ -565,6 +568,35 @@
Extension e = new Extension();
extensions.add(e);
return e;
+ }
+
+ /**
+ * One or more namespaces in which duplicate definitions are to be ignored
+ * can be passed in via the <ignoreDuplicatesInNamespaces> subelement.
+ */
+ public void setIgnoreDuplicatesInNamespaces(String namespaces) {
+ mdefnamespaces = new HashSet();
+ StringTokenizer st = new StringTokenizer(namespaces, ",");
+ while (st.hasMoreTokens())
+ {
+ String namespace = st.nextToken().trim();
+ mdefnamespaces.add(namespace);
+ }
+ }
+
+ public String getIgnoreDuplicatesInNamespaces() {
+ if (mdefnamespaces == null) {
+ return null;
+ }
+ StringBuffer buf = new StringBuffer();
+ Iterator i = mdefnamespaces.iterator();
+ while (i.hasNext()) {
+ buf.append((String)i.next());
+ if (i.hasNext()) {
+ buf.append(",");
+ }
+ }
+ return buf.toString();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org