portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager TestPortletDescriptorSecurityRoles.java TestPortletDescriptor.java TestJetspeedPortletDescriptor.java
Date Mon, 16 Aug 2004 18:33:30 GMT
taylor      2004/08/16 11:33:30

  Modified:    portal/src/test/org/apache/jetspeed/userinfo
                        TestUserInfoManager.java
               portal/src/test/org/apache/jetspeed/tools/pamanager
                        TestPortletDescriptorSecurityRoles.java
                        TestPortletDescriptor.java
                        TestJetspeedPortletDescriptor.java
  Log:
  refactored cache and portlet factory to new component, removing
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.11      +6 -0      jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
  
  Index: TestUserInfoManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestUserInfoManager.java	1 Aug 2004 23:01:02 -0000	1.10
  +++ TestUserInfoManager.java	16 Aug 2004 18:33:30 -0000	1.11
  @@ -25,6 +25,9 @@
   import junit.framework.TestSuite;
   
   import org.apache.jetspeed.AbstractPrefsSupportedTestCase;
  +import org.apache.jetspeed.cache.PortletCache;
  +import org.apache.jetspeed.factory.JetspeedPortletFactory;
  +import org.apache.jetspeed.factory.JetspeedPortletFactoryProxy;
   import org.apache.jetspeed.mockobjects.request.MockRequestContext;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.prefs.PropertyException;
  @@ -82,6 +85,9 @@
       public void setUp() throws Exception
       {
           super.setUp();
  +        
  +        PortletCache portletCache = new PortletCache();
  +        new JetspeedPortletFactoryProxy(new JetspeedPortletFactory(portletCache));
           
           ums = new UserManagerImpl(persistenceStore);
           gms = new GroupManagerImpl(persistenceStore);
  
  
  
  1.10      +11 -0     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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestPortletDescriptorSecurityRoles.java	29 Jul 2004 15:44:47 -0000	1.9
  +++ TestPortletDescriptorSecurityRoles.java	16 Aug 2004 18:33:30 -0000	1.10
  @@ -22,6 +22,9 @@
   import junit.textui.TestRunner;
   
   import org.apache.jetspeed.AbstractPrefsSupportedTestCase;
  +import org.apache.jetspeed.cache.PortletCache;
  +import org.apache.jetspeed.factory.JetspeedPortletFactory;
  +import org.apache.jetspeed.factory.JetspeedPortletFactoryProxy;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
   import org.apache.jetspeed.om.servlet.impl.SecurityRoleImpl;
  @@ -79,6 +82,14 @@
           return new TestSuite(TestPortletDescriptorSecurityRoles.class);
       }
   
  +    public void setUp() throws Exception
  +    {
  +        super.setUp();
  +        
  +        PortletCache portletCache = new PortletCache();
  +        new JetspeedPortletFactoryProxy(new JetspeedPortletFactory(portletCache));
  +    }
  +    
       public void testSecurityRoles() throws Exception
       {
           System.out.println("Testing securityRoles");
  
  
  
  1.26      +8 -2      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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- TestPortletDescriptor.java	29 Jul 2004 15:44:47 -0000	1.25
  +++ TestPortletDescriptor.java	16 Aug 2004 18:33:30 -0000	1.26
  @@ -28,7 +28,10 @@
   import junit.textui.TestRunner;
   
   import org.apache.jetspeed.AbstractPrefsSupportedTestCase;
  +import org.apache.jetspeed.cache.PortletCache;
   import org.apache.jetspeed.components.persistence.store.PersistenceStore;
  +import org.apache.jetspeed.factory.JetspeedPortletFactory;
  +import org.apache.jetspeed.factory.JetspeedPortletFactoryProxy;
   import org.apache.jetspeed.om.common.MutableLanguage;
   import org.apache.jetspeed.om.common.ParameterComposite;
   import org.apache.jetspeed.om.common.UserAttribute;
  @@ -94,7 +97,7 @@
           return new TestSuite(TestPortletDescriptor.class);
   
       }
  -
  +    
       /*
        * Overrides the database properties
        */
  @@ -105,6 +108,9 @@
   
       public void testLoadPortletApplicationTree() throws Exception
       {
  +        PortletCache portletCache = new PortletCache();
  +        new JetspeedPortletFactoryProxy(new JetspeedPortletFactory(portletCache));
  +        
           System.out.println("Testing loadPortletApplicationTree");
           PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("./test/testdata/deploy/portlet.xml"),
"unit-test");
           MutablePortletApplication app = pad.createPortletApplication();
  
  
  
  1.8       +7 -1      jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java
  
  Index: TestJetspeedPortletDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestJetspeedPortletDescriptor.java	29 Jul 2004 15:44:47 -0000	1.7
  +++ TestJetspeedPortletDescriptor.java	16 Aug 2004 18:33:30 -0000	1.8
  @@ -23,6 +23,9 @@
   import junit.textui.TestRunner;
   
   import org.apache.jetspeed.AbstractPrefsSupportedTestCase;
  +import org.apache.jetspeed.cache.PortletCache;
  +import org.apache.jetspeed.factory.JetspeedPortletFactory;
  +import org.apache.jetspeed.factory.JetspeedPortletFactoryProxy;
   import org.apache.jetspeed.om.common.JetspeedServiceReference;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
  @@ -88,6 +91,9 @@
       
       public void testLoadPortletApplicationTree() throws Exception
       {
  +        PortletCache portletCache = new PortletCache();
  +        new JetspeedPortletFactoryProxy(new JetspeedPortletFactory(portletCache));
  +        
           System.out.println("Testing loadPortletApplicationTree");
           PortletApplicationDescriptor pad = new PortletApplicationDescriptor(new FileReader("./test/testdata/deploy/portlet.xml"),
"unit-test");
           MutablePortletApplication app = pad.createPortletApplication();            
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message