weaver 2004/07/09 11:30:45
Modified: portal/src/test/org/apache/jetspeed/tools/pamanager
TestPortletDescriptorSecurityRoles.java
TestPortletDescriptor.java
Log:
Removal of VFS
Revision Changes Path
1.8 +5 -2
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java
Index: TestPortletDescriptorSecurityRoles.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptorSecurityRoles.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestPortletDescriptorSecurityRoles.java 2 Jul 2004 14:39:42 -0000 1.7
+++ TestPortletDescriptorSecurityRoles.java 9 Jul 2004 18:30:45 -0000 1.8
@@ -15,15 +15,17 @@
*/
package org.apache.jetspeed.tools.pamanager;
+import java.io.File;
+
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.vfs.VFS;
import org.apache.jetspeed.components.util.RegistrySupportedTestCase;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
import org.apache.jetspeed.om.servlet.impl.SecurityRoleImpl;
+import org.apache.jetspeed.util.DirectoryHelper;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
import org.apache.pluto.om.common.SecurityRole;
import org.apache.pluto.om.common.SecurityRoleRef;
@@ -80,7 +82,8 @@
public void testSecurityRoles() throws Exception
{
System.out.println("Testing securityRoles");
- PortletApplicationWar paWar = new
PortletApplicationWar("./test/testdata/deploy/webapp", "unit-test", "/",
VFS.getManager());
+ File warFile = new File("./test/testdata/deploy/webapp");
+ PortletApplicationWar paWar = new PortletApplicationWar(new
DirectoryHelper(warFile), "unit-test", "/" );
MutablePortletApplication app = paWar.createPortletApp();
assertNotNull("App is null", app);
1.24 +9 -6
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
Index: TestPortletDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TestPortletDescriptor.java 2 Jul 2004 14:39:42 -0000 1.23
+++ TestPortletDescriptor.java 9 Jul 2004 18:30:45 -0000 1.24
@@ -15,6 +15,7 @@
*/
package org.apache.jetspeed.tools.pamanager;
+import java.io.File;
import java.io.FileReader;
import java.util.Collection;
import java.util.Iterator;
@@ -26,7 +27,6 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.vfs.VFS;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.util.RegistrySupportedTestCase;
import org.apache.jetspeed.om.common.MutableLanguage;
@@ -36,6 +36,7 @@
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
+import org.apache.jetspeed.util.DirectoryHelper;
import org.apache.jetspeed.util.descriptor.PortletApplicationDescriptor;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
import org.apache.pluto.om.common.DisplayName;
@@ -360,7 +361,8 @@
public void testInfusingWebXML() throws Exception
{
- PortletApplicationWar paWar = new
PortletApplicationWar("./test/testdata/deploy/webapp", "unit-test", "/",
VFS.getManager());
+ File warFile = new File("./test/testdata/deploy/webapp");
+ PortletApplicationWar paWar = new PortletApplicationWar(new
DirectoryHelper(warFile), "unit-test", "/" );
SAXBuilder builder = new SAXBuilder(false);
@@ -416,9 +418,10 @@
srcReader.close();
paWar.close();
targetReader.close();
- PortletApplicationWar targetWar = new
PortletApplicationWar("./target/webapp", "unit-test", "/", VFS.getManager()) ;
- targetWar.removeWar();
- targetWar.close();
+ File warFile2 = new File("./target/webapp");
+ DirectoryHelper dirHelper = new DirectoryHelper(warFile2);
+ dirHelper.remove();
+ dirHelper.close();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
