portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager CatalinaPAM.java
Date Thu, 15 Apr 2004 21:23:49 GMT
weaver      2004/04/15 14:23:49

  Modified:    portal/src/java/org/apache/jetspeed/tools/pamanager
                        CatalinaPAM.java
  Log:
  Fixed issues with CatalinaPAM failing when the war had been pre-expanded by the FileSystemPAM's
  sysDeploy method.
  
  Revision  Changes    Path
  1.11      +5 -7      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/CatalinaPAM.java
  
  Index: CatalinaPAM.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/CatalinaPAM.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CatalinaPAM.java	8 Mar 2004 00:34:16 -0000	1.10
  +++ CatalinaPAM.java	15 Apr 2004 21:23:49 -0000	1.11
  @@ -38,9 +38,7 @@
       protected static final Log log = LogFactory.getLog("deployment");
   
       public CatalinaPAM(String server, int port, String user, String password) throws PortletApplicationException
  -    {
  -    	useDefaultPluginFordeploy = true;
  -		
  +    {		
           try
           {
               tomcatManager = new TomcatManager(server, port, user, password);
  @@ -58,9 +56,9 @@
           
           try
           {            
  -			super.deploy(webAppsDir, warFile, paName);
  -            //checkResponse(tomcatManager.install(warFile, paName));
  +            super.deploy(webAppsDir, warFile, paName);
               checkResponse(tomcatManager.install(webAppsDir + "/" + paName, paName));
  +			
           }
           catch (PortletApplicationException pe)
           {
  @@ -225,7 +223,7 @@
        */
       private void checkResponse(String response) throws PortletApplicationException
       {
  -        if (response == null || !response.startsWith("OK"))
  +        if (response == null || (!response.startsWith("OK") && response.indexOf("Application
already exists at path") == -1) )
           {
               if (response == null)
               {
  
  
  

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