Author: gturrell
Date: Sun Jan 21 12:13:05 2007
New Revision: 498441
URL: http://svn.apache.org/viewvc?view=rev&rev=498441
Log:
Moved the schema.catalog file into resources folder; added resources folder to
classpath.
This allows IDEs to run with URI resolving for standard wsdl20 & xsd schema
resolving automatically (as is already the case when running off the woden jar).
Previously it was neccesary to manually add eclipse project root to to each
runtime configuration.
Finally, woden build.xml changed to pick the schema.catalog from its new source
location during jar creation.
Added:
incubator/woden/trunk/java/resources/
incubator/woden/trunk/java/resources/schema.catalog
- copied unchanged from r496669, incubator/woden/trunk/java/schema.catalog
Removed:
incubator/woden/trunk/java/schema.catalog
Modified:
incubator/woden/trunk/java/.classpath
incubator/woden/trunk/java/build.xml
Modified: incubator/woden/trunk/java/.classpath
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/.classpath?view=diff&rev=498441&r1=498440&r2=498441
==============================================================================
--- incubator/woden/trunk/java/.classpath (original)
+++ incubator/woden/trunk/java/.classpath Sun Jan 21 12:13:05 2007
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry path="src" kind="src"/>
+ <classpathentry path="resources" kind="src"/>
<classpathentry path="test" kind="src"/>
<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
<classpathentry path="JUNIT_HOME/junit.jar" kind="var"/>
@@ -14,6 +15,6 @@
<classpathentry path="downloads/lib/xercesImpl.jar" kind="lib"/>
<classpathentry path="downloads/lib/xml-apis.jar" kind="lib"/>
<classpathentry path="downloads/lib/XmlSchema-SNAPSHOT.jar" kind="lib"/>
- <classpathentry
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/j2se150"
kind="con"/>
+ <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER"
kind="con"/>
<classpathentry path="bin" kind="output"/>
</classpath>
Modified: incubator/woden/trunk/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/build.xml?view=diff&rev=498441&r1=498440&r2=498441
==============================================================================
--- incubator/woden/trunk/java/build.xml (original)
+++ incubator/woden/trunk/java/build.xml Sun Jan 21 12:13:05 2007
@@ -35,6 +35,8 @@
<property name="test.results" value="${build.output}/test-results" />
<property name="src.home" value="${build.home}/src" />
<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}" />
<property name="testsrc.home" value="${build.home}/test/" />
<property name="eclipseplugin" value="${build.home}/eclipseplugin" />
<property name="manifestfile" value="META-INF/MANIFEST.MF" />
@@ -61,6 +63,8 @@
<echo message="test.results=${test.results}" />
<echo message="src.home=${src.home}" />
<echo
message="schema.package.location=${schema.package.location}" />
+ <echo message="schema.catalog.home=${schema.catalog.home}" />
+ <echo
message="schema.catalog.location=${schema.catalog.location}" />
<echo message="testsrc.home=${testsrc.home}" />
<echo message="eclipseplugin=${eclipseplugin}" />
<echo message="manifestfile=${manifestfile}" />
@@ -284,6 +288,7 @@
<fileset dir="${src.home}">
<include name="**/*" />
<exclude name="org/apache/woden/ant/**/*" />
+ <exclude name="${schema.catalog.home}/*" />
<exclude name="**/*.java" />
</fileset>
</copy>
@@ -300,7 +305,7 @@
<!-- copy the standard schema resolver catalog -->
<copy todir="${build.classes}/META-INF">
- <fileset dir="${build.home}">
+ <fileset dir="${schema.catalog.location}">
<include name="schema.catalog" />
</fileset>
</copy>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
