You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2009/06/25 10:44:07 UTC
svn commit: r788293 - in /webservices/axis2/trunk/java/modules/adb-codegen:
./ test-resources/std/ test-resources/testsuite/
test/org/apache/axis2/schema/rampart/
Author: veithen
Date: Thu Jun 25 08:44:07 2009
New Revision: 788293
URL: http://svn.apache.org/viewvc?rev=788293&view=rev
Log:
Cleaned up the base64binary tests:
* Restored the original xmime schema and use an import in the test schema.
* Removed the rampart test because it duplicates a test case in Base64BinaryTest.
Added:
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/README.txt (with props)
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/xmlmime.xsd
Removed:
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/rampart.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/rampart/
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/base64binary.xsd
Modified: webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml?rev=788293&r1=788292&r2=788293&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml Thu Jun 25 08:44:07 2009
@@ -74,7 +74,6 @@
<arg file="${testsuite.source.dir}/abstract.xsd"/>
<arg file="${testsuite.source.dir}/decimal.xsd"/>
<arg file="${testsuite.source.dir}/anytype.xsd"/>
- <arg file="${testsuite.source.dir}/rampart.xsd"/>
<arg file="${testsuite.source.dir}/innerParticleExtension.xsd"/>
<arg file="${testsuite.source.dir}/union2.xsd"/>
<arg file="${testsuite.source.dir}/default_value.xsd"/>
Added: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/README.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/README.txt?rev=788293&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/README.txt (added)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/README.txt Thu Jun 25 08:44:07 2009
@@ -0,0 +1 @@
+This folder contains standard (third party) schemas. Please don't modify them.
\ No newline at end of file
Propchange: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/xmlmime.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/xmlmime.xsd?rev=788293&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/xmlmime.xsd (added)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/std/xmlmime.xsd Thu Jun 25 08:44:07 2009
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<!--
+ W3C XML Schema defined in the Describing Media Content of Binary Data in XML
+ specification
+ http://www.w3.org/TR/xml-media-types
+
+ Copyright © 2005 World Wide Web Consortium,
+
+ (Massachusetts Institute of Technology, European Research Consortium for
+ Informatics and Mathematics, Keio University). All Rights Reserved. This
+ work is distributed under the W3C® Software License [1] in the hope that
+ it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id: xmlmime.xsd,v 1.1 2005/04/25 17:08:35 hugo Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+ targetNamespace="http://www.w3.org/2005/05/xmlmime" >
+
+ <xs:attribute name="contentType">
+ <xs:simpleType>
+ <xs:restriction base="xs:string" >
+ <xs:minLength value="3" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="expectedContentTypes" type="xs:string" />
+
+ <xs:complexType name="base64Binary" >
+ <xs:simpleContent>
+ <xs:extension base="xs:base64Binary" >
+ <xs:attribute ref="xmime:contentType" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="hexBinary" >
+ <xs:simpleContent>
+ <xs:extension base="xs:hexBinary" >
+ <xs:attribute ref="xmime:contentType" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/base64binary.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/base64binary.xsd?rev=788293&r1=788292&r2=788293&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/base64binary.xsd (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/base64binary.xsd Thu Jun 25 08:44:07 2009
@@ -18,30 +18,10 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
- targetNamespace="http://www.w3.org/2005/05/xmlmime">
- <xs:attribute name="contentType">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:minLength value="3" />
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="expectedContentTypes" type="xs:string" />
- <xs:complexType name="base64Binary">
- <xs:simpleContent>
- <xs:extension base="xs:base64Binary">
- <xs:attribute ref="xmime:contentType" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- <xs:complexType name="hexBinary">
- <xs:simpleContent>
- <xs:extension base="xs:hexBinary">
- <xs:attribute ref="xmime:contentType" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+ targetNamespace="http://apache.org/axis2/schema/base64binary">
+ <xs:import namespace="http://www.w3.org/2005/05/xmlmime" schemaLocation="../std/xmlmime.xsd"/>
+
<xs:element name="TestBase64Binary" type="xmime:base64Binary"></xs:element>
<xs:element name="TestHexBinary" type="xmime:hexBinary"></xs:element>
<xs:element name="ByteArray" nillable="true" type="xs:base64Binary"/>