You are viewing a plain text version of this content. The canonical link for it is here.
Posted to woden-dev@ws.apache.org by hu...@apache.org on 2008/07/24 23:23:17 UTC
svn commit: r679550 [2/2] - in /webservices/woden/branches/woden211/trunk:
./ java/ java/resources/ java/src/javax/ java/src/org/apache/woden/
java/src/org/apache/woden/ant/ java/src/org/apache/woden/internal/
java/src/org/apache/woden/internal/resolve...
Copied: webservices/woden/branches/woden211/trunk/build.properties (from r671493, webservices/woden/trunk/java/build.properties)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/build.properties?p2=webservices/woden/branches/woden211/trunk/build.properties&p1=webservices/woden/trunk/java/build.properties&r1=671493&r2=679550&rev=679550&view=diff
==============================================================================
--- webservices/woden/trunk/java/build.properties (original)
+++ webservices/woden/branches/woden211/trunk/build.properties Thu Jul 24 14:22:58 2008
@@ -19,14 +19,16 @@
XmlSchemaURL = http://archive.apache.org/dist/ws/commons/XmlSchema/1_4_2/XmlSchema-1.4.2.jar
XmlSchemaFile = XmlSchema-1.4.2.jar
XercesURL = http://archive.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.8.1.zip
+#XercesURL = http://www.uniontransit.com/apache/xml/xerces-j/Xerces-J-bin.2.8.1.zip
XercesFile = Xerces-J-bin.2.8.1.zip
XercesJar1 = xercesImpl.jar
XercesJar2 = xml-apis.jar
-AntURL = http://www.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.zip
+AntURL = http://archive.apache.org/dist/ant/binaries/apache-ant-1.7.0-bin.zip
AntFile = apache-ant-1.7.0-bin.zip
AntJar = ant.jar
WSDL4JURL = http://surfnet.dl.sourceforge.net/sourceforge/wsdl4j/wsdl4j-bin-1.6.2.zip
WSDL4JFile = wsdl4j-bin-1.6.2.zip
+WSDL4JJar = wsdl4j.jar
AxiomApiURL = http://repo1.maven.org/maven2/org/apache/ws/commons/axiom/axiom-api/1.2.7/axiom-api-1.2.7.jar
AxiomApiFile = axiom-api-1.2.7.jar
AxiomImplURL = http://repo1.maven.org/maven2/org/apache/ws/commons/axiom/axiom-impl/1.2.7/axiom-impl-1.2.7.jar
@@ -55,12 +57,15 @@
! Woden library names
api.name = ${namePrefix}-api-${versionPostfix}
+commons.name = ${namePrefix}-commons-${versionPostfix}
+commons.impl.name = ${namePrefix}-impl-commons-${versionPostfix}
dom.name = ${namePrefix}-dom-${versionPostfix}
dom.impl.name = ${namePrefix}-impl-dom-${versionPostfix}
om.name = ${namePrefix}-om-${versionPostfix}
om.impl.name = ${namePrefix}-impl-om-${versionPostfix}
ant.name = ${namePrefix}-ant-${versionPostfix}
-test.name = ${namePrefix}-test-${versionPostfix}
+tests.name = ${namePrefix}-tests-${versionPostfix}
+tool.name = ${namePrefix}-tool-${versionPostfix}
src.name = ${namePrefix}-src-${versionPostfix}
! Woden Archive name
@@ -68,9 +73,9 @@
archive.dom.name = ${archive.name}-${dom.name}
archive.om.name = ${archive.name}-${om.name}
archive.src.name = ${archive.name}-${src.name}
-archive.dom.rootprefix = ${dom.name}
-archive.om.rootprefix = ${om.name}
-archive.src.rootprefix = ${src.name}
+archive.dom.rootprefix = ${dom.name}
+archive.om.rootprefix = ${om.name}
+archive.src.rootprefix = ${src.name}
! Woden URI Resolver trace to console during test execution (valid values: on, off)
Copied: webservices/woden/branches/woden211/trunk/build.xml (from r671493, webservices/woden/trunk/java/build.xml)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/build.xml?p2=webservices/woden/branches/woden211/trunk/build.xml&p1=webservices/woden/trunk/java/build.xml&r1=671493&r2=679550&rev=679550&view=diff
==============================================================================
--- webservices/woden/trunk/java/build.xml (original)
+++ webservices/woden/branches/woden211/trunk/build.xml Thu Jul 24 14:22:58 2008
@@ -34,13 +34,46 @@
<property name="build.classes" value="${build.output}/classes" />
<property name="build.classes.qname" value="${build.output}/classes/qname" />
<property name="build.classes.api" value="${build.output}/classes/api" />
+ <property name="build.test.classes.api" value="${build.output}/test-classes/api" />
<property name="build.classes.impl" value="${build.output}/classes/impl" />
+ <property name="build.test.classes.impl" value="${build.output}/test-classes/impl" />
<property name="build.classes.dom" value="${build.output}/classes/dom" />
+ <property name="build.test.classes.dom" value="${build.output}/test-classes/dom" />
<property name="build.classes.om" value="${build.output}/classes/om" />
+ <property name="build.test.classes.om" value="${build.output}/test-classes/om" />
<property name="build.classes.ant" value="${build.output}/classes/ant" />
+ <property name="build.test.classes.ant" value="${build.output}/test-classes/ant" />
+ <property name="build.test.classes.tests" value="${build.output}/test-classes/tests" />
+ <property name="build.classes.tool" value="${build.output}/classes/tool" />
<property name="build.classes.eclipse" value="${build.output}/classes/eclipse" />
- <property name="build.classes.test" value="${build.output}/classes/test" />
<property name="src.home" value="${build.home}/src" />
+ <property name="api.dir" value="${build.home}/woden-api"/>
+ <property name="api.java.dir" value="${api.dir}/src/main/java"/>
+ <property name="api.resources.dir" value="${api.dir}/src/main/resources"/>
+ <property name="api.test.java.dir" value="${api.dir}/src/test/java"/>
+ <property name="api.test.resources.dir" value="${api.dir}/src/test/resources"/>
+ <property name="impl.dir" value="${build.home}/woden-commons"/>
+ <property name="impl.java.dir" value="${impl.dir}/src/main/java"/>
+ <property name="impl.resources.dir" value="${impl.dir}/src/main/resources"/>
+ <property name="impl.test.java.dir" value="${impl.dir}/src/test/java"/>
+ <property name="impl.test.resources.dir" value="${impl.dir}/src/test/resources"/>
+ <property name="dom.dir" value="${build.home}/woden-dom"/>
+ <property name="dom.java.dir" value="${dom.dir}/src/main/java"/>
+ <property name="dom.resources.dir" value="${dom.dir}/src/main/resources"/>
+ <property name="dom.test.java.dir" value="${dom.dir}/src/test/java"/>
+ <property name="om.dir" value="${build.home}/woden-om"/>
+ <property name="om.java.dir" value="${om.dir}/src/main/java"/>
+ <property name="om.resources.dir" value="${om.dir}/src/main/resources"/>
+ <property name="om.test.java.dir" value="${om.dir}/src/test/java"/>
+ <property name="tests.dir" value="${build.home}/woden-tests"/>
+ <property name="tests.test.java.dir" value="${tests.dir}/src/test/java"/>
+ <property name="tests.test.resources.dir" value="${tests.dir}/src/test/resources"/>
+ <property name="ant.dir" value="${build.home}/woden-ant"/>
+ <property name="ant.java.dir" value="${ant.dir}/src/main/java"/>
+ <property name="ant.resources.dir" value="${ant.dir}/src/main/resources"/>
+ <property name="ant.test.java.dir" value="${ant.dir}/src/test/java"/>
+ <property name="tool.dir" value="${build.home}/woden-tool"/>
+ <property name="tool.java.dir" value="${tool.dir}/src/main/java"/>
<property name="schema.package.location" value="${src.home}/org/apache/woden/resolver" />
<property name="schema.catalog.home" value="resources" />
<property name="schema.catalog.location" value="${build.home}/${schema.catalog.home}" />
@@ -62,7 +95,7 @@
<target name="buildAndTestAll" depends="buildAll, runAllJUnitTests" />
- <target name="buildAll" depends="clean, init, buildImplAndAPI, buildANT, buildEclipsePlugin, buildJavadoc, buildTests" />
+ <target name="buildAll" depends="clean, init, buildImplAndAPI, buildANT, buildTool, buildJavadoc, buildTests" />
<target name="distBuild" depends="buildAndTestAll, createArchives, createChecksums" />
@@ -198,7 +231,7 @@
<!-- Get the latest version of Xerces and unzip it -->
<target name="getXerces" unless="Xerces.exists">
- <get src="${XercesURL}" dest="${downloads}/${XercesFile}" />
+ <get src="${XercesURL}" dest="${downloads}/${XercesFile}"/>
<unzip src="${downloads}/${XercesFile}" dest="${libraryDir}">
<patternset>
@@ -291,34 +324,25 @@
<!-- This task builds the Woden API jar file. -->
<target name="buildQName" depends="init">
<mkdir dir="${build.classes.qname}" />
- <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${src.home}" destdir="${build.classes.qname}">
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${api.java.dir}" destdir="${build.classes.qname}">
<include name="**/javax/xml/namespace/*.java" />
</javac>
</target>
<!-- This task builds the Woden API jar file. -->
<target name="buildAPI" depends="init, buildQName">
<mkdir dir="${build.classes.api}" />
- <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${src.home}" destdir="${build.classes.api}">
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${api.java.dir}" destdir="${build.classes.api}">
<classpath>
<pathelement location="${libraryDir}/${XmlSchemaFile}" />
<pathelement location="${build.classes.qname}"/>
</classpath>
- <include name="**/*.java" />
- <exclude name="**/internal/**/*.java" />
- <exclude name="**/tool/converter/*.java" />
- <exclude name="**/org/apache/woden/ant/**/*.java" />
- <exclude name="**/javax/xml/namespace/*.java" />
+ <exclude name="**/javax/xml/namespace/*.java" />
</javac>
<!-- Copy all non Java files. -->
<copy todir="${build.classes.api}">
- <fileset dir="${src.home}">
+ <fileset dir="${api.resources.dir}">
<include name="**/*" />
- <exclude name="**/*.java" />
- <exclude name="**/internal/**" />
- <exclude name="**/tool/**" />
- <exclude name="**/org/apache/woden/ant/**" />
- <exclude name="**/javax/**" />
</fileset>
</copy>
@@ -338,61 +362,38 @@
<!-- This task compiles all of the Woden implementation classes -->
<target name="buildImpl" depends="init,buildAPI">
<mkdir dir="${build.classes.impl}" />
- <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${src.home}" destdir="${build.classes.impl}">
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${impl.java.dir}" destdir="${build.classes.impl}">
<classpath>
<fileset dir="${libraryDir}">
<include name="**/*.jar" />
</fileset>
<pathelement location="${build.output}/jar/${api.name}.jar" />
</classpath>
- <include name="**/internal/**/*.java" />
- <include name="**/javax/xml/namespace/*.java" />
- <include name="**/tool/converter/*.java" />
</javac>
+ <!-- Copy all non Java files. -->
+ <copy todir="${build.classes.impl}">
+ <fileset dir="${impl.resources.dir}">
+ <include name="**/*" />
+ </fileset>
+ </copy>
+ <jar destfile="${build.output.jar}/${commons.impl.name}.jar" basedir="${build.classes.impl}" />
</target>
<!-- This task builds the Woden DOM implementation jar file. -->
- <target name="buildDOM" depends="init, buildAPI">
+ <target name="buildDOM" depends="init, buildAPI, buildImpl">
<mkdir dir="${build.classes.dom}" />
<!-- Compile all common and DOM-specific Java files. -->
- <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${src.home}" destdir="${build.classes.dom}">
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${dom.java.dir}" destdir="${build.classes.dom}">
<classpath>
<fileset dir="${libraryDir}">
<include name="**/*.jar" />
</fileset>
<pathelement location="${build.output}/jar/${api.name}.jar" />
+ <pathelement location="${build.output}/jar/${commons.impl.name}.jar" />
</classpath>
- <include name="**/internal/**/*.java" />
- <include name="**/javax/xml/namespace/*.java" />
- <include name="**/tool/converter/*.java" />
- <exclude name="**/internal/OM**.java" />
- <exclude name="**/internal/resolver/OM**.java" />
- <exclude name="**/internal/util/om/**" />
- <exclude name="**/xpointer/OM**.java" />
</javac>
- <!-- Copy all common and DOM-specific non-Java files. -->
- <copy todir="${build.classes.dom}">
- <fileset dir="${src.home}">
- <include name="**/internal/**/*" />
- <include name="**/javax/xml/namespace/**/*" />
- <include name="**/tool/converter/*" />
- <exclude name="${schema.catalog.home}/*" />
- <exclude name="**/internal/OM*" />
- <exclude name="**/internal/resolver/OM*" />
- <exclude name="**/internal/util/om/**" />
- <exclude name="**/*.java" />
- </fileset>
- </copy>
-
- <!-- copy the standard schema resolver catalog -->
- <copy todir="${build.classes.dom}/META-INF">
- <fileset dir="${schema.catalog.location}">
- <include name="schema.catalog" />
- </fileset>
- </copy>
-
<!-- Copy the LICENSE and NOTICE files. -->
<mkdir dir="${build.classes.dom}/META-INF" />
<copy todir="${build.classes.dom}/META-INF">
@@ -407,46 +408,20 @@
</target>
<!-- This task builds the Woden OM implementation jar file. -->
- <target name="buildOM" depends="init, buildAPI">
+ <target name="buildOM" depends="init, buildAPI, buildImpl">
<mkdir dir="${build.classes.om}" />
<!-- Compile all common and OM-specific Java files. -->
- <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${src.home}" destdir="${build.classes.om}">
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${om.java.dir}" destdir="${build.classes.om}">
<classpath>
<fileset dir="${libraryDir}">
<include name="**/*.jar" />
</fileset>
<pathelement location="${build.output}/jar/${api.name}.jar" />
+ <pathelement location="${build.output}/jar/${commons.impl.name}.jar" />
</classpath>
- <include name="**/internal/**/*.java" />
- <include name="**/javax/xml/namespace/*.java" />
- <include name="**/tool/converter/*.java" />
- <exclude name="**/internal/DOM**.java" />
- <exclude name="**/internal/resolver/DOM**.java" />
- <exclude name="**/internal/util/dom/**" />
- <exclude name="**/xpointer/DOM**.java" />
</javac>
- <!-- Copy all common and OM-specific non-Java files. -->
- <copy todir="${build.classes.om}">
- <fileset dir="${src.home}">
- <include name="**/internal/**/*" />
- <include name="**/javax/xml/namespace/**/*" />
- <include name="**/tool/converter/*" />
- <exclude name="${schema.catalog.home}/*" />
- <exclude name="**/internal/DOM*" />
- <exclude name="**/internal/resolver/DOM*" />
- <exclude name="**/internal/util/dom/**" />
- <exclude name="**/*.java" />
- </fileset>
- </copy>
-
- <!-- copy the standard schema resolver catalog -->
- <copy todir="${build.classes.om}/META-INF">
- <fileset dir="${schema.catalog.location}">
- <include name="schema.catalog" />
- </fileset>
- </copy>
<!-- Copy the LICENSE and NOTICE files. -->
<mkdir dir="${build.classes.om}/META-INF" />
@@ -464,7 +439,7 @@
<!-- This task builds the Woden ANT jar file. -->
<target name="buildANT" depends="init, buildAPI">
<mkdir dir="${build.classes.ant}" />
- <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${src.home}" destdir="${build.classes.ant}">
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${ant.java.dir}" destdir="${build.classes.ant}">
<classpath>
<pathelement location="${libraryDir}/${XmlSchemaFile}" />
<pathelement location="${libraryDir}/${AxiomImplFile}" />
@@ -476,13 +451,11 @@
<pathelement location="${libraryDir}/${XercesJar2}" />
<pathelement location="${build.output}/jar/${api.name}.jar" />
</classpath>
- <include name="org/apache/woden/ant/**/*.java" />
</javac>
+
<!-- Copy all non Java files. -->
<copy todir="${build.classes.ant}">
- <fileset dir="${src.home}">
- <include name="org.apache.woden.ant/**/*" />
- </fileset>
+ <fileset dir="${ant.resources.dir}"/>
</copy>
<!-- Copy the LICENSE and NOTICE files. -->
@@ -498,33 +471,74 @@
<jar destfile="${build.output.jar}/${ant.name}.jar" basedir="${build.classes.ant}" />
</target>
- <!-- This task builds a Woden Eclipse Plugin.
- The plugin contains the API and implementation. -->
- <target name="buildEclipsePlugin" depends="init">
- <mkdir dir="${build.classes.eclipse}" />
- <!-- Compile all API and Implementation Class files. -->
- <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${src.home}" destdir="${build.classes.om}">
+ <!-- This task builds the Woden tests jar file. -->
+ <target name="buildTests" depends="init, informJunit, buildImplAndAPI, buildANT" if="junitAvailable">
+ <mkdir dir="${build.test.classes.api}" />
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${api.test.java.dir}" destdir="${build.test.classes.api}">
<classpath>
- <fileset dir="${libraryDir}">
- <include name="**/*.jar" />
- </fileset>
+ <pathelement location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement location="${libraryDir}/${AxiomImplFile}" />
+ <pathelement location="${libraryDir}/${AxiomApiFile}" />
+ <pathelement location="${libraryDir}/${CommonsLoggingFile}" />
+ <pathelement location="${libraryDir}/${StaxFile}" />
+ <pathelement location="${libraryDir}/${WstxFile}" />
+ <pathelement location="${libraryDir}/${XercesJar1}" />
+ <pathelement location="${libraryDir}/${XercesJar2}" />
+ <pathelement location="${build.output.jar}/${api.name}.jar" />
</classpath>
</javac>
- <copy todir="${build.classes.eclipse}">
- <fileset dir="${eclipseplugin}" />
+ <!-- Copy all non Java files. -->
+ <copy todir="${build.test.classes.api}">
+ <fileset dir="${api.test.resources.dir}"/>
</copy>
- <replace file="${build.classes.eclipse}/${manifestfile}" token="*VERSION_NUMBER*" value="${version}" />
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.test.classes.api}/META-INF" />
+ <copy todir="${build.test.classes.api}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
- <jar destfile="${build.output.jar}/org.apache.woden_${version}.jar" basedir="${build.classes.eclipse}" manifest="${build.classes.eclipse}/${manifestfile}" />
- </target>
+ <jar destfile="${build.output.jar}/${api.name}-tests.jar" basedir="${build.test.classes.api}" />
- <!-- This task builds the Woden tests jar file. -->
- <target name="buildTests" depends="init, informJunit, buildImplAndAPI, buildANT" if="junitAvailable">
- <mkdir dir="${build.classes.test}" />
- <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${testsrc.home}" destdir="${build.classes.test}">
+ <mkdir dir="${build.test.classes.impl}" />
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${impl.test.java.dir}" destdir="${build.test.classes.impl}">
+ <classpath>
+ <pathelement location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement location="${libraryDir}/${AxiomImplFile}" />
+ <pathelement location="${libraryDir}/${AxiomApiFile}" />
+ <pathelement location="${libraryDir}/${CommonsLoggingFile}" />
+ <pathelement location="${libraryDir}/${StaxFile}" />
+ <pathelement location="${libraryDir}/${WstxFile}" />
+ <pathelement location="${libraryDir}/${XercesJar1}" />
+ <pathelement location="${libraryDir}/${XercesJar2}" />
+ <pathelement location="${build.output.jar}/${api.name}.jar" />
+ <pathelement location="${build.output.jar}/${commons.impl.name}.jar" />
+ </classpath>
+ </javac>
+
+ <!-- Copy all non Java files. -->
+ <copy todir="${build.test.classes.impl}">
+ <fileset dir="${impl.test.resources.dir}"/>
+ </copy>
+
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.test.classes.impl}/META-INF" />
+ <copy todir="${build.test.classes.impl}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
+
+ <jar destfile="${build.output.jar}/${commons.impl.name}-tests.jar" basedir="${build.test.classes.impl}" />
+
+ <mkdir dir="${build.test.classes.dom}" />
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${dom.test.java.dir}" destdir="${build.test.classes.dom}">
<classpath>
<pathelement location="${libraryDir}/${XmlSchemaFile}" />
<pathelement location="${libraryDir}/${AxiomImplFile}" />
@@ -534,31 +548,135 @@
<pathelement location="${libraryDir}/${WstxFile}" />
<pathelement location="${libraryDir}/${XercesJar1}" />
<pathelement location="${libraryDir}/${XercesJar2}" />
- <pathelement location="${build.output.jar}/${ant.name}.jar" />
<pathelement location="${build.output.jar}/${api.name}.jar" />
+ <pathelement location="${build.output.jar}/${commons.impl.name}.jar" />
<pathelement location="${build.output.jar}/${dom.impl.name}.jar" />
+ <pathelement location="${build.output.jar}/${commons.impl.name}-tests.jar" />
+ </classpath>
+ </javac>
+
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.test.classes.dom}/META-INF" />
+ <copy todir="${build.test.classes.dom}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
+
+ <jar destfile="${build.output.jar}/${dom.impl.name}-tests.jar" basedir="${build.test.classes.dom}" />
+
+ <mkdir dir="${build.test.classes.om}" />
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${om.test.java.dir}" destdir="${build.test.classes.om}">
+ <classpath>
+ <pathelement location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement location="${libraryDir}/${AxiomImplFile}" />
+ <pathelement location="${libraryDir}/${AxiomApiFile}" />
+ <pathelement location="${libraryDir}/${CommonsLoggingFile}" />
+ <pathelement location="${libraryDir}/${StaxFile}" />
+ <pathelement location="${libraryDir}/${WstxFile}" />
+ <pathelement location="${libraryDir}/${XercesJar1}" />
+ <pathelement location="${libraryDir}/${XercesJar2}" />
+ <pathelement location="${build.output.jar}/${api.name}.jar" />
+ <pathelement location="${build.output.jar}/${commons.impl.name}.jar" />
<pathelement location="${build.output.jar}/${om.impl.name}.jar" />
+ <pathelement location="${build.output.jar}/${commons.impl.name}-tests.jar" />
+ </classpath>
+ </javac>
+
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.test.classes.om}/META-INF" />
+ <copy todir="${build.test.classes.om}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ </fileset>
+ </copy>
+
+ <jar destfile="${build.output.jar}/${om.impl.name}-tests.jar" basedir="${build.test.classes.om}" />
+
+ <mkdir dir="${build.test.classes.tests}" />
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${tests.test.java.dir}" destdir="${build.test.classes.tests}">
+ <classpath>
+ <pathelement location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement location="${libraryDir}/${AxiomImplFile}" />
+ <pathelement location="${libraryDir}/${AxiomApiFile}" />
+ <pathelement location="${libraryDir}/${CommonsLoggingFile}" />
+ <pathelement location="${libraryDir}/${StaxFile}" />
+ <pathelement location="${libraryDir}/${WstxFile}" />
+ <pathelement location="${libraryDir}/${XercesJar1}" />
+ <pathelement location="${libraryDir}/${XercesJar2}" />
+ <pathelement location="${build.output.jar}/${api.name}.jar" />
+ <pathelement location="${build.output.jar}/${commons.impl.name}.jar" />
+ <pathelement location="${build.output.jar}/${commons.impl.name}-tests.jar" />
</classpath>
</javac>
<!-- Copy all non Java files. -->
- <copy todir="${build.classes.test}">
- <fileset dir="${testsrc.home}">
- <include name="**/*" />
- <exclude name="**/*.java" />
+ <copy todir="${build.test.classes.tests}">
+ <fileset dir="${tests.test.resources.dir}"/>
+ </copy>
+
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.test.classes.tests}/META-INF" />
+ <copy todir="${build.test.classes.tests}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
</fileset>
</copy>
+ <jar destfile="${build.output.jar}/${tests.name}-tests.jar" basedir="${build.test.classes.tests}" />
+
+ <mkdir dir="${build.test.classes.ant}" />
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${ant.test.java.dir}" destdir="${build.test.classes.ant}">
+ <classpath>
+ <pathelement location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement location="${libraryDir}/${AxiomImplFile}" />
+ <pathelement location="${libraryDir}/${AxiomApiFile}" />
+ <pathelement location="${libraryDir}/${CommonsLoggingFile}" />
+ <pathelement location="${libraryDir}/${StaxFile}" />
+ <pathelement location="${libraryDir}/${WstxFile}" />
+ <pathelement location="${libraryDir}/${XercesJar1}" />
+ <pathelement location="${libraryDir}/${XercesJar2}" />
+ <pathelement location="${build.output.jar}/${api.name}.jar" />
+ <pathelement location="${build.output.jar}/${ant.name}.jar" />
+ </classpath>
+ </javac>
+
<!-- Copy the LICENSE and NOTICE files. -->
- <mkdir dir="${build.classes.test}/META-INF" />
- <copy todir="${build.classes.test}/META-INF">
+ <mkdir dir="${build.test.classes.ant}/META-INF" />
+ <copy todir="${build.test.classes.ant}/META-INF">
<fileset dir="${build.home}">
<include name="LICENSE" />
<include name="NOTICE" />
</fileset>
</copy>
- <jar destfile="${build.output.jar}/${test.name}.jar" basedir="${build.classes.test}" />
+ <jar destfile="${build.output.jar}/${ant.name}-tests.jar" basedir="${build.test.classes.ant}" />
+
+ </target>
+
+ <!-- This task builds the Woden Tool jar file. -->
+ <target name="buildTool" depends="init, buildAPI">
+ <mkdir dir="${build.classes.tool}" />
+ <javac debug="true" debuglevel="vars,lines,source" sourcepath="" srcdir="${tool.java.dir}" destdir="${build.classes.tool}">
+ <classpath>
+ <pathelement location="${libraryDir}/${WSDL4JJar}" />
+ </classpath>
+ </javac>
+
+ <!-- Copy the LICENSE and NOTICE files. -->
+ <mkdir dir="${build.classes.tool}/META-INF" />
+ <copy todir="${build.classes.tool}/META-INF">
+ <fileset dir="${build.home}">
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="README" />
+ </fileset>
+ </copy>
+
+ <jar destfile="${build.output.jar}/${tool.name}.jar" basedir="${build.classes.tool}" />
</target>
<!-- This task builds the Woden Javadoc. -->
@@ -569,7 +687,27 @@
<include name="**/*.jar" />
</fileset>
</classpath>
- <fileset dir="${src.home}">
+ <fileset dir="${api.java.dir}">
+ <include name="**/*.java" />
+ <exclude name="**/internal/**/*.java" />
+ </fileset>
+ <fileset dir="${impl.java.dir}">
+ <include name="**/*.java" />
+ <exclude name="**/internal/**/*.java" />
+ </fileset>
+ <fileset dir="${dom.java.dir}">
+ <include name="**/*.java" />
+ <exclude name="**/internal/**/*.java" />
+ </fileset>
+ <fileset dir="${om.java.dir}">
+ <include name="**/*.java" />
+ <exclude name="**/internal/**/*.java" />
+ </fileset>
+ <fileset dir="${ant.java.dir}">
+ <include name="**/*.java" />
+ <exclude name="**/internal/**/*.java" />
+ </fileset>
+ <fileset dir="${tool.java.dir}">
<include name="**/*.java" />
<exclude name="**/internal/**/*.java" />
</fileset>
@@ -579,7 +717,7 @@
<!-- Targets for the JUnit tests -->
<target name="runAllJUnitTests"
- depends="allWodenJUnitTests, allAntJUnitTests, createTestReport"
+ depends="allAPIJUnitTests, allCommonsJUnitTests, allDOMJUnitTests, allOMJUnitTests, allTestsJUnitTests, allAntJUnitTests, createTestReport"
description="This runs all the JUnit tests on woden and creates reports for them."
/>
@@ -594,14 +732,16 @@
/>
<target name="initTests">
- <mkdir dir="${test.results}/xml" />
<mkdir dir="${test.results}" />
+ <mkdir dir="${test.results}/xml" />
+ <mkdir dir="${test.results}/xml/dom" />
+ <mkdir dir="${test.results}/xml/om" />
</target>
<target name="createTestReport">
<junitreport>
<fileset dir="${test.results}/xml">
- <include name="*.xml" />
+ <include name="**/*.xml" />
</fileset>
<report format="noframes" todir="${test.results}" />
</junitreport>
@@ -609,14 +749,12 @@
<!-- JUnit tests for both DOM and StAX/OM parsers
This is not meant to be run on its own. -->
- <target name="allWodenJUnitTests" depends="init, informJunit, buildTests, initTests" if="junitAvailable">
+ <target name="allAPIJUnitTests" depends="init, informJunit, buildTests, initTests" if="junitAvailable">
<junit showoutput="true" fork="yes">
<classpath>
- <pathelement location="${build.classes.api}" />
- <pathelement location="${build.classes.dom}" />
- <pathelement location="${build.classes.om}" />
- <pathelement location="${build.classes.ant}" />
- <pathelement location="${build.classes.test}" />
+ <pathelement location="${build.classes.api}" />
+ <pathelement location="${build.classes.qname}" />
+ <pathelement location="${build.test.classes.api}" />
<pathelement location="${libraryDir}/${XmlSchemaFile}" />
<pathelement location="${libraryDir}/${AxiomImplFile}" />
<pathelement location="${libraryDir}/${AxiomApiFile}" />
@@ -631,9 +769,41 @@
<sysproperty key="org.apache.woden.resolver.simpleresolver.catalog" value="${w3cTests.catalog}" />
<sysproperty key="org.apache.woden.resolver.simpleresolver.baseURIs" value="${w3cTests.catalog.baseloc}" />
- <test name="org.apache.woden.tests.AllWodenTests" haltonfailure="no" todir="${test.results}/xml">
- <formatter type="xml" />
- </test>
+ <batchtest haltonfailure="no" todir="${test.results}/xml">
+ <formatter type="xml" />
+ <fileset dir="${api.test.java.dir}"/>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="allCommonsJUnitTests" depends="init, informJunit, buildTests, initTests" if="junitAvailable">
+ <junit showoutput="true" fork="yes">
+ <classpath>
+ <pathelement location="${build.classes.api}" />
+ <pathelement location="${build.classes.qname}" />
+ <pathelement location="${build.classes.impl}" />
+ <pathelement location="${build.test.classes.api}" />
+ <pathelement location="${build.test.classes.impl}" />
+ <pathelement location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement location="${libraryDir}/${AxiomImplFile}" />
+ <pathelement location="${libraryDir}/${AxiomApiFile}" />
+ <pathelement location="${libraryDir}/${CommonsLoggingFile}" />
+ <pathelement location="${libraryDir}/${StaxFile}" />
+ <pathelement location="${libraryDir}/${WstxFile}" />
+ <pathelement location="${libraryDir}/${XercesJar1}" />
+ <pathelement location="${libraryDir}/${XercesJar2}" />
+ </classpath>
+
+ <sysproperty key="org.apache.woden.resolver.logging" value="${resolver.trace}" />
+ <sysproperty key="org.apache.woden.resolver.simpleresolver.catalog" value="${w3cTests.catalog}" />
+ <sysproperty key="org.apache.woden.resolver.simpleresolver.baseURIs" value="${w3cTests.catalog.baseloc}" />
+
+ <batchtest haltonfailure="no" todir="${test.results}/xml">
+ <formatter type="xml" />
+ <fileset dir="${impl.test.java.dir}">
+ <include name="**/*Test.java"/>
+ </fileset>
+ </batchtest>
</junit>
</target>
@@ -643,16 +813,17 @@
<junit showoutput="true" fork="yes">
<classpath>
<pathelement location="${build.classes.ant}" />
- <pathelement location="${build.classes.test}" />
+ <pathelement location="${build.test.classes.ant}" />
</classpath>
<sysproperty key="org.apache.woden.resolver.logging" value="${resolver.trace}" />
<sysproperty key="org.apache.woden.resolver.simpleresolver.catalog" value="${w3cTests.catalog}" />
<sysproperty key="org.apache.woden.resolver.simpleresolver.baseURIs" value="${w3cTests.catalog.baseloc}" />
- <test name="org.apache.woden.ant.ObjectIdTableTest" haltonfailure="no" todir="${test.results}/xml">
- <formatter type="xml" />
- </test>
+ <batchtest haltonfailure="no" todir="${test.results}/xml">
+ <fileset dir="${ant.test.java.dir}"/>
+ <formatter type="xml" />
+ </batchtest>
</junit>
</target>
@@ -661,21 +832,23 @@
<target name="allDOMJUnitTests" depends="init, informJunit, buildTests, initTests" if="junitAvailable">
<junit showoutput="true" fork="yes">
<classpath>
- <pathelement location="${build.classes.api}" />
- <pathelement location="${build.classes.dom}" />
- <pathelement location="${build.classes.test}" />
+ <pathelement location="${build.classes.api}" />
+ <pathelement location="${build.classes.impl}" />
+ <pathelement location="${build.classes.dom}" />
+ <pathelement location="${build.test.classes.impl}" />
+ <pathelement location="${build.test.classes.dom}" />
<pathelement location="${libraryDir}/${XmlSchemaFile}" />
<pathelement location="${libraryDir}/${XercesJar1}" />
<pathelement location="${libraryDir}/${XercesJar2}" />
</classpath>
<sysproperty key="org.apache.woden.resolver.logging" value="${resolver.trace}" />
- <sysproperty key="org.apache.woden.resolver.simpleresolver.catalog" value="${w3cTests.catalog}" />
<sysproperty key="org.apache.woden.resolver.simpleresolver.baseURIs" value="${w3cTests.catalog.baseloc}" />
- <test name="org.apache.woden.tests.AllWodenTestsDOM" haltonfailure="no" todir="${test.results}/xml">
+ <batchtest haltonfailure="no" todir="${test.results}/xml">
+ <fileset dir="${dom.test.java.dir}"/>
<formatter type="xml" />
- </test>
+ </batchtest>
</junit>
</target>
@@ -684,9 +857,12 @@
<target name="allOMJUnitTests" depends="init, informJunit, buildTests, initTests" if="junitAvailable">
<junit showoutput="true" fork="yes">
<classpath>
- <pathelement location="${build.classes.api}" />
- <pathelement location="${build.classes.om}" />
- <pathelement location="${build.classes.test}" />
+ <pathelement location="${build.classes.qname}" />
+ <pathelement location="${build.classes.api}" />
+ <pathelement location="${build.classes.impl}" />
+ <pathelement location="${build.classes.om}" />
+ <pathelement location="${build.test.classes.impl}" />
+ <pathelement location="${build.test.classes.om}" />
<pathelement location="${libraryDir}/${XmlSchemaFile}" />
<pathelement location="${libraryDir}/${AxiomApiFile}" />
<pathelement location="${libraryDir}/${AxiomImplFile}" />
@@ -696,12 +872,68 @@
</classpath>
<sysproperty key="org.apache.woden.resolver.logging" value="${resolver.trace}" />
- <sysproperty key="org.apache.woden.resolver.simpleresolver.catalog" value="${w3cTests.catalog}" />
<sysproperty key="org.apache.woden.resolver.simpleresolver.baseURIs" value="${w3cTests.catalog.baseloc}" />
- <test name="org.apache.woden.tests.AllWodenTestsOM" haltonfailure="no" todir="${test.results}/xml">
+ <batchtest haltonfailure="no" todir="${test.results}/xml">
+ <fileset dir="${om.test.java.dir}"/>
+ <formatter type="xml" />
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="allTestsJUnitTests" depends="init, informJunit, buildTests, initTests" if="junitAvailable">
+ <echo message="Running tests against DOM implementation"/>
+ <junit showoutput="true" fork="yes">
+ <classpath>
+ <pathelement location="${build.classes.api}" />
+ <pathelement location="${build.classes.impl}" />
+ <pathelement location="${build.classes.dom}" />
+ <pathelement location="${build.test.classes.impl}" />
+ <pathelement location="${build.test.classes.tests}" />
+ <pathelement location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement location="${libraryDir}/${XercesJar1}" />
+ <pathelement location="${libraryDir}/${XercesJar2}" />
+ </classpath>
+
+ <sysproperty key="org.apache.woden.resolver.logging" value="${resolver.trace}" />
+ <sysproperty key="org.apache.woden.resolver.simpleresolver.baseURIs" value="${w3cTests.catalog.baseloc}" />
+ <sysproperty key="org.apache.woden.WSDLFactory" value="org.apache.woden.internal.DOMWSDLFactory"/>
+ <batchtest haltonfailure="no" todir="${test.results}/xml/dom">
+ <fileset dir="${tests.test.java.dir}">
+ <include name="**/*Test.java"/>
+ </fileset>
+ <formatter type="xml" />
+ </batchtest>
+ </junit>
+
+ <echo message="Running tests against OM implementation"/>
+ <junit showoutput="true" fork="yes">
+ <classpath>
+ <pathelement location="${build.classes.qname}" />
+ <pathelement location="${build.classes.api}" />
+ <pathelement location="${build.classes.impl}" />
+ <pathelement location="${build.classes.om}" />
+ <pathelement location="${build.test.classes.impl}" />
+ <pathelement location="${build.test.classes.tests}" />
+ <pathelement location="${libraryDir}/${XmlSchemaFile}" />
+ <pathelement location="${libraryDir}/${AxiomApiFile}" />
+ <pathelement location="${libraryDir}/${AxiomImplFile}" />
+ <pathelement location="${libraryDir}/${CommonsLoggingFile}" />
+ <pathelement location="${libraryDir}/${StaxFile}" />
+ <pathelement location="${libraryDir}/${WstxFile}" />
+ <pathelement location="${libraryDir}/${XercesJar1}" />
+ <pathelement location="${libraryDir}/${XercesJar2}" />
+ </classpath>
+
+ <sysproperty key="org.apache.woden.resolver.logging" value="${resolver.trace}" />
+ <sysproperty key="org.apache.woden.resolver.simpleresolver.baseURIs" value="${w3cTests.catalog.baseloc}" />
+ <sysproperty key="org.apache.woden.WSDLFactory" value="org.apache.woden.internal.OMWSDLFactory"/>
+ <batchtest haltonfailure="no" todir="${test.results}/xml/om">
+ <fileset dir="${tests.test.java.dir}">
+ <include name="**/*Test.java"/>
+ </fileset>
<formatter type="xml" />
- </test>
+ </batchtest>
</junit>
</target>
@@ -718,6 +950,7 @@
<copy todir="${archiveDir.dom}/lib">
<fileset dir="${build.output}/jar/">
<include name="${api.name}.jar" />
+ <include name="${commons.impl.name}.jar" />
<include name="${dom.impl.name}.jar" />
</fileset>
</copy>
@@ -765,6 +998,7 @@
<copy todir="${archiveDir.om}/lib">
<fileset dir="${build.output}/jar/">
<include name="${api.name}.jar" />
+ <include name="${commons.impl.name}.jar" />
<include name="${om.impl.name}.jar" />
</fileset>
</copy>
@@ -839,10 +1073,27 @@
<!-- Builds a zip of the source code -->
<target name="createSrcZip" depends="init">
<zip destfile="${build.output.dist}/${archive.src.name}.zip">
- <zipfileset dir="${build.home}/src" prefix="${archive.src.rootprefix}/src" />
- <zipfileset dir="${build.home}/test" prefix="${archive.src.rootprefix}/test" />
- <zipfileset dir="${build.home}/ant-test" prefix="${archive.src.rootprefix}/ant-test" />
- <zipfileset dir="${build.home}/eclipseplugin" prefix="${archive.src.rootprefix}/eclipseplugin" />
+ <zipfileset dir="${build.home}/woden-api" prefix="${archive.src.rootprefix}/woden-api">
+ <exclude name="target/"/>
+ </zipfileset>
+ <zipfileset dir="${build.home}/woden-commons" prefix="${archive.src.rootprefix}/woden-commons">
+ <exclude name="target/"/>
+ </zipfileset>
+ <zipfileset dir="${build.home}/woden-dom" prefix="${archive.src.rootprefix}/woden-dom">
+ <exclude name="target/"/>
+ </zipfileset>
+ <zipfileset dir="${build.home}/woden-om" prefix="${archive.src.rootprefix}/woden-om">
+ <exclude name="target/"/>
+ </zipfileset>
+ <zipfileset dir="${build.home}/woden-ant" prefix="${archive.src.rootprefix}/woden-ant">
+ <exclude name="target/"/>
+ </zipfileset>
+ <zipfileset dir="${build.home}/woden-tests" prefix="${archive.src.rootprefix}/woden-tests">
+ <exclude name="target/"/>
+ </zipfileset>
+ <zipfileset dir="${build.home}/woden-tool" prefix="${archive.src.rootprefix}/woden-tool">
+ <exclude name="target/"/>
+ </zipfileset>
<zipfileset dir="${build.home}" prefix="${archive.src.rootprefix}">
<include name="LICENSE*" />
<include name="NOTICE" />
@@ -858,10 +1109,24 @@
<!-- Builds a tar.gz and tar.bz2 of the source code -->
<target name="createSrcTarGzBz2" depends="init">
<tar destfile="${build.output.dist}/${archive.src.name}.tar">
- <tarfileset dir="${build.home}/src" prefix="${archive.src.rootprefix}/src" />
- <tarfileset dir="${build.home}/test" prefix="${archive.src.rootprefix}/test" />
- <tarfileset dir="${build.home}/ant-test" prefix="${archive.src.rootprefix}/ant-test" />
- <tarfileset dir="${build.home}/eclipseplugin" prefix="${archive.src.rootprefix}/eclipseplugin" />
+ <tarfileset dir="${build.home}/woden-api" prefix="${archive.src.rootprefix}/woden-api">
+ <exclude name="target/"/>
+ </tarfileset>
+ <tarfileset dir="${build.home}/woden-commons" prefix="${archive.src.rootprefix}/woden-commons">
+ <exclude name="target/"/>
+ </tarfileset>
+ <tarfileset dir="${build.home}/woden-dom" prefix="${archive.src.rootprefix}/woden-dom">
+ <exclude name="target/"/>
+ </tarfileset>
+ <tarfileset dir="${build.home}/woden-om" prefix="${archive.src.rootprefix}/woden-om">
+ <exclude name="target/"/>
+ </tarfileset>
+ <tarfileset dir="${build.home}/woden-ant" prefix="${archive.src.rootprefix}/woden-ant">
+ <exclude name="target/"/>
+ </tarfileset>
+ <tarfileset dir="${build.home}/woden-tests" prefix="${archive.src.rootprefix}/woden-tests">
+ <exclude name="target/"/>
+ </tarfileset>
<tarfileset dir="${build.home}" prefix="${archive.src.rootprefix}">
<include name="LICENSE*" />
<include name="NOTICE" />
Copied: webservices/woden/branches/woden211/trunk/pom.xml (from r671493, webservices/woden/trunk/java/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/pom.xml?p2=webservices/woden/branches/woden211/trunk/pom.xml&p1=webservices/woden/trunk/java/pom.xml&r1=671493&r2=679550&rev=679550&view=diff
==============================================================================
--- webservices/woden/trunk/java/pom.xml (original)
+++ webservices/woden/branches/woden211/trunk/pom.xml Thu Jul 24 14:22:58 2008
@@ -188,9 +188,13 @@
</snapshotRepository>
</distributionManagement>
<modules>
+ <module>woden-api</module>
+ <module>woden-commons</module>
<module>woden-dom</module>
<module>woden-om</module>
- <module>woden-api</module>
+ <module>woden-tests</module>
+ <module>woden-ant</module>
+ <module>woden-tool</module>
</modules>
<properties>
<woden.osgi.version>1.0.0</woden.osgi.version>
Added: webservices/woden/branches/woden211/trunk/woden-ant/pom.xml
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/woden-ant/pom.xml?rev=679550&view=auto
==============================================================================
--- webservices/woden/branches/woden211/trunk/woden-ant/pom.xml (added)
+++ webservices/woden/branches/woden211/trunk/woden-ant/pom.xml Thu Jul 24 14:22:58 2008
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! 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.
+ !-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>woden-ant</artifactId>
+ <name>Woden - Ant</name>
+
+ <build>
+ <resources>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>../</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ <compilerArgument>-g</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-one-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-maven-one-repository</goal>
+ <goal>deploy-maven-one-repository</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <remoteRepositoryId>apache</remoteRepositoryId>
+ <remoteRepositoryUrl>
+ scpexe://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository
+ </remoteRepositoryUrl>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Copied: webservices/woden/branches/woden211/trunk/woden-ant/src/test/java/org/apache/woden/ant/ObjectIdTableTest.java (from r679547, webservices/woden/trunk/java/test/org/apache/woden/ant/ObjectIdTableTest.java)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/woden-ant/src/test/java/org/apache/woden/ant/ObjectIdTableTest.java?p2=webservices/woden/branches/woden211/trunk/woden-ant/src/test/java/org/apache/woden/ant/ObjectIdTableTest.java&p1=webservices/woden/trunk/java/test/org/apache/woden/ant/ObjectIdTableTest.java&r1=679547&r2=679550&rev=679550&view=diff
==============================================================================
--- webservices/woden/trunk/java/test/org/apache/woden/ant/ObjectIdTableTest.java (original)
+++ webservices/woden/branches/woden211/trunk/woden-ant/src/test/java/org/apache/woden/ant/ObjectIdTableTest.java Thu Jul 24 14:22:58 2008
@@ -18,7 +18,6 @@
package org.apache.woden.ant;
import org.apache.woden.ant.ObjectIdTable;
-import org.apache.woden.types.NCNameTest;
import junit.framework.Test;
import junit.framework.TestCase;
Copied: webservices/woden/branches/woden211/trunk/woden-api/pom.xml (from r679547, webservices/woden/trunk/java/woden-api/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/woden-api/pom.xml?p2=webservices/woden/branches/woden211/trunk/woden-api/pom.xml&p1=webservices/woden/trunk/java/woden-api/pom.xml&r1=679547&r2=679550&rev=679550&view=diff
==============================================================================
--- webservices/woden/trunk/java/woden-api/pom.xml (original)
+++ webservices/woden/branches/woden211/trunk/woden-api/pom.xml Thu Jul 24 14:22:58 2008
@@ -30,19 +30,8 @@
<name>Woden - API</name>
<build>
- <sourceDirectory>../src</sourceDirectory>
<resources>
<resource>
- <directory>../src</directory>
- <excludes>
- <exclude>**/internal/**</exclude>
- <exclude>**/tool/converter/**</exclude>
- <exclude>org/apache/woden/ant/**</exclude>
- <exclude>javax/xml/namespace/**</exclude>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
<targetPath>META-INF</targetPath>
<directory>../</directory>
<includes>
@@ -52,11 +41,7 @@
</includes>
</resource>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>../resources</directory>
- <includes>
- <include>schema.catalog</include>
- </includes>
+ <directory>src/main/resources</directory>
</resource>
</resources>
@@ -64,12 +49,6 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>**/internal/**</exclude>
- <exclude>**/tool/converter/**</exclude>
- <exclude>org/apache/woden/ant/**</exclude>
- <exclude>javax/xml/namespace/**</exclude>
- </excludes>
<source>1.4</source>
<target>1.4</target>
<compilerArgument>-g</compilerArgument>
@@ -92,13 +71,6 @@
</remoteRepositoryUrl>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Added: webservices/woden/branches/woden211/trunk/woden-commons/pom.xml
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/woden-commons/pom.xml?rev=679550&view=auto
==============================================================================
--- webservices/woden/branches/woden211/trunk/woden-commons/pom.xml (added)
+++ webservices/woden/branches/woden211/trunk/woden-commons/pom.xml Thu Jul 24 14:22:58 2008
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! 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.
+ !-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>woden-impl-commons</artifactId>
+ <name>Woden - Commons</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>../</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ <compilerArgument>-g</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-one-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-maven-one-repository</goal>
+ <goal>deploy-maven-one-repository</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <remoteRepositoryId>apache</remoteRepositoryId>
+ <remoteRepositoryUrl>
+ scpexe://people.apache.org/www/people.apache.org/repo/m1-snapshot-repository
+ </remoteRepositoryUrl>
+ </configuration>
+ </plugin>
+ <!-- this POM contains test resources shared by the OM, DOM and tests POMs. This configuration
+ will generate a JAR for the test resources so that they can be used by these POMs.
+ See http://tildemh.com/2007/12/19/maven2-unit-test-dependencies
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Copied: webservices/woden/branches/woden211/trunk/woden-dom/pom.xml (from r679547, webservices/woden/trunk/java/woden-dom/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/woden-dom/pom.xml?p2=webservices/woden/branches/woden211/trunk/woden-dom/pom.xml&p1=webservices/woden/trunk/java/woden-dom/pom.xml&r1=679547&r2=679550&rev=679550&view=diff
==============================================================================
--- webservices/woden/trunk/java/woden-dom/pom.xml (original)
+++ webservices/woden/branches/woden211/trunk/woden-dom/pom.xml Thu Jul 24 14:22:58 2008
@@ -30,23 +30,9 @@
<name>Woden - DOM</name>
<build>
- <sourceDirectory>../src</sourceDirectory>
- <testSourceDirectory>../test</testSourceDirectory>
<resources>
<resource>
- <directory>../src</directory>
- <includes>
- <include>**/internal/**</include>
- <include>**/javax/xml/namespace/**</include>
- <include>**/tool/converter/**</include>
- </includes>
- <excludes>
- <exclude>**/internal/OM**</exclude>
- <exclude>**/internal/resolver/OM**</exclude>
- <exclude>**/internal/util/om/**</exclude>
- <exclude>**/internal/xpointer/OM**</exclude>
- <exclude>**/*.java</exclude>
- </excludes>
+ <directory>src/main/resources</directory>
</resource>
<resource>
<targetPath>META-INF</targetPath>
@@ -58,39 +44,14 @@
</includes>
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>../test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <includes>
- <include>**/internal/**</include>
- <include>**/javax/xml/namespace/**</include>
- <include>**/tool/converter/**</include>
- </includes>
- <excludes>
- <exclude>**/internal/OM**</exclude>
- <exclude>**/internal/resolver/OM**</exclude>
- <exclude>**/internal/util/om/**</exclude>
- <exclude>**/internal/xpointer/OM**</exclude>
- </excludes>
<source>1.4</source>
<target>1.4</target>
<compilerArgument>-g</compilerArgument>
- <testExcludes>
- <exclude>**/ant/*</exclude>
- <exclude>**/OM*</exclude>
- <exclude>**/AllWodenTests.java</exclude>
- <exclude>**/AllWodenTestsOM.java</exclude>
- </testExcludes>
</configuration>
</plugin>
<plugin>
@@ -110,7 +71,7 @@
</remoteRepositoryUrl>
</configuration>
</plugin>
- <plugin>
+ <!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -118,15 +79,25 @@
<include>**/AllWodenTestsDOM.class</include>
</includes>
</configuration>
- </plugin>
+ </plugin>-->
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.woden</groupId>
- <artifactId>woden-api</artifactId>
+ <artifactId>woden-impl-commons</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <!-- This dependency is need for getting shared test resources.
+ See http://tildemh.com/2007/12/19/maven2-unit-test-dependencies
+ -->
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-impl-commons</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Copied: webservices/woden/branches/woden211/trunk/woden-om/pom.xml (from r679547, webservices/woden/trunk/java/woden-om/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/woden-om/pom.xml?p2=webservices/woden/branches/woden211/trunk/woden-om/pom.xml&p1=webservices/woden/trunk/java/woden-om/pom.xml&r1=679547&r2=679550&rev=679550&view=diff
==============================================================================
--- webservices/woden/trunk/java/woden-om/pom.xml (original)
+++ webservices/woden/branches/woden211/trunk/woden-om/pom.xml Thu Jul 24 14:22:58 2008
@@ -29,23 +29,9 @@
<artifactId>woden-impl-om</artifactId>
<name>Woden - OM</name>
<build>
- <sourceDirectory>../src</sourceDirectory>
- <testSourceDirectory>../test</testSourceDirectory>
<resources>
<resource>
- <directory>../src</directory>
- <includes>
- <include>**/internal/**</include>
- <include>**/javax/xml/namespace/**</include>
- <include>**/tool/converter/**</include>
- </includes>
- <excludes>
- <exclude>**/internal/DOM**</exclude>
- <exclude>**/internal/resolver/DOM**</exclude>
- <exclude>**/internal/util/dom/**</exclude>
- <exclude>**/internal/xpointer/DOM**</exclude>
- <exclude>**/*.java</exclude>
- </excludes>
+ <directory>src/main/resources</directory>
</resource>
<resource>
<targetPath>META-INF</targetPath>
@@ -57,42 +43,14 @@
</includes>
</resource>
</resources>
- <testResources>
- <testResource>
- <directory>../test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <includes>
- <include>**/internal/**</include>
- <include>**/javax/xml/namespace/**</include>
- <include>**/tool/converter/**</include>
- </includes>
- <excludes>
- <exclude>**/internal/DOM**</exclude>
- <exclude>**/internal/resolver/DOM**</exclude>
- <exclude>**/internal/util/dom/**</exclude>
- <exclude>**/internal/xpointer/DOM**</exclude>
- </excludes>
<source>1.4</source>
<target>1.4</target>
<compilerArgument>-g</compilerArgument>
- <testExcludes>
- <exclude>**/ant/*</exclude>
- <exclude>**/DOM*</exclude>
- <exclude>**/AllWodenTests.java</exclude>
- <exclude>**/AllWodenTestsDOM.java</exclude>
- <exclude>**/SchemaTest.java</exclude>
- <exclude>**/SchemaLocationTest.java</exclude>
- <exclude>**/WSDLDocumentValidatorTest.java</exclude>
- </testExcludes>
</configuration>
</plugin>
<plugin>
@@ -125,8 +83,18 @@
<dependencies>
<dependency>
<groupId>org.apache.woden</groupId>
- <artifactId>woden-api</artifactId>
+ <artifactId>woden-impl-commons</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+ <!-- This dependency is need for getting shared test resources.
+ See http://tildemh.com/2007/12/19/maven2-unit-test-dependencies
+ -->
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-impl-commons</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: webservices/woden/branches/woden211/trunk/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java
URL: http://svn.apache.org/viewvc/webservices/woden/branches/woden211/trunk/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java?rev=679550&r1=679547&r2=679550&view=diff
==============================================================================
--- webservices/woden/branches/woden211/trunk/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java (original)
+++ webservices/woden/branches/woden211/trunk/woden-tests/src/test/java/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidatorTest.java Thu Jul 24 14:22:58 2008
@@ -31,7 +31,6 @@
import org.apache.woden.ErrorReporter;
import org.apache.woden.WSDLException;
import org.apache.woden.WSDLFactory;
-import org.apache.woden.internal.DOMWSDLFactory;
import org.apache.woden.internal.ErrorReporterImpl;
import org.apache.woden.internal.schema.ImportedSchemaImpl;
import org.apache.woden.internal.schema.InlinedSchemaImpl;
---------------------------------------------------------------------
To unsubscribe, e-mail: woden-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: woden-dev-help@ws.apache.org