weaver 2004/07/02 07:39:42
Modified: portal/src/test/org/apache/jetspeed/tools/pamanager
TestPortletDescriptorSecurityRoles.java
TestPortletDescriptor.java
Log:
Changed due to PortletApplicationWar refactoring
Revision Changes Path
1.7 +2 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestPortletDescriptorSecurityRoles.java 11 Jun 2004 18:01:35 -0000 1.6
+++ TestPortletDescriptorSecurityRoles.java 2 Jul 2004 14:39:42 -0000 1.7
@@ -19,7 +19,7 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.jetspeed.Jetspeed;
+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;
@@ -80,7 +80,7 @@
public void testSecurityRoles() throws Exception
{
System.out.println("Testing securityRoles");
- PortletApplicationWar paWar = new
PortletApplicationWar("./test/testdata/deploy/webapp", "unit-test", "/",
Jetspeed.getDefaultLocale(), "unit-test", null);
+ PortletApplicationWar paWar = new
PortletApplicationWar("./test/testdata/deploy/webapp", "unit-test", "/",
VFS.getManager());
MutablePortletApplication app = paWar.createPortletApp();
assertNotNull("App is null", app);
1.23 +6 -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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TestPortletDescriptor.java 14 Jun 2004 12:33:41 -0000 1.22
+++ TestPortletDescriptor.java 2 Jul 2004 14:39:42 -0000 1.23
@@ -18,7 +18,6 @@
import java.io.FileReader;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import java.util.Locale;
import javax.portlet.PortletMode;
@@ -27,6 +26,7 @@
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;
@@ -360,7 +360,7 @@
public void testInfusingWebXML() throws Exception
{
- PortletApplicationWar paWar = new
PortletApplicationWar("./test/testdata/deploy/webapp", "unit-test", "/",
Locale.getDefault(), "unit-test", null);
+ PortletApplicationWar paWar = new
PortletApplicationWar("./test/testdata/deploy/webapp", "unit-test", "/",
VFS.getManager());
SAXBuilder builder = new SAXBuilder(false);
@@ -395,8 +395,8 @@
assertNull(jetspeedServlet);
assertNull(jetspeedServletMapping);
- paWar.copyWar("./target/webapp");
- paWar.processWebXML("./target/webapp/WEB-INF/web.xml");
+ PortletApplicationWar targetWar = paWar.copyWar("./target/webapp");
+ targetWar.processWebXML();
targetReader = new FileReader("./target/webapp/WEB-INF/web.xml");
@@ -416,7 +416,7 @@
srcReader.close();
paWar.close();
targetReader.close();
- PortletApplicationWar targetWar = new
PortletApplicationWar("./target/webapp", "unit-test", "/", Locale.getDefault(),
"unit-test", null) ;
+ PortletApplicationWar targetWar = new
PortletApplicationWar("./target/webapp", "unit-test", "/", VFS.getManager()) ;
targetWar.removeWar();
targetWar.close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
