diff --git a/.travis-settings.xml b/.travis-settings.xml new file mode 100644 index 0000000000..ab1e4a6d6d --- /dev/null +++ b/.travis-settings.xml @@ -0,0 +1,13 @@ + + + + + apache.snapshots.https + ${env.REPO_USERNAME} + ${env.REPO_PASSWORD} + + + diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..a5571bcacd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,25 @@ +dist: trusty +language: java +jdk: + - openjdk8 +before_install: + - if [ -e $JAVA_HOME/lib/security/cacerts ]; then ln -sf /etc/ssl/certs/java/cacerts $JAVA_HOME/lib/security/cacerts; fi +install: true +script: mvn -B -s .travis-settings.xml -Papache-release -Dgpg.skip=true verify +before_cache: "find $HOME/.m2 -name '*-SNAPSHOT' -a -type d -exec rm -rf '{}' ';'" +jobs: + include: + - stage: test + - if: repo = "apache/axis-axis2-java-core" AND branch = 1_7 AND type = push + stage: deploy + script: mvn -B -s .travis-settings.xml -Papache-release -Dgpg.skip=true -DskipTests=true deploy + env: + - secure: "FtTstQQ7UzWoeSeDSDuRVZmaa/HspGKdqN/zhDY73xvVqQNiN/qEJ1n080199GPfWYZPtB6p9hFhXCbE9UN3+fnfuW0CO4iiBolRCsjdxU43bCaGjLpXiw/6ZIAaKSDPNsiXYK4d0EOKKWjWNWF1lODPrWvUdvB+bhOopUujsTImVKDZ4EqxW/35Qs96DipOz4BDLIGpdduQd8WywuCxUmGQgrzEy8xGmVt/Up383yZLAkPybR1YMp227chsgNLIurdBUbiNd73wh9YAjo/PRTDGbUgkjuUXj0m25vrmTPcHO4CBTzgb5dWeDFfwtZ5chfeanm/bAQyzPhqWF2XkbfKENGrDhOsYIT122VDfXxp+dNFnYj6vx27ulSea1m5GvclBCWkz9cqg4NTL9ZFRJwPvOLBNf/hni4aG4GKGv8sIU3HVVAB4qwpP9WLIDgKlimUq1bfIlj0jIPn/ZZmxd9KHw5gYcCTK0BHXjuFInXFM/3yb71fe8q+Rf8Zqc3HHyVCXCu9JDCuLDbN5BqKAULRAW+pK6Y5LCQTcE0GdotaA1EAlnB1hpwWCaXuGh4WS2+enTxMv6AsJgF1vB0JOXyocYcLp/0j0aolVk6azzdI9fk7VEXPt9xBI+GFmQqGHJf4iX85YizmB7ApwX9iIlMFMoIzuwllWogGO8IaTrPs=" + - secure: "Amz5GjcuFs5A2nksM5GrzhmBe2+RpuwmTILBxzQ3Uhdb6fiNtIqsb+9OsYVWmqPwsI9Oun9yM4NCicWpWFJRDdoBN7pjK65mwlE356VvfyHx9MupXwJO00ILxJ5x5HiKtVglM1M3EZ9gm1PoVzxed9ZpSp/gmFUwvHzdImSNqLbWJ3SjHNOAqXoq2VPhvOae+jsmpBmeGHsTefNtFoLszZq2GgtEgFF3kNZzCTBnk6x5WXOAIO28elseZGEtp6yG5ugesdh6Z+EbifeAU1Rj/H5d820wiwViSmP3ieLrHUwbtbhUtU4f2UK9kXSEPu6FruYLj1tYWggM4w9jHM6Kiytq54YgnL8hNrzQeiU+YpOHaD7rNHrEVaVPFUSzog4YCh7IH4uD1nqrMHMoEpbKltn1ViJodOaAE2LBk32VFP832R4nUZLfhLspQ/V0N+fh4zp57LoYX0A+0MVX72gz395B+nN5mgK8JOPkXJYC4IVttN2nECAxqzabGTrJ5g97Jc73JVrvyQi4VFx9G2Ej/ye3EYpd+nqtAee5JeCHevqggcmPlnUlXMjuNCMx2r+di1HQMPu/CtmKfMGG4qayOZqvrMg1ld2dqY2ZllFGkpEprG1cCD5PR+ibZmiCN/c2w6mLBdHoc2KqGoXPvgi85MspeddrmtMtywTAN3Zta7Q=" +cache: + directories: + - $HOME/.m2 +notifications: + email: + # java-dev@axis.apache.org doesn't work here because it's not an address registered on GitHub. + - veithen@apache.org diff --git a/apidocs/pom.xml b/apidocs/pom.xml index 160256a94d..98307f5e00 100644 --- a/apidocs/pom.xml +++ b/apidocs/pom.xml @@ -22,7 +22,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT apidocs Javadoc @@ -269,9 +269,50 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + + + create-javadoc-compat-out-dir + pre-site + + regex-property + + + javadoc-compat-out-dir + ${project.build.directory} + \\ + \\\\ + false + + + + maven-javadoc-plugin + + extract-resource-info + pre-site + + javadoc + + + + + ${project.groupId} + axis2-transport-testkit + ${project.version} + + + org.apache.axis2.transport.testkit.doclet.ResourceInfoDoclet + false + private + -out "${javadoc-compat-out-dir}/resource-info.dat" + + site-javadoc site @@ -279,6 +320,19 @@ javadoc-no-fork + + + ${project.groupId} + axis2-transport-testkit + ${project.version} + + + org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet + true + + ${javadoc.nolint.param} + -resource-info "${javadoc-compat-out-dir}/resource-info.dat" + ${project.reporting.outputDirectory} . @@ -286,11 +340,10 @@ -J-Xmx256m + false - http://docs.oracle.com/javase/1.5.0/docs/api/ - http://docs.oracle.com/javaee/5/api/ + https://docs.oracle.com/javase/7/docs/api/ http://ws.apache.org/axiom/apidocs/ - http://jaxen.org/apidocs/ true diff --git a/etc/dist.py b/etc/dist.py index 2854e0b220..1ed9ba0e87 100644 --- a/etc/dist.py +++ b/etc/dist.py @@ -34,7 +34,7 @@ rmtree(dist_root) call(["svn", "checkout", "https://dist.apache.org/repos/dist/dev/axis/axis2/java/core/", dist_root]) mkdir(dist_dir) -for suffix in [ "zip", "zip.asc", "zip.md5", "zip.sha1" ]: +for suffix in [ "zip", "zip.asc", "zip.sha512" ]: for classifier in [ "bin", "src", "war" ]: file = "axis2-" + release + "-" + classifier + "." + suffix copyfile(join(root_dir, "modules", "distribution", "target", file), join(dist_dir, file)) diff --git a/legal/woden-impl-dom-LICENSE.txt b/legal/gson-LICENSE.txt similarity index 100% rename from legal/woden-impl-dom-LICENSE.txt rename to legal/gson-LICENSE.txt index 57bc88a15a..d645695673 100644 --- a/legal/woden-impl-dom-LICENSE.txt +++ b/legal/gson-LICENSE.txt @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -199,4 +200,3 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - diff --git a/legal/XmlSchema-LICENSE.txt b/legal/httpclient-LICENSE.txt similarity index 100% rename from legal/XmlSchema-LICENSE.txt rename to legal/httpclient-LICENSE.txt diff --git a/legal/woden-api-LICENSE.txt b/legal/woden-core-LICENSE.txt similarity index 100% rename from legal/woden-api-LICENSE.txt rename to legal/woden-core-LICENSE.txt diff --git a/legal/woden-impl-commons-LICENSE.txt b/legal/woden-impl-commons-LICENSE.txt deleted file mode 100644 index fef8c29fe0..0000000000 --- a/legal/woden-impl-commons-LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/legal/regexp-LICENSE.txt b/legal/xmlschema-core-LICENSE.txt similarity index 100% rename from legal/regexp-LICENSE.txt rename to legal/xmlschema-core-LICENSE.txt diff --git a/modules/adb-codegen/pom.xml b/modules/adb-codegen/pom.xml index 5b6ba6e829..1482ec3c5e 100644 --- a/modules/adb-codegen/pom.xml +++ b/modules/adb-codegen/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml axis2-adb-codegen diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java b/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java index d2a9809341..a3a2246a13 100644 --- a/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java +++ b/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java @@ -80,13 +80,13 @@ public class BeanWriterMetaInfoHolder { protected String itemTypeClassName; protected boolean isUnion; protected boolean isList; - protected boolean fixed = false; protected boolean isParticleClass; // keep whether this class has a partical class type variable protected boolean hasParticleType; protected List nillableQNameList = new ArrayList(); + protected List fixedQNameList = new ArrayList(); //the parent metainfo holder, useful in handling extensions and //restrictions @@ -315,6 +315,25 @@ public boolean isNillable(QName eltQName) { return nillableQNameList.contains(eltQName); } + /** + * Registers a Qname as fixed + * The qName better be of an element + * + * @param eltQName + */ + public void registerFixedQName(QName eltQName) { + fixedQNameList.add(eltQName); + } + + /** + * Returns whether a QName is fixed or not + * + * @param eltQName + */ + public boolean isFixed(QName eltQName) { + return fixedQNameList.contains(eltQName); + } + /** * Registers a mapping. * @@ -944,14 +963,6 @@ public QName getRestrictionBaseType() { return restrictionBaseType; } - public boolean isFixed() { - return fixed; - } - - public void setFixed(boolean fixed) { - this.fixed = fixed; - } - @Override public String toString() { return "BeanWriterMetaInfoHolder [anonymous=" + anonymous + ", choice=" + choice @@ -975,7 +986,7 @@ public String toString() { + restrictionBaseType + ", restrictionClassName=" + restrictionClassName + ", simple=" + simple + ", specialTypeFlagMap=" + specialTypeFlagMap + ", totalDigitsFacet=" + totalDigitsFacet + ", xmlNameJavaNameMap=" - + xmlNameJavaNameMap + ", xmlNameJavaNameMap=" + fixed + "]"; + + xmlNameJavaNameMap + ", fixedQNameList=" + fixedQNameList + "]"; } } diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java b/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java index 83dae5f6f3..fc02d51de5 100644 --- a/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java +++ b/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java @@ -503,7 +503,7 @@ private void writeElement(XmlSchemaElement xsElt) throws SchemaCompilationExcept // register the fixed value if present if (xsElt.getFixedValue() != null) { metainf.registerDefaultValue(xsElt.getQName(), xsElt.getFixedValue()); - metainf.setFixed(true); + metainf.registerFixedQName(xsElt.getQName()); } if (isBinary(xsElt)) { @@ -619,7 +619,7 @@ private void processElement(XmlSchemaElement xsElt, boolean isOuter, String className = findClassName(schemaType.getQName(), isArray(xsElt)); - innerElementMap.put(xsElt.getQName(), className); + innerElementMap.put(xsElt.getWireName(), className); // always store the class name in the element meta Info itself // this details only needed by the unwrappig to set the complex type @@ -642,7 +642,7 @@ private void processElement(XmlSchemaElement xsElt, boolean isOuter, //the anon map. we've to write it just like we treat a referenced type(giving due //care that this is meant to be an attribute in some class) - QName generatedTypeName = generateTypeQName(xsElt.getQName(), parentSchema); + QName generatedTypeName = generateTypeQName(xsElt.getWireName(), parentSchema); if (schemaType instanceof XmlSchemaComplexType) { //set a name @@ -664,7 +664,7 @@ private void processElement(XmlSchemaElement xsElt, boolean isOuter, processedAnonymousComplexTypesMap.remove(xsElt); String className = findClassName(schemaType.getQName(), isArray(xsElt)); innerElementMap.put( - xsElt.getQName(), + xsElt.getWireName(), className); //store in the schema map to retrive in the unwrapping @@ -691,7 +691,7 @@ private void processElement(XmlSchemaElement xsElt, boolean isOuter, processedAnonymousComplexTypesMap.remove(xsElt); String className = findClassName(schemaType.getQName(), isArray(xsElt)); innerElementMap.put( - xsElt.getQName(), + xsElt.getWireName(), className); //store in the schema map @@ -832,7 +832,7 @@ private void processElement(XmlSchemaElement xsElt, boolean isOuter, if (!isOuter) { String className = findClassName(schemaTypeName, isArray(xsElt)); //since this is a inner element we should add it to the inner element map - innerElementMap.put(xsElt.getQName(), className); + innerElementMap.put(xsElt.getWireName(), className); // set the class name to be used in unwrapping xsElt.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY, className); @@ -843,7 +843,7 @@ private void processElement(XmlSchemaElement xsElt, boolean isOuter, //this type is not found at all. we'll just register it with whatever the class name we can comeup with if (!isOuter) { String className = findClassName(schemaTypeName, isArray(xsElt)); - innerElementMap.put(xsElt.getQName(), className); + innerElementMap.put(xsElt.getWireName(), className); // set the class name to be used in unwrapping xsElt.addMetaInfo(SchemaConstants.SchemaCompilerInfoHolder.CLASSNAME_KEY, className); @@ -858,7 +858,7 @@ private void processElement(XmlSchemaElement xsElt, boolean isOuter, if (isOuter) { this.nillableElementList.add(xsElt.getQName()); } else { - localNillableList.add(xsElt.getQName()); + localNillableList.add(xsElt.getWireName()); } } @@ -1837,17 +1837,17 @@ public void processAttribute(XmlSchemaAttribute att, BeanWriterMetaInfoHolder me QName schemaTypeName = att.getSchemaTypeName(); if (schemaTypeName != null) { - if (att.getQName() != null) { + if (att.getWireName() != null) { if (baseSchemaTypeMap.containsKey(schemaTypeName)) { - metainf.registerMapping(att.getQName(), schemaTypeName, + metainf.registerMapping(att.getWireName(), schemaTypeName, baseSchemaTypeMap.get(schemaTypeName).toString(), SchemaConstants.ATTRIBUTE_TYPE); // add optional attribute status if set String use = att.getUse().toString(); if (USE_NONE.equals(use) || USE_OPTIONAL.equals(use)) { - metainf.addtStatus(att.getQName(), SchemaConstants.OPTIONAL_TYPE); + metainf.addtStatus(att.getWireName(), SchemaConstants.OPTIONAL_TYPE); } String className = findClassName(schemaTypeName, false); @@ -1857,11 +1857,11 @@ public void processAttribute(XmlSchemaAttribute att, BeanWriterMetaInfoHolder me className); // set the default value if (att.getDefaultValue() != null) { - metainf.registerDefaultValue(att.getQName(), att.getDefaultValue()); + metainf.registerDefaultValue(att.getWireName(), att.getDefaultValue()); } if (att.getFixedValue() != null) { - metainf.registerDefaultValue(att.getQName(), att.getFixedValue()); - metainf.setFixed(true); + metainf.registerDefaultValue(att.getWireName(), att.getFixedValue()); + metainf.registerFixedQName(att.getWireName()); } // after } else { @@ -1882,14 +1882,14 @@ public void processAttribute(XmlSchemaAttribute att, BeanWriterMetaInfoHolder me //process simple type processSimpleSchemaType(simpleType, null, resolvedSchema, null); } - metainf.registerMapping(att.getQName(), + metainf.registerMapping(att.getWireName(), schemaTypeName, processedTypemap.get(schemaTypeName).toString(), SchemaConstants.ATTRIBUTE_TYPE); // add optional attribute status if set String use = att.getUse().toString(); if (USE_NONE.equals(use) || USE_OPTIONAL.equals(use)) { - metainf.addtStatus(att.getQName(), SchemaConstants.OPTIONAL_TYPE); + metainf.addtStatus(att.getWireName(), SchemaConstants.OPTIONAL_TYPE); } } @@ -1924,7 +1924,7 @@ public void processAttribute(XmlSchemaAttribute att, BeanWriterMetaInfoHolder me } else { // this attribute refers to a custom type, probably one of the extended simple types. // with the inline schema definition - QName attributeQName = att.getQName(); + QName attributeQName = att.getWireName(); if (attributeQName != null) { XmlSchemaSimpleType attributeSimpleType = att.getSchemaType(); XmlSchema resolvedSchema = parentSchema; @@ -1964,14 +1964,14 @@ public void processAttribute(XmlSchemaAttribute att, BeanWriterMetaInfoHolder me processSimpleSchemaType(attributeSimpleType, null, resolvedSchema, schemaTypeQName); } - metainf.registerMapping(att.getQName(), + metainf.registerMapping(att.getWireName(), schemaTypeQName, processedTypemap.get(schemaTypeQName).toString(), SchemaConstants.ATTRIBUTE_TYPE); // add optional attribute status if set String use = att.getUse().toString(); if (USE_NONE.equals(use) || USE_OPTIONAL.equals(use)) { - metainf.addtStatus(att.getQName(), SchemaConstants.OPTIONAL_TYPE); + metainf.addtStatus(att.getWireName(), SchemaConstants.OPTIONAL_TYPE); } } else { // TODO: handle the case when no attribute type specifed @@ -2246,12 +2246,12 @@ private void addProcessedItemsToMetaInfoHolder( XmlSchemaElement elt = (XmlSchemaElement) child; QName referencedQName = null; - if (elt.getQName() != null) { - referencedQName = elt.getQName(); + if (elt.getWireName() != null) { + referencedQName = elt.getWireName(); QName schemaTypeQName = elt.getSchemaType() != null ? elt.getSchemaType().getQName() : elt.getSchemaTypeName(); if (schemaTypeQName != null) { - String clazzName = (String) processedElementTypeMap.get(elt.getQName()); + String clazzName = (String) processedElementTypeMap.get(elt.getWireName()); metainfHolder.registerMapping(referencedQName, schemaTypeQName, clazzName, @@ -2269,7 +2269,7 @@ private void addProcessedItemsToMetaInfoHolder( // register the default value as well if (elt.getFixedValue() != null) { metainfHolder.registerDefaultValue(referencedQName, elt.getFixedValue()); - metainfHolder.setFixed(true); + metainfHolder.registerFixedQName(referencedQName); } } } @@ -2337,13 +2337,13 @@ private void addProcessedItemsToMetaInfoHolder( } //get the nillable state and register that on the metainf holder - if (localNillableList.contains(elt.getQName())) { - metainfHolder.registerNillableQName(elt.getQName()); + if (localNillableList.contains(elt.getWireName())) { + metainfHolder.registerNillableQName(elt.getWireName()); } //get the binary state and add that to the status map if (isBinary(elt)) { - metainfHolder.addtStatus(elt.getQName(), + metainfHolder.addtStatus(elt.getWireName(), SchemaConstants.BINARY_TYPE); } // process the XMLSchemaAny diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl index 61d42634da..f992fd45c3 100644 --- a/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl +++ b/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl @@ -1811,16 +1811,17 @@ // handle unexpected enumeration values properly - - log.warn("Unexpected value " + value + " for enumeration "); - return enumeration; - - - if (enumeration == null && !((value == null) || (value.equals("")))) { - throw new java.lang.IllegalArgumentException(); - } - return enumeration; - + if (enumeration == null && !((value == null) || (value.equals("")))) { + + + log.warn("Unexpected value " + value + " for enumeration "); + + + throw new java.lang.IllegalArgumentException(); + + + } + return enumeration; } public static fromString(java.lang.String value,java.lang.String namespaceURI) throws java.lang.IllegalArgumentException { @@ -2162,7 +2163,6 @@ new javax.xml.namespace.QName("","") - new javax.xml.namespace.QName("","") @@ -2187,7 +2187,7 @@ we have to sollow an excpetions : todo find a better solsution--> try{ - if (reader.isStartElement() || reader.hasText() && .equals(reader.getName()) || .equals(reader.getName()) ){ + if (reader.isStartElement() || reader.hasText() && .equals(reader.getName())){ diff --git a/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java b/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java index 4856dc2b56..a2f4a1955a 100644 --- a/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java +++ b/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java @@ -882,12 +882,6 @@ private void addPropertyEntries(BeanWriterMetaInfoHolder metainf, XSLTUtils.addAttribute(model, "innerchoice", "yes", property); } - if (metainf.isFixed()){ - XSLTUtils.addAttribute(model, "fixed", "yes", property); - } - - - if ((parentMetaInf != null) && metainf.isRestriction() && missingQNames.contains(name)) { // this element details should be there with the parent meta Inf addAttributesToProperty( @@ -937,6 +931,10 @@ private void addAttributesToProperty(BeanWriterMetaInfoHolder metainf, XSLTUtils.addAttribute(model, "nillable", "yes", property); } + if (metainf.isFixed(name)){ + XSLTUtils.addAttribute(model, "fixed", "yes", property); + } + if (metainf.getOptionalAttributeStatusForQName(name)) { XSLTUtils.addAttribute(model, "optional", "yes", property); } diff --git a/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java b/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java index 892e0ddef5..f06d54c70d 100644 --- a/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java +++ b/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java @@ -58,8 +58,7 @@ public void testSimpleAmmountElementParse() throws Exception { OMFactory factory = OMAbstractFactory.getOMFactory(); OMElement element = factory.createOMElement(new QName( "http://apache.org/axis2/schema/extension", "SimpleAmmountElement")); - element.addAttribute("currency", "SLR", - factory.createOMNamespace("http://apache.org/axis2/schema/extension", null)); + element.addAttribute("currency", "SLR", null); element.setText("1000"); SimpleAmmountElement ammountElement = SimpleAmmountElement.Factory.parse(element .getXMLStreamReader()); @@ -82,8 +81,7 @@ public void testPaymentAmountElementParse() throws Exception { OMFactory factory = OMAbstractFactory.getOMFactory(); OMElement element = factory.createOMElement(new QName( "http://apache.org/axis2/schema/extension", "PaymentAmountElement")); - element.addAttribute("currency", "SLR", - factory.createOMNamespace("http://apache.org/axis2/schema/extension", null)); + element.addAttribute("currency", "SLR", null); element.setText("2000"); PaymentAmountElement ammountElement = PaymentAmountElement.Factory.parse(element .getXMLStreamReader()); @@ -156,8 +154,7 @@ public void testReproStringTypeElementParse() throws Exception { OMFactory factory = OMAbstractFactory.getOMFactory(); OMElement element = factory.createOMElement(new QName( "http://apache.org/axis2/schema/extension", "ReproStringTypeElement")); - element.addAttribute("lang", "EN", - factory.createOMNamespace("http://apache.org/axis2/schema/extension", null)); + element.addAttribute("lang", "EN", null); element.setText("Value"); ReproStringTypeElement reproStringTypeElement = ReproStringTypeElement.Factory.parse(element diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml new file mode 100644 index 0000000000..9adaf6ae9f --- /dev/null +++ b/modules/adb-tests/pom.xml @@ -0,0 +1,429 @@ + + + + 4.0.0 + + org.apache.axis2 + axis2 + 1.7.10-SNAPSHOT + ../../pom.xml + + + axis2-adb-tests + Apache Axis2 - ADB Tests + ADB Tests + http://axis.apache.org/axis2/java/core/ + + scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/adb-tests + scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/adb-tests + http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-tests + + + + ${project.groupId} + axis2-adb + ${project.version} + test + + + ${project.groupId} + axis2-transport-local + ${project.version} + test + + + ${project.groupId} + axis2-transport-http + ${project.version} + test + + + junit + junit + test + + + org.apache.ws.commons.axiom + testutils + test + + + ${project.groupId} + axis2-testutils + ${project.version} + test + + + com.sun.xml.ws + jaxws-rt + + + + + + + ${project.groupId} + axis2-wsdl2code-maven-plugin + ${project.version} + + + wsdl2code-mtom + generate-test-sources + + wsdl2code + + + src/test/wsdl/MTOMService.wsdl + sync + org.apache.axis2.databinding.mtom.client + ${project.build.directory}/wsdl2code/mtom + + + + wsdl2code-axis2-5741 + generate-test-sources + + wsdl2code + + + src/test/wsdl/AXIS2-5741.wsdl + org.apache.axis2.databinding.axis2_5741.service + true + true + ${project.build.directory}/wsdl2code/AXIS2-5741 + + + + wsdl2code-axis2-5749 + generate-test-sources + + wsdl2code + + + src/test/wsdl/AXIS2-5749.wsdl + org.apache.axis2.databinding.axis2_5749.service + true + true + ${project.build.directory}/wsdl2code/AXIS2-5749 + + + + wsdl2code-axis2-5750 + generate-test-sources + + wsdl2code + + + src/test/wsdl/AXIS2-5750.wsdl + sync + true + + + http://ise-online.com/FixedValueService/ + org.apache.axis2.databinding.axis2_5750.client + + + org.apache.axis2.databinding.axis2_5750.client + ${project.build.directory}/wsdl2code/AXIS2-5750 + + + + wsdl2code-axis2-5758 + generate-test-sources + + wsdl2code + + + src/test/wsdl/AXIS2-5758.wsdl + sync + true + + + http://example.com/stockquote.xsd + org.apache.axis2.databinding.axis2_5758.client + + + org.apache.axis2.databinding.axis2_5758.client + ${project.build.directory}/wsdl2code/AXIS2-5758 + + + + wsdl2code-axis2-5799 + generate-test-sources + + wsdl2code + + + src/test/wsdl/AXIS2-5799.wsdl + sync + true + + + urn:echo + org.apache.axis2.databinding.axis2_5799.client + + + org.apache.axis2.databinding.axis2_5799.client + ${project.build.directory}/wsdl2code/AXIS2-5799 + + + + wsdl2code-axis2-5809 + generate-test-sources + + wsdl2code + + + src/test/wsdl/AXIS2-5809.wsdl + sync + true + + + http://apache.org/axis2/echo + org.apache.axis2.databinding.axis2_5809 + + + org.apache.axis2.databinding.axis2_5809 + true + true + true + ${project.build.directory}/wsdl2code/AXIS2-5809 + + + + wsdl2code-axis2-5887 + generate-test-sources + + wsdl2code + + + src/test/wsdl/AXIS2-5887.wsdl + sync + true + + + webservice/xtc/plugins/Speed4Trade/com + org.apache.axis2.databinding.axis2_5887.client + + + org.apache.axis2.databinding.axis2_5887.client + ${project.build.directory}/wsdl2code/AXIS2-5887 + + + + + adb + + + + maven-resources-plugin + + + generate-test-resources + + copy-resources + + + ${project.build.directory}/repo + + + src/test/repo + false + + + + + + + + org.codehaus.mojo + xml-maven-plugin + 1.0.1 + + + generate-test-resources + + transform + + + + + ${project.build.directory}/wsdl2code/AXIS2-5741/resources + + services.xml + + src/test/xslt/AXIS2-5741.xsl + ${project.build.directory}/repo/AXIS2-5741/services/FiverxLinkService/META-INF + + + ${project.build.directory}/wsdl2code/AXIS2-5749/resources + + services.xml + + src/test/xslt/AXIS2-5749.xsl + ${project.build.directory}/repo/AXIS2-5749/services/ColorService/META-INF + + + ${project.build.directory}/wsdl2code/AXIS2-5809/resources + + services.xml + + src/test/xslt/AXIS2-5809.xsl + ${project.build.directory}/repo/AXIS2-5809/services/EchoService/META-INF + + + + + + + + org.codehaus.mojo + jaxws-maven-plugin + 2.4.1 + + + wsimport-mtom + + wsimport-test + + + + ${basedir}/src/test/wsdl/MTOMService.wsdl + + org.apache.axis2.databinding.mtom.service + + + + wsimport-axis2-5741 + + wsimport-test + + + + ${basedir}/src/test/wsdl/AXIS2-5741.wsdl + + org.apache.axis2.databinding.axis2_5741.client + + + + wsimport-axis2-5749 + + wsimport-test + + + + ${basedir}/src/test/wsdl/AXIS2-5749.wsdl + + org.apache.axis2.databinding.axis2_5749.client + + + + wsimport-axis2-5750 + + wsimport-test + + + + ${basedir}/src/test/wsdl/AXIS2-5750.wsdl + + org.apache.axis2.databinding.axis2_5750.service + + + + wsimport-axis2-5758 + + wsimport-test + + + + ${basedir}/src/test/wsdl/AXIS2-5758.wsdl + + org.apache.axis2.databinding.axis2_5758.service + + + + wsimport-axis2-5799 + + wsimport-test + + + + ${basedir}/src/test/wsdl/AXIS2-5799.wsdl + + org.apache.axis2.databinding.axis2_5799.service + + + + + + com.sun.xml.ws + jaxws-tools + ${jaxws.tools.version} + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + process-test-resources + + add-test-source + + + + ${project.build.directory}/wsdl2code/mtom/src + ${project.build.directory}/wsdl2code/AXIS2-5741/src + ${project.build.directory}/wsdl2code/AXIS2-5749/src + ${project.build.directory}/wsdl2code/AXIS2-5750/src + ${project.build.directory}/wsdl2code/AXIS2-5758/src + ${project.build.directory}/wsdl2code/AXIS2-5799/src + ${project.build.directory}/wsdl2code/AXIS2-5809/src + ${project.build.directory}/wsdl2code/AXIS2-5887/src + + + + + + + maven-deploy-plugin + + true + + + + + maven-javadoc-plugin + + + attach-javadocs + none + + jar + + + + + + + diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java new file mode 100644 index 0000000000..387b29ccdc --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5741; + +import static com.google.common.truth.Truth.assertThat; + +import javax.xml.ws.BindingProvider; + +import org.apache.axis2.databinding.axis2_5741.client.FiverxLinkService; +import org.apache.axis2.databinding.axis2_5741.client.FiverxLinkService_Service; +import org.apache.axis2.testutils.Axis2Server; +import org.junit.ClassRule; +import org.junit.Test; + +public class ServiceTest { + @ClassRule + public static Axis2Server server = new Axis2Server("target/repo/AXIS2-5741"); + + @Test + public void test() throws Exception { + FiverxLinkService client = new FiverxLinkService_Service().getFiverxLinkServicePort(); + ((BindingProvider)client).getRequestContext().put( + BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + server.getEndpoint("FiverxLinkService")); + assertThat(client.ladeRzVersion("test")).isEqualTo("test result"); + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/service/FiverxLinkServiceImpl.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/service/FiverxLinkServiceImpl.java new file mode 100644 index 0000000000..3d3057abf7 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/service/FiverxLinkServiceImpl.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5741.service; + +import de.fiverx.spec.abrechnungsservice.types.LadeRzVersionE; +import de.fiverx.spec.abrechnungsservice.types.LadeRzVersionResponse; +import de.fiverx.spec.abrechnungsservice.types.LadeRzVersionResponseE; + +public class FiverxLinkServiceImpl extends FiverxLinkServiceSkeleton { + @Override + public LadeRzVersionResponseE ladeRzVersion(LadeRzVersionE ladeRzVersion) { + LadeRzVersionResponseE ladeRzVersionResponseE = new LadeRzVersionResponseE(); + LadeRzVersionResponse ladeRzVersionResponse = new LadeRzVersionResponse(); + ladeRzVersionResponseE.setLadeRzVersionResponse(ladeRzVersionResponse); + ladeRzVersionResponse.setResult("test result"); + return ladeRzVersionResponseE; + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java new file mode 100644 index 0000000000..305c605a6a --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5749; + +import static com.google.common.truth.Truth.assertThat; + +import javax.xml.ws.BindingProvider; + +import org.apache.axis2.databinding.axis2_5749.client.Color; +import org.apache.axis2.databinding.axis2_5749.client.ColorService; +import org.apache.axis2.databinding.axis2_5749.client.ColorService_Service; +import org.apache.axis2.testutils.Axis2Server; +import org.junit.ClassRule; +import org.junit.Test; + +public class ServiceTest { + @ClassRule + public static Axis2Server server = new Axis2Server("target/repo/AXIS2-5749"); + + @Test + public void test() throws Exception { + ColorService client = new ColorService_Service().getColorServiceSOAP(); + ((BindingProvider)client).getRequestContext().put( + BindingProvider.ENDPOINT_ADDRESS_PROPERTY, + server.getEndpoint("ColorService")); + Color color = new Color(); + color.setIn("RED"); + assertThat(client.test(color).getOut()).isEqualTo("Red is good!"); + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/service/ColorServiceImpl.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/service/ColorServiceImpl.java new file mode 100644 index 0000000000..6e736c3336 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/service/ColorServiceImpl.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5749.service; + +import com.ise_online.colorservice.Color; +import com.ise_online.colorservice.ColorResponse; +import com.ise_online.colorservice.In_type1; + +public class ColorServiceImpl extends ColorServiceSkeleton { + @Override + public ColorResponse test(Color color) { + ColorResponse response = new ColorResponse(); + if (color.getIn() == In_type1.RED) { + response.setOut("Red is good!"); + } else { + response.setOut("Don't like that color..."); + } + return response; + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java new file mode 100644 index 0000000000..e882207384 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5750; + +import static com.google.common.truth.Truth.assertThat; + +import javax.xml.ws.Endpoint; + +import org.apache.axiom.testutils.PortAllocator; +import org.apache.axis2.databinding.axis2_5750.client.FixedValue; +import org.apache.axis2.databinding.axis2_5750.client.FixedValueServiceStub; +import org.apache.axis2.databinding.axis2_5750.client.NonFixedValue_type1; +import org.apache.axis2.databinding.axis2_5750.service.FixedValueServiceImpl; +import org.junit.Test; + +public class ServiceTest { + @Test + public void test() throws Exception { + int port = PortAllocator.allocatePort(); + String address = "http://localhost/" + port + "/service"; + Endpoint endpoint = Endpoint.publish(address, new FixedValueServiceImpl()); + try { + FixedValue fixedValue = new FixedValue(); + NonFixedValue_type1 nonFixedValue_type1 = new NonFixedValue_type1(); + nonFixedValue_type1.setNonFixedValue_type0("SomeId"); + fixedValue.setNonFixedValue(nonFixedValue_type1); + FixedValueServiceStub stub = new FixedValueServiceStub(address); + assertThat(stub.test(fixedValue).getOut()).isEqualTo("OK"); + } finally { + endpoint.stop(); + } + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/service/FixedValueServiceImpl.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/service/FixedValueServiceImpl.java new file mode 100644 index 0000000000..b63ef8c4ff --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/service/FixedValueServiceImpl.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5750.service; + +import javax.jws.WebService; + +@WebService(endpointInterface="org.apache.axis2.databinding.axis2_5750.service.FixedValueService") +public class FixedValueServiceImpl implements FixedValueService { + @Override + public FixedValueResponse test(FixedValue parameters) { + FixedValueResponse response = new FixedValueResponse(); + if (parameters.getFixedValue().equals("strict") && parameters.getNonFixedValue().equals("SomeId")) { + response.setOut("OK"); + } else { + response.setOut("NOK"); + } + return response; + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java new file mode 100644 index 0000000000..c2bd476fa3 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5758; + +import static com.google.common.truth.Truth.assertThat; + +import javax.xml.ws.Endpoint; + +import org.apache.axiom.testutils.PortAllocator; +import org.apache.axis2.databinding.axis2_5758.client.StockQuoteServiceStub; +import org.apache.axis2.databinding.axis2_5758.client.TradePriceRequest; +import org.apache.axis2.databinding.axis2_5758.service.StockQuoteServiceImpl; +import org.junit.Test; + +public class ServiceTest { + @Test + public void test() throws Exception { + int port = PortAllocator.allocatePort(); + String address = "http://localhost/" + port + "/service"; + Endpoint endpoint = Endpoint.publish(address, new StockQuoteServiceImpl()); + try { + StockQuoteServiceStub stub = new StockQuoteServiceStub(address); + TradePriceRequest request = new TradePriceRequest(); + request.setTickerSymbol(null); + assertThat(stub.getLastTradePrice(request).getPrice()).isNaN(); + request.setTickerSymbol("GOOG"); + assertThat(stub.getLastTradePrice(request).getPrice()).isWithin(0.001f).of(100.0f); + } finally { + endpoint.stop(); + } + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/service/StockQuoteServiceImpl.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/service/StockQuoteServiceImpl.java new file mode 100644 index 0000000000..11265a63c4 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/service/StockQuoteServiceImpl.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5758.service; + +import javax.jws.WebService; + +@WebService(endpointInterface="org.apache.axis2.databinding.axis2_5758.service.StockQuotePortType") +public class StockQuoteServiceImpl implements StockQuotePortType { + @Override + public TradePrice getLastTradePrice(TradePriceRequest body) { + TradePrice price = new TradePrice(); + if (body.getTickerSymbol() != null) { + price.setPrice(100.0f); + } + return price; + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java new file mode 100644 index 0000000000..c629f2d1f4 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5799; + +import static com.google.common.truth.Truth.assertThat; + +import javax.xml.ws.Endpoint; + +import org.apache.axiom.testutils.PortAllocator; +import org.apache.axis2.databinding.axis2_5799.client.ComplexTypeWithAttribute; +import org.apache.axis2.databinding.axis2_5799.client.EchoServiceStub; +import org.apache.axis2.databinding.axis2_5799.service.EchoImpl; +import org.junit.Test; + +public class ServiceTest { + @Test + public void test() throws Exception { + int port = PortAllocator.allocatePort(); + String address = "http://localhost/" + port + "/service"; + Endpoint endpoint = Endpoint.publish(address, new EchoImpl()); + try { + EchoServiceStub stub = new EchoServiceStub(address); + ComplexTypeWithAttribute request = new ComplexTypeWithAttribute(); + request.setAttr("value"); + assertThat(stub.echo(request).getAttr()).isEqualTo("value"); + } finally { + endpoint.stop(); + } + } +} diff --git a/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/util/Constants.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/service/EchoImpl.java similarity index 65% rename from modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/util/Constants.java rename to modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/service/EchoImpl.java index d5c45e1410..7a71d3246c 100644 --- a/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/util/Constants.java +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/service/EchoImpl.java @@ -16,17 +16,14 @@ * specific language governing permissions and limitations * under the License. */ +package org.apache.axis2.databinding.axis2_5799.service; -package org.apache.axis2.tool.util; +import javax.jws.WebService; +import javax.xml.ws.Holder; -public class Constants { - public static class UIConstants{ - public static final int LABEL_WIDTH=100; - public static final int RADIO_BUTTON_WIDTH=200; - public static final int TEXT_BOX_WIDTH=250; - public static final int BROWSE_BUTTON_WIDTH=20; - public static final int GENERAL_BUTTON_WIDTH=80; - - public static final int GENERAL_COMP_HEIGHT=20; +@WebService(endpointInterface="org.apache.axis2.databinding.axis2_5799.service.EchoPortType") +public class EchoImpl implements EchoPortType { + @Override + public void echo(Holder body) { } } diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/EchoServiceImpl.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/EchoServiceImpl.java new file mode 100644 index 0000000000..3aeaaca7e4 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/EchoServiceImpl.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5809; + +public class EchoServiceImpl extends EchoServiceSkeleton { + @Override + public EchoResponse echo(Echo echo) { + String content = echo.getContent(); + if (content.isEmpty()) { + throw new RuntimeException(); + } + EchoResponse response = new EchoResponse(); + response.setContent(echo.getContent()); + return response; + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java new file mode 100644 index 0000000000..d5837e3110 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java @@ -0,0 +1,57 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5809; + +import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.fail; + +import org.apache.axis2.AxisFault; +import org.apache.axis2.testutils.Axis2Server; +import org.junit.ClassRule; +import org.junit.Test; + +public class ServiceTest { + @ClassRule + public static Axis2Server server = new Axis2Server("target/repo/AXIS2-5809"); + + @Test + public void testWithNormalResponse() throws Exception { + EchoServiceStub stub = new EchoServiceStub(server.getConfigurationContext(), server.getEndpoint("EchoService")); + for (int i=0; i<500; i++) { + Echo request = new Echo(); + request.setContent("test"); + assertThat(stub.echo(request).getContent()).isEqualTo("test"); + } + } + + @Test + public void testWithFault() throws Exception { + EchoServiceStub stub = new EchoServiceStub(server.getConfigurationContext(), server.getEndpoint("EchoService")); + for (int i=0; i<500; i++) { + Echo request = new Echo(); + request.setContent(""); + try { + stub.echo(request); + fail("Expected AxisFault"); + } catch (AxisFault ex) { + // Expected + } + } + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/ParseTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/ParseTest.java new file mode 100644 index 0000000000..79f771ab04 --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/ParseTest.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.axis2_5887; + +import static com.google.common.truth.Truth.assertThat; + +import java.io.InputStream; + +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.soap.SOAPEnvelope; +import org.apache.axis2.databinding.axis2_5887.client.GetOrdersByStatusResponse; +import org.junit.Test; + +public class ParseTest { + @Test + public void test() throws Exception { + GetOrdersByStatusResponse response; + InputStream in = ParseTest.class.getResourceAsStream("getOrdersByStatus_response.xml"); + try { + SOAPEnvelope envelope = OMXMLBuilderFactory.createSOAPModelBuilder(in, null).getSOAPEnvelope(); + response = GetOrdersByStatusResponse.Factory.parse( + envelope.getBody().getFirstElement().getXMLStreamReader(false)); + } finally { + in.close(); + } + assertThat(response.getOrders()).isNotNull(); + assertThat(response.getOrders().getOrders()).isNull(); + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java new file mode 100644 index 0000000000..6ae0a79f3b --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/MTOMTest.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.mtom; + +import javax.activation.DataHandler; +import javax.xml.ws.Endpoint; + +import org.apache.axiom.testutils.PortAllocator; +import org.apache.axiom.testutils.activation.RandomDataSource; +import org.apache.axiom.testutils.io.IOTestUtils; +import org.apache.axis2.Constants; +import org.apache.axis2.databinding.mtom.client.MTOMServiceStub; +import org.apache.axis2.databinding.mtom.client.MTOMServiceStub.GetContent; +import org.apache.axis2.databinding.mtom.service.MTOMServiceImpl; +import org.junit.Ignore; +import org.junit.Test; + +public class MTOMTest { + @Test + @Ignore("AXIS2-5694") + public void test() throws Exception { + int port = PortAllocator.allocatePort(); + String address = "http://localhost/" + port + "/mtom"; + Endpoint endpoint = Endpoint.publish(address, new MTOMServiceImpl()); + try { + MTOMServiceStub stub = new MTOMServiceStub(address); + // JAX-WS only produces an MTOM response if the request uses MTOM + stub._getServiceClient().getOptions().setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE); + DataHandler content = stub.getContent(new GetContent()).getContent(); + IOTestUtils.compareStreams( + new RandomDataSource(654321L, 1000000).getInputStream(), "expected", + content.getInputStream(), "actual"); + } finally { + endpoint.stop(); + } + } +} diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/service/MTOMServiceImpl.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/service/MTOMServiceImpl.java new file mode 100644 index 0000000000..c843d30c2b --- /dev/null +++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/mtom/service/MTOMServiceImpl.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.databinding.mtom.service; + +import javax.activation.DataHandler; +import javax.jws.WebService; +import javax.xml.ws.soap.MTOM; + +import org.apache.axiom.testutils.activation.RandomDataSource; + +@WebService(endpointInterface="org.apache.axis2.databinding.mtom.service.MTOMService") +@MTOM +public class MTOMServiceImpl implements MTOMService { + @Override + public DataHandler getContent() { + return new DataHandler(new RandomDataSource(654321L, 1000000)); + } +} diff --git a/modules/adb-tests/src/test/repo/AXIS2-5809/axis2.xml b/modules/adb-tests/src/test/repo/AXIS2-5809/axis2.xml new file mode 100644 index 0000000000..aded6cf437 --- /dev/null +++ b/modules/adb-tests/src/test/repo/AXIS2-5809/axis2.xml @@ -0,0 +1,300 @@ + + + + + + + true + false + false + + + false + + + + true + + + + + + false + + + admin + axis2 + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6060 + + + + + + + + + + + + + + + + + + + + + HTTP/1.1 + chunked + + + HTTP/1.1 + chunked + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/adb-tests/src/test/resources/org/apache/axis2/databinding/axis2_5887/getOrdersByStatus_response.xml b/modules/adb-tests/src/test/resources/org/apache/axis2/databinding/axis2_5887/getOrdersByStatus_response.xml new file mode 100644 index 0000000000..db0003a21d --- /dev/null +++ b/modules/adb-tests/src/test/resources/org/apache/axis2/databinding/axis2_5887/getOrdersByStatus_response.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl b/modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl new file mode 100644 index 0000000000..c37025814b --- /dev/null +++ b/modules/adb-tests/src/test/wsdl/AXIS2-5741.wsdl @@ -0,0 +1,309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/adb-tests/src/test/wsdl/AXIS2-5749.wsdl b/modules/adb-tests/src/test/wsdl/AXIS2-5749.wsdl new file mode 100644 index 0000000000..719fdd2b7c --- /dev/null +++ b/modules/adb-tests/src/test/wsdl/AXIS2-5749.wsdl @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/adb-tests/src/test/wsdl/AXIS2-5750.wsdl b/modules/adb-tests/src/test/wsdl/AXIS2-5750.wsdl new file mode 100644 index 0000000000..f6d668e3e0 --- /dev/null +++ b/modules/adb-tests/src/test/wsdl/AXIS2-5750.wsdl @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/adb-tests/src/test/wsdl/AXIS2-5758.wsdl b/modules/adb-tests/src/test/wsdl/AXIS2-5758.wsdl new file mode 100644 index 0000000000..75c1ea5b28 --- /dev/null +++ b/modules/adb-tests/src/test/wsdl/AXIS2-5758.wsdl @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + My first service + + + + + + diff --git a/modules/adb-tests/src/test/wsdl/AXIS2-5799.wsdl b/modules/adb-tests/src/test/wsdl/AXIS2-5799.wsdl new file mode 100644 index 0000000000..3c28264027 --- /dev/null +++ b/modules/adb-tests/src/test/wsdl/AXIS2-5799.wsdl @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/adb-tests/src/test/wsdl/AXIS2-5809.wsdl b/modules/adb-tests/src/test/wsdl/AXIS2-5809.wsdl new file mode 100644 index 0000000000..d94a574dfe --- /dev/null +++ b/modules/adb-tests/src/test/wsdl/AXIS2-5809.wsdl @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/adb-tests/src/test/wsdl/AXIS2-5887.wsdl b/modules/adb-tests/src/test/wsdl/AXIS2-5887.wsdl new file mode 100644 index 0000000000..8b33dbe89f --- /dev/null +++ b/modules/adb-tests/src/test/wsdl/AXIS2-5887.wsdl @@ -0,0 +1,2536 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/adb-tests/src/test/wsdl/MTOMService.wsdl b/modules/adb-tests/src/test/wsdl/MTOMService.wsdl new file mode 100644 index 0000000000..c7b1613289 --- /dev/null +++ b/modules/adb-tests/src/test/wsdl/MTOMService.wsdl @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/adb-tests/src/test/xslt/AXIS2-5741.xsl b/modules/adb-tests/src/test/xslt/AXIS2-5741.xsl new file mode 100644 index 0000000000..4801e07d64 --- /dev/null +++ b/modules/adb-tests/src/test/xslt/AXIS2-5741.xsl @@ -0,0 +1,11 @@ + + + + org.apache.axis2.databinding.axis2_5741.service.FiverxLinkServiceImpl + + + + + + + diff --git a/modules/adb-tests/src/test/xslt/AXIS2-5749.xsl b/modules/adb-tests/src/test/xslt/AXIS2-5749.xsl new file mode 100644 index 0000000000..4fae41ebef --- /dev/null +++ b/modules/adb-tests/src/test/xslt/AXIS2-5749.xsl @@ -0,0 +1,11 @@ + + + + org.apache.axis2.databinding.axis2_5749.service.ColorServiceImpl + + + + + + + diff --git a/modules/adb-tests/src/test/xslt/AXIS2-5809.xsl b/modules/adb-tests/src/test/xslt/AXIS2-5809.xsl new file mode 100644 index 0000000000..03064e6a21 --- /dev/null +++ b/modules/adb-tests/src/test/xslt/AXIS2-5809.xsl @@ -0,0 +1,11 @@ + + + + org.apache.axis2.databinding.axis2_5809.EchoServiceImpl + + + + + + + diff --git a/modules/adb/pom.xml b/modules/adb/pom.xml index 71c668d043..7ae9dfa7c1 100644 --- a/modules/adb/pom.xml +++ b/modules/adb/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml @@ -61,7 +61,12 @@ xmlunit xmlunit test - + + + org.apache.ws.commons.axiom + xml-truth + test + org.apache.geronimo.specs geronimo-javamail_1.4_spec diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyType.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyType.java index 887004d85b..9aa9f74fb1 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyType.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyType.java @@ -84,22 +84,6 @@ public void setAnyType(org.apache.axiom.om.OMElement param){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyURI.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyURI.java index f75bad9d7a..f357da8d15 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyURI.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/AnyURI.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Array.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Array.java index 7628011a11..ec1b71ea4e 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Array.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Array.java @@ -219,23 +219,6 @@ public void setHref(org.apache.axis2.databinding.types.URI param) { } - /** - * isReaderMTOMAware - * - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try { - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - } catch (java.lang.IllegalArgumentException e) { - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - /** * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayCoordinate.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayCoordinate.java index de558fced0..6d968c630a 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayCoordinate.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayCoordinate.java @@ -91,22 +91,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayE.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayE.java index 37253fabd3..92a8d00d10 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayE.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ArrayE.java @@ -84,22 +84,6 @@ public void setArray(org.apache.axis2.databinding.types.soapencoding.Array param /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Base64.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Base64.java index 4f5dcd328d..6ffc9672eb 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Base64.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Base64.java @@ -91,22 +91,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Date.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Date.java index 827849ef4b..51da0f66e3 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Date.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Date.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/DateTime.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/DateTime.java index 778c8e1ac7..14bbd52ea9 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/DateTime.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/DateTime.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Decimal.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Decimal.java index b38ad17071..3f9b84578f 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Decimal.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Decimal.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Duration.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Duration.java index e9f78b6e4e..779012ae93 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Duration.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Duration.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITIES.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITIES.java index f2f1808ad5..614822e6c1 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITIES.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITIES.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITY.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITY.java index b8b6839c2b..aeb5ec7dde 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITY.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ENTITY.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GDay.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GDay.java index 0e5b426d7f..352e619354 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GDay.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GDay.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonth.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonth.java index f916609a7f..9315970723 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonth.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonth.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonthDay.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonthDay.java index 162fa6b15b..ad76535c5f 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonthDay.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GMonthDay.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYear.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYear.java index e50eb9e012..ea83aebb11 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYear.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYear.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYearMonth.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYearMonth.java index b21ad5ad66..8421b6b682 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYearMonth.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/GYearMonth.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/HexBinary.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/HexBinary.java index 6d9057f57e..c10b5fe2ce 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/HexBinary.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/HexBinary.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ID.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ID.java index 512276a3e7..3da21ee7d3 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ID.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/ID.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREF.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREF.java index 59e7b408e0..7bec643715 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREF.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREF.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREFS.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREFS.java index 34b1010fa0..0818f2515d 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREFS.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/IDREFS.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Integer.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Integer.java index ad9c316803..d0617096f4 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Integer.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Integer.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Language.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Language.java index 3d41a6d989..6f0e950863 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Language.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Language.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NCName.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NCName.java index b1e5f41a4b..415496253c 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NCName.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NCName.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKEN.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKEN.java index b755609810..b659103eb0 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKEN.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKEN.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKENS.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKENS.java index b4561bf430..38e00c3332 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKENS.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NMTOKENS.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NOTATION.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NOTATION.java index 238b86779f..71d05b6bda 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NOTATION.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NOTATION.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Name.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Name.java index 2afad047fb..f9346230d8 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Name.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Name.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NegativeInteger.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NegativeInteger.java index 2e94e9c7f2..1ad530fbf8 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NegativeInteger.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NegativeInteger.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonNegativeInteger.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonNegativeInteger.java index 14e4d3e328..c98eb42092 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonNegativeInteger.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonNegativeInteger.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonPositiveInteger.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonPositiveInteger.java index 1ed67b98b3..e63dd5be14 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonPositiveInteger.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NonPositiveInteger.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NormalizedString.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NormalizedString.java index c8e2da960b..2fb9842fd6 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NormalizedString.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/NormalizedString.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/PositiveInteger.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/PositiveInteger.java index 51bb9365ea..b54af61cf0 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/PositiveInteger.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/PositiveInteger.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/QName.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/QName.java index 291a5d489c..e5562a5ad7 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/QName.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/QName.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/String.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/String.java index 419bfb8bfa..bb214a9357 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/String.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/String.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Struct.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Struct.java index c85eb6f974..d638c38e64 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Struct.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Struct.java @@ -197,22 +197,6 @@ public void setHref(org.apache.axis2.databinding.types.URI param){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Time.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Time.java index 62fa59e813..bfa1b1223b 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Time.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Time.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Token.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Token.java index 7ad19a77dd..a4ded90bbf 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Token.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/Token.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedByte.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedByte.java index 899752cde4..bc1860fa71 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedByte.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedByte.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedInt.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedInt.java index 34eced0b82..2be4959e32 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedInt.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedInt.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedLong.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedLong.java index 888c8b0a11..2eaba3a21f 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedLong.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedLong.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedShort.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedShort.java index 9b3cb77754..44077df6e8 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedShort.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/UnsignedShort.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_boolean.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_boolean.java index 5442ab5719..97b93954a4 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_boolean.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_boolean.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_byte.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_byte.java index cd2f883bf7..999c6a778a 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_byte.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_byte.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_double.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_double.java index a5f419058a..41a4c18714 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_double.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_double.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_float.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_float.java index 8300a7b505..51673374dc 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_float.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_float.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_int.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_int.java index 201df2669a..d47fef391f 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_int.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_int.java @@ -88,23 +88,6 @@ public java.lang.String toString() { } - /** - * isReaderMTOMAware - * - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try { - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - } catch (java.lang.IllegalArgumentException e) { - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - /** * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java index 9746dfa3d4..604f0b55ce 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_long.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java index e788f3133f..ef855801b9 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/soapencoding/_short.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java index 0a13363e1b..260e52dc77 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/AnyURI.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java index e46a624cf9..3d0d836835 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64.java @@ -91,22 +91,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java index 33678ace53..e8bb55a7f9 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Base64Binary.java @@ -95,22 +95,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java index add0d30132..117ded768a 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Date.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java index 686defb565..abf38e026a 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/DateTime.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java index eefddfa787..6ffd6a4ed7 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Decimal.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java index 15297033eb..7677199c20 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Duration.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java index 95a289236e..6bf3a20023 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITIES.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java index c1c13eb8e9..e30c2d8a4f 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/ENTITY.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java index 41a97c8030..d6a6328237 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GDay.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java index c399ee7cbc..882ff4c9a1 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonth.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java index 84df9b1738..1269489af9 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GMonthDay.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java index 6119300016..b75ff6a658 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYear.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java index ab1dfabb39..879df961fd 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/GYearMonth.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java index bf14f21c8e..6ffb5c28f2 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/HexBinary.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java index 3bf1af2032..9e74fdd13a 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/ID.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java index 7beb9b1c7d..3f0eb48f01 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREF.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java index d1500751e2..f1edf9ac44 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/IDREFS.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java index 5fe12c5359..66cc146470 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Integer.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java index 5d610a87d6..2430a97881 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Language.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java index 78e47593ce..aa8a7a33f5 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NCName.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java index d956781516..0a72d6659a 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKEN.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java index 9040b435b5..8579c5391b 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NMTOKENS.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java index 9d270cac05..a23a90fd5f 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NOTATION.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java index 849fb1cda9..44c207623d 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Name.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java index 1151ac89e0..3a086af875 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NegativeInteger.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java index f1b7bef89d..2310e94378 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonNegativeInteger.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java index 5028195c97..f1d8b30ba0 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NonPositiveInteger.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java index 8abbb74535..c030474be6 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/NormalizedString.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java index 064386efee..4f75af7e35 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/PositiveInteger.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java index b6e238acc5..a053a091c8 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/QName.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java index 58683eed01..a80795a972 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/String.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java index fa92fc8cfe..38ac02d089 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Time.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java index f5d6eddb75..dea81fbb55 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/Token.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java index d5161afd8f..b7a80ee235 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedByte.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java index 4908d47664..0d84bddfad 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedInt.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java index 00a075545c..c1b8681d37 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedLong.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java index f7ea9090a0..a479925985 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/UnsignedShort.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java index 83ac9f49c9..c7d51dcae4 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_boolean.java @@ -88,23 +88,6 @@ public java.lang.String toString() { } - /** - * isReaderMTOMAware - * - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try { - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - } catch (java.lang.IllegalArgumentException e) { - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - /** * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java index a4c8102b0e..5d395b8d8f 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_byte.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java index 69edb3b706..e1f29854dd 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_double.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java index cfe125cd59..1049d2cec5 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_float.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java index 4d0e12e8b0..64288d2001 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_int.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java index 6665f139c0..a2649cad43 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_long.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java index 12cf3cfbf8..cd5e4b7ed3 100644 --- a/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java +++ b/modules/adb/src/org/apache/axis2/databinding/types/xsd/_short.java @@ -90,22 +90,6 @@ public java.lang.String toString(){ /** - * isReaderMTOMAware - * @return true if the reader supports MTOM - */ - public static boolean isReaderMTOMAware(javax.xml.stream.XMLStreamReader reader) { - boolean isReaderMTOMAware = false; - - try{ - isReaderMTOMAware = java.lang.Boolean.TRUE.equals(reader.getProperty(org.apache.axiom.om.OMConstants.IS_DATA_HANDLERS_AWARE)); - }catch(java.lang.IllegalArgumentException e){ - isReaderMTOMAware = false; - } - return isReaderMTOMAware; - } - - - /** * * @param parentQName * @param factory diff --git a/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java b/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java index 31ec73ab38..9fb8a45790 100644 --- a/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java +++ b/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java @@ -355,7 +355,7 @@ private static List getPropertyQnameList(Object beanObject, }else { addTypeQname(elemntNameSpace, propertyQnameValueList, property, beanName, processingDocLitBare); - if (Object.class.equals(ptype)) { + if (Object.class.equals(ptype) && value != null) { //this is required to match this element prefix as //root element's prefix. QName qNamefortheType = (QName) typeTable diff --git a/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java b/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java index 20d339728b..36fcc36fda 100644 --- a/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java +++ b/modules/adb/src/org/apache/axis2/databinding/utils/Constants.java @@ -19,7 +19,6 @@ package org.apache.axis2.databinding.utils; -import org.apache.axiom.om.OMConstants; import org.apache.axis2.databinding.utils.reader.OMAttribKey; import org.apache.axis2.databinding.utils.reader.OMElementKey; @@ -38,8 +37,4 @@ public interface Constants { static Object OM_ATTRIBUTE_KEY = new OMAttribKey(); static Object OM_ELEMENT_KEY = new OMElementKey(); - - static final String IS_BINARY = OMConstants.IS_BINARY; - static final String DATA_HANDLER = OMConstants.DATA_HANDLER; - static final String OPTIMIZATION_ENABLED = OMConstants.IS_DATA_HANDLERS_AWARE; } diff --git a/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java b/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java index e1e211c171..ffebc21c43 100644 --- a/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java +++ b/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java @@ -1286,7 +1286,9 @@ public static List toList(Object[] array) { * @return 0 if equal , + value if greater than , - value if less than */ public static int compare(int intValue, String value) { - return intValue - Integer.parseInt(value); + int other = Integer.parseInt(value); + return intValue < other ? -1 : (intValue == other ? 0 : 1); + } /** diff --git a/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBDataHandlerStreamReader.java b/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBDataHandlerStreamReader.java index 204abd4b83..7f4aca66bd 100644 --- a/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBDataHandlerStreamReader.java +++ b/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBDataHandlerStreamReader.java @@ -19,6 +19,9 @@ package org.apache.axis2.databinding.utils.reader; +import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider; +import org.apache.axiom.ext.stax.datahandler.DataHandlerReader; +import org.apache.axiom.util.stax.XMLStreamReaderUtils; import org.apache.axis2.databinding.utils.ConverterUtil; import javax.activation.DataHandler; @@ -27,7 +30,7 @@ import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; -public class ADBDataHandlerStreamReader implements ADBXMLStreamReader { +public class ADBDataHandlerStreamReader implements ADBXMLStreamReader, DataHandlerReader { private static final int START_ELEMENT_STATE = 0; private static final int TEXT_STATE = 1; private static final int END_ELEMENT_STATE = 2; @@ -59,18 +62,37 @@ public ADBDataHandlerStreamReader(QName name, DataHandler value) { * @throws IllegalArgumentException */ public Object getProperty(String propKey) throws IllegalArgumentException { - if (OPTIMIZATION_ENABLED.equals(propKey)) { - return Boolean.TRUE; - } - if (state == TEXT_STATE) { - if (IS_BINARY.equals(propKey)) { - return Boolean.TRUE; - } else if (DATA_HANDLER.equals(propKey)) { - return value; - } - } + return XMLStreamReaderUtils.processGetProperty(this, propKey); + } + + @Override + public boolean isBinary() { + return state == TEXT_STATE; + } + + @Override + public boolean isOptimized() { + return true; + } + + @Override + public boolean isDeferred() { + return false; + } + + @Override + public String getContentID() { return null; + } + + @Override + public DataHandler getDataHandler() throws XMLStreamException { + return value; + } + @Override + public DataHandlerProvider getDataHandlerProvider() { + throw new UnsupportedOperationException(); } public int next() throws XMLStreamException { diff --git a/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java b/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java index 10737d20f4..7c1cfb6bce 100644 --- a/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java +++ b/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java @@ -19,10 +19,13 @@ package org.apache.axis2.databinding.utils.reader; +import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider; +import org.apache.axiom.ext.stax.datahandler.DataHandlerReader; import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.impl.util.OMSerializerUtil; +import org.apache.axiom.util.stax.XMLStreamReaderUtils; import org.apache.axis2.databinding.typemapping.SimpleTypeMapper; import org.apache.axis2.databinding.utils.BeanUtil; import org.apache.axis2.databinding.utils.ConverterUtil; @@ -57,7 +60,7 @@ * possible *

