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/java/org/apache/jetspeed/tools/pamanager FileSystemPAM.java
Date Fri, 23 Jul 2004 05:35:32 GMT
taylor      2004/07/22 22:35:32

  Modified:    portal/src/webapp/WEB-INF web.xml
               portal/src/webapp/WEB-INF/assembly jetspeed-spring.xml
               portal/src/java/org/apache/jetspeed/tools/pamanager
                        FileSystemPAM.java
  Log:
  correctly update the database (not insert) on redeploy
  
  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.14      +4 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- web.xml	20 Jul 2004 13:57:31 -0000	1.13
  +++ web.xml	23 Jul 2004 05:35:31 -0000	1.14
  @@ -83,16 +83,18 @@
         <param-value>webContext</param-value>
       </init-param>
       <!-- To enable SpringEngine, uncomment this param and comment out the
  -    	 PicoEngine one.    	 
  +    	 PicoEngine one.    	 -->
       <init-param>
         <param-name>engine</param-name>
         <param-value>org.apache.jetspeed.engine.SpringEngine</param-value>
       </init-param>
  -    -->
  +
  +	<!--
       <init-param>
         <param-name>engine</param-name>
         <param-value>org.apache.jetspeed.engine.PicoEngine</param-value>
       </init-param>
  +	-->
       <load-on-startup>1</load-on-startup>
     </servlet>
   
  
  
  
  1.4       +3 -0      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
  
  Index: jetspeed-spring.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jetspeed-spring.xml	20 Jul 2004 18:07:22 -0000	1.3
  +++ jetspeed-spring.xml	23 Jul 2004 05:35:32 -0000	1.4
  @@ -34,6 +34,9 @@
     	   	  <entry key="PortletRegistryComponent">
     	   	  	<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"
/>
     	   	  </entry>
  +  	   	  <entry key="PAM">
  +  	   	  	<ref bean="org.apache.jetspeed.tools.pamanager.ApplicationServerPAM" />
  +  	   	  </entry>		  
     	   	</map>
     	   </constructor-arg>
     </bean>
  
  
  
  1.37      +17 -8     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
  
  Index: FileSystemPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- FileSystemPAM.java	23 Jul 2004 02:43:31 -0000	1.36
  +++ FileSystemPAM.java	23 Jul 2004 05:35:32 -0000	1.37
  @@ -531,12 +531,14 @@
       public boolean registerPortletApplication(FileSystemHelper fileSystem,
               String portletApplicationName) 
       throws RegistryException
  -    {
  -        long checksum = fileSystem.getChecksum(PORTLET_XML);        
  +    {        
  +        long checksum = fileSystem.getChecksum(PORTLET_XML);
           MutablePortletApplication pa = registry
                   .getPortletApplication(portletApplicationName);
           if (pa != null)
  -        {            
  +        {
  +            System.out.println("CHECKSUM from APP Server: " + checksum);
  +            System.out.println("CHECKSUM from Registry  : " + pa.getChecksum());
               if (checksum == pa.getChecksum())
               {
                   System.out.println("PORTLET APPLICATION REGISTRATION: NO CHANGE on CHECKSUM
for portlet.xml: " 
  @@ -546,6 +548,15 @@
               }
               System.out.println("PORTLET APPLICATION REGISTRATION: Checksum changed on portlet.xml:
" 
                                   + portletApplicationName);
  +            try
  +            {
  +                this.doUnregister(portletApplicationName, false);
  +            }
  +            catch (Exception e)
  +            {
  +                
  +            }
  +            
           }
   
           PortletApplicationWar paWar = null;
  @@ -564,8 +575,7 @@
   
           try
           {
  -            app = paWar.createPortletApp();
  -
  +            app = paWar.createPortletApp();            
               if (app == null)
               {
                   String msg = "Error loading portlet.xml: ";
  @@ -577,8 +587,7 @@
               app.setChecksum(checksum);
   
               // load the web.xml
  -            log
  -                    .info("Loading web.xml into memory...."
  +            log.info("Loading web.xml into memory...."
                               + portletApplicationName);
               MutableWebApplication webapp = paWar.createWebApp();
               paWar.validate();
  
  
  

---------------------------------------------------------------------
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