[jbossws-commits] JBossWS SVN: r12208 - in common/branches/jbossws-common-1.1.0/src: main/java/org/jboss/wsf/common/injection/finders and 1 other directories.

Author: jim.ma Date: 2010-05-12 02:35:06 -0400 (Wed, 12 May 2010) New Revision: 12208 Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java Log: [JBPAPP-3813]:Fixed windows issues in common module Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -140,8 +140,8 @@ try { //get the jar and open it - String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator)); - String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1); + String folder = jarRoot.substring(5,jarRoot.lastIndexOf("/")); + String filename = jarRoot.substring(jarRoot.lastIndexOf("/")+1); final File jar = new File(folder, filename); PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>() Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -151,8 +151,8 @@ try { - String folder = jarRoot.substring(5,jarRoot.lastIndexOf(File.separator)); - String filename = jarRoot.substring(jarRoot.lastIndexOf(File.separator)+1); + String folder = jarRoot.substring(5,jarRoot.lastIndexOf("/")); + String filename = jarRoot.substring(jarRoot.lastIndexOf("/")+1); final File jar = new File(folder, filename); PrivilegedAction<JarFile> action = new PrivilegedAction<JarFile>() Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceFieldFinder.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -37,7 +37,7 @@ * method declaration if necessary. The name of the resource, if not declared, is the * name of the JavaBeans property as determined starting from the name of the setter * method in question. The setter method must follow the standard JavaBeans - * convention - name starts with a “set”, void return type and only one parameter. + * convention - name starts with a 'set', void return type and only one parameter. * Additionally, the type of the parameter must be compatible with the type specified * as a property of the Resource if present. * Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/common/injection/finders/ResourceMethodFinder.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -36,7 +36,7 @@ * method declaration if necessary. The name of the resource, if not declared, is the * name of the JavaBeans property as determined starting from the name of the setter * method in question. The setter method must follow the standard JavaBeans - * convention - name starts with a “set”, void return type and only one parameter. + * convention - name starts with a 'set', void return type and only one parameter. * Additionally, the type of the parameter must be compatible with the type specified * as a property of the Resource if present. * Modified: common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/ResourceLoaderAdapterTestCase.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -72,7 +72,7 @@ UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/"); assertNotNull(common); - assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir + assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir assertEquals("common/", common.getName()); List<UnifiedVirtualFile> children = common.getChildren(); assertNotNull(children); Modified: common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java =================================================================== --- common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-12 06:30:36 UTC (rev 12207) +++ common/branches/jbossws-common-1.1.0/src/test/java/org/jboss/test/ws/common/URLLoaderAdapterTestCase.java 2010-05-12 06:35:06 UTC (rev 12208) @@ -76,7 +76,7 @@ UnifiedVirtualFile common = ula.findChild("org/jboss/wsf/common/"); assertNotNull(common); - assertTrue(common.toURL().toExternalForm().contains("target" + File.separator + "classes")); //check we got a URL to dir + assertTrue(common.toURL().toExternalForm().contains("target/classes")); //check we got a URL to dir assertEquals("common/", common.getName()); List<UnifiedVirtualFile> children = common.getChildren(); assertNotNull(children);