You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by kk...@apache.org on 2005/02/01 04:34:58 UTC
svn commit: r149363 -
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
Author: kkrouse
Date: Mon Jan 31 19:34:57 2005
New Revision: 149363
URL: http://svn.apache.org/viewcvs?view=rev&rev=149363
Log:
XMLBEANS-106: Please make entity resolver settable in SchemaCompiler
Contributed by David Jencks
Modified:
xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
Modified: xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java?view=diff&r1=149362&r2=149363
==============================================================================
--- xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java (original)
+++ xmlbeans/trunk/src/xmlcomp/org/apache/xmlbeans/impl/tool/SchemaCompiler.java Mon Jan 31 19:34:57 2005
@@ -408,6 +408,7 @@
private Set mdefNamespaces = Collections.EMPTY_SET;
private String catalogFile;
private SchemaCodePrinter schemaCodePrinter;
+ private EntityResolver entityResolver;
public File getBaseDir()
{
@@ -728,6 +729,14 @@
{
this.schemaCodePrinter = schemaCodePrinter;
}
+
+ public EntityResolver getEntityResolver() {
+ return entityResolver;
+ }
+
+ public void setEntityResolver(EntityResolver entityResolver) {
+ this.entityResolver = entityResolver;
+ }
}
private static SchemaTypeSystem loadTypeSystem(String name, File[] xsdFiles, File[] wsdlFiles, URL[] urlFiles, File[] configFiles,
@@ -1030,7 +1039,8 @@
List extensions = params.getExtensions();
Set mdefNamespaces = params.getMdefNamespaces();
- EntityResolver cmdLineEntRes = ResolverUtil.resolverForCatalog(params.getCatalogFile());
+ EntityResolver cmdLineEntRes = params.getEntityResolver() == null ?
+ ResolverUtil.resolverForCatalog(params.getCatalogFile()) : params.getEntityResolver();
if (srcDir == null || classesDir == null)
throw new IllegalArgumentException("src and class gen directories may not be null.");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org