You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/07/06 00:06:49 UTC
svn commit: r1689294 - in /webservices/woden/trunk/java: ./ ant-test/
src/site/ w3c-tests/
Author: veithen
Date: Sun Jul 5 22:06:48 2015
New Revision: 1689294
URL: http://svn.apache.org/r1689294
Log:
Integrate the W3C test reports into the Maven site.
Added:
webservices/woden/trunk/java/w3c-tests/
- copied from r1689272, webservices/woden/trunk/java/ant-test/
webservices/woden/trunk/java/w3c-tests/Interface.wsdl
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/Interface.wsdl
webservices/woden/trunk/java/w3c-tests/XSDImport.wsdl
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/XSDImport.wsdl
webservices/woden/trunk/java/w3c-tests/XSDImport2.wsdl
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/XSDImport2.wsdl
webservices/woden/trunk/java/w3c-tests/build.xml
- copied, changed from r1689291, webservices/woden/trunk/java/ant-test/build.xml
webservices/woden/trunk/java/w3c-tests/documents-bad-report.xml
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/documents-bad-report.xml
webservices/woden/trunk/java/w3c-tests/documents-good-report.xml
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/documents-good-report.xml
webservices/woden/trunk/java/w3c-tests/identify-test-case-roots.xsl
- copied unchanged from r1689291, webservices/woden/trunk/java/ant-test/identify-test-case-roots.xsl
webservices/woden/trunk/java/w3c-tests/name.xsd
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/name.xsd
webservices/woden/trunk/java/w3c-tests/pom.xml
- copied, changed from r1689268, webservices/woden/trunk/java/ant-test/pom.xml
webservices/woden/trunk/java/w3c-tests/test-suite-results.zip
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/test-suite-results.zip
webservices/woden/trunk/java/w3c-tests/test.wsdl
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/test.wsdl
webservices/woden/trunk/java/w3c-tests/validation-results-without-ids.xml
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/validation-results-without-ids.xml
webservices/woden/trunk/java/w3c-tests/validation-results.xml
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/validation-results.xml
webservices/woden/trunk/java/w3c-tests/wsdl20-extensions.xsd
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/wsdl20-extensions.xsd
webservices/woden/trunk/java/w3c-tests/wsdl20-http.xsd
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/wsdl20-http.xsd
webservices/woden/trunk/java/w3c-tests/wsdl20-instance.xsd
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/wsdl20-instance.xsd
webservices/woden/trunk/java/w3c-tests/wsdl20-rpc.xsd
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/wsdl20-rpc.xsd
webservices/woden/trunk/java/w3c-tests/wsdl20-soap.xsd
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/wsdl20-soap.xsd
webservices/woden/trunk/java/w3c-tests/wsdl20.xsd
- copied unchanged from r1689268, webservices/woden/trunk/java/ant-test/wsdl20.xsd
Removed:
webservices/woden/trunk/java/ant-test/
Modified:
webservices/woden/trunk/java/pom.xml
webservices/woden/trunk/java/src/site/site.xml
Modified: webservices/woden/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/pom.xml?rev=1689294&r1=1689293&r2=1689294&view=diff
==============================================================================
--- webservices/woden/trunk/java/pom.xml (original)
+++ webservices/woden/trunk/java/pom.xml Sun Jul 5 22:06:48 2015
@@ -133,6 +133,7 @@
<module>woden-converter-maven-plugin</module>
<module>woden-ant</module>
<module>woden-dist</module>
+ <module>w3c-tests</module>
</modules>
<build>
<pluginManagement>
Modified: webservices/woden/trunk/java/src/site/site.xml
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/src/site/site.xml?rev=1689294&r1=1689293&r2=1689294&view=diff
==============================================================================
--- webservices/woden/trunk/java/src/site/site.xml (original)
+++ webservices/woden/trunk/java/src/site/site.xml Sun Jul 5 22:06:48 2015
@@ -43,5 +43,9 @@
<item name="Development Processes" href="dev/devprocess.html"/>
<item name="Milestone Plan" href="dev/1.0/milestoneplan.html"/>
</menu>
+ <menu name="W3C Test Reports">
+ <item name="Component Model Test Results" href="w3c-tests/Interchange.html"/>
+ <item name="Validation Results" href="w3c-tests/Validation.html"/>
+ </menu>
</body>
</project>
Copied: webservices/woden/trunk/java/w3c-tests/build.xml (from r1689291, webservices/woden/trunk/java/ant-test/build.xml)
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/w3c-tests/build.xml?p2=webservices/woden/trunk/java/w3c-tests/build.xml&p1=webservices/woden/trunk/java/ant-test/build.xml&r1=1689291&r2=1689294&rev=1689294&view=diff
==============================================================================
--- webservices/woden/trunk/java/ant-test/build.xml (original)
+++ webservices/woden/trunk/java/w3c-tests/build.xml Sun Jul 5 22:06:48 2015
@@ -82,7 +82,7 @@
<target name="main" depends="getW3cWsdl20" description="---> Validate test suite, generates interchange format, and validates results">
<taskdef name="validatewsdl20" classname="org.apache.woden.ant.ValidateWSDL20">
<classpath>
- <pathelement path="${maven.test.classpath}" />
+ <pathelement path="${maven.runtime.classpath}" />
</classpath>
</taskdef>
@@ -182,6 +182,14 @@
<ant dir="${test-suite.dir}/results" target="evaluate-Woden" />
<ant dir="${test-suite.dir}/results" target="Interchange.html" />
<ant dir="${test-suite.dir}/results" target="Validation.html" />
+ <mkdir dir="${build.dir}/site" />
+ <copy todir="${build.dir}/site">
+ <fileset dir="${test-suite.dir}/results">
+ <include name="Interchange.html" />
+ <include name="Validation.html" />
+ <include name="*.gif" />
+ </fileset>
+ </copy>
</target>
</project>
Copied: webservices/woden/trunk/java/w3c-tests/pom.xml (from r1689268, webservices/woden/trunk/java/ant-test/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/w3c-tests/pom.xml?p2=webservices/woden/trunk/java/w3c-tests/pom.xml&p1=webservices/woden/trunk/java/ant-test/pom.xml&r1=1689268&r2=1689294&rev=1689294&view=diff
==============================================================================
--- webservices/woden/trunk/java/ant-test/pom.xml (original)
+++ webservices/woden/trunk/java/w3c-tests/pom.xml Sun Jul 5 22:06:48 2015
@@ -24,7 +24,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>ant-test</artifactId>
+ <artifactId>w3c-tests</artifactId>
<name>Woden - W3C tests</name>
<dependencies>
@@ -32,7 +32,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>woden-ant</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -43,11 +42,11 @@
<version>1.8</version>
<executions>
<execution>
- <phase>test</phase>
+ <phase>site</phase>
<configuration>
<target>
<property name="build.dir" value="${project.build.directory}" />
- <property name="maven.test.classpath" refid="maven.test.classpath" />
+ <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
<ant antfile="${basedir}/build.xml">
<target name="main" />
<target name="createW3CReport" />
@@ -72,6 +71,28 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- http://veithen.github.io/2013/05/04/maven-patterns-skipping-site-generation.html -->
+ <id>default-site</id>
+ <phase>site</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>