You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by di...@apache.org on 2006/02/10 01:52:27 UTC
svn commit: r376517 [1/3] - in /webservices/commons/modules/XmlSchema:
build.xml maven.xml project.xml
src/org/apache/ws/commons/schema/XmlSchemaSerializer.java
test/tests/TestElementRefs.java
Author: dims
Date: Thu Feb 9 16:52:26 2006
New Revision: 376517
URL: http://svn.apache.org/viewcvs?rev=376517&view=rev
Log:
Fix for WSCOMMONS-4 - unit test for xml schema test suite from Dan Diephouse (with minor edits to build.xml from me)
Modified:
webservices/commons/modules/XmlSchema/build.xml
webservices/commons/modules/XmlSchema/maven.xml
webservices/commons/modules/XmlSchema/project.xml
webservices/commons/modules/XmlSchema/src/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/modules/XmlSchema/test/tests/TestElementRefs.java
Modified: webservices/commons/modules/XmlSchema/build.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/XmlSchema/build.xml?rev=376517&r1=376516&r2=376517&view=diff
==============================================================================
--- webservices/commons/modules/XmlSchema/build.xml (original)
+++ webservices/commons/modules/XmlSchema/build.xml Thu Feb 9 16:52:26 2006
@@ -6,23 +6,52 @@
<property name="output.jar" value="${project.name}.jar"/>
<property name="build.dir" value="${basedir}/build"/>
<property name="build_classes.dir" value="${build.dir}/classes"/>
- <property name="build_lib.dir" value="${build.dir}/lib"/>
+ <property name="build_lib.dir" value="${build.dir}/lib"/>
<property name="build_doc.dir" value="${build.dir}/apidoc"/>
<property name="dist.dir" value="${build.dir}/dist"/>
<property name="dist.zip" value="${project.name}.zip"/>
<property name="srcdist.zip" value="${project.name}-src.zip"/>
<property name="test.dir" value="${basedir}/test"/>
- <property name="test_classes.dir" value="${build.dir}/test-classes"/>
+ <property name="test_classes.dir" value="${build.dir}/test-classes"/>
<property name="test_reports.dir" value="${build.dir}/test-reports"/>
<target name="prepare">
<mkdir dir="${build_classes.dir}"/>
<mkdir dir="${build_lib.dir}"/>
+
+ <condition property="downloadLibs">
+ <not>
+ <available file="${build_lib.dir}/xmlunit-1.0.jar"/>
+ </not>
+ </condition>
+
+ <antcall target="get-deps"/>
+ </target>
+
+ <target name="get-deps" if="downloadLibs">
+ <get src="http://www.ibiblio.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.jar"
+ dest="${build_lib.dir}/xmlunit-1.0.jar"/>
</target>
<target name="prepare-tests">
<mkdir dir="${test_classes.dir}"/>
<mkdir dir="${test_reports.dir}"/>
+
+ <condition property="needsTestsDownload">
+ <not>
+ <available file="${build.dir}/xmlschema2002-01-16"/>
+ </not>
+ </condition>
+
+ <antcall target="get-xml-schema-tests"/>
+ </target>
+
+ <target name="get-xml-schema-tests" if="needsTestsDownload">
+ <echo>Downloading 6MB XML Schema test suite. This make take a few minutes...</echo>
+ <get dest="${build.dir}/xsts-2002-01-16.tar.gz"
+ src="http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz"/>
+ <gunzip src="${build.dir}/xsts-2002-01-16.tar.gz"/>
+ <untar src="${build.dir}/xsts-2002-01-16.tar" dest="${build.dir}"/>
</target>
<target name="compile" depends="prepare" description="compiles the src and puts it in build/classes">
@@ -38,6 +67,9 @@
deprecation="true">
<classpath>
<pathelement location="${build_classes.dir}"/>
+ <fileset dir="${build_lib.dir}">
+ <include name="*.jar" />
+ </fileset>
</classpath>
<include name="**/*.java" />
</javac>
@@ -48,6 +80,9 @@
<classpath>
<pathelement location="${build_classes.dir}"/>
<pathelement location="${test_classes.dir}"/>
+ <fileset dir="${build_lib.dir}">
+ <include name="*.jar" />
+ </fileset>
</classpath>
<formatter type="plain"/>
<batchtest todir="${test_reports.dir}">
@@ -55,6 +90,10 @@
<include name="**/*Test*.java"/>
</fileset>
</batchtest>
+
+ <sysproperty key="nistTestLocation"
+ value="${build.dir}/xmlschema2002-01-16/nisttest/NISTTestsAll"/>
+
</junit>
</target>
@@ -68,8 +107,7 @@
destdir="${build.dir}/apidoc"
windowtitle="${project.name} API"
doctitle="${project.name}"
- bottom="Copyright © Infravio XML Schema Project. All Rights Reserved.">
-
+ bottom="Copyright © Apache XML Schema Project. All Rights Reserved.">
<classpath>
<pathelement location="${build_classes.dir}"/>
</classpath>
Modified: webservices/commons/modules/XmlSchema/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/XmlSchema/maven.xml?rev=376517&r1=376516&r2=376517&view=diff
==============================================================================
--- webservices/commons/modules/XmlSchema/maven.xml (original)
+++ webservices/commons/modules/XmlSchema/maven.xml Thu Feb 9 16:52:26 2006
@@ -1,19 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
-
-<project default="jar"
- xmlns:j="jelly:core"
- xmlns:u="jelly:util"
- xmlns:maven="jelly:maven"
- xmlns:util="jelly:util"
- xmlns:deploy="deploy"
- xmlns:ant="jelly:ant">
-
- <preGoal name="itest:compile">
- <u:file var="file" name="${maven.itest.src}"/>
- <j:if test="${!file.exists()}">
- <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
- </j:if>
- </preGoal>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:util="jelly:util"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+
+ <preGoal name="test:compile">
+ <u:file var="file" name="${maven.build.dir}/xmlschema2002-01-16"/>
+ <j:if test="${!file.exists()}">
+ <echo>Downloading 6MB XML Schema test suite. This make take a few minutes...</echo>
+ <ant:get dest="${maven.build.dir}/xsts-2002-01-16.tar.gz"
+ src="http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz"/>
+
+ <ant:gunzip src="${maven.build.dir}/xsts-2002-01-16.tar.gz"/>
+ <ant:untar src="${maven.build.dir}/xsts-2002-01-16.tar" dest="${maven.build.dir}"/>
+ </j:if>
+ </preGoal>
+</project>
Modified: webservices/commons/modules/XmlSchema/project.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/XmlSchema/project.xml?rev=376517&r1=376516&r2=376517&view=diff
==============================================================================
--- webservices/commons/modules/XmlSchema/project.xml (original)
+++ webservices/commons/modules/XmlSchema/project.xml Thu Feb 9 16:52:26 2006
@@ -1,219 +1,228 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * 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.
- */
- -->
-<project>
- <name>XmlSchema</name>
- <pomVersion>3</pomVersion>
- <!-- a unique name for this project -->
- <name>Apache XmlSchema</name>
- <id>XmlSchema</id>
- <groupId>ws-commons</groupId>
- <package>org.apache.commons</package>
- <currentVersion>${schema.version}</currentVersion>
- <!-- details about the organization that 'owns' the project -->
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- <logo>http://www.apache.org/images/asf-logo.gif</logo>
- </organization>
- <inceptionYear>2004</inceptionYear>
- <package>org.apache.commons</package>
- <logo>http://www.apache.org/images/asf-logo.gif</logo>
- <description>API to manipulate XmlSchema.</description>
- <shortDescription>API to manipulate XmlSchema.</shortDescription>
- <!-- the project home page -->
- <url>http://ws.apache.org/commons/XmlSchema</url>
- <issueTrackingUrl>http://issues.apache.org/jira/browse/WS-Commons</issueTrackingUrl>
- <siteAddress>ws.apache.org/commons/XmlSchema</siteAddress>
- <siteDirectory>/www/ws.apache.org/commons/XmlSchema/</siteDirectory>
- <distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
-
- <!-- ========== -->
- <!-- Developers -->
- <!-- ========== -->
- <developers>
- <developer>
- <name>Davanum Srinivas</name>
- <id>dims</id>
- <email>dims AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Sanjiva Weerawarana</name>
- <id>sanjiva</id>
- <email>sanjiva AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Glen Daniels</name>
- <id>gdaniels</id>
- <email>gdaniels AT apache.org</email>
- <organization>Sonic Software</organization>
- </developer>
- <developer>
- <name>Aleksander Slominski</name>
- <id>alek</id>
- <email>aslom AT cs.indiana.edu</email>
- <organization>Indiana University Extreme! Computing Lab</organization>
- </developer>
- <developer>
- <name>Srinath Perera</name>
- <id>hemapani</id>
- <email>hemapani AT apache.org</email>
- <organization>Lanka Software Foundation</organization>
- <url>http://www.apache.org/~hemapani</url>
- </developer>
- <developer>
- <name>Eran Chinthaka</name>
- <id>chinthaka</id>
- <email>chinthaka AT wso2.com</email>
- <organization>WSO2</organization>
- <url>http://www.apache.org/~chinthaka</url>
- </developer>
- <developer>
- <name>Dasarath Weerathunga</name>
- <id>dasarath</id>
- <email>dasarath AT opensource.lk</email>
- <organization>Lanka Software Foundation</organization>
- </developer>
- <developer>
- <name>Jaliya Ekanayake</name>
- <id>jaliya</id>
- <email>jaliya AT opensource.lk</email>
- <organization>Virtusa / Lanka Software Foundation</organization>
- <url>http://www.apache.org/~jaliya</url>
- </developer>
- <developer>
- <name>Chathura Herath</name>
- <id>chathura</id>
- <email>chathura AT opensource.lk</email>
- <organization>LSF/MIT</organization>
- <url>www.apache.org/~chathura</url>
- </developer>
- <developer>
- <name>Deepal Jayasinghe</name>
- <id>deepal</id>
- <email>deepal AT wso2.com</email>
- <organization>WSO2</organization>
- <url>http://www.apache.org/~deepal</url>
- </developer>
- <developer>
- <name>Ajith Ranabahu</name>
- <id>ajith</id>
- <email>ajith AT wso2.com</email>
- <organization>WSO2</organization>
- <url>http://www.apache.org/~ajith</url>
- </developer>
- <developer>
- <name>Venkat Reddy</name>
- <id>venkat</id>
- <email>vreddyp AT gmail.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Ashutosh Shahi</name>
- <id>ashu</id>
- <email>Ashutosh.Shahi AT ca.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Jayachandra Sekhara Rao Sunkara</name>
- <id>jaya</id>
- <email>jayachandra AT gmail.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Thilina Gunarathne</name>
- <id>thilina</id>
- <email>thilina AT opensource.lk</email>
- <organization>Lanka Software Foundation</organization>
- </developer>
- <developer>
- <name>Ruchith Fernando</name>
- <id>ruchith</id>
- <email>ruchith AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Saminda Abeyruwan</name>
- <id>saminda</id>
- <email>saminda AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Chamil Thanthrimudalige</name>
- <id>chamil</id>
- <email>chamil AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
-
- </developers>
-
- <build>
- <nagEmailAddress></nagEmailAddress>
- <sourceDirectory>src</sourceDirectory>
- <unitTestSourceDirectory>test</unitTestSourceDirectory>
-
- <unitTest>
- <excludes>
- </excludes>
- <includes>
- <include>**/*Test*.java</include>
- </includes>
-
- <resources>
- <resource>
- <directory>${basedir}/test-resources</directory>
- </resource>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
-
- <resources>
- <resource>
- <directory>conf</directory>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-
- <reports>
- <report>maven-junit-report-plugin</report>
- </reports>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * 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.
+ */
+ -->
+<project>
+ <name>XmlSchema</name>
+ <pomVersion>3</pomVersion>
+ <!-- a unique name for this project -->
+ <name>Apache XmlSchema</name>
+ <id>XmlSchema</id>
+ <groupId>ws-commons</groupId>
+ <package>org.apache.commons</package>
+ <currentVersion>${schema.version}</currentVersion>
+ <!-- details about the organization that 'owns' the project -->
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ <logo>http://www.apache.org/images/asf-logo.gif</logo>
+ </organization>
+ <inceptionYear>2004</inceptionYear>
+ <package>org.apache.commons</package>
+ <logo>http://www.apache.org/images/asf-logo.gif</logo>
+ <description>API to manipulate XmlSchema.</description>
+ <shortDescription>API to manipulate XmlSchema.</shortDescription>
+ <!-- the project home page -->
+ <url>http://ws.apache.org/commons/XmlSchema</url>
+ <issueTrackingUrl>http://issues.apache.org/jira/browse/WS-Commons</issueTrackingUrl>
+ <siteAddress>ws.apache.org/commons/XmlSchema</siteAddress>
+ <siteDirectory>/www/ws.apache.org/commons/XmlSchema/</siteDirectory>
+ <distributionDirectory>/www/ws.apache.org/builds/</distributionDirectory>
+
+ <!-- ========== -->
+ <!-- Developers -->
+ <!-- ========== -->
+ <developers>
+ <developer>
+ <name>Davanum Srinivas</name>
+ <id>dims</id>
+ <email>dims AT wso2.com</email>
+ <organization>WSO2</organization>
+ </developer>
+ <developer>
+ <name>Sanjiva Weerawarana</name>
+ <id>sanjiva</id>
+ <email>sanjiva AT wso2.com</email>
+ <organization>WSO2</organization>
+ </developer>
+ <developer>
+ <name>Glen Daniels</name>
+ <id>gdaniels</id>
+ <email>gdaniels AT apache.org</email>
+ <organization>Sonic Software</organization>
+ </developer>
+ <developer>
+ <name>Aleksander Slominski</name>
+ <id>alek</id>
+ <email>aslom AT cs.indiana.edu</email>
+ <organization>Indiana University Extreme! Computing Lab</organization>
+ </developer>
+ <developer>
+ <name>Srinath Perera</name>
+ <id>hemapani</id>
+ <email>hemapani AT apache.org</email>
+ <organization>Lanka Software Foundation</organization>
+ <url>http://www.apache.org/~hemapani</url>
+ </developer>
+ <developer>
+ <name>Eran Chinthaka</name>
+ <id>chinthaka</id>
+ <email>chinthaka AT wso2.com</email>
+ <organization>WSO2</organization>
+ <url>http://www.apache.org/~chinthaka</url>
+ </developer>
+ <developer>
+ <name>Dasarath Weerathunga</name>
+ <id>dasarath</id>
+ <email>dasarath AT opensource.lk</email>
+ <organization>Lanka Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Jaliya Ekanayake</name>
+ <id>jaliya</id>
+ <email>jaliya AT opensource.lk</email>
+ <organization>Virtusa / Lanka Software Foundation</organization>
+ <url>http://www.apache.org/~jaliya</url>
+ </developer>
+ <developer>
+ <name>Chathura Herath</name>
+ <id>chathura</id>
+ <email>chathura AT opensource.lk</email>
+ <organization>LSF/MIT</organization>
+ <url>www.apache.org/~chathura</url>
+ </developer>
+ <developer>
+ <name>Deepal Jayasinghe</name>
+ <id>deepal</id>
+ <email>deepal AT wso2.com</email>
+ <organization>WSO2</organization>
+ <url>http://www.apache.org/~deepal</url>
+ </developer>
+ <developer>
+ <name>Ajith Ranabahu</name>
+ <id>ajith</id>
+ <email>ajith AT wso2.com</email>
+ <organization>WSO2</organization>
+ <url>http://www.apache.org/~ajith</url>
+ </developer>
+ <developer>
+ <name>Venkat Reddy</name>
+ <id>venkat</id>
+ <email>vreddyp AT gmail.com</email>
+ <organization>Computer Associates</organization>
+ </developer>
+ <developer>
+ <name>Ashutosh Shahi</name>
+ <id>ashu</id>
+ <email>Ashutosh.Shahi AT ca.com</email>
+ <organization>Computer Associates</organization>
+ </developer>
+ <developer>
+ <name>Jayachandra Sekhara Rao Sunkara</name>
+ <id>jaya</id>
+ <email>jayachandra AT gmail.com</email>
+ <organization>Computer Associates</organization>
+ </developer>
+ <developer>
+ <name>Thilina Gunarathne</name>
+ <id>thilina</id>
+ <email>thilina AT opensource.lk</email>
+ <organization>Lanka Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Ruchith Fernando</name>
+ <id>ruchith</id>
+ <email>ruchith AT wso2.com</email>
+ <organization>WSO2</organization>
+ </developer>
+ <developer>
+ <name>Saminda Abeyruwan</name>
+ <id>saminda</id>
+ <email>saminda AT wso2.com</email>
+ <organization>WSO2</organization>
+ </developer>
+ <developer>
+ <name>Chamil Thanthrimudalige</name>
+ <id>chamil</id>
+ <email>chamil AT wso2.com</email>
+ <organization>WSO2</organization>
+ </developer>
+
+ </developers>
+
+ <dependencies>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.0</version>
+ <url>http://xmlunit.sourceforge.net/</url>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <nagEmailAddress></nagEmailAddress>
+ <sourceDirectory>src</sourceDirectory>
+ <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+ <unitTest>
+ <excludes>
+ </excludes>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/test-resources</directory>
+ </resource>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <reports>
+ <report>maven-junit-report-plugin</report>
+ </reports>
+</project>