[jboss-cvs] JBossAS SVN: r101591 - in branches/vfs3-int/testsuite/src/main/org/jboss/test: webservice/jbws309 and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: johnbailey
Date: 2010-02-26 14:28:11 -0500 (Fri, 26 Feb 2010)
New Revision: 101591

Modified:
   branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java
   branches/vfs3-int/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
Log:
[JBAS-7357] - More testsuite fixes

Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java	2010-02-26 19:21:07 UTC (rev 101590)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/deployers/seam/test/SeamVFSClassloadingUnitTestCase.java	2010-02-26 19:28:11 UTC (rev 101591)
@@ -120,19 +120,19 @@
       URL[] cp = {
          // ear
          ear.toURL(),
-         ear.getChild("lib/commons-beanutils.jar").toURL(),
-         ear.getChild("lib/commons-digester.jar").toURL(),
-         ear.getChild("lib/commons-digester.jar").toURL(),
-         ear.getChild("lib/jboss-el.jar").toURL(),
-         ear.getChild("lib/richfaces-api.jar").toURL(),
-         ear.getChild("jboss-seam.jar").toURL(),
-         ear.getChild("jboss-seam-booking.jar").toURL(),
-         ear.getChild("jboss-seam-booking.war/WEB-INF/classes/").toURL(),
-         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-debug.jar").toURL(),
-         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-ui.jar").toURL(),
-         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jsf-facelets.jar").toURL(),
-         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/richfaces-impl.jar").toURL(),
-         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/richfaces-ui.jar").toURL(),
+         ear.getChild("lib/commons-beanutils.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("lib/commons-digester.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("lib/commons-digester.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("lib/jboss-el.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("lib/richfaces-api.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("jboss-seam.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("jboss-seam-booking.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("jboss-seam-booking.war/WEB-INF/classes/").getPhysicalFile().toURI().toURL(),
+         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-debug.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jboss-seam-ui.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/jsf-facelets.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/richfaces-impl.jar").getPhysicalFile().toURI().toURL(),
+         ear.getChild("jboss-seam-booking.war/WEB-INF/lib/richfaces-ui.jar").getPhysicalFile().toURI().toURL(),
       };
       return cp;
    }
@@ -187,7 +187,7 @@
       ArrayList<Closeable> mounts = new ArrayList<Closeable>();
 
       if (!file.isDirectory() && file.getName().matches("^.*\\.([EeWwJj][Aa][Rr]|[Zz][Ii][Pp])$"))
-         mounts.add(VFS.mountZip(file, file, provider));
+         mounts.add(VFS.mountZipExpanded(file, file, provider));
 
       if (file.isDirectory())
          for (VirtualFile child : file.getChildren())

Modified: branches/vfs3-int/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
===================================================================
--- branches/vfs3-int/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java	2010-02-26 19:21:07 UTC (rev 101590)
+++ branches/vfs3-int/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java	2010-02-26 19:28:11 UTC (rev 101591)
@@ -111,6 +111,7 @@
 
    public void testBasicSecuredServiceAccess() throws Exception
    {
+      mountJars("ws4ee-jbws309.jar", "ws4ee-jbws309-client.jar");
       InitialContext iniCtx = getClientContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
       Organization endpoint = (Organization)service.getPort(new QName(nsURI, "BasicSecuredPort"), Organization.class);
@@ -169,6 +170,7 @@
 
    public void testRoleSecuredServiceAccess() throws Exception
    {
+      mountJars("ws4ee-jbws309.jar", "ws4ee-jbws309-client.jar");
       InitialContext iniCtx = getClientContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
       Organization endpoint = (Organization)service.getPort(new QName(nsURI, "RoleSecuredPort"), Organization.class);