Author: jkaputin
Date: Fri Dec 21 05:54:54 2007
New Revision: 606200
URL: http://svn.apache.org/viewvc?rev=606200&view=rev
Log:
Merging latest trunk changes into woden47 branch.
Modified:
incubator/woden/branches/woden47/build.properties
incubator/woden/branches/woden47/build.xml
incubator/woden/branches/woden47/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
Modified: incubator/woden/branches/woden47/build.properties
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/woden47/build.properties?rev=606200&r1=606199&r2=606200&view=diff
==============================================================================
--- incubator/woden/branches/woden47/build.properties (original)
+++ incubator/woden/branches/woden47/build.properties Fri Dec 21 05:54:54 2007
@@ -33,8 +33,8 @@
AxiomImplFile = axiom-impl-1.2.3.jar
CommonsLoggingURL =
http://www.ibiblio.org/maven2/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar
CommonsLoggingFile = commons-logging-api-1.1.jar
-StaxURL =
http://www.ibiblio.org/maven/stax/jars/stax-api-1.0.1.jar
-StaxFile = stax-api-1.0.1.jar
+StaxURL =
http://repo1.maven.org/maven2/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0/geronimo-stax-api_1.0_spec-1.0.jar
+StaxFile = geronimo-stax-api_1.0_spec-1.0.jar
WstxURL =
http://repo1.maven.org/maven2/org/codehaus/woodstox/wstx-asl/3.2.0/wstx-asl-3.2.0.jar
WstxFile = wstx-asl-3.2.0.jar
W3cWsdl20URL =
http://dev.w3.org/cvsweb/~checkout~/2002/ws/desc/test-suite/zips/test-suite.zip
Modified: incubator/woden/branches/woden47/build.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/woden47/build.xml?rev=606200&r1=606199&r2=606200&view=diff
==============================================================================
--- incubator/woden/branches/woden47/build.xml (original)
+++ incubator/woden/branches/woden47/build.xml Fri Dec 21 05:54:54 2007
@@ -377,6 +377,13 @@
</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">
@@ -425,6 +432,13 @@
</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" />
<copy todir="${build.classes.om}/META-INF">
Modified:
incubator/woden/branches/woden47/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
URL:
http://svn.apache.org/viewvc/incubator/woden/branches/woden47/src/org/apache/woden/internal/resolver/SimpleURIResolver.java?rev=606200&r1=606199&r2=606200&view=diff
==============================================================================
---
incubator/woden/branches/woden47/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
(original)
+++
incubator/woden/branches/woden47/src/org/apache/woden/internal/resolver/SimpleURIResolver.java
Fri Dec 21 05:54:54 2007
@@ -175,18 +175,8 @@
*/
private Properties loadCatalog(URL catalogLocation, Properties catalog)
{
if (catalogLocation != null) {
- URI catalogURI = null;
- try {
- catalogURI = new
URI(catalogLocation.toString());
- } catch (URISyntaxException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- try
- {
- if (catalogURI != null) {
- catalog.load(catalogURI.toURL().openStream());
- }
+ try {
+ catalog.load(catalogLocation.openStream());
}
catch (IllegalArgumentException e) {
e.printStackTrace();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
