Author: heiko.braun(a)jboss.com Date: 2007-11-08 08:36:51 -0500 (Thu, 08 Nov 2007) New Revision: 5014 Modified: stack/native/branches/jbossws-native-2.0.2/jbossws-native-2.0.2.iml stack/native/branches/jbossws-native-2.0.2/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java Log: Update to JBWS-1798, ficx relative non-parent paths. Covered by TCK 1.4 7 webservices Modified: stack/native/branches/jbossws-native-2.0.2/jbossws-native-2.0.2.iml =================================================================== --- stack/native/branches/jbossws-native-2.0.2/jbossws-native-2.0.2.iml 2007-11-08 13:35:35 UTC (rev 5013) +++ stack/native/branches/jbossws-native-2.0.2/jbossws-native-2.0.2.iml 2007-11-08 13:36:51 UTC (rev 5014) @@ -229,15 +229,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-common.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/commons-logging.jar!/" /> </CLASSES> <JAVADOC /> @@ -640,6 +631,7 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="common" /> <orderEntryProperties /> </component> </module> Modified: stack/native/branches/jbossws-native-2.0.2/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- stack/native/branches/jbossws-native-2.0.2/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-11-08 13:35:35 UTC (rev 5013) +++ stack/native/branches/jbossws-native-2.0.2/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-11-08 13:36:51 UTC (rev 5014) @@ -136,6 +136,8 @@ if (resPath != null && resPath.indexOf("/") > 0) { String resParent = resPath.substring(0, resPath.lastIndexOf("/")); + + // replace parent traversal, results in resParent == null when successfully executed while (orgLocation.startsWith("../") && resParent != null) { if (resParent.indexOf("/") > 0) @@ -151,6 +153,10 @@ resParent = null; } } + + // no parent traversal happend + if(resParent!=null) + newResourcePath = resParent +"/"+ orgLocation; } String reqPath = reqURL.getPath();