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/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager FusionPAM.java FusionAppServerPAM.java
Date Fri, 23 Jul 2004 07:06:54 GMT
taylor      2004/07/23 00:06:54

  Modified:    fusion/src/java/org/apache/jetspeed/fusion/services/fusion
                        FusionServiceImpl.java
               fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager
                        FusionPAM.java FusionAppServerPAM.java
  Log:
  Spring is in the Air!
  Spring Forward!
  
  converted Fusion to Spring
  
  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.3       +3 -5      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/services/fusion/FusionServiceImpl.java
  
  Index: FusionServiceImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/services/fusion/FusionServiceImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FusionServiceImpl.java	20 Jul 2004 14:51:49 -0000	1.2
  +++ FusionServiceImpl.java	23 Jul 2004 07:06:53 -0000	1.3
  @@ -22,7 +22,6 @@
   
   import org.apache.jetspeed.components.ComponentManager;
   import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
  -import org.apache.jetspeed.cps.CPSInitializationException;
   import org.apache.jetspeed.cps.CommonPortletServices;
   import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
   import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
  @@ -36,7 +35,7 @@
   // Fusion
   import org.apache.jetspeed.Jetspeed;
   import org.apache.jetspeed.engine.Engine;
  -import org.apache.jetspeed.engine.PicoEngine;
  +import org.apache.jetspeed.engine.SpringEngine;
   import org.apache.jetspeed.exception.JetspeedException;
   
   /**
  @@ -153,9 +152,8 @@
       {
           try
           {
  -                        
               // Start Jetspeed
  -            Engine engine = Jetspeed.createEngine(configuration, applicationRoot, servletConfig,
PicoEngine.class);
  +            Engine engine = Jetspeed.createEngine(configuration, applicationRoot, servletConfig,
SpringEngine.class);
               engine.initContainer(servletConfig);
               
           }
  
  
  
  1.6       +2 -1      jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionPAM.java
  
  Index: FusionPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionPAM.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FusionPAM.java	23 Jul 2004 01:09:21 -0000	1.5
  +++ FusionPAM.java	23 Jul 2004 07:06:54 -0000	1.6
  @@ -43,6 +43,7 @@
   import org.apache.jetspeed.tools.pamanager.FileSystemPAM;
   import org.apache.jetspeed.tools.pamanager.PortletApplicationException;
   import org.apache.jetspeed.tools.pamanager.Registration;
  +import org.apache.jetspeed.tools.pamanager.DeploymentRegistration;
   import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
   import org.apache.pluto.om.common.Description;
   import org.apache.pluto.om.common.DisplayName;
  
  
  
  1.5       +20 -2     jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionAppServerPAM.java
  
  Index: FusionAppServerPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionAppServerPAM.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FusionAppServerPAM.java	23 Jul 2004 01:09:21 -0000	1.4
  +++ FusionAppServerPAM.java	23 Jul 2004 07:06:54 -0000	1.5
  @@ -30,13 +30,14 @@
   import org.apache.jetspeed.util.ArgUtil;
   import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
   
  +
   /**
    * FusionCatalinaPAM
    * 
    * @author <a href="mailto:taylor@apache.org">David Sean Taylor </a>
    * @version $Id$
    */
  -public class FusionAppServerPAM extends FusionPAM implements PortletApplicationManagement,
Lifecycle, DeploymentRegistration
  +public class FusionAppServerPAM extends FusionPAM implements PortletApplicationManagement,
Lifecycle
   {
       // Implementaion of deplyment interface
       public final static String PAM_PROPERTY_SERVER = "server";
  @@ -290,5 +291,22 @@
           }
           return appServerManager.isConnected();
       }
  +    
  +    public void start()
  +    {
  +        if (isServerAvailable())
  +        {
  +
  +            log.info("Deployment server port: " + appServerManager.getHostPort());
  +            log.info("Deployment server: " + appServerManager.getHostUrl());          
 
  +            
  +        }
  +    }
  +    
  +    public void stop()
  +    {
  +
  +    }
  +    
   
   }
  
  
  

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