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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to