You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by am...@apache.org on 2007/07/26 07:41:53 UTC
svn commit: r559696 - in
/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema:
CompilerOptions.java ExtensionUtility.java SchemaCompiler.java
SchemaConstants.java
Author: amilas
Date: Wed Jul 25 22:41:52 2007
New Revision: 559696
URL: http://svn.apache.org/viewvc?view=rev&rev=559696
Log:
add the offstrictvalidation option to adb. this method basically consiter every element it
process have minOccurs 0 onit.
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java?view=diff&rev=559696&r1=559695&r2=559696
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/CompilerOptions.java Wed Jul 25 22:41:52 2007
@@ -45,6 +45,8 @@
private String packageName = null;
private boolean generateAll = false;
+ private boolean offStrictValidation = false;
+
/**
* Package for the mapper
*/
@@ -184,4 +186,14 @@
public void setSuppressPrefixesMode(boolean suppressPrefixesMode) {
this.suppressPrefixesMode = suppressPrefixesMode;
}
+
+ public boolean isOffStrictValidation() {
+ return offStrictValidation;
+ }
+
+ public void setOffStrictValidation(boolean offStrictValidation) {
+ this.offStrictValidation = offStrictValidation;
+ }
+
+
}
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java?view=diff&rev=559696&r1=559695&r2=559696
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/ExtensionUtility.java Wed Jul 25 22:41:52 2007
@@ -580,6 +580,10 @@
}
+ if (propertyMap.containsKey(SchemaConstants.SchemaCompilerArguments.OFF_STRICT_VALIDATION)){
+ options.setOffStrictValidation(true);
+ }
+
//set helper mode
//this becomes effective only if the classes are unpacked
if (!options.isWrapClasses()) {
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?view=diff&rev=559696&r1=559695&r2=559696
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Wed Jul 25 22:41:52 2007
@@ -2091,7 +2091,12 @@
//register the occurence counts
metainfHolder.addMaxOccurs(referencedQName, elt.getMaxOccurs());
- metainfHolder.addMinOccurs(referencedQName, elt.getMinOccurs());
+ // if the strict validation off then we consider all elements have minOccurs zero on it
+ if (this.options.isOffStrictValidation()){
+ metainfHolder.addMinOccurs(referencedQName, 0);
+ } else {
+ metainfHolder.addMinOccurs(referencedQName, elt.getMinOccurs());
+ }
//we need the order to be preserved. So record the order also
if (order) {
//record the order in the metainf holder
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java?view=diff&rev=559696&r1=559695&r2=559696
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaConstants.java Wed Jul 25 22:41:52 2007
@@ -110,6 +110,7 @@
public static final String PACKAGE = "p";
public static final String MAPPER_PACKAGE = "mp";
public static final String HELPER_MODE = "h";
+ public static final String OFF_STRICT_VALIDATION = "osv";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org