Return-Path: 
 <jetspeed-dev-return-20923-apmail-jakarta-jetspeed-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-jetspeed-dev-archive@www.apache.org
Received: (qmail 33683 invoked from network); 16 Mar 2005 17:01:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 16 Mar 2005 17:01:14 -0000
Received: (qmail 77420 invoked by uid 500); 16 Mar 2005 17:01:13 -0000
Delivered-To: apmail-jakarta-jetspeed-dev-archive@jakarta.apache.org
Received: (qmail 77390 invoked by uid 500); 16 Mar 2005 17:01:12 -0000
Mailing-List: contact jetspeed-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:jetspeed-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:jetspeed-dev-help@jakarta.apache.org>
List-Post: <mailto:jetspeed-dev@jakarta.apache.org>
List-Id: "Jetspeed Developers List" <jetspeed-dev.jakarta.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@jakarta.apache.org>
Delivered-To: mailing list jetspeed-dev@jakarta.apache.org
Received: (qmail 77377 invoked by uid 500); 16 Mar 2005 17:01:12 -0000
Received: (qmail 77374 invoked by uid 500); 16 Mar 2005 17:01:12 -0000
Received: (qmail 77370 invoked by uid 99); 16 Mar 2005 17:01:12 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 16 Mar 2005 09:01:12 -0800
Received: (qmail 33645 invoked by uid 1866); 16 Mar 2005 17:01:11 -0000
Date: 16 Mar 2005 17:01:11 -0000
Message-ID: <20050316170111.33644.qmail@minotaur.apache.org>
From: ate@apache.org
To: jakarta-jetspeed-2-cvs@apache.org
Subject: cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly
 jetspeed-spring.xml
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

ate         2005/03/16 09:01:11

  Modified:    portal/src/webapp/WEB-INF/assembly Tag:
                        deployment-refactoring jetspeed-spring.xml
  Log:
  Configuration changes required for the new PAM Portlet, including the ApplicationServerManager for usage on Tomcat
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.43.2.2  +15 -7     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.43.2.1
  retrieving revision 1.43.2.2
  diff -u -r1.43.2.1 -r1.43.2.2
  --- jetspeed-spring.xml	2 Mar 2005 02:51:03 -0000	1.43.2.1
  +++ jetspeed-spring.xml	16 Mar 2005 17:01:11 -0000	1.43.2.2
  @@ -67,6 +67,15 @@
     	   	  <entry key="EntityAccessor">
     	   	  	 <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'/>
     	   	  </entry>
  +          <entry key="ApplicationServerManager">
  +            <ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"/>
  +          </entry>
  +          <entry key="PortletFactory">
  +            <ref bean="portletFactory"/>
  +          </entry>
  +          <entry key="DeploymentManager">
  +            <ref bean="deploymentManager"/>
  +          </entry>
     	   	</map>
     	   </constructor-arg>
     </bean>
  @@ -440,20 +449,19 @@
     	   Provides hooks into the application server to help us deploy portlet applications
     	   as web application into that server.  This manager is for Tomcat 5
     	-->
  -  <!--
  +
     <bean id="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager" 
     	   class="org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager" 
     	   init-method="start" destroy-method="stop"
     >  	   
          <constructor-arg index="0"><value>${autodeployment.catalina.base}</value></constructor-arg>
          <constructor-arg index="1"><value>${autodeployment.catalina.engine}</value></constructor-arg>
  -       <constructor-arg index="2"><value>${autodeployment.catalina.version.major}</value></constructor-arg>
  -  	   <constructor-arg index="3"><value>${autodeployment.server}</value></constructor-arg>
  -  	   <constructor-arg index="4"><value>${autodeployment.port}</value></constructor-arg>
  -  	   <constructor-arg index="5"><value>${autodeployment.user}</value></constructor-arg>
  -  	   <constructor-arg index="6"><value>${autodeployment.password}</value></constructor-arg>
  +  	   <constructor-arg index="2"><value>${autodeployment.server}</value></constructor-arg>
  +  	   <constructor-arg index="3"><value>${autodeployment.port}</value></constructor-arg>
  +  	   <constructor-arg index="4"><value>${autodeployment.user}</value></constructor-arg>
  +  	   <constructor-arg index="5"><value>${autodeployment.password}</value></constructor-arg>
     </bean>
  -  --> 
  + 
     <!--
     	Application Server Manager for JBoss.
     	To support deployment in JBoss, comment the Tomcat app server definition above
  
  
  

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