portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal maven.xml
Date Wed, 23 Mar 2005 23:07:19 GMT
ate         2005/03/23 15:07:19

  Modified:    portal   maven.xml
  Log:
  Resolving http://issues.apache.org/jira/browse/JS2-210:
  Tomcat 4 is no longer supported
  
  Revision  Changes    Path
  1.121     +7 -17     jakarta-jetspeed-2/portal/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
  retrieving revision 1.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- maven.xml	8 Mar 2005 04:28:52 -0000	1.120
  +++ maven.xml	23 Mar 2005 23:07:19 -0000	1.121
  @@ -426,22 +426,20 @@
   
         <j:set var="catalina_version_major" value="${org.apache.jetspeed.catalina.version.major}"/>
         <j:choose>
  -        <j:when test="${catalina_version_major == '5'}" >
  -          <j:set var="context_dir" value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
  -          <j:set var="use_contextclassloader" value='useContextClassLoader="false"'/>
  +        <j:when test="${catalina_version_major == '5.5'}" >
  +          <j:set var="context_file_source" value="jetspeed-tomcat-5.5.xml"/>
           </j:when>
           <j:otherwise>
  -          <j:set var="context_dir" value="${org.apache.jetspeed.deploy.war.dir}"/>
  -          <j:set var="use_contextclassloader" value=""/>
  +          <j:set var="context_file_source" value="jetspeed-tomcat-5.xml"/>
           </j:otherwise>
         </j:choose>
  -      <copy file="./src/resources/jetspeed.xml" tofile="${context_dir}/jetspeed.xml"
overwrite="true">
  +      <j:set var="context_file_target" value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml"/>
  +      <copy file="./src/resources/${context_file_source}" tofile="${context_file_target}"
overwrite="true">
           <filterset begintoken="@" endtoken="@">
             <filter token="USERNAME" value="${org.apache.jetspeed.production.database.user}"/>
             <filter token="PASSWORD" value="${org.apache.jetspeed.production.database.password}"/>
             <filter token="DRIVER" value="${org.apache.jetspeed.production.database.driver}"/>
             <filter token="URL" value="${org.apache.jetspeed.production.database.url}"/>
  -          <filter token="USE_CONTEXTCLASSLOADER" value="${use_contextclassloader}"/>
           </filterset>
         </copy>
         <attainGoal name="catalina:base-shared" />
  @@ -664,7 +662,7 @@
              in a test failure (TestSpringEngine)
              This property therefore MUST remain defined EXACTLY as specified for this filter
to be able to work
         -->
  -      <filterset begintoken="autodeployment.catalina.version.major" endtoken="4">
  +      <filterset begintoken="autodeployment.catalina.version.major" endtoken="5">
           <filter token="=" value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
         </filterset>
         <filterset begintoken="autodeployment.port" endtoken="8080">
  @@ -696,15 +694,7 @@
       <delete file="${org.apache.jetspeed.deploy.war.dir}/rss.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/jpetstore"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/jpetstore.war"/>
  -    <j:set var="catalina_version_major" value="${org.apache.jetspeed.catalina.version.major}"/>
  -    <j:choose>
  -      <j:when test="${catalina_version_major == '5'}" >
  -        <j:set var="context_dir" value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
  -      </j:when>
  -      <j:otherwise>
  -        <j:set var="context_dir" value="${org.apache.jetspeed.deploy.war.dir}"/>
  -      </j:otherwise>
  -    </j:choose>
  +    <j:set var="context_dir" value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
   	<delete file="${context_dir}/${org.apache.jetspeed.portal.name}.xml"/>
   	<delete file="${context_dir}/security.xml"/>
     </goal>
  
  
  

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