You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by mm...@apache.org on 2007/09/24 05:50:39 UTC
svn commit: r578637 - in /incubator/cxf/trunk:
rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
Author: mmao
Date: Sun Sep 23 20:50:38 2007
New Revision: 578637
URL: http://svn.apache.org/viewvc?rev=578637&view=rev
Log:
* CXF-1053
Fix the build on Windows Vista,
* Enable the AegisTest, it works on Windows, previous problem was caused by the remove of the javato/core
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java?rev=578637&r1=578636&r2=578637&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java Sun Sep 23 20:50:38 2007
@@ -116,18 +116,16 @@
if ("file".equals(catalogURL.getProtocol())) {
try {
File file = new File(catalogURL.toURI());
- if (file.exists()) {
- this.resolver.parseCatalog(file.getAbsolutePath());
- } else {
+ if (!file.exists()) {
throw new FileNotFoundException(file.getAbsolutePath());
}
} catch (URISyntaxException e) {
//just process as is
- this.resolver.parseCatalog(catalogURL);
}
- } else {
- this.resolver.parseCatalog(catalogURL);
}
+
+ this.resolver.parseCatalog(catalogURL);
+
loadedCatalogs.add(catalogURL);
}
}
Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java?rev=578637&r1=578636&r2=578637&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java (original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java Sun Sep 23 20:50:38 2007
@@ -91,7 +91,6 @@
}
@Test
- @org.junit.Ignore("The test seems to have failed on Vista")
public void testAegisReconfigureDatabinding() throws Exception {
final String sei = "org.apache.cxf.tools.fortest.aegis2ws.TestAegisSEI";
String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/aegis.wsdl",