*/ -public class ADBXMLStreamReaderImpl implements ADBXMLStreamReader { +public class ADBXMLStreamReaderImpl implements ADBXMLStreamReader, DataHandlerReader { private Object[] properties; private Object[] attributes; @@ -168,20 +171,37 @@ public void init() { * @throws IllegalArgumentException */ public Object getProperty(String key) throws IllegalArgumentException { - if (OPTIMIZATION_ENABLED.equals(key)) { - return Boolean.TRUE; - } else if (state == TEXT_STATE) { - if (IS_BINARY.equals(key)) { - return Boolean.FALSE; - } else { - return null; - } - } else if (state == DELEGATED_STATE) { - return childReader.getProperty(key); - } else { - return null; - } + return XMLStreamReaderUtils.processGetProperty(this, key); + } + + @Override + public boolean isBinary() { + return state == DELEGATED_STATE && childReader instanceof DataHandlerReader && ((DataHandlerReader)childReader).isBinary(); + } + + @Override + public boolean isOptimized() { + return ((DataHandlerReader)childReader).isOptimized(); + } + + @Override + public boolean isDeferred() { + return ((DataHandlerReader)childReader).isDeferred(); + } + + @Override + public String getContentID() { + return ((DataHandlerReader)childReader).getContentID(); + } + + @Override + public DataHandler getDataHandler() throws XMLStreamException { + return ((DataHandlerReader)childReader).getDataHandler(); + } + @Override + public DataHandlerProvider getDataHandlerProvider() { + return ((DataHandlerReader)childReader).getDataHandlerProvider(); } public void require(int i, String string, String string1) diff --git a/modules/adb/src/org/apache/axis2/databinding/utils/reader/NameValuePairStreamReader.java b/modules/adb/src/org/apache/axis2/databinding/utils/reader/NameValuePairStreamReader.java index a801bbfd4c..914bb5a547 100644 --- a/modules/adb/src/org/apache/axis2/databinding/utils/reader/NameValuePairStreamReader.java +++ b/modules/adb/src/org/apache/axis2/databinding/utils/reader/NameValuePairStreamReader.java @@ -49,19 +49,7 @@ public NameValuePairStreamReader(QName name, String value) { } public Object getProperty(String key) throws IllegalArgumentException { - //since optimization is a global property - //we've to implement it everywhere - if (OPTIMIZATION_ENABLED.equals(key)) { - return Boolean.TRUE; - } else if (state == TEXT_STATE) { - if (IS_BINARY.equals(key)) { - return Boolean.FALSE; - } else { - return null; - } - } else { - return null; - } + return null; } public int next() throws XMLStreamException { diff --git a/modules/adb/src/org/apache/axis2/databinding/utils/reader/NullXMLStreamReader.java b/modules/adb/src/org/apache/axis2/databinding/utils/reader/NullXMLStreamReader.java index 02304b30fd..f89c39ee3e 100644 --- a/modules/adb/src/org/apache/axis2/databinding/utils/reader/NullXMLStreamReader.java +++ b/modules/adb/src/org/apache/axis2/databinding/utils/reader/NullXMLStreamReader.java @@ -44,13 +44,7 @@ public NullXMLStreamReader(QName outerQName) { } public Object getProperty(String key) throws IllegalArgumentException { - //since optimization is a global property - //we've to implement it everywhere - if (OPTIMIZATION_ENABLED.equals(key)) { - return Boolean.TRUE; - } else { - return null; - } + return null; } public int next() throws XMLStreamException { diff --git a/modules/adb/src/org/apache/axis2/databinding/utils/reader/WrappingXMLStreamReader.java b/modules/adb/src/org/apache/axis2/databinding/utils/reader/WrappingXMLStreamReader.java index c3d6d4632b..3edf14aa37 100644 --- a/modules/adb/src/org/apache/axis2/databinding/utils/reader/WrappingXMLStreamReader.java +++ b/modules/adb/src/org/apache/axis2/databinding/utils/reader/WrappingXMLStreamReader.java @@ -19,20 +19,27 @@ package org.apache.axis2.databinding.utils.reader; +import javax.activation.DataHandler; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -public class WrappingXMLStreamReader implements ADBXMLStreamReader { +import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider; +import org.apache.axiom.ext.stax.datahandler.DataHandlerReader; +import org.apache.axiom.util.stax.XMLStreamReaderUtils; + +public class WrappingXMLStreamReader implements ADBXMLStreamReader, DataHandlerReader { private XMLStreamReader reader; + private DataHandlerReader dataHandlerReader; private int depth; private boolean done; public WrappingXMLStreamReader(XMLStreamReader reader) { this.reader = reader; + dataHandlerReader = XMLStreamReaderUtils.getDataHandlerReader(reader); } public boolean isDone() { @@ -40,7 +47,37 @@ public boolean isDone() { } public Object getProperty(String string) throws IllegalArgumentException { - return reader.getProperty(string); + return XMLStreamReaderUtils.processGetProperty(this, string); + } + + @Override + public boolean isBinary() { + return dataHandlerReader != null && dataHandlerReader.isBinary(); + } + + @Override + public boolean isOptimized() { + return dataHandlerReader.isOptimized(); + } + + @Override + public boolean isDeferred() { + return dataHandlerReader.isDeferred(); + } + + @Override + public String getContentID() { + return dataHandlerReader.getContentID(); + } + + @Override + public DataHandler getDataHandler() throws XMLStreamException { + return dataHandlerReader.getDataHandler(); + } + + @Override + public DataHandlerProvider getDataHandlerProvider() { + return dataHandlerReader.getDataHandlerProvider(); } public int next() throws XMLStreamException { diff --git a/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java b/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java index 8a0cf1ca19..88cf5073aa 100644 --- a/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java +++ b/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java @@ -34,6 +34,9 @@ import javax.mail.util.ByteArrayDataSource; import javax.xml.namespace.QName; +import static com.google.common.truth.Truth.assertAbout; +import static org.apache.axiom.truth.xml.XMLTruth.xml; + import java.io.ByteArrayInputStream; import java.math.BigInteger; import java.util.List; @@ -283,5 +286,14 @@ private static String toStr(ByteArrayInputStream is) { return new String(theChars); } - + /** + * Regression test for AXIS2-5751. + */ + public void testSerializeAnyTypeNull() { + assertAbout(xml()) + .that(BeanUtil.getPullParser(new ComplexTypeWithAnyTypeElement(), new QName("root"), null, false, false)) + .ignoringNamespaceDeclarations() + .ignoringNamespacePrefixes() + .hasSameContentAs(""); + } } diff --git a/modules/kernel/src/org/apache/axis2/classloader/JarStreamHandlerFactory.java b/modules/adb/test/org/apache/axis2/databinding/utils/ComplexTypeWithAnyTypeElement.java similarity index 67% rename from modules/kernel/src/org/apache/axis2/classloader/JarStreamHandlerFactory.java rename to modules/adb/test/org/apache/axis2/databinding/utils/ComplexTypeWithAnyTypeElement.java index e32813ec08..c05c0a453a 100644 --- a/modules/kernel/src/org/apache/axis2/classloader/JarStreamHandlerFactory.java +++ b/modules/adb/test/org/apache/axis2/databinding/utils/ComplexTypeWithAnyTypeElement.java @@ -16,17 +16,16 @@ * specific language governing permissions and limitations * under the License. */ +package org.apache.axis2.databinding.utils; -package org.apache.axis2.classloader; +public class ComplexTypeWithAnyTypeElement { + private Object prop; -import java.net.URLStreamHandler; -import java.net.URLStreamHandlerFactory; + public Object getProp() { + return prop; + } -public class JarStreamHandlerFactory implements URLStreamHandlerFactory { - public URLStreamHandler createURLStreamHandler(String protocol) { - if("jar".equalsIgnoreCase(protocol)){ - return new JarFileUrlStreamHandler(); - } - return null; + public void setProp(Object prop) { + this.prop = prop; } } diff --git a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java index 92c1e05d97..41c4136467 100644 --- a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java +++ b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java @@ -21,6 +21,8 @@ import junit.framework.TestCase; +import static com.google.common.truth.Truth.assertThat; + import java.math.BigDecimal; import java.math.BigInteger; import java.text.SimpleDateFormat; @@ -158,8 +160,8 @@ public void testConvertToDateTime() { this.internalTestConvertToDateTime(); // run tests with time zone "Africa/Windhoek" - System.out.println( "setting time zone to Africa/Windhoek" ); - TimeZone.setDefault(TimeZone.getTimeZone("Africa/Windhoek")); + System.out.println( "setting time zone to Africa/Tunis" ); + TimeZone.setDefault(TimeZone.getTimeZone("Africa/Tunis")); this.internalTestConvertToDateTime(); // run tests with time zone "Australia/Darwin" @@ -560,5 +562,8 @@ public void testConvertToNormalizedString() { } - + public void testCompareInt() { + // https://stackoverflow.com/questions/46372764/axis2-adb-and-mininclusive-2147483648 + assertThat(ConverterUtil.compare(3, "-2147483648")).isGreaterThan(0); + } } diff --git a/modules/addressing/pom.xml b/modules/addressing/pom.xml index 1ffe20b915..33afee3be1 100644 --- a/modules/addressing/pom.xml +++ b/modules/addressing/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml addressing diff --git a/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java b/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java index 4f4f6827a6..e6a750a5c0 100644 --- a/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java +++ b/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java @@ -90,12 +90,12 @@ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault { SOAPFaultCode code = fault.getCode(); SOAPFaultSubCode subCode = code.getSubCode(); if (subCode == null) { - faultLocalName = code.getTextAsQName().getLocalPart(); + faultLocalName = code.getValueAsQName().getLocalPart(); } else { while (subCode.getSubCode() != null) { subCode = subCode.getSubCode(); } - faultLocalName = subCode.getValue().getTextAsQName().getLocalPart(); + faultLocalName = subCode.getValueAsQName().getLocalPart(); } String newReason = AddressingFaultsHelper diff --git a/modules/clustering/pom.xml b/modules/clustering/pom.xml index fa81eb0d81..d995743d14 100644 --- a/modules/clustering/pom.xml +++ b/modules/clustering/pom.xml @@ -24,12 +24,15 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml axis2-clustering Apache Axis2 - Clustering Axis2 Clustering module + + 6.0.53 + org.apache.axis2 @@ -62,10 +65,12 @@ org.apache.tomcat tribes + ${tomcat.version} org.apache.tomcat juli + ${tomcat.version} http://axis.apache.org/axis2/java/core/ diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index a381c38165..e24f5e1061 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml axis2-codegen diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl index f547ed0053..f588b9cd34 100644 --- a/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl +++ b/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl @@ -315,7 +315,7 @@ , { - org.apache.axis2.context.MessageContext _messageContext = null; + org.apache.axis2.context.MessageContext _messageContext = new org.apache.axis2.context.MessageContext(); try{ org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[].getName()); _operationClient.getOptions().setAction(""); @@ -326,9 +326,6 @@ addPropertyToOperationClient(_operationClient,,); - // create a message context - _messageContext = new org.apache.axis2.context.MessageContext(); - // create SOAP envelope with that payload @@ -923,7 +920,7 @@ { - org.apache.axis2.context.MessageContext _messageContext = null; + org.apache.axis2.context.MessageContext _messageContext = new org.apache.axis2.context.MessageContext(); try { org.apache.axis2.client.OperationClient _operationClient = _serviceClient.createClient(_operations[].getName()); @@ -937,7 +934,6 @@ _operationClient.getOptions().setAction(""); org.apache.axiom.soap.SOAPEnvelope env = null; - _messageContext = new org.apache.axis2.context.MessageContext(); diff --git a/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java b/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java index 88e2b030f9..7dd260bd6e 100644 --- a/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java +++ b/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java @@ -23,29 +23,24 @@ import org.apache.axis2.wsdl.codegen.XMLSchemaTest; import org.apache.ws.commons.schema.XmlSchema; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +@RunWith(JUnit4.class) public class SchemaWriterTest extends XMLSchemaTest{ - private SchemaWriter writer; - - - @Override - protected void setUp() throws Exception { - writer=new SchemaWriter(new File(customDirectoryLocation)); - super.setUp(); - } - - @Override - protected void tearDown() throws Exception { - writer=null; - super.tearDown(); - } + @Rule + public final TemporaryFolder tmpFolder = new TemporaryFolder(); @Test public void testWriteSchema() throws Exception{ + File baseFolder = tmpFolder.getRoot(); + SchemaWriter writer = new SchemaWriter(baseFolder); XmlSchema schema=loadSingleSchemaFile(1); writer.writeSchema(schema, "generated.xsd"); - String s1=readXMLfromSchemaFile(customDirectoryLocation+"generated.xsd"); + String s1=readXMLfromSchemaFile(new File(baseFolder, "generated.xsd").getPath()); String s2=readXMLfromSchemaFile(customDirectoryLocation+"sampleSchema1.xsd"); assertSimilarXML(s1, s2); diff --git a/modules/corba/pom.xml b/modules/corba/pom.xml index 141856de28..a925c26f03 100644 --- a/modules/corba/pom.xml +++ b/modules/corba/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml axis2-corba diff --git a/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java b/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java index d4d6cd5109..815edddd91 100644 --- a/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java +++ b/modules/corba/src/org/apache/axis2/corba/deployer/CorbaDeployer.java @@ -95,7 +95,7 @@ public void deploy(DeploymentFileData deploymentFileData) throws DeploymentExcep AxisServiceGroup serviceGroup = new AxisServiceGroup(axisConfig); serviceGroup.setServiceGroupClassLoader(deploymentFileData.getClassLoader()); ArrayList serviceList = processService(deploymentFileData, serviceGroup, configCtx); - DeploymentEngine.addServiceGroup(serviceGroup, serviceList, deploymentFileData.getFile().toURL(), deploymentFileData, axisConfig); + DeploymentEngine.addServiceGroup(serviceGroup, serviceList, deploymentFileData.getFile().toURI().toURL(), deploymentFileData, axisConfig); name = deploymentFileData.getName(); super.deploy(deploymentFileData); log.info("Deploying " + name); diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 5229ed4185..be56e86402 100755 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml @@ -186,6 +186,12 @@ ${project.version} mar + + org.apache.axis2 + axis2-jaxws-mar + ${project.version} + mar + org.apache.axis2 @@ -281,7 +287,9 @@ - + + http://axis.apache.org/axis2/java/core/ @@ -314,6 +328,28 @@ + + com.github.veithen.alta + alta-maven-plugin + + + war-location + + generate-properties + + + webapp + %file% + + test + + *:axis2-webapp:war:* + + + + + + org.codehaus.gmavenplus gmavenplus-plugin @@ -335,6 +371,41 @@ + + check-webapp-content + verify + + execute + + + + + + + @@ -347,6 +418,7 @@ ${project.build.directory}/tmp-repository + false true @@ -374,6 +446,27 @@ + + + maven-clean-plugin + + + clean-test-files + pre-integration-test + + clean + + + true + + + ${project.build.directory}/axis2-${project.version} + + + + + + + + @@ -430,14 +526,29 @@ + + + + + + com.github.veithen.invoker + resolver-proxy-maven-plugin + + + + start + stop + + + + maven-invoker-plugin - 1.5 build-maven-samples @@ -476,7 +587,7 @@ - net.ju-n.maven.plugins + net.nicoulaj.maven.plugins checksum-maven-plugin diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/src/main/assembly/bin-assembly.xml index c6033e76a7..1649fcca52 100755 --- a/modules/distribution/src/main/assembly/bin-assembly.xml +++ b/modules/distribution/src/main/assembly/bin-assembly.xml @@ -170,6 +170,9 @@ false lib + + ${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension} *:*:jar @@ -215,7 +218,14 @@ webapp + org/apache/axis2/soapmonitor/applet/**/* WEB-INF/classes/**/* + WEB-INF/include/**/* + WEB-INF/lib/taglibs-standard-impl-*.jar + WEB-INF/lib/taglibs-standard-spec-*.jar + WEB-INF/lib/axis2-soapmonitor-servlet-*.jar + WEB-INF/tags/**/* + WEB-INF/views/**/* WEB-INF/web.xml axis2-web/**/* diff --git a/modules/fastinfoset/pom.xml b/modules/fastinfoset/pom.xml index 609c1d3b57..58a0841149 100644 --- a/modules/fastinfoset/pom.xml +++ b/modules/fastinfoset/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml axis2-fastinfoset @@ -69,24 +69,13 @@ org.apache.axis2 axis2-java2wsdl ${project.version} + test org.apache.axis2 axis2-adb-codegen ${project.version} - - - org.apache.axis2 - axis2-codegen - ${project.version} - - - org.apache.httpcomponents - httpcore - - - commons-codec - commons-codec + test org.apache.neethi @@ -169,14 +158,6 @@ - - maven-compiler-plugin - true - - 1.5 - 1.5 - - org.apache.axis2 axis2-repo-maven-plugin @@ -221,7 +202,7 @@ Generating the WSDL - + @@ -231,7 +212,7 @@ - + @@ -269,7 +250,7 @@ because the test server doesn't shut down properly :-( Should be removed if possible --> pertest - -Xms256m -Xmx512m + ${argLine} -Xms256m -Xmx512m diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 93907fb20d..1daa1a03ac 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml axis2-integration @@ -76,16 +76,6 @@ axis2-java2wsdl ${project.version} - - org.apache.axis2 - ${project.version} - axis2-jaxws - - - org.apache.axis2 - ${project.version} - axis2-jaxws-integration - org.apache.axis2 axis2-kernel @@ -142,6 +132,12 @@ xmlunit test + + org.apache.axis2 + axis2-testutils + ${project.version} + test + log4j log4j @@ -196,8 +192,6 @@ maven-compiler-plugin true - 1.5 - 1.5 true @@ -493,7 +487,7 @@ because the test server doesn't shut down properly :-( Should be removed if possible --> pertest - -Xms256m -Xmx512m + ${argLine} -Xms256m -Xmx512m diff --git a/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java b/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java index 8350b29d21..0513779428 100644 --- a/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java +++ b/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleB/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultB.java @@ -114,7 +114,7 @@ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault { //fault.setReason(reason); if (roleValue != null && roleValue.equals(SAMPLE_ROLE + "/" + ROLE_BY_B)) { SOAPFaultNode node = factory.createSOAPFaultNode(fault); - node.setNodeValue(SAMPLE_ROLE + "/" + ROLE_BY_B); + node.setFaultNodeValue(SAMPLE_ROLE + "/" + ROLE_BY_B); SOAPFaultRole role = factory.createSOAPFaultRole(fault); role.setRoleValue(SAMPLE_ROLE + "/" + ROLE_BY_B); msgContext.setProperty(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME, node); diff --git a/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java b/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java index 59e6a07682..334af644ea 100644 --- a/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java +++ b/modules/integration/test-resources/SOAP12Testing/SOAP12TestModuleC/org/apache/axis2/soap12testing/handlers/SOAP12InFlowHandlerDefaultC.java @@ -117,7 +117,7 @@ public InvocationResponse invoke(MessageContext msgContext) throws AxisFault { //fault.setReason(reason); if (roleValue != null && roleValue.equals(SAMPLE_ROLE + "/" + ROLE_BY_B)) { SOAPFaultNode node = factory.createSOAPFaultNode(fault); - node.setNodeValue(SAMPLE_ROLE + "/" + ROLE_BY_B); + node.setFaultNodeValue(SAMPLE_ROLE + "/" + ROLE_BY_B); SOAPFaultRole role = factory.createSOAPFaultRole(fault); role.setRoleValue(SAMPLE_ROLE + "/" + ROLE_BY_B); msgContext.setProperty(SOAP12Constants.SOAP_FAULT_NODE_LOCAL_NAME, node); diff --git a/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java b/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java index 7d751c6d5f..c8428e12af 100644 --- a/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java +++ b/modules/integration/test/org/apache/axis2/engine/PausingHandlerExecutionTest.java @@ -19,6 +19,9 @@ package org.apache.axis2.engine; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -31,13 +34,11 @@ import java.util.Iterator; import java.util.List; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.axiom.om.OMElement; import org.apache.axiom.soap.SOAP12Constants; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; +import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.ConfigurationContext; @@ -48,58 +49,44 @@ import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.integration.TestingUtils; import org.apache.axis2.integration.UtilServer; -import org.apache.axis2.integration.UtilServerBasedTestCase; import org.apache.axis2.phaseresolver.PhaseMetadata; +import org.apache.axis2.testutils.Axis2Server; import org.apache.axis2.util.Utils; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; + +public class PausingHandlerExecutionTest implements TestConstants { + @ClassRule + public static final Axis2Server server = new Axis2Server(TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY)); -public class PausingHandlerExecutionTest extends UtilServerBasedTestCase implements TestConstants { - private static boolean initDone = false; private static ArrayList testResults; - private AxisService testService; private static TestHandler middleGlobalInHandler; - private TestHandler firstOperationInHandler; - private TestHandler middleOperationInHandler; - private TestHandler middleOperationOutHandler; - - public PausingHandlerExecutionTest() { - super(PausingHandlerExecutionTest.class.getName()); - } - - public PausingHandlerExecutionTest(String testName) { - super(testName); - } - - public static Test suite() { - return getTestSetup(new TestSuite(PausingHandlerExecutionTest.class)); - } - protected void setUp() throws Exception { - //org.apache.log4j.BasicConfigurator.configure(); + @BeforeClass + public static void setUp() throws Exception { + AxisConfiguration axisConfiguration = server.getConfigurationContext().getAxisConfiguration(); testResults = new ArrayList(); - if (!initDone) { - initDone = true; - List globalInPhases = - UtilServer.getConfigurationContext().getAxisConfiguration().getInFlowPhases(); - for (int i = 0; i < globalInPhases.size(); i++) { - Phase globalInPhase = (Phase)globalInPhases.get(i); - if (PhaseMetadata.PHASE_PRE_DISPATCH.equals(globalInPhase.getPhaseName())) { - System.out.println("Adding handlers to globalInPhase name [" + - globalInPhase.getPhaseName() + "] ..."); - globalInPhase.addHandler(new TestHandler("In1")); - middleGlobalInHandler = new TestHandler("In2"); - globalInPhase.addHandler(middleGlobalInHandler); - globalInPhase.addHandler(new TestHandler("In3")); - System.out.println("...done adding handlers to globalInPhase name [" + - globalInPhase.getPhaseName() + "] ..."); - } + List globalInPhases = axisConfiguration.getInFlowPhases(); + for (int i = 0; i < globalInPhases.size(); i++) { + Phase globalInPhase = (Phase)globalInPhases.get(i); + if (PhaseMetadata.PHASE_PRE_DISPATCH.equals(globalInPhase.getPhaseName())) { + System.out.println("Adding handlers to globalInPhase name [" + + globalInPhase.getPhaseName() + "] ..."); + globalInPhase.addHandler(new TestHandler("In1")); + middleGlobalInHandler = new TestHandler("In2"); + globalInPhase.addHandler(middleGlobalInHandler); + globalInPhase.addHandler(new TestHandler("In3")); + System.out.println("...done adding handlers to globalInPhase name [" + + globalInPhase.getPhaseName() + "] ..."); } } - testService = Utils.createSimpleService(serviceName, Echo.class.getName(), - operationName); - UtilServer.deployService(testService); + AxisService testService = Utils.createSimpleService(serviceName, Echo.class.getName(), + operationName); + axisConfiguration.addService(testService); AxisOperation operation = testService.getOperation(operationName); ArrayList operationSpecificPhases = new ArrayList(); @@ -111,9 +98,9 @@ protected void setUp() throws Exception { Phase operationSpecificPhase = (Phase)phaseList.get(i); if (PhaseMetadata.PHASE_POLICY_DETERMINATION .equals(operationSpecificPhase.getPhaseName())) { - firstOperationInHandler = new TestHandler("In4"); + TestHandler firstOperationInHandler = new TestHandler("In4"); operationSpecificPhase.addHandler(firstOperationInHandler); - middleOperationInHandler = new TestHandler("In5"); + TestHandler middleOperationInHandler = new TestHandler("In5"); operationSpecificPhase.addHandler(middleOperationInHandler); operationSpecificPhase.addHandler(new TestHandler("In6")); } @@ -129,21 +116,16 @@ protected void setUp() throws Exception { if (PhaseMetadata.PHASE_POLICY_DETERMINATION .equals(operationSpecificPhase.getPhaseName())) { operationSpecificPhase.addHandler(new TestHandler("Out1")); - middleOperationOutHandler = new TestHandler("Out2"); + TestHandler middleOperationOutHandler = new TestHandler("Out2"); operationSpecificPhase.addHandler(middleOperationOutHandler); operationSpecificPhase.addHandler(new TestHandler("Out3")); } } } - protected void tearDown() throws Exception { - UtilServer.unDeployService(serviceName); - UtilServer.unDeployClientService(); - } - private ServiceClient createClient() throws Exception { Options options = new Options(); - options.setTo(targetEPR); + options.setTo(new EndpointReference("http://127.0.0.1/" + server.getPort() + "/axis2/services/EchoXMLService/echoOMElement")); options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI); options.setTransportInProtocol(Constants.TRANSPORT_HTTP); options.setAction(operationName.getLocalPart()); @@ -164,6 +146,7 @@ private void executeClient() throws Exception { TestingUtils.compareWithCreatedOMElement(result); } + @Test public void testSuccessfulInvocation() throws Exception { System.out.println("Starting testSuccessfulInvocation"); middleGlobalInHandler.shouldPause(true); @@ -198,7 +181,7 @@ public void testSuccessfulInvocation() throws Exception { } - private class TestHandler extends AbstractHandler { + private static class TestHandler extends AbstractHandler { private String handlerName; private boolean shouldFail = false; private boolean shouldPause = false; @@ -360,7 +343,7 @@ private void checkHandler(Iterator it) { } - private class Worker extends Thread { + private static class Worker extends Thread { private byte[] serializedMessageContext = null; private ConfigurationContext configurationContext = null; private File theFile = null; diff --git a/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java b/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java index 4560c884cf..2aa6697e67 100644 --- a/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java +++ b/modules/integration/test/org/apache/axis2/engine/ThreadingTest.java @@ -21,42 +21,73 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.apache.axis2.context.MessageContext; -import org.apache.axis2.context.ServiceContext; + +import org.apache.axiom.om.OMElement; +import org.apache.axis2.AxisFault; +import org.apache.axis2.Constants; +import org.apache.axis2.addressing.EndpointReference; +import org.apache.axis2.client.Options; +import org.apache.axis2.client.ServiceClient; import org.apache.axis2.description.AxisService; -import org.apache.axis2.engine.util.InvokerThread; import org.apache.axis2.engine.util.TestConstants; +import org.apache.axis2.integration.TestingUtils; import org.apache.axis2.integration.UtilServer; import org.apache.axis2.integration.UtilServerBasedTestCase; import org.apache.axis2.util.Utils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.xml.namespace.QName; -import java.util.Calendar; -import java.util.GregorianCalendar; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; public class ThreadingTest extends UtilServerBasedTestCase implements TestConstants { - - private static final Log log = LogFactory.getLog(ThreadingTest.class); - protected QName transportName = new QName("http://localhost/my", - "NullTransport"); + private static class Invoker implements Runnable { + private final int threadNumber; + private final CountDownLatch latch; + private Exception thrownException; - protected AxisConfiguration engineRegistry; - protected MessageContext mc; - protected ServiceContext serviceContext; - protected AxisService service; + Invoker(int threadNumber, CountDownLatch latch) throws AxisFault { + this.threadNumber = threadNumber; + this.latch = latch; + } - protected boolean finish = false; + @Override + public void run() { + try { + log.info("Starting Thread number " + threadNumber + " ............."); + OMElement payload = TestingUtils.createDummyOMElement(); + + Options options = new Options(); + options.setTo(new EndpointReference("http://127.0.0.1/" + + UtilServer.TESTING_PORT + + "/axis2/services/EchoXMLService/echoOMElement")); + options.setTransportInProtocol(Constants.TRANSPORT_HTTP); + ServiceClient sender = new ServiceClient(); + sender.setOptions(options); + OMElement result = sender.sendReceive(payload); + + TestingUtils.compareWithCreatedOMElement(result); + log.info("Finishing Thread number " + threadNumber + " ....."); + } catch (Exception axisFault) { + thrownException = axisFault; + log.error("Error has occured invoking the service ", axisFault); + } + latch.countDown(); + } + + Exception getThrownException() { + return thrownException; + } + } public static Test suite() { return getTestSetup(new TestSuite(ThreadingTest.class)); } protected void setUp() throws Exception { - service = + AxisService service = Utils.createSimpleService(serviceName, Echo.class.getName(), operationName); @@ -69,41 +100,22 @@ protected void tearDown() throws Exception { } public void testEchoXMLSync() throws Exception { - int numberOfThreads = 5; - InvokerThread[] invokerThreads = new InvokerThread[numberOfThreads]; + Invoker[] invokers = new Invoker[5]; + CountDownLatch latch = new CountDownLatch(invokers.length); - for (int i = 0; i < numberOfThreads; i++) { - InvokerThread invokerThread = new InvokerThread(i + 1); - invokerThreads[i] = invokerThread; - invokerThread.start(); + for (int i = 0; i < invokers.length; i++) { + Invoker invoker = new Invoker(i + 1, latch); + invokers[i] = invoker; + new Thread(invoker).start(); } - boolean threadsAreRunning; - Calendar cal = new GregorianCalendar(); - int min = cal.get(Calendar.MINUTE); - - do { - threadsAreRunning = false; - for (int i = 0; i < numberOfThreads; i++) { - if (invokerThreads[i].isAlive()) { - threadsAreRunning = true; - break; - } - Exception exception = invokerThreads[i].getThrownException(); - if (exception != null) { - throw new Exception("Exception thrown in thread " + i + " ....", exception); - } - } + latch.await(30, TimeUnit.SECONDS); - // waiting 3 seconds, if not finish, time out. - if (Math.abs(min - new GregorianCalendar().get(Calendar.MINUTE)) > 1) { - log.info("I'm timing out. Can't wait more than this to finish."); - fail("Timing out"); + for (Invoker invoker : invokers) { + Exception exception = invoker.getThrownException(); + if (exception != null) { + throw exception; } - - Thread.sleep(100); - } while (threadsAreRunning); - - assertTrue(true); + } } } diff --git a/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java b/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java index cfd1a3056a..91854e8782 100644 --- a/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java +++ b/modules/integration/test/org/apache/axis2/engine/map/MapServiceTest.java @@ -19,8 +19,10 @@ package org.apache.axis2.engine.map; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import javax.xml.stream.XMLStreamException; -import junit.framework.TestCase; import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; @@ -31,33 +33,19 @@ import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; import org.apache.axis2.client.ServiceClient; -import org.apache.axis2.description.AxisService; -import org.apache.axis2.engine.AxisServer; +import org.apache.axis2.testutils.Axis2Server; +import org.apache.axis2.testutils.SimpleAxisServiceFactory; +import org.junit.ClassRule; +import org.junit.Test; /** * The Class MapServiceTest. */ -public class MapServiceTest extends TestCase { - private AxisServer server; +public class MapServiceTest { + @ClassRule + public static Axis2Server server = new Axis2Server(null, + new SimpleAxisServiceFactory(MapService.class)); - /** The service. */ - protected AxisService service; - - /* - * (non-Javadoc) - * - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception { - server = new AxisServer(); - server.deployService(MapService.class.getName()); - } - - @Override - protected void tearDown() throws Exception { - server.stop(); - } - /** * Test string generics map service. * @@ -66,9 +54,10 @@ protected void tearDown() throws Exception { * @throws AxisFault * the axis fault */ + @Test public void testStringGenericsMapService() throws XMLStreamException, AxisFault { - String epr = "http://localhost:6060/axis2/services/MapService/stringGenericsMapService"; + String epr = server.getEndpoint("MapService") + "/stringGenericsMapService"; Options options = new Options(); options.setTo(new EndpointReference(epr)); ServiceClient sender = new ServiceClient(); @@ -94,10 +83,11 @@ public void testStringGenericsMapService() throws XMLStreamException, * @throws AxisFault * the axis fault */ + @Test public void testStringGenericsTreeMapService() throws XMLStreamException, AxisFault { - String epr = "http://localhost:6060/axis2/services/MapService/stringGenericsTreeMapService"; + String epr = server.getEndpoint("MapService") + "/stringGenericsTreeMapService"; Options options = new Options(); options.setTo(new EndpointReference(epr)); ServiceClient sender = new ServiceClient(); diff --git a/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java b/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java deleted file mode 100644 index 64e07e2706..0000000000 --- a/modules/integration/test/org/apache/axis2/engine/util/InvokerThread.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.axis2.engine.util; - -import org.apache.axiom.om.OMElement; -import org.apache.axis2.AxisFault; -import org.apache.axis2.Constants; -import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.Options; -import org.apache.axis2.client.ServiceClient; -import org.apache.axis2.context.ConfigurationContext; -import org.apache.axis2.context.ConfigurationContextFactory; -import org.apache.axis2.integration.TestingUtils; -import org.apache.axis2.integration.UtilServer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.xml.namespace.QName; - -public class InvokerThread extends Thread { - - private int threadNumber; - protected EndpointReference targetEPR = - new EndpointReference("http://127.0.0.1/" - + (UtilServer.TESTING_PORT) - + "/axis2/services/EchoXMLService/echoOMElement"); - protected QName operationName = new QName("echoOMElement"); - private static final Log log = LogFactory.getLog(InvokerThread.class); - private Exception thrownException = null; - ConfigurationContext configContext; - - public InvokerThread(int threadNumber) throws AxisFault { - this.threadNumber = threadNumber; - configContext = - ConfigurationContextFactory.createConfigurationContextFromFileSystem( - null, null); - } - - public void run() { - try { - log.info("Starting Thread number " + threadNumber + " ............."); - OMElement payload = TestingUtils.createDummyOMElement(); - - Options options = new Options(); - options.setTo(targetEPR); - options.setTransportInProtocol(Constants.TRANSPORT_HTTP); - ServiceClient sender = new ServiceClient(configContext, null); - sender.setOptions(options); - OMElement result = sender.sendReceive(payload); - - TestingUtils.compareWithCreatedOMElement(result); - log.info("Finishing Thread number " + threadNumber + " ....."); - } catch (AxisFault axisFault) { - thrownException = axisFault; - log.error("Error has occured invoking the service ", axisFault); - } - } - - public Exception getThrownException() { - return thrownException; - } -} diff --git a/modules/java2wsdl/pom.xml b/modules/java2wsdl/pom.xml index 4a71e0f7f1..321d1947a0 100644 --- a/modules/java2wsdl/pom.xml +++ b/modules/java2wsdl/pom.xml @@ -24,7 +24,7 @@ org.apache.axis2 axis2 - 1.7.1-SNAPSHOT + 1.7.10-SNAPSHOT ../../pom.xml axis2-java2wsdl @@ -46,10 +46,6 @@ axis2-transport-local ${project.version} - - org.apache.ant - ant - commons-logging @@ -61,10 +57,6 @@ org.apache.ws.xmlschema xmlschema-core - - org.apache.geronimo.specs - geronimo-javamail_1.4_spec - xalan xalan @@ -202,7 +194,7 @@ + + + prepare-site pre-site diff --git a/src/site/markdown/docs/reference.md b/src/site/markdown/docs/reference.md new file mode 100644 index 0000000000..7fbe7f35db --- /dev/null +++ b/src/site/markdown/docs/reference.md @@ -0,0 +1,129 @@ + + +Axis2 Reference Guide +===================== + +WSDL2Java Reference +------------------- + + NAME + wsdl2java.sh or wsdl2java.bat - Generates java code according to a given WSDL file to handle Web service invocation. + These scripts can be found under the bin directory of the Axis2 distribution. + + SYNOPSIS + wsdl2java.sh [OPTION]... -uri + + DESCRIPTION + Given a WSDL file, this generates java code to handle Web service invocations. + + -o Specify a directory path for the generated code. + -a Generate async style code only (Default: off). + -s Generate sync style code only (Default: off). Takes precedence over -a. + -p Specify a custom package name for the generated code. + -l Valid languages are java and c (Default: java). + -t Generate a test case for the generated code. + -ss Generate server side code (i.e. skeletons) (Default: off). + -sd Generate service descriptor (i.e. services.xml). (Default: off). Valid with -ss. + -d Valid databinding(s) are adb, xmlbeans, jibx and jaxbri (Default: adb). + -g Generates all the classes. Valid only with -ss. + -pn Choose a specific port when there are multiple ports in the wsdl. + -sn Choose a specific service when there are multiple services in the wsdl. + -u Unpacks the databinding classes + -r Specify a repository against which code is generated. + -ns2p ns1=pkg1,ns2=pkg2 Specify a custom package name for each namespace specified in the wsdls schema. + -ssi Generate an interface for the service implementation (Default: off). + -wv WSDL Version. Valid Options : 2, 2.0, 1.1 + -S Specify a directory path for generated source + -R Specify a directory path for generated resources + -em Specify an external mapping file + -f Flattens the generated files + -uw Switch on un-wrapping. + -xsdconfig Use XMLBeans .xsdconfig file. Valid only with -d xmlbeans. + -ap Generate code for all ports + -or Overwrite the existing classes + -b Generate Axis 1.x backword compatible code. + -sp Suppress namespace prefixes (Optimzation that reduces size of soap request/response) + -E Extra configuration options specific to certain databindings. Examples: + -Ebindingfile (for jibx) - specify the file path for the binding file + -Etypesystemname (for xmlbeans) - override the randomly generated type system name + -Ejavaversion 1.5 (for xmlbeans) - generates Java 1.5 code (typed lists instead of arrays) + -Emp (for ADB) - extension mapper package name + -Eosv (for ADB) - turn off strict validation. + -Eiu (for ADB) - Ignore Unexpected elements instead of throwing ADBException + -Ewdc (for xmlbeans) - Generate code with a dummy schema. if someone use this option + they have to generate the xmlbeans code seperately with the scomp command comes with the + xmlbeans distribution and replace the Axis2 generated classes with correct classes + --noBuildXML Dont generate the build.xml in the output directory + --noWSDL Dont generate WSDLs in the resources directory + --noMessageReceiver Dont generate a MessageReceiver in the generated sources + --http-proxy-host Proxy host address if you are behind a firewall + --http-proxy-port Proxy prot address if you are behind a firewall + -ep Exclude packages - these packages are deleted after codegeneration + + EXAMPLES + wsdl2java.sh -uri ../samples/wsdl/Axis2SampleDocLit.wsdl + wsdl2java.sh -uri ../samples/wsdl/Axis2SampleDocLit.wsdl -ss -sd + wsdl2java.sh -uri ../samples/wsdl/Axis2SampleDocLit.wsdl -ss -sd -d xmlbeans -o ../samples -p org.apache.axis2.userguide + +Java2WSDL Reference +------------------- + + NAME + Java2WSDL.sh or Java2WSDL.bat - Generates the appropriate WSDL file for a given java class. + These scripts can be found under the bin directory of the Axis2 distribution. + + SYNOPSIS + Java2WSDL.sh [OPTION]... -cn + + DESCRIPTION + Given a java class generates a WSDL file for the given java class. + + -o output directory + -of output file name for the WSDL + -sn service name + -l location URIs, comma-delimited + -cp list of classpath entries - (urls) + -tn target namespace for service + -tp target namespace prefix for service + -stn target namespace for schema + -stp target namespace prefix for schema + -st style for the WSDL + -u use for the WSDL + -nsg fully qualified name of a class that implements NamespaceGenerator + -sg fully qualified name of a class that implements SchemaGenerator + -p2n [,] [,] + java package to namespace mapping for argument and return types + -p2n [all, ] to assign all types to a single namespace + -efd setting for elementFormDefault (defaults to qualified) + -afd setting for attributeFormDefault (defaults to qualified) + -xc class1 -xc class2... extra class(es) for which schematype must be generated. + -wv <1.1/2.0> wsdl version - defaults to 1.1 if not specified + -dlb generate schemas conforming to doc/lit/bare style + -dne disallow nillable elements in the generated schema + -doe disallow optional elements in the generated schema + -disableSOAP11 disable binding generation for SOAP 1.1 + -disableSOAP12 disable binding generation for SOAP 1.2 + -disableREST disable binding generation for REST + + EXAMPLES + Java2WSDL.sh -cn ../samples/test/searchTool.Search + Java2WSDL.sh -cn ../samples/test/searchTool.Search -sn search + Java2WSDL.sh -cn ../samples/test/searchTool.Search -u -sn search + Java2WSDL.sh -cn ../samples/test/searchTool.Search -sn search -o ../samples/test/wsdl diff --git a/src/site/markdown/download.md.vm b/src/site/markdown/download.md.vm index 2124601c7d..f2fc4f82ad 100644 --- a/src/site/markdown/download.md.vm +++ b/src/site/markdown/download.md.vm @@ -26,13 +26,13 @@ release can be found [here](release-notes/${release_version}.html). The following distributions are available for download:   | Link | Checksums and signatures ------------------------------------|-----------------------------------------------------------|------------------------------- -Binary distribution | [axis2-${release_version}-bin.zip][1] | [MD5][2] [SHA1][3] [PGP][4] -Source distribution | [axis2-${release_version}-src.zip][5] | [MD5][6] [SHA1][7] [PGP][8] -WAR distribution | [axis2-${release_version}-war.zip][9] | [MD5][10] [SHA1][11] [PGP][12] -Service Archive plugin for Eclipse | [axis2-eclipse-service-plugin-${release_version}.zip][13] | [MD5][14] [SHA1][15] [PGP][16] -Code Generator plugin for Eclipse | [axis2-eclipse-codegen-plugin-${release_version}.zip][17] | [MD5][18] [SHA1][19] [PGP][20] -Axis2 plugin for IntelliJ IDEA | [axis2-idea-plugin-${release_version}.zip][21] | [MD5][22] [SHA1][23] [PGP][24] +-----------------------------------|-----------------------------------------------------------|------------------------- +Binary distribution | [axis2-${release_version}-bin.zip][1] | [SHA512][3] [PGP][4] +Source distribution | [axis2-${release_version}-src.zip][5] | [SHA512][7] [PGP][8] +WAR distribution | [axis2-${release_version}-war.zip][9] | [SHA512][11] [PGP][12] +Service Archive plugin for Eclipse | [axis2-eclipse-service-plugin-${release_version}.zip][13] | [SHA512][15] [PGP][16] +Code Generator plugin for Eclipse | [axis2-eclipse-codegen-plugin-${release_version}.zip][17] | [SHA512][19] [PGP][20] +Axis2 plugin for IntelliJ IDEA | [axis2-idea-plugin-${release_version}.zip][21] | [SHA512][23] [PGP][24] The binary distribution contains all the Axis2 libraries and modules, except for [Apache Rampart](../rampart/) (WS-Security implementation) which must be downloaded separately. It also contains command line tools, @@ -48,31 +48,25 @@ Distributions for older releases can be found in the [archive][28]. All releases are also available as Maven artifacts in the [central repository][29]. [1]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip -[2]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.md5 -[3]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.sha1 -[4]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.asc +[3]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.sha512 +[4]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-${release_version}-bin.zip.asc [5]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip -[6]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.md5 -[7]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.sha1 -[8]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.asc +[7]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.sha512 +[8]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-${release_version}-src.zip.asc [9]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip -[10]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.md5 -[11]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.sha1 -[12]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.asc +[11]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.sha512 +[12]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-${release_version}-war.zip.asc [13]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip -[14]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.md5 -[15]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.sha1 -[16]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.asc +[15]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.sha512 +[16]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-eclipse-service-plugin-${release_version}.zip.asc [17]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip -[18]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.md5 -[19]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.sha1 -[20]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.asc +[19]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.sha512 +[20]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-eclipse-codegen-plugin-${release_version}.zip.asc [21]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip -[22]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.md5 -[23]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.sha1 -[24]: https://www.apache.org/dist/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.asc +[23]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.sha512 +[24]: https://downloads.apache.org/axis/axis2/java/core/${release_version}/axis2-idea-plugin-${release_version}.zip.asc [25]: http://www.apache.org/dev/release-signing#verifying-signature -[26]: https://www.apache.org/dist/axis/axis2/java/core/KEYS +[26]: https://downloads.apache.org/axis/axis2/java/core/KEYS [27]: http://www.apache.org/dyn/closer.lua/axis/axis2/java/core/ [28]: http://archive.apache.org/dist/axis/axis2/java/core/ [29]: http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.axis2%22 diff --git a/src/site/markdown/release-notes/1.7.0.md b/src/site/markdown/release-notes/1.7.0.md index cc30dad065..ed2d4c7dd0 100644 --- a/src/site/markdown/release-notes/1.7.0.md +++ b/src/site/markdown/release-notes/1.7.0.md @@ -26,12 +26,13 @@ generated using the JAXBRI databinding which has been significantly improved. maintained Commons HttpClient 3.x. To enable the support for HttpClient 4.x, use `org.apache.axis2.transport.http.impl.httpclient4.HTTPClient4TransportSender` instead of `org.apache.axis2.transport.http.CommonsHTTPTransportSender` in - `axis2.xml`. + `axis2.xml`. Please note that the code was written for HttpClient 4.2.x and + should work with 4.3.x and 4.4.x, but is incompatible with 4.5.x. * Several classes, methods and constants deprecated in Axis2 1.3 and 1.4 have been removed. See [AXIS2-5315][] for more details. - As a consequence, MEP URLs in the form `http://www.w3.org/2004/08/wsdl/XXX` + As a consequence, MEP URIs in the form `http://www.w3.org/2004/08/wsdl/XXX` and `http://www.w3.org/2006/01/wsdl/XXX` are no longer supported. Instead use `http://www.w3.org/ns/wsdl/XXX`. diff --git a/src/site/markdown/release-notes/1.7.1.md b/src/site/markdown/release-notes/1.7.1.md new file mode 100644 index 0000000000..5d27872877 --- /dev/null +++ b/src/site/markdown/release-notes/1.7.1.md @@ -0,0 +1,12 @@ +Apache Axis2 1.7.1 Release Note +------------------------------- + +Apache Axis2 1.7.1 is a maintenance release that fixes a critical issue in ADB +causing it to produce messages that don't conform to the XML schema (see +[AXIS2-5741][]). All users of ADB in Axis2 1.7.0 should upgrade to 1.7.1 +as soon as possible. + +This release also fixes an issue with the Eclipse plugins (see [AXIS2-5738][]). + +[AXIS2-5741]: https://issues.apache.org/jira/browse/AXIS2-5741 +[AXIS2-5738]: https://issues.apache.org/jira/browse/AXIS2-5738 diff --git a/src/site/markdown/release-notes/1.7.10.md b/src/site/markdown/release-notes/1.7.10.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/site/markdown/release-notes/1.7.2.md b/src/site/markdown/release-notes/1.7.2.md new file mode 100644 index 0000000000..5498e037bb --- /dev/null +++ b/src/site/markdown/release-notes/1.7.2.md @@ -0,0 +1,7 @@ +Apache Axis2 1.7.2 Release Note +------------------------------- + +Apache Axis2 1.7.2 is a maintenance release that upgrades Apache Axiom to +version 1.2.19 and fixes several [issues][1] reported since 1.7.1. + +[1]: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10611&version=12334939 diff --git a/src/site/markdown/release-notes/1.7.3.md b/src/site/markdown/release-notes/1.7.3.md new file mode 100644 index 0000000000..bd69af6083 --- /dev/null +++ b/src/site/markdown/release-notes/1.7.3.md @@ -0,0 +1,21 @@ +Apache Axis2 1.7.3 Release Note +------------------------------- + +Apache Axis2 1.7.3 is a security release that contains a fix for [CVE-2010-3981][]. That security +vulnerability affects the admin console that is part of the Axis2 Web application and was originally +reported for SAP BusinessObjects (which includes a version of Axis2). That report didn't mention +Axis2 at all and the Axis2 project only recently became aware (thanks to Devesh Bhatt and Nishant +Agarwala) that the issue affects Apache Axis2 as well. + +The admin console now has a CSRF prevention mechanism and all known XSS vulnerabilities as well as +two non-security bugs in the admin console ([AXIS2-4764][] and [AXIS2-5716][]) have been fixed. +Users of the Axis2 WAR distribution are encouraged to upgrade to 1.7.3 to take advantage of these +improvements. + +This release also fixes a regression in the HTTP client code that is triggered by the presence of +certain types of cookies in HTTP responses (see [AXIS2-5772][]). + +[CVE-2010-3981]: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-3981 +[AXIS2-4764]: https://issues.apache.org/jira/browse/AXIS2-4764 +[AXIS2-5716]: https://issues.apache.org/jira/browse/AXIS2-5716 +[AXIS2-5772]: https://issues.apache.org/jira/browse/AXIS2-5772 diff --git a/src/site/markdown/release-notes/1.7.4.md b/src/site/markdown/release-notes/1.7.4.md new file mode 100644 index 0000000000..addc610266 --- /dev/null +++ b/src/site/markdown/release-notes/1.7.4.md @@ -0,0 +1,18 @@ +Apache Axis2 1.7.4 Release Note +------------------------------- + +Apache Axis2 1.7.4 is a maintenance release that includes fixes for several +issues, including the following security issues: + +* Session fixation ([AXIS2-4739][]) and XSS ([AXIS2-5683][]) vulnerabilities + affecting the admin console. + +* A dependency on an Apache HttpClient version affected by known security + vulnerabilities (CVE-2012-6153 and CVE-2014-3577); see [AXIS2-5757][]. + +The complete list of issues fixed in this version can be found [here][1]. + +[AXIS2-4739]: https://issues.apache.org/jira/browse/AXIS2-4739 +[AXIS2-5683]: https://issues.apache.org/jira/browse/AXIS2-5683 +[AXIS2-5757]: https://issues.apache.org/jira/browse/AXIS2-5757 +[1]: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10611&version=12335945 \ No newline at end of file diff --git a/src/site/markdown/release-notes/1.7.5.md b/src/site/markdown/release-notes/1.7.5.md new file mode 100644 index 0000000000..0fd7a83677 --- /dev/null +++ b/src/site/markdown/release-notes/1.7.5.md @@ -0,0 +1,10 @@ +Apache Axis2 1.7.5 Release Note +------------------------------- + +Apache Axis2 1.7.5 is a maintenance release that includes fixes for several +issues, including a local file inclusion vulnerability ([AXIS2-5846][]). + +The complete list of issues fixed in this version can be found [here][1]. + +[AXIS2-5846]: https://issues.apache.org/jira/browse/AXIS2-5846 +[1]: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10611&version=12338598 diff --git a/src/site/markdown/release-notes/1.7.6.md b/src/site/markdown/release-notes/1.7.6.md new file mode 100644 index 0000000000..c74bd56469 --- /dev/null +++ b/src/site/markdown/release-notes/1.7.6.md @@ -0,0 +1,20 @@ +Apache Axis2 1.7.6 Release Note +------------------------------- + +Apache Axis2 1.7.6 is a maintenance release containing the following fixes and +improvements: + +* The JSTL is now packaged into the Axis2 Web application. This fixes issues + with the Admin consoles on servlet containers that don't provide the JSTL. +* The `commons-fileupload` dependency has been updated to a version that fixes + CVE-2016-1000031 ([AXIS2-5853][]). +* A fix for [AXIS2-5863][], a possible null pointer dereference in generated + code flagged by static code analyzers. +* The dependencies of the Maven plugins have been updated to prevent issues + with temporary files being written to the source tree. This is part of the + fix for [AXIS2-5781][]. +* The source code is now buildable with Java 8. + +[AXIS2-5781]: https://issues.apache.org/jira/browse/AXIS2-5781 +[AXIS2-5853]: https://issues.apache.org/jira/browse/AXIS2-5853 +[AXIS2-5863]: https://issues.apache.org/jira/browse/AXIS2-5863 diff --git a/src/site/markdown/release-notes/1.7.7.md b/src/site/markdown/release-notes/1.7.7.md new file mode 100644 index 0000000000..6594fc50c0 --- /dev/null +++ b/src/site/markdown/release-notes/1.7.7.md @@ -0,0 +1,7 @@ +Apache Axis2 1.7.7 Release Note +------------------------------- + +Apache Axis2 1.7.7 is a maintenance release that fixes several [issues][1] +reported since 1.7.6. + +[1]: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10611&version=12341295 diff --git a/src/site/markdown/release-notes/1.7.8.md b/src/site/markdown/release-notes/1.7.8.md new file mode 100644 index 0000000000..eec160769b --- /dev/null +++ b/src/site/markdown/release-notes/1.7.8.md @@ -0,0 +1,7 @@ +Apache Axis2 1.7.8 Release Note +------------------------------- + +Apache Axis2 1.7.8 is a maintenance release that fixes several [issues][1] +reported since 1.7.7. + +[1]: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10611&version=12342260 diff --git a/src/site/markdown/release-notes/1.7.9.md b/src/site/markdown/release-notes/1.7.9.md new file mode 100644 index 0000000000..9491fa267b --- /dev/null +++ b/src/site/markdown/release-notes/1.7.9.md @@ -0,0 +1,7 @@ +Apache Axis2 1.7.9 Release Note +------------------------------- + +Apache Axis2 1.7.9 is a maintenance release that upgrades to Apache Axiom +1.2.21 and fixes several [issues][1] reported since 1.7.8. + +[1]: https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10611&version=12343353 diff --git a/src/site/markdown/tools/eclipse/plugin-installation.md b/src/site/markdown/tools/eclipse/plugin-installation.md new file mode 100644 index 0000000000..e9112aaf20 --- /dev/null +++ b/src/site/markdown/tools/eclipse/plugin-installation.md @@ -0,0 +1,81 @@ + + +Eclipse plugin installation +=========================== + +Introduction +------------ + +This document provides instructions for installating of the two Eclipse plugins provided by Axis2 +([Service Archive Generator](servicearchiver-plugin.html) and [Code Generator Wizard](wsdl2java-plugin.html)). +The two plugins should work on Eclipse version 3.1 and upwards, and require at least Java 1.5. +The plugins have dependencies on bundles that are installed by default in the Eclipse IDE for Java EE Developers +edition, but not in the Eclipse IDE for Java Developers edition. It is therefore recommended +to use the EE edition. +The installation procedure is the same for both plugins, but depends on the Eclipse +version being used. To determine which procedure to use, check if there is a +`dropins` folder in the Eclipse installation directory. This folder is used +by the p2 provisioning system introduced in recent Eclipse version. It should be +present starting with Eclipse version 3.4. + +Installation using the dropins directory +---------------------------------------- + +If your Eclipse version uses p2, use the following procedure to install the +Axis2 plugins: + +1. [Download](../../download.html) the ZIP file for the plugin you want to install. + +2. Extract the content of the `plugins` folder in the ZIP archive into the + `dropins` folder (i.e. do **not** create a `plugins` folder under `dropins`). + +As explained [here](http://wiki.eclipse.org/Equinox_p2_Getting_Started#Dropins), +it is possible to use other directory layouts in the `dropins` folder. + +Installation on older Eclipse versions +-------------------------------------- + +If you have an older Eclipse version that doesn't support p2 yet, use the following +procedure to install the Axis2 plugins: + +1. [Download](../../download.html) the ZIP file for the plugin you want to install. + +2. Extract the content of the ZIP archive into the Eclipse installation directory. + This should add one or more JAR files and/or directories to the existing `plugins` + folder. + +Debugging +--------- + +If a plugin doesn't show up in the Eclipse UI, use the following debugging procedure: + +1. Start Eclipse with the `-console` option. + +2. In the console, use `ss axis2` to check if the plugin has been installed and to + identify its bundle ID. + +3. If the plugin has not been installed, use the `install` command (with a `file:` URL + pointing to the plugin) to force its installation. + +4. Use the `start` command (with the bundle ID as argument) to attempt to start the + bundle. If the plugin doesn't show up in the UI, then this command will typically + fail with an error message explaining the reason. + +Please use this procedure before opening a bug report. diff --git a/src/site/site.xml b/src/site/site.xml index 3bd8c16d2d..6cd66ca586 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,7 +22,7 @@ org.apache.maven.skins maven-fluido-skin - 1.4 + 1.6 Apache Axis2 @@ -48,6 +48,15 @@ + + + + + + + + + diff --git a/src/site/xdoc/archived_news.xml b/src/site/xdoc/archived_news.xml deleted file mode 100644 index 0b6da53ed2..0000000000 --- a/src/site/xdoc/archived_news.xml +++ /dev/null @@ -1,869 +0,0 @@ - - - - - - - - - -Apache Axis2 Archived News - - - -

Apache Axis2 Archived News

-

This document contains details of each Axis2 version that was -released, up to the current version.

-

Content

-

Apache Axis2 Releases:

- - - - -

13rd August 2007 - Apache Axis2/Java Version 1.3 Released!

-

[Download 1.3]

-

Apache Axis2 Version 1.3 comes with performance improvements and -a number bug fixes over the 1.2 release. Check out the complete list of -features below.

-

Programming Model

-
    -
  • Improved, XML-centric client API including full WSDL and policy -support
    • -
  • Support for POJO and Spring services and clients
    • -
  • Support for any message exchange pattern
    • -
  • Synchronous and asynchronous calls
    • -
  • Archived service deployment model supporting full service -encapsulation with versioning support
    • -
  • Archived module deployment model supporting controlled -extensibility with versioning support
    • -
  • Hot deployment
    • -
  • WS-Policy driven code generation extensions
    • -
  • Flexible service life cycle model
    • -
  • Automatic support for POX (REST) style invocation of -services
    • -
  • Support for querying a service's WSDL (using ?wsdl), schema -(using ?xsd) and policies (using ?policy)
    • -
  • WSDL 2.0
    • -
  • POJO annotation (JSR 181)
    • -
  • JAX-WS intregration
    • -
  • Custom Deployers
    • -
  • Binary serialization (Fast Infoset)
    • -
  • JSON support
    • -
  • EJB Provider support
    • -
-

Supported Specifications

-
    -
  • SOAP 1.1 and 1.2
    • -
  • Message Transmission Optimization Mechanism (MTOM), XML -Optimized Packaging (XOP) and SOAP with Attachments
    • -
  • WSDL 1.1, including both SOAP and HTTP bindings
    • -
  • WS-Addressing (submission and final)
    • -
  • WS-Policy
    • -
  • SAAJ 1.1
    • -
-

Transports

-
    -
  • HTTP
    • -
  • SMTP
    • -
  • JMS
    • -
  • TCP
    • -
-

Supported Data Bindings

-
    -
  • Axis Data Binding (ADB)
    • -
  • XMLBeans
    • -
  • JibX
    • -
  • JaxBRI (Experimental)
    • -
-

Tools Included in This -Release

-

[Download Tool Plug-ins]

-
    -
  1. Axis2 Web Application (Web App)
    2. -
  2. WSDL2WS- eclipse plug-in/ Command line -version/IntelliJ IDEA plug-in/Maven2 WSDL2Code Plug-in
    3. -
  3. Service Archive Wizard- eclipse plug-in/ IntelliJ IDEA plug-in/ Maven2 AAR Plug-in
    4. -
  4. Java2WSDL- Maven2 Java2WSDL Plug-in
    5. -
-

Extension Modules

-
    -
  • Apache Rampart: Supporting WS-Security (and soon -WS-Policy)
    • -
  • Apache Sandesha2: Supporting WS-Reliable Messaging
    • -
-(Apache Axis2 comes built in with a module that supports -WS-Addressing.) -

Known Issues and Limitations

- - -

27th April 2007 - Apache Axis2/Java Version 1.2 Released!

-

[Download 1.2]

-

Programming Model

-
    -
  • Improved, XML-centric client API including full WSDL and policy -support
    • -
  • Support for POJO and Spring services and clients
    • -
  • Support for any message exchange pattern
    • -
  • Synchronous and asynchronous calls
    • -
  • Archived service deployment model supporting full service -encapsulation with versioning support
    • -
  • Archived module deployment model supporting controlled -extensibility with versioning support
    • -
  • Hot deployment
    • -
  • WS-Policy driven code generation extensions
    • -
  • Flexible service life cycle model
    • -
  • Automatic support for POX (REST) style invocation of -services
    • -
  • Support for querying a service's WSDL (using ?wsdl), schema -(using ?xsd) and policies (using ?policy)
    • -
  • WSDL 2.0
    • -
  • POJO annotation (JSR 181)
    • -
  • JAX-WS intregration
    • -
  • Custom Deployers
    • -
  • Binary serialization (Fast Infoset)
    • -
  • JSON support
    • -
  • EJB Provider support
    • -
-

Supported Specifications

-
    -
  • SOAP 1.1 and 1.2
    • -
  • Message Transmission Optimization Mechanism (MTOM), XML -Optimized Packaging (XOP) and SOAP with Attachments
    • -
  • WSDL 1.1, including both SOAP and HTTP bindings
    • -
  • WS-Addressing (submission and final)
    • -
  • WS-Policy
    • -
  • SAAJ 1.1
    • -
-

Transports

-
    -
  • HTTP
    • -
  • SMTP
    • -
  • JMS
    • -
  • TCP
    • -
-

Supported Data Bindings

-
    -
  • Axis Data Binding (ADB)
    • -
  • XMLBeans
    • -
  • JibX
    • -
  • JaxMe (Experimental)
    • -
  • JaxBRI (Experimental)
    • -
-

Tools Included in this Release

-

[Download Tool Plug-ins]

-
    -
  1. Axis2 Web Application (Web App)
    2. -
  2. WSDL2WS- eclipse -plug-in/ Command line -version/IntelliJ -IDEA plug-in/Maven2 -WSDL2Code Plug-in
    3. -
  3. Service Archive Wizard- eclipse -plug-in/ -IntelliJ IDEA plug-in/ Maven2 AAR -Plug-in
    4. -
  4. Java2WSDL- Maven2 -Java2WSDL Plug-in
    5. -
-

Extension Modules

-
    -
  • Apache Rampart: Supporting WS-Security (and soon -WS-Policy)
    • -
  • Apache Sandesha2: Supporting WS-Reliable Messaging
    • -
-(Apache Axis2 comes built-in with a module that supports -WS-Addressing.) -

Known Issues and Limitations

-
    -
  • Xml-beans databinding does not support response unwrapping
    • -
  • ADB databinding does not support minOccurs and maxOccurs -attributes in sequence and choice elements (i.e., -<sequence minOccurs="0" -maxOccurs="unbounded"></sequence>)
    • -
  • Unable to produce original WSDL in the case of WSDL 2.0, -therefore the AxisService is serialized to produce ?wsdl2.
    • -
- -

09th January 2007- Apache Axis2/Java Version 1.1.1 -Released!

-

[Download 1.1.1]

-

Apache Axis2 Version 1.1.1 comes with performance improvements -and bug fixes over the 1.1 release. Check out the complete list of -features below.

-

Programming Model

-
    -
  • Improved, XML-centric client API including full WSDL and policy -support
    • -
  • Support for any message exchange pattern
    • -
  • Synchronous and asynchronous calls
    • -
  • Archived service deployment model
    • -
  • Archived module deployment model supporting controlled -extensibility with versioning support
    • -
  • Hot deployment
    • -
  • WS-Policy driven code generation extensions
    • -
  • Flexible service life cycle model
    • -
  • Support for querying a service's WSDL (using ?wsdl), schema -(using ?xsd) and policies (using ?policy)
    • -
-

Supported Specifications

-
    -
  • SOAP 1.1 and 1.2
    • -
  • Message Transmission Optimization Mechanism (MTOM), XML -Optimized Packaging (XOP) and SOAP with Attachments
    • -
  • WSDL 1.1, including both SOAP and HTTP bindings
    • -
  • WS-Addressing (submission and final)
    • -
  • WS-Policy
    • -
  • SAAJ 1.1
    • -
-

Transports

-
    -
  • HTTP
    • -
  • SMTP
    • -
  • JMS
    • -
  • TCP
    • -
-

Supported Data Bindings

-
    -
  • Axis Data Binding (ADB)
    • -
  • XMLBeans
    • -
  • JibX
    • -
  • JaxMe
    • -
-

Tools Included in This Release

-

[Download Tool Plug-ins]

-
    -
  1. Axis2 Web Application (Web App)
    2. -
  2. WSDL2WS- eclipse -plug-in/ Command line -version/IntelliJ -IDEA plug-in/Maven2 -WSDL2Code Plug-in
    3. -
  3. Service Archive Wizard- eclipse -plug-in/ -IntelliJ IDEA plug-in/ Maven2 -AAR Plug-in
    4. -
  4. Java2WSDL- -Maven2 Java2WSDL Plug-in
    5. -
-

Extension Modules

-
    -
  • Apache Rampart: Supporting WS-Security (and soon -WS-Policy)
    • -
  • Apache Sandesha2: Supporting WS-Reliable Messaging
    • -
-(Apache Axis2 comes built in with a module that supports -WS-Addressing.) -

Known Issues and Limitations

-
    -
  • ADB does not support unwrapping of response messages(coming in -1.2)
    • -
  • JSR 181/183 Annotation support (coming in 1.2)
    • -
  • JaxMe and JAXBRI data binding support is experimental
    • -
  • Simple Axis Server does not support POX/REST
    • -
  • RPC Message Receiver does not validate a request against the -schema (AXIS2-1943)
    • -
  • Axis2 Idea plugin shows random behavior when XMLBeans is -used
    • -
- -

13th November 2006 - Apache Axis2/Java Version 1.1 -Released!

-

[Download 1.1]

-

Apache Axis2 Version 1.1 comes with better Axis2 Databinding -Framework (ADB) support, attachments API, -Spring, and complete support for SOAP with Attachments (SwA). Check -out the complete list of features below.

-

Programming Model

-
    -
  • Improved, XML-centric client API including full WSDL and policy -support
    • -
  • Support for any message exchange pattern
    • -
  • Synchronous and asynchronous calls
    • -
  • Archived service deployment model
    • -
  • Archived module deployment model, supporting controlled -extensibility with versioning support
    • -
  • Hot deployment
    • -
  • WS-Policy driven code generation extensions
    • -
  • Flexible service life cycle model
    • -
  • Support for the querying service's WSDL (using ?wsdl), schema -(using ?xsd), and policies (using ?policy)
    • -
-

Supported Specifications

-
    -
  • SOAP 1.1 and 1.2
    • -
  • Message Transmission Optimization Mechanism (MTOM), XML -Optimized Packaging (XOP) and SOAP with Attachments
    • -
  • WSDL 1.1, including both SOAP and HTTP bindings
    • -
  • WS-Addressing (submission and final)
    • -
  • WS-Policy
    • -
  • SAAJ 1.1
    • -
-

Transports

-
    -
  • HTTP
    • -
  • SMTP
    • -
  • JMS
    • -
  • TCP
    • -
-

Supported Data Bindings

-
    -
  • Axis Data Binding (ADB)
    • -
  • XMLBeans
    • -
  • JibX
    • -
  • JaxMe
    • -
-

Tools Included in This Release

-

[Download Tool Plug-ins]

-
    -
  1. Axis2 Web Application (Web App)
    2. -
  2. WSDL2WS- eclipse -plug-in/ Command line -version/IntelliJ -IDEA plug-in/Maven2 -WSDL2Code Plug-in
    3. -
  3. Service Archive Wizard- eclipse -plug-in/ -IntelliJ IDEA plug-in/ Maven2 AAR -Plug-in
    4. -
  4. Java2WSDL- Maven2 -Java2WSDL Plug-in
    5. -
-

Extension Modules

-
    -
  • Apache Rampart: Supporting WS-Security (and soon -WS-Policy)
    • -
  • Apache Sandesha2: Supporting WS-Reliable Messaging
    • -
-(Apache Axis2 comes built in with a module that supports -WS-Addressing.) -

Known Issues and Limitations

-
    -
  • JaxMe and JAXBRI data binding support is experimental
    • -
  • AXIS2-595: Hot re-deployment in Apache Tomcat has problems
    • -
  • Axis Data Binding (ADB) does not support the following -constructs: -
      -
    1. AXIS2-983: Support for Simple Type Union and Simple Type -List
      2. -
    2. AXIS2-1092: Support for xs:list inside an xs:simpleType
      3. -
    3. AXIS2-1093: Support for xs:union inside xs:simpleType
      4. -
    -
    • -
  • No support yet for unwrapping of doc/lit WSDL files (in stub -generation)
    • -
  • No support yet for rpc/encoded style WSDL documents (in stub -generation)
    • -
  • Idea plugin shows random behavior when XMLBeans is used
    • -
- -

04 May 2006 - Apache Axis2 Version 1.0 Released!

-

[Download 1.0]

-

Apache Axis2 is a complete re-design and re-write of the widely -used Apache Axis SOAP stack, built on the lessons learnt from -Apache Axis.

-

Apache Axis2 not only supports SOAP 1.1 and SOAP 1.2, but it -also has integrated support for the widely popular REST style of -Web services. The same business logic implementation can offer both -a WS-* style interface as well as a REST style interface -simultaneously.

-

Apache Axis2 is more efficient, more modular and more -XML-oriented than the older version. It is designed to support the -easy addition of plug-in "modules" that extend their functionality -for features such as security and reliability. The modules -currently available or under development include:

- -

Apache Axis2 is built on Apache Axiom, a -new high performant, pull-based XML object model that was released -on 02 May 2006.

-

Features

-

Programming Model

-
    -
  • Improved, XML-centric client API including full WSDL and policy -support
    • -
  • Support for any message exchange pattern
    • -
  • Synchronous and asynchronous calls
    • -
  • Archived service deployment model
    • -
  • Archived module deployment model supporting controlled -extensibility with versioning support
    • -
  • Hot -deployment
    • -
  • WS-Policy driven code generation extensions
    • -
  • Flexible service lifecyle model
    • -
  • Support for querying a service's WSDL (using ?wsdl), schema -(using ?xsd) and policies (using ?policy)
    • -
-

Supported Specifications

-
    -
  • SOAP 1.1 and 1.2
    • -
  • Message Transmission Optimization Mechanism (MTOM), XML -Optimized Packaging (XOP) and SOAP with Attachments
    • -
  • WSDL 1.1, including both SOAP and HTTP bindings
    • -
  • WS-Addressing (submission and final)
    • -
  • WS-Policy
    • -
  • SAAJ 1.1
    • -
-

Transports

-
    -
  • HTTP
    • -
  • SMTP
    • -
  • JMS
    • -
  • TCP
    • -
-

Supported Data Bindings

-
    -
  • Axis Data Binding (ADB)
    • -
  • XMLBeans
    • -
  • JibX
    • -
  • JaxMe
    • -
-

Tools Included in This Release

-

[Download plug-ins]

-
    -
  1. Axis2 Web Application (Web App)
    2. -
  2. WSDL2WS- eclipse -plug-in/ Command line -version/IntelliJ -IDEA plug-in
    3. -
  3. Service Archive Wizard- eclipse -plug-in/ -IntelliJ IDEA plug-in
    4. -
-

Extension Modules

-
    -
  • Apache Rampart: Supporting WS-Security (and soon -WS-Policy)
    • -
  • Apache Sandesha2: Supporting WS-Reliable Messaging
    • -
-(Apache Axis2 comes with a built in module that supports -WS-Addressing.) -

Known Issues and Limitations

-
    -
  • Recursive schemas (A includes B which includes A) may cause -problems
    • -
  • JaxMe data binding support is experimental
    • -
  • Axis2-595: Hot re-deployment in Apache Tomcat has problems
    • -
  • Axis2-666: AddressingSubmissionInHandler does not deserialize -EPR extensibility attributes and elements
    • -
  • AXIS2-667: Operation dispatch based on message body has a known -issue
    • -
  • Axis Data Binding (ADB) does not cover all of the XML Schema; -its an 80-20 design point. Unsupported XML Schema features include: -
      -
    1. Simple content extension and restriction
      2. -
    2. Complex content restriction
      3. -
    -
    • -
  • ADB does not support xsi:type based deserialization at -runtime
    • -
  • No support yet for unwrapping of doc/lit WSDL files (in stub -generation)
    • -
  • No support yet for rpc/encoded style WSDL documents (in stub -generation)
    • -
- -

23 March 2006 - Apache Axis2 Version 0.95 Released!

-

[Download -0.95]

-

This release includes the following features:

-

Axis2 -Complete List of Features

-
    -
  1. AXIOM, an XML object model working on StAX (Streaming API for -XML) parsing optimized for SOAP 1.1/1.2 messages. This has complete -XML infoset support.
    2. -
  2. Support for One-Way Messaging (In-Only) and Request Response -Messaging (In-Out)
    3. -
  3. Module Architecture, a mechanism to extend the SOAP Processing -Model
    4. -
  4. Module version support; you can have multiple versions of the -same module and use them depending on the requirement.
    5. -
  5. Context hierarchy
    6. -
  6. Archive based deployment model and Directory based deployment -model
    7. -
  7. JWS-like deployment (making a Java class into a Web -service)
    8. -
  8. WSDL Code Generation Tool for Stub and skeletons
    9. -
  9. WS-Addressing, both in the submission (2004/08) and final -(2005/08) versions
    10. -
  10. WSS4J module for security
    11. -
  11. Improved and user friendly Client API
    12. -
  12. WSDL2Java and Java2WSDL
    13. -
  13. REST (REpresentational State Transfer) Support
    14. -
  14. Transports supports: HTTP, SMTP, TCP, JMS
    15. -
  15. Raw XML providers
    16. -
  16. Support for MTOM/ MIME/ SwA
    17. -
  17. SAAJ implementation
    18. -
  18. DOOM
    19. -
  19. Pack/Unpack capability for the generated code
    20. -
  20. Axis Data Binding - ADB (Framework and Schema Compiler)
    21. -
  21. Numerous bug fixes since last release
    22. -
  22. Transport framework improvements (ListenerManager)-New
    23. -
  23. AxisServlet auto start when the application server starts -up-New
    24. -
  24. Module disengagement support-New
    25. -
  25. Loading module (.mar) from classpath-New
    26. -
  26. Sessions scoping for Application, SOAP, Transport and Request -levels-New
    27. -
-

-Axis2 List of Experimental Features

-
    -
  1. Server side and client side Web Service Policy support
    2. -
  2. ?wsdl and ?xsd support
    3. -
  3. Generate ServiceClient for a given WSDL and invoke the -corresponding service using the generated client.
    4. -
-

Major -Changes Since Last Release

-
    -
  1. Transport framework improvements (ListenerManager) -
    -   <actionMapping>MyMapping</actionMapping>
-   
-
    2. -
  2. Changed the way you add action to mapping (wsamapping) from a -parameter to a child element. Therefore, from this version onward, -adding mapping is as follows:
    3. -
  3. Refactored the following packages in Axiom. -
      -
    • org.apache.axiom.om.impl.llom.builder to -org.apache.axiom.om.impl.builder
      • -
    • org.apache.axiom.om.impl.llom.mtom to -org.apache.axiom.om.impl.mtom
      • -
    • org.apache.axiom.om.impl.llom.serialize to -org.apache.axiom.om.impl.serialize
      • -
    • org.apache.axiom.om.impl.llom.traverse to -org.apache.axiom.om.impl.traverse
      • -
    -
    4. -
-

Tools -Included in This Release

-
    -
  1. Axis2 Web Application (Web App)
    2. -
  2. WSDL2WS- Command line version
    3. -
-

What Still -Needs to be Done

-

The list of what we think needs to be done. Even you can -consider helping out if you are interested.

-
    -
  1. JAX-RPC 1.1 and/or JAX-WS compliance
    2. -
  2. SOAP Encoding
    3. -
  3. Binary serialization and de-serialization support
    4. -
  4. Management Interface for Axis2
    5. -
  5. Implementation of other Transports.
    6. -
  6. Resource framework implementation (WS-RF) and Enterprise web -services such as JSR 109 support
    7. -
  7. Completion of Interop tests
    8. -
- -

11 January 2006 - Apache Axis2 Version 0.94 Released!

-

[Download 0.94]

-

This release includes the following features:

-

The Complete -List of Features

-
    -
  1. AXIOM, an XML object model working on StAX (Streaming API for -XML) parsing optimized for SOAP 1.1/1.2 Messages. This has complete -XML infoset support.
    2. -
  2. Support for One-Way Messaging (In-Only) and Request Response -Messaging (In-Out)
    3. -
  3. Module Architecture, mechanism to extend the SOAP Processing -Model
    4. -
  4. Module version support; you can have multiple versions of the -same module and use them depending on the requirement.
    5. -
  5. Context hierarchy
    6. -
  6. Archive based deployment Model, and Directory based deployment -model
    7. -
  7. JWS-like deployment (making a Java class into a Web -service)
    8. -
  8. WSDL Code Generation Tool for Stub and skeletons
    9. -
  9. WS-Addressing, both the submission (2004/08) and final -(2005/08) versions
    10. -
  10. WSS4J module for security
    11. -
  11. Improved and user friendly Client API
    12. -
  12. WSDL2Java
    13. -
  13. REST (REpresentational State Transfer) Support
    14. -
  14. Transports supports: HTTP, SMTP, TCP, JMS
    15. -
  15. Raw XML providers
    16. -
  16. Support for MTOM/ MIME/ SwA
    17. -
  17. SAAJ implementation
    18. -
  18. DOOM - New
    19. -
  19. Pack/Unpack capability for the generated code - New
    20. -
  20. Axis Data Binding - ADB (Framework and Schema Compiler)
    21. -
  21. Numerous bug fixes since last release
    22. -
-

Axis2 List -of Experimental Features

-
    -
  1. Sessions scoping for Application, SOAP, Transport and Request -levels
    2. -
  2. Server side Web Service Policy support
    3. -
  3. ?wsdl and ?xsd support
    4. -
  4. Java2WSDL
    5. -
  5. Generate ServiceClient for a given WSDL and invoke the -corresponding service using the generated client.
    6. -
-

Major -Changes Since the Last Release

-
    -
  1. Fixing of memory leaks.
    2. -
  2. Client API changes. Introducing ServiceClient instead of -MEPClient, InOnlyMEPClient, InOutMEPClient, Call. (Please note that -the above classes will be deprecated in this release.)
    3. -
  3. Module versioning support. You can have multiple versions of -the same module and use them depending on the requirement.
    4. -
  4. Code generator improved to process multi-port WSDLs
    5. -
  5. Packing and unpacking options for the code generated -classes
    6. -
-

Tools -Included in this Release

-
    -
  1. Axis2 Web Application (Web App)
    2. -
  2. WSDL2WS- Eclipse plugin/ Command line version/ IntelliJ IDEA -plugin
    3. -
  3. Service Archive Wizard- Eclipse plugin/ IntelliJ IDEA -plugin
    4. -
-

What Still -Needs to be Done

-
    -
  1. JAX-RPC 1.1 and/or JAX-WS compliance
    2. -
  2. SOAP Encoding
    3. -
  3. Binary serialization and de-serialization support
    4. -
  4. Management interface for Axis2
    5. -
  5. Implementation of other Transports.
    6. -
  6. Resource framework implementation (WS-RF) and Enterprise web -services such as JSR 109 support
    7. -
  7. Completion of interop tests
    8. -
- -

02 December 2005 - Apache Axis2 Version 0.93 Released!

-

[Download 0.93]

-

Axis2 is becoming more and more stable. This 0.93 release -contains the following additional features:

-
    -
  • JDK 1.5 compatibility
    • -
  • Configurable handler chains using axis2.xml
    • -
  • Improved class loader hierarchy
    • -
  • Improved security module with dynamic configurability
    • -
  • ADB (Axis Data Binding) with complete simple type support and -limited complex type support
    • -
  • Jalopy based code formatting of generated code
    • -
  • Proxy support and NTLM authentication
    • -
  • Support for rpc/literal
    • -
  • And numerous bug fixes after 0.92 release
    • -
-

List of Experimental Features

-
    -
  1. DOOM - DOM implementation over OM
    2. -
  2. Java2WSDL
    3. -
  3. RPC Support
    4. -
-

Major Changes Since the Last Release

-
    -
  1. Refactored org.apache.axis2.clientapi to -org.apache.axis2.client
    2. -
  2. Introduction of Options to configure clients
    3. -
  3. Renaming of descriptors. OperationDescription -> -AxisOperation, ServiceDescription -> AxisService, -ServiceGroupDescription -> AxisServiceGroup
    4. -
-We are getting closer to a 1.0 release, and the remaining tasks to -be completed before the 1.0 release include: SOAP 1.1 and 1.2 -validation, our own data binding implementation, and WSDL -generation. -

26 September 2005 - Apache Axis2 Version 0.92 Released!

-

[Download 0.92]

-

This 0.92 release contains the following additional -features:

-
    -
  • WS-Security support using WSS4J
    • -
  • Support for context hierarchy serialization
    • -
  • Service Groups
    • -
  • Numerous bug fixes after 0.91 release
    • -
-

The Release Includes the Following Tools

-
    -
  • Admin Web App
    • -
  • WSDL2Java, eclipse Plugin/Command line version
    • -
  • Service Archive Wizard, eclipse Plugin
    • -
  • Module Archive Wizard, eclipse Plugin
    • -
  • Service Archive Wizard, IntelliJ IDEA Plugin
    • -
-

We are getting closer to a 1.0 release, and the remaining tasks -to be completed before a 1.0 release include: SOAP 1.1 and 1.2 -validation, our own data binding implementation, and WSDL -generation.

- -

12 August 2005 - Apache Axis2 Version 0.91 Released!

-

[Download 0.91]

-

This 0.91 release is a glimpse of the 1.0 that should be coming -soon. This 0.91 release contains the following additional -features:

-
    -
  • File Caching for MTOM
    • -
  • SOAP faults based on the SOAP version and better fault -handling
    • -
  • Different character encoding support
    • -
  • Improved infoset support in AXIOM
    • -
  • Improved code generation templates
    • -
  • Numerous bug fixes
    • -
- -

02 July 2005 - Apache Axis2 Version 0.9 Released!

-

[Download 0.9]

-

Axis2 is taking shape. This 0.9 release is a glimpse of the 1.0 -that should be coming soon. This 0.9 release contains the following -additional features:

-
    -
  • XML Beans based data binding support
    • -
  • Support for WS-Addressing, both the submission and final -versions
    • -
  • REST Web Service Support
    • -
  • MTOM/SWA attachments support
    • -
  • SAAJ implementation
    • -
- -

07 June 2005 - Apache Axis2 Milestone 2 (M2) Released

-

Apache Axis2 is starting to take shape. Features implemented in -this second milestone release are:

-
    -
  • Modules - a mechanism to extend the SOAP Processing Model
    • -
  • Support for WS-Addressing
    • -
  • Axis2 Client API - Blocking and Non-Blocking API
    • -
  • Support for One-Way Messaging and Request Response -Messaging
    • -
  • WSDL Code Generation Tool.
    • -
  • HTTP, SMTP, and TCP transport support
    • -
-This release also includes the following tools: -
    -
  • Administration web application,
    • -
  • WSDL2WS-Eclipse plug-in
    • -
  • Service Archive Wizard- Eclipse plug-in
    • -
  • Module Archive Wizard-Eclipse plug-in
    • -
- -

24 February 2005 - Apache Axis2 Milestone 1 (M1) Released

-

This first milestone release of Axis2 includes the following -features:

-
    -
  • AXIOM, a SOAP specific streaming XML infoset model for SOAP -1.1/1.2 Messages
    • -
  • WSDL Object Model built based on the proposed WSDL 2.0 -Component Model.
    • -
  • Handler framework with the support to specify the location of -the Handler in a specific Phase
    • -
  • Support to bundle and enable the Handlers as Modules
    • -
  • Support for the Synchronous and Asynchronous IN-OUT messaging -over HTTP transport
    • -
  • Hot deployment of Web Services
    • -
- - diff --git a/src/site/xdoc/articles.xml b/src/site/xdoc/articles.xml index 31953f99d1..ef83b59eb4 100644 --- a/src/site/xdoc/articles.xml +++ b/src/site/xdoc/articles.xml @@ -178,12 +178,5 @@ with Axis2/Java ServiceClient?- By Eran Chinthaka (17 June based Web Service in your Webapp?- By Davanum Sirinivas(17 May 2006) -

Other

- diff --git a/src/site/xdoc/docs/contents.xml.vm b/src/site/xdoc/docs/contents.xml.vm index a4cc8ccf3f..f0006abc7a 100644 --- a/src/site/xdoc/docs/contents.xml.vm +++ b/src/site/xdoc/docs/contents.xml.vm @@ -211,7 +211,7 @@ Maven 2 Plug-in that takes a Java class as input and generates a WSDL, which describes a Web service for invoking the class methods
  • +"../tools/maven-plugins/axis2-wsdl2code-maven-plugin/index.html"> Maven2 WSDL2Code Plug-in Guide - A guide to using this plugin that takes as input a WSDL and generates client and server stubs for calling or implementing a Web service matching the WSDL.
    • diff --git a/src/site/xdoc/docs/reference.xml b/src/site/xdoc/docs/reference.xml deleted file mode 100644 index 4c585c218d..0000000000 --- a/src/site/xdoc/docs/reference.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - -Axis2 Reference Guide - - - -

    Axis2 Reference Guide

    - -

    WSDL2Java Reference

    -
    -NAME
-       wsdl2java.sh or wsdl2java.bat - Generates java code according to a given WSDL file to handle Web service invocation.
-       These scripts can be found under the bin directory of the Axis2 distribution.
-
-SYNOPSIS
-       wsdl2java.sh [OPTION]... -uri <Location of WSDL>
-
-DESCRIPTION
-       Given a WSDL file, this generates java code to handle Web service invocations.
-
-      -o <path>          Specify a directory path for the generated code.
-      -a                       Generate async style code only (Default: off).
-      -s                       Generate sync style code only (Default: off). Takes precedence over -a.
-      -p <pkg1>          Specify a custom package name for the generated code.
-      -l <language>      Valid languages are java and c (Default: java).
-      -t                       Generate a test case for the generated code.
-      -ss                      Generate server side code (i.e. skeletons) (Default: off).
-      -sd                      Generate service descriptor (i.e. services.xml). (Default: off). Valid with -ss.
-      -d <databinding>   Valid databinding(s) are adb, xmlbeans, jibx and jaxbri (Default: adb).
-      -g                       Generates all the classes. Valid only with -ss.
-      -pn <port_name>    Choose a specific port when there are multiple ports in the wsdl.
-      -sn <service_name> Choose a specific service when there are multiple services in the wsdl.
-      -u                       Unpacks the databinding classes
-      -r <path>          Specify a repository against which code is generated.
-      -ns2p ns1=pkg1,ns2=pkg2  Specify a custom package name for each namespace specified in the wsdls schema.
-      -ssi                     Generate an interface for the service implementation (Default: off).
-      -wv <version>      WSDL Version. Valid Options : 2, 2.0, 1.1
-      -S                       Specify a directory path for generated source
-      -R                       Specify a directory path for generated resources
-      -em                      Specify an external mapping file
-      -f                       Flattens the generated files
-      -uw                      Switch on un-wrapping.
-      -xsdconfig <file path>   Use XMLBeans .xsdconfig file. Valid only with -d xmlbeans.
-      -ap                      Generate code for all ports
-      -or                      Overwrite the existing classes
-      -b                       Generate Axis 1.x backword compatible code.
-      -sp                      Suppress namespace prefixes (Optimzation that reduces size of soap request/response)
-      -E<key> <value>          Extra configuration options specific to certain databindings. Examples:
-                               -Ebindingfile <path>                   (for jibx) - specify the file path for the binding file
-                               -Etypesystemname <my_type_system_name> (for xmlbeans) - override the randomly generated type system name
-                               -Ejavaversion 1.5                      (for xmlbeans) - generates Java 1.5 code (typed lists instead of arrays)
-                               -Emp <package name> (for ADB) - extension mapper package name
-                               -Eosv (for ADB) - turn off strict validation.
-                               -Ewdc (for xmlbeans) - Generate code with a dummy schema. if someone use this option
-                                  they have to generate the xmlbeans code seperately with the scomp command comes with the
-                                  xmlbeans distribution and replace the Axis2 generated classes with correct classes
-      --noBuildXML             Dont generate the build.xml in the output directory
-      --noWSDL                 Dont generate WSDLs in the resources directory
-      --noMessageReceiver      Dont generate a MessageReceiver in the generated sources
-      --http-proxy-host        Proxy host address if you are behind a firewall
-      --http-proxy-port        Proxy prot address if you are behind a firewall
-      -ep                      Exclude packages - these packages are deleted after codegeneration
-    
-EXAMPLES
-       wsdl2java.sh -uri ../samples/wsdl/Axis2SampleDocLit.wsdl
-       wsdl2java.sh -uri ../samples/wsdl/Axis2SampleDocLit.wsdl -ss -sd 
-       wsdl2java.sh -uri ../samples/wsdl/Axis2SampleDocLit.wsdl -ss -sd -d xmlbeans -o ../samples -p org.apache.axis2.userguide
-
    - -

    Java2WSDL Reference

    -
    -NAME
-       Java2WSDL.sh or Java2WSDL.bat - Generates the appropriate WSDL file for a given java class.
-       These scripts can be found under the bin directory of the Axis2 distribution.
-
-SYNOPSIS
-       Java2WSDL.sh [OPTION]... -cn <fully qualified class name>
-
-DESCRIPTION
-       Given a java class generates a WSDL file for the given java class. 
-
-      -o <output location>                    output directory
-      -of <output file name>                  output file name for the WSDL
-      -sn <service name>                      service name
-      -l <one or more soap addresses>         location URIs, comma-delimited
-      -cp <class path uri>                    list of classpath entries - (urls)
-      -tn <target namespace>                  target namespace for service
-      -tp <target namespace prefix>           target namespace prefix for service
-      -stn <schema target namespace>          target namespace for schema
-      -stp <schema target namespace prefix>   target namespace prefix for schema
-      -st <binding style>                     style for the WSDL
-      -u <binding use>                        use for the WSDL
-      -nsg <class name>                       fully qualified name of a class that implements NamespaceGenerator
-      -sg <class name>                        fully qualified name of a class that implements SchemaGenerator
-      -p2n [<java package>,<namespace] [<java package>,<namespace]...
-                                              java package to namespace mapping for argument and return types
-      -p2n [all, <namespace>]                 to assign all types to a single namespace
-      -efd <qualified/unqualified>            setting for elementFormDefault (defaults to qualified)
-      -afd <qualified/unqualified>            setting for attributeFormDefault (defaults to qualified)
-      -xc class1 -xc class2...                extra class(es) for which schematype must be generated.
-      -wv <1.1/2.0>                           wsdl version - defaults to 1.1 if not specified
-      -dlb                                    generate schemas conforming to doc/lit/bare style
-      -dne                                    disallow nillable elements in the generated schema
-      -doe                                    disallow optional elements in the generated schema
-      -disableSOAP11                          disable binding generation for SOAP 1.1
-      -disableSOAP12                          disable binding generation for SOAP 1.2
-      -disableREST                            disable binding generation for REST
-    
-EXAMPLES
-       Java2WSDL.sh -cn ../samples/test/searchTool.Search
-       Java2WSDL.sh -cn ../samples/test/searchTool.Search -sn search
-       Java2WSDL.sh -cn ../samples/test/searchTool.Search -u -sn search
-       Java2WSDL.sh -cn ../samples/test/searchTool.Search -sn search -o ../samples/test/wsdl  
-
    - - diff --git a/src/site/xdoc/docs/soapmonitor-module.xml.vm b/src/site/xdoc/docs/soapmonitor-module.xml.vm index 132342208f..f31d9c459c 100644 --- a/src/site/xdoc/docs/soapmonitor-module.xml.vm +++ b/src/site/xdoc/docs/soapmonitor-module.xml.vm @@ -28,6 +28,11 @@

    Using the SOAP Monitor

    +

    Warning: the SOAP Monitor uses a protocol based on Java serialization +and is therefore vulnerable to attacks. It should be used exclusively as a +development and debugging tool, but never be permanently enabled on production +systems.

    +

    Web service developers often want to see the SOAP messages that are being used to invoke the Web services, along with the results of those messages. The goal of the SOAP Monitor utility is to provide a way for the developers diff --git a/src/site/xdoc/docs/toc.xml b/src/site/xdoc/docs/toc.xml index 7b8078907b..73d0b8043d 100644 --- a/src/site/xdoc/docs/toc.xml +++ b/src/site/xdoc/docs/toc.xml @@ -137,7 +137,7 @@ Plug-in

  • 25.4 Code Generator Wizard - Eclipse Plug-in
  • 25.5 AAR Maven2 Plug-in
  • 25.6 Java2WSDL Maven2 Plug-in
    • -
  • 25.7 WSDL2Code Maven2 Plug-in
    • +
  • 25.7 WSDL2Code Maven2 Plug-in
  • Migration Guide diff --git a/src/site/xdoc/docs/userguide.xml b/src/site/xdoc/docs/userguide.xml index c0098e2b60..459164d7a4 100644 --- a/src/site/xdoc/docs/userguide.xml +++ b/src/site/xdoc/docs/userguide.xml @@ -127,18 +127,9 @@ using WSDL
  • Easily retrieve the WSDL for a service
  • Send and receive SOAP messages with attachments
  • Create or utilize a REST-based Web service
    • -
  • Create or utilize services that take advantage of the Create or utilize services that take advantage of -WS-Security, WS-ReliableMessaging, -WS-Addressing, -WS-Coordination, -and -WS-Atomic Transaction recommendations
    • -
  • Use Axis2's modular structure to easily add support for new -recommendations as they emerge
    • +WS-Security and WS-Addressing

    Many more features exist as well, but this user guide concentrates on showing you how to accomplish the first five tasks @@ -207,8 +198,7 @@ are executed within the phases. You can also add your own phases and handlers.

    Handlers come from "modules" that can be plugged into a running Axis2 system. These modules, such as Rampart, which provides an -implementation of WS-Security, and Sandesha, which provides an -implementation of WS-ReliableMessaging, are the main extensibility +implementation of WS-Security, are the main extensibility mechanisms in Axis2.

    Axis2 Distributions

    diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 869a8d6928..0eef1ba128 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -58,17 +58,6 @@ functionality for features such as security and reliability. The currently available or under development include:

    • WS-ReliableMessaging - Supported by Apache -Sandesha2
      • -
    • WS-Coordination and WS-AtomicTransaction - Supported by Apache Kandula2
      • -
    • WS-Security - Supported by @@ -157,16 +146,6 @@ export machine-readable descriptions of your deployed services from Axis2.

    • -

      Add-ons - Several -Web services specifications have been incorporated including -WSS4J for -security (Apache Rampart), Sandesha for reliable messaging, Kandula which -is an encapsulation of WS-Coordination, WS-AtomicTransaction and -WS-BusinessActivity.

      -
      • -

    • Composition and Extensibility - Modules and phases improve support for composability and extensibility. Modules support composability and @@ -185,104 +164,5 @@ participation.

      "java-user@axis.apache.org". Make sure to prefix the subject of the mail with [Axis2].

      -

      Features of Axis2 Latest Version

      -

      Apache Axis2 Version 1.4 comes with performance improvements and -a number bug fixes over the 1.3 release. Check out the complete list of -features below.

      -

      Programming Model

      -
        -
      • Improved, XML-centric client API including full WSDL and policy -support
        • -
      • Support for JAXWS-style services and clients
        • -
      • Support for POJO and Spring services and clients
        • -
      • Support for any message exchange pattern
        • -
      • Synchronous and asynchronous calls
        • -
      • Archived service deployment model supporting full service -encapsulation with versioning support
        • -
      • Archived module deployment model supporting controlled -extensibility with versioning support
        • -
      • Hot deployment
        • -
      • WS-Policy driven code generation extensions
        • -
      • Flexible service life cycle model
        • -
      • Automatic support for POX (REST) style invocation of -services
        • -
      • Support for querying a service's WSDL (using ?wsdl), schema -(using ?xsd) and policies (using ?policy)
        • -
      • WSDL 2.0
        • -
      • Custom Deployers
        • -
      • Binary serialization (Fast Infoset)
        • -
      • JSON support
        • -
      • EJB Provider support
        • -
      -

      Supported Specifications

      -
        -
      • SOAP 1.1 and 1.2
        • -
      • Message Transmission Optimization Mechanism (MTOM), XML -Optimized Packaging (XOP) and SOAP with Attachments
        • -
      • WSDL 1.1, including both SOAP and HTTP bindings
        • -
      • WS-Addressing (submission and final)
        • -
      • WS-Policy
        • -
      • SAAJ 1.1
        • -
      -

      Transports

      -
        -
      • HTTP
        • -
      • SMTP
        • -
      • JMS
        • -
      • TCP
        • -
      -

      Supported Data Bindings

      -
        -
      • Axis Data Binding (ADB)
        • -
      • XMLBeans
        • -
      • JibX
        • -
      • JaxBRI (Experimental)
        • -
      -

      Tools Included in This -Release

      -

      [Download Tool Plug-ins]

      -
        -
      1. Axis2 Web Application (Web App)
        2. -
      2. WSDL2WS- eclipse plug-in/ Command line -version/IntelliJ IDEA plug-in/Maven2 WSDL2Code Plug-in
        3. -
      3. Service Archive Wizard- eclipse plug-in/ IntelliJ IDEA plug-in/ Maven2 AAR Plug-in
        4. -
      4. Java2WSDL- Maven2 Java2WSDL Plug-in
        5. -
      -

      Extension Modules

      -
        -
      • Apache Rampart: Supporting WS-Security (and soon -WS-Policy)
        • -
      • Apache Sandesha2: Supporting WS-Reliable Messaging
        • -
      -(Apache Axis2 comes built in with a module that supports -WS-Addressing.) -

      Known Issues and Limitations

      -

      Archived News

      -

      For information on previous Axis2 releases running up to the -current release see the 'Axis2 Archived News' page.

      -For other news items from Apache Software Foundation see: - diff --git a/src/site/xdoc/tools/eclipse/plugin-installation.xml b/src/site/xdoc/tools/eclipse/plugin-installation.xml deleted file mode 100644 index bde82d17c3..0000000000 --- a/src/site/xdoc/tools/eclipse/plugin-installation.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - Eclipse plugin installation - - -

      Eclipse plugin installation

      -
      -

      - This document provides instructions for installating of the two Eclipse plugins provided by Axis2 - (Service Archive Generator and - Code Generator Wizard). - The two plugins should work on Eclipse version 3.1 and upwards, and require at least Java 1.5. - The plugins have dependencies on bundles that are installed by default in the Eclipse IDE for Java EE Developers - edition, but not in the Eclipse IDE for Java Developers edition. It is therefore recommended - to use the EE edition. - The installation procedure is the same for both plugins, but depends on the Eclipse - version being used. To determine which procedure to use, check if there is a - dropins folder in the Eclipse installation directory. This folder is used - by the p2 provisioning system introduced in recent Eclipse version. It should be - present starting with Eclipse version 3.4. -

      -
      -
      -

      - If your Eclipse version uses p2, use the following procedure to install the - Axis2 plugins: -

      -
        -
      1. Download the ZIP file for the plugin you want to install.
        2. -
      2. Extract the content of the plugins folder in the ZIP archive into the - dropins folder (i.e. do not create a plugins folder under dropins).
        3. -
      -

      - As explained here, - it is possible to use other directory layouts in the dropins folder. -

      -
      -
      -

      - If you have an older Eclipse version that doesn't support p2 yet, use the following - procedure to install the Axis2 plugins: -

      -
        -
      1. Download the ZIP file for the plugin you want to install.
        2. -
      2. Extract the content of the ZIP archive into the Eclipse installation directory. - This should add one or more JAR files and/or directories to the existing plugins - folder.
        3. -
      -
      - -       diff --git a/src/site/xdoc/tools/eclipse/servicearchiver-plugin.xml b/src/site/xdoc/tools/eclipse/servicearchiver-plugin.xml index ff9e4e4de1..e392cecc0d 100644 --- a/src/site/xdoc/tools/eclipse/servicearchiver-plugin.xml +++ b/src/site/xdoc/tools/eclipse/servicearchiver-plugin.xml @@ -27,7 +27,7 @@

      Service Archive Generator Wizard Guide for Eclipse Plug-in

      This document will guide you through the installation and usage of the archive generator Eclipse plug-in.

      -

      [Download Plugin Tool]

      +

      [Download Plugin Tool]

      As part of the Axis2 tool set, the service archive generator is diff --git a/src/site/xdoc/tools/eclipse/wsdl2java-plugin.xml b/src/site/xdoc/tools/eclipse/wsdl2java-plugin.xml index a7476ec38d..a5d0f58a07 100644 --- a/src/site/xdoc/tools/eclipse/wsdl2java-plugin.xml +++ b/src/site/xdoc/tools/eclipse/wsdl2java-plugin.xml @@ -29,7 +29,7 @@ for Eclipse. In other words, this document will guide you through the operations of generating a WSDL file from a Java class and/or generating a Java class file from a WSDL file.

      -

      [Download Plugin Tool]

      +

      [Download Plugin Tool]

      The Axis2 code generator comes built-in with an Axis2 Plug-in Guide for IntelliJ IDEA

      This document explains the installation and usage of Axis2 plug-in for IntelliJ IDEA.

      -

      [Download +

      [Download Plug-in]

      Content

        @@ -63,7 +63,7 @@ functionality has not been changed.

        Installation

        First download the +"../../download.html">download the plug-in which is a zipped file, and extract it into plugins directory which is located in the directory where IDEA is installed. If a previous version of the plug-in resides in this diff --git a/src/site/xdoc/tools/index.xml b/src/site/xdoc/tools/index.xml index cfb366618f..b29ea4be02 100644 --- a/src/site/xdoc/tools/index.xml +++ b/src/site/xdoc/tools/index.xml @@ -93,7 +93,7 @@ which describes a Web service for invoking the classes methods.

        - axis2-wsdl2java-maven-plugin + axis2-wsdl2code-maven-plugin

        This plugin takes as input a WSDL and generates client and @@ -113,7 +113,7 @@ WSDL.

        The command line tools and Ant tasks are bundled with the Axis2 binary distribution. The Eclipse and IntelliJ IDEA plugins are shipped as separate archives. These files can - be downloaded here. + be downloaded here. All Maven plugins are available from the Maven central repository and need not be downloaded separately.

        diff --git a/src/site/xdoc/tools/maven-plugins/maven-wsdl2code-plugin.xml b/src/site/xdoc/tools/maven-plugins/maven-wsdl2code-plugin.xml deleted file mode 100644 index 4fa0f37b35..0000000000 --- a/src/site/xdoc/tools/maven-plugins/maven-wsdl2code-plugin.xml +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - -Maven2 WSDL2Code Plug-in Guide - - -

        Maven2 WSDL2Code Plug-in Guide

        -

        Introduction

        -

        This plugin takes as input a WSDL and generates client and -server stubs for calling or implementing a Web service matching the -WSDL.

        -

        [Download Plugin Tool]

        -

        Goals

        -

        The WSDl2Code offers a single goal:

        -
          -
        • wsdl2code (default): Reads the WSDL and generates code.
          • -
        -

        To run the plugin, add the following section to your -POM (Project Object Model):

        -
        -    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.axis2</groupId>
-                <artifactId>axis2-wsdl2code-maven-plugin</artifactId>
-                <version>1.6.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>wsdl2code</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <packageName>com.foo.myservice</packageName>
-                    <wsdlFile>src/main/wsdl/myservice.wsdl</wsdlFile>
-                    <databindingName>xmlbeans</databindingName>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
        -Also please add axis2 jars as a dependency -
        -    <dependency>
-          <groupId>org.apache.axis2</groupId>
-          <artifactId>axis2</artifactId>
-          <version>1.6.2</version>
-    </dependency>
-
        - -

        The plugin will be invoked automatically in the generate-sources -phase. You can also invoke it directly from the command line by -running the command

        -
        -mvn axis2-wsdl2code:wsdl2code
-
        -

        The WSDL2Code Goal

        -

        By default, the plugin reads the file -src/main/axis2/service.wsdl. Sources for the Java -programming language and the ADB data binding are generated into -target/generated-sources/axis2/wsdl2code. Note the -configuration element packageName above, which -sets the package name, thus a subdirectory.

        -

        Configuration

        -

        The WSDL2Code goal takes the following parameters as input. All -parameters can be set from the command line by using properties. -For example, the parameter "generateServerSide" may be set using -the property "axis2.wsdl2code.generateServerSide". If the parameter -isn't set via property or in the POM, then a default value -applies.

        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        Parameter NameCommand Line PropertyDescriptionDefault Value
        databindingName${axis2.wsdl2code.databindingName}Data binding framework, which is being used by the generated -sources.adb
        generateAllClasses${axis2.wsdl2code.generateAllClasses}Whether to generate simply all classes. This is only valid in -conjunction with "generateServerSide".false
        generateServerSide${axis2.wsdl2code.generateServerSide}Whether server side sources are being generated.false
        generateServerSideInterface${axis2.wsdl2code.generateServerSideInterface}Whether to generate the server side interface.false
        generateServicesXml${axis2.wsdl2code.generateServicesXml}Whether a "services.xml" file is being generated.false
        generateTestcase${axis2.wsdl2code.generateTestCase}Whether a test case is being generated.false
        language${axis2.wsdl2code.language}Programming language of the generated sources.java
        namespaceToPackages${axis2.wsdl2code.namespaceToPackages}Map of namespace URI to packages in the format -uri1=package1,uri2=package2,... Using this parameter is -discouraged. In general, you should use the namespaceUris -parameter. However, the latter cannot be set on the command -line.
        namespaceURIsMap of namespace URI to packages. Example: -<namespaceURIs> <namespaceURI> -<uri>uri1</uri> <packageName>package1</packageName> -</namespaceURI> ........ </namespaceURI>
        outputDirectory${axis2.wsdl2code.target}Target directory, where sources are being -target/generated-sources/axis2/wsdl2code generated.
        packageName${axis2.wsdl2code.package}Package name of the generated sources.
        portName${axis2.wsdl2code.portName}Port name, for which sources are being generated. By default, -sources are generated for a randomly picked port.
        allPorts${axis2.wsdl2code.allPorts}Set this to true to generate code for all ports.false
        serviceName${axis2.wsdl2code.serviceName}Service name, for which sources are being generated. By -default, sources are generated for all services.
        syncMode${axis2.wsdl2code.syncMode}Sync mode, for which sources are being generated; either of -"sync", "async", or "both" (default).both
        unpackClasses${axis2.wsdl2code.unpackClasses}Whether to unpack classes.
        wsdlFile${axis2.wsdl2code.wsdl}Location of the WSDL file, which is read as inputsrc/main/axis2/service.wsdl
        unwrap${axis2.wsdl2code.unwrap}This will select between wrapped and unwrapped during code generation. -Maps to the -uw option of the command line tool.false
        - - diff --git a/systests/echo/pom.xml b/systests/echo/pom.xml new file mode 100644 index 0000000000..969e831d27 --- /dev/null +++ b/systests/echo/pom.xml @@ -0,0 +1,50 @@ + + + + 4.0.0 + + org.apache.axis2 + systests + 1.7.10-SNAPSHOT + + echo + aar + http://axis.apache.org/axis2/java/core/ + + + + org.apache.axis2 + axis2-aar-maven-plugin + true + + services.xml + false + + + + + + + org.apache.axis2 + axis2-kernel + ${project.version} + + + diff --git a/modules/webapp/src/main/webapp/axis2-web/TopFrame.jsp b/systests/echo/services.xml similarity index 73% rename from modules/webapp/src/main/webapp/axis2-web/TopFrame.jsp rename to systests/echo/services.xml index 881bf82a1c..e9ef0fc840 100644 --- a/modules/webapp/src/main/webapp/axis2-web/TopFrame.jsp +++ b/systests/echo/services.xml @@ -1,30 +1,25 @@ -<%-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --%> - - - - - Untitled Document - - - - - - + + + + org.apache.axis2.echo.EchoService + + + + \ No newline at end of file diff --git a/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java b/systests/echo/src/main/java/org/apache/axis2/echo/EchoService.java similarity index 81% rename from modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java rename to systests/echo/src/main/java/org/apache/axis2/echo/EchoService.java index 1576c00166..535c0d451b 100644 --- a/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java +++ b/systests/echo/src/main/java/org/apache/axis2/echo/EchoService.java @@ -16,13 +16,12 @@ * specific language governing permissions and limitations * under the License. */ +package org.apache.axis2.echo; -package org.apache.axis2.transport.local; +import org.apache.axiom.om.OMElement; -public class NonBlockingLocalTransportSender extends LocalTransportSender { - - protected boolean isNonBlocking() { - return true; +public class EchoService { + public OMElement echo(OMElement element) { + return element; } - } diff --git a/systests/pom.xml b/systests/pom.xml new file mode 100644 index 0000000000..338c1db650 --- /dev/null +++ b/systests/pom.xml @@ -0,0 +1,47 @@ + + + + 4.0.0 + + org.apache.axis2 + axis2 + 1.7.10-SNAPSHOT + + + systests + pom + http://axis.apache.org/axis2/java/core/ + + + + + maven-deploy-plugin + + true + + + + + + + echo + webapp-tests + + diff --git a/systests/webapp-tests/pom.xml b/systests/webapp-tests/pom.xml new file mode 100644 index 0000000000..41f50e5113 --- /dev/null +++ b/systests/webapp-tests/pom.xml @@ -0,0 +1,186 @@ + + + + 4.0.0 + + org.apache.axis2 + systests + 1.7.10-SNAPSHOT + + webapp-tests + http://axis.apache.org/axis2/java/core/ + + + ${project.groupId} + axis2-webapp + ${project.version} + war + test + + + ${project.groupId} + echo + ${project.version} + aar + test + + + com.google.truth + truth + test + + + net.sourceforge.jwebunit + jwebunit-htmlunit-plugin + 3.3 + test + + + org.slf4j + slf4j-jdk14 + 1.6.6 + test + + + + + + + commons-io + commons-io + 2.4 + + + + + + + com.github.veithen.alta + alta-maven-plugin + + + war-location + + generate-properties + + + webapp + %file% + + test + + *:axis2-webapp:war:* + + + + + + aar-location + + generate-test-resources + + + echo-service-location.txt + %file% + + test + + *:echo:aar:* + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + reserve-network-port + + reserve-network-port + + pre-integration-test + + + jetty.stopPort + jetty.httpPort + + + + + + + org.mortbay.jetty + jetty-maven-plugin + + foo + ${jetty.stopPort} + + + ${jetty.httpPort} + + + ${webapp} + + /axis2 + + + + + start-jetty + pre-integration-test + + deploy-war + + + + true + + + + stop-jetty + post-integration-test + + stop + + + + + + maven-failsafe-plugin + + + + integration-test + verify + + + + ${jetty.httpPort} + + + + + + + + diff --git a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/Axis2WebTester.java b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/Axis2WebTester.java new file mode 100644 index 0000000000..cea751d5a8 --- /dev/null +++ b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/Axis2WebTester.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.webapp; + +import java.util.Iterator; +import java.util.List; + +import javax.servlet.http.Cookie; + +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import net.sourceforge.jwebunit.junit.WebTester; + +public class Axis2WebTester extends WebTester implements TestRule { + public Statement apply(final Statement base, Description description) { + return new Statement() { + @Override + public void evaluate() throws Throwable { + setBaseUrl("http://localhost/" + System.getProperty("jetty.httpPort", "8080") + "/axis2"); + base.evaluate(); + } + }; + } + + public String getSessionId() { + List cookies = getTestingEngine().getCookies(); + for (Iterator i = cookies.iterator(); i.hasNext();) { + Cookie cookie = (Cookie)i.next(); + if (cookie.getName().equals("JSESSIONID")) { + return cookie.getValue(); + } + } + String path = getTestingEngine().getPageURL().getPath(); + int idx = path.lastIndexOf(";jsessionid="); + return idx == -1 ? null : path.substring(idx+12); + } +} diff --git a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java new file mode 100644 index 0000000000..ea6abd6592 --- /dev/null +++ b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.webapp; + +import static com.google.common.truth.Truth.assertThat; + +import org.apache.commons.io.IOUtils; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +public class AxisAdminServletITCase { + @Rule + public Axis2WebTester tester = new Axis2WebTester(); + + @Before + public void setUp() { + tester.beginAt("/axis2-admin/"); + tester.setTextField("userName", "admin"); + tester.setTextField("password", "axis2"); + tester.submit(); + } + + @Test + public void testAvailableServices() { + tester.clickLinkWithText("Available Services"); + tester.assertMatch("Service EPR : http://localhost:[0-9]+/axis2/services/Version"); + } + + /** + * Tests that the admin console is not vulnerable to session fixation attacks. This tests + * attempts to log in with an existing session. This should result in a new session with a + * different session ID. + */ + @Test + public void loginInvalidatesExistingSession() { + String sessionId = tester.getSessionId(); + assertThat(sessionId).isNotNull(); + tester.gotoPage("/axis2-admin/welcome"); + tester.setTextField("userName", "admin"); + tester.setTextField("password", "axis2"); + tester.submit(); + assertThat(tester.getSessionId()).isNotEqualTo(sessionId); + } + + @Test + public void testUploadRemoveService() throws Exception { + tester.clickLinkWithText("Upload Service"); + String echoServiceLocation = IOUtils.toString(AxisAdminServletITCase.class.getResource("/echo-service-location.txt")); + tester.setTextField("filename", echoServiceLocation); + tester.clickButtonWithText(" Upload "); + tester.assertMatch("File echo-.+\\.aar successfully uploaded"); + int attempt = 0; + while (true) { + attempt++; + tester.clickLinkWithText("Available Services"); + try { + tester.assertFormPresent("Echo"); + break; + } catch (AssertionError ex) { + if (attempt < 30) { + Thread.sleep(1000); + } else { + throw ex; + } + } + } + tester.setWorkingForm("Echo"); + tester.submit(); + tester.assertTextPresent("Service 'Echo' has been successfully removed."); + } + + @Test + public void testEditServiceParameters() { + tester.clickLinkWithText("Edit Parameters"); + tester.selectOption("axisService", "Version"); + tester.clickButtonWithText(" Edit Parameters "); + tester.assertTextFieldEquals("Version_ServiceClass", "sample.axisversion.Version"); + } +} diff --git a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java new file mode 100644 index 0000000000..f79752da54 --- /dev/null +++ b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisServletITCase.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.webapp; + +import org.junit.Rule; +import org.junit.Test; + +public class AxisServletITCase { + @Rule + public Axis2WebTester tester = new Axis2WebTester(); + + @Test + public void testListServices() { + tester.beginAt("/"); + tester.clickLinkWithExactText("Services"); + tester.assertLinkPresentWithExactText("Version"); + } + + /** + * Regression test for AXIS2-5683. + */ + @Test + public void testHandlePolicyRequestXSS() { + tester.setIgnoreFailingStatusCodes(true); + tester.beginAt("/services/Version?policy&id="); + tester.assertResponseCode(404); + } +} diff --git a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/NoSessionITCase.java b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/NoSessionITCase.java new file mode 100644 index 0000000000..04b02a2c54 --- /dev/null +++ b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/NoSessionITCase.java @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.axis2.webapp; + +import static com.google.common.truth.Truth.assertThat; + +import java.util.Arrays; +import java.util.Collection; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; + +/** + * Test that pages that don't require login don't create HTTP sessions. Pages that create HTTP + * sessions without the user being logged in may be exploited in session fixation attacks. + */ +@RunWith(Parameterized.class) +public class NoSessionITCase { + @Parameters(name = "{0}") + public static Collection data() { + return Arrays.asList(new Object[][] { + { "/" }, + { "/services/listServices" }, + { "/services/ListFaultyServices" }, + { "/axis2-web/HappyAxis.jsp" }, + { "/axis2-admin/" } }); + } + + @Parameter + public String page; + + @Rule + public Axis2WebTester tester = new Axis2WebTester(); + + @Test + public void test() { + tester.beginAt(page); + assertThat(tester.getSessionId()).isNull(); + } +}