Changeset 1306

Show
Ignore:
Timestamp:
03/07/07 15:54:09
Author:
douglm
Message:

Additions to filtering support

Some changes to build process to better support portals.

Caldav fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildwar.xml

    r1213 r1306  
    6464 
    6565    <!--temp web.xml location  --> 
     66    <property name="app.temp.web.xml" 
     67              location="${app.dest.webinf}/tempweb.xml" /> 
     68 
     69    <!--final web.xml location  --> 
    6670    <property name="app.dest.web.xml" 
    6771              location="${app.dest.webinf}/web.xml" /> 
    …… 
    146150    </copy> 
    147151 
    148     <!-- Make a modified copy of the web.xml file --> 
     152    <!-- Make a temp copy of the web.xml file --> 
     153    <copy tofile="${app.temp.web.xml}" file="${app.web.xml}" 
     154          overwrite="yes" /> 
     155 
     156    <antcall target="struts-stuff" inheritRefs="true" /> 
     157 
     158    <!-- Filter the temp copy of the web.xml file --> 
    149159    <copy tofile="${app.dest.web.xml}" 
    150           file="${app.web.xml}" 
     160          file="${app.temp.web.xml}" 
    151161          overwrite="yes" > 
    152162      <filterset> 
    …… 
    156166    </copy> 
    157167 
    158     <antcall target="struts-stuff" inheritRefs="true" /> 
     168    <delete file="${app.temp.web.xml}" /> 
    159169 
    160170    <!-- =============================================================== 
    …… 
    401411        <antcall target="add.uportal2" inheritRefs="true" /> 
    402412        <antcall target="add.liferay4" inheritRefs="true" /> 
    403  
    404         <replace file="${app.dest.webinf}/web.xml"> 
    405           <replacefilter token="@PORTLET-NAME@" value="${propval.app.portlet.name}"/> 
    406           <replacefilter token="@PORTAL-SERVLET-CONTEXT-LISTENER@" 
    407                          value="${org.bedework.global.portal-servlet.context.listener}"/> 
    408         </replace> 
    409413      </then> 
    410414    </if> 
    …… 
    449453 
    450454    <!-- Add the portlet servlet mapping --> 
    451     <replace file="${app.dest.webinf}/web.xml"> 
     455    <replace file="${app.temp.web.xml"> 
    452456      <replacetoken><![CDATA[<!-- portlet servlet mapping here -->]]></replacetoken> 
    453457      <replacevalue><![CDATA[<servlet-mapping> 
    …… 
    482486    </copy> 
    483487 
    484     <!-- Add the portlet servlet mapping --> 
    485     <replace file="${app.dest.webinf}/web.xml"> 
    486       <replacetoken><![CDATA[<!-- portlet servlet mapping here -->]]></replacetoken> 
    487       <replacevalue><![CDATA[<listener> 
     488    <!-- Add the context params --> 
     489    <replace file="${app.temp.web.xml}"> 
     490      <replacetoken><![CDATA[<!-- add context params here -->]]></replacetoken> 
     491      <replacevalue><![CDATA[<!-- add context params here --> 
     492 
     493  <context-param> 
     494    <param-name>company_id</param-name> 
     495    <param-value>@LIFERAY-COMPANY-ID@</param-value> 
     496  </context-param>]]> 
     497      </replacevalue> 
     498    </replace> 
     499 
     500    <!-- Add the portal listener --> 
     501    <replace file="${app.temp.web.xml}"> 
     502      <replacetoken><![CDATA[<!-- add listeners here -->]]></replacetoken> 
     503      <replacevalue><![CDATA[<!-- add listeners here --> 
     504 
     505  <listener> 
    488506    <listener-class> 
    489507      @PORTAL-SERVLET-CONTEXT-LISTENER@ 
    490508    </listener-class> 
    491   </listener> 
     509  </listener>]]> 
     510      </replacevalue> 
     511    </replace> 
     512 
     513    <!-- Add the portlet servlet definition --> 
     514    <replace file="${app.temp.web.xml}"> 
     515      <replacetoken><![CDATA[<!-- add servlet definitions here -->]]></replacetoken> 
     516      <replacevalue><![CDATA[<!-- add servlet definitions here --> 
     517 
     518  <!-- Servlet definition for portlet use. --> 
     519  <servlet> 
     520    <servlet-name>@PORTLET-NAME@</servlet-name> 
     521    <display-name>@PORTLET-NAME@ Wrapper</display-name> 
     522    <servlet-class>@PORTLET-SERVLET-CLASS@</servlet-class> 
     523    <init-param> 
     524      <param-name>portlet-class</param-name> 
     525      <param-value>@PORTLET-CLASS@</param-value> 
     526    </init-param> 
     527    <init-param> 
     528      <param-name>portlet-guid</param-name> 
     529      <param-value>@CONTEXT-ROOT@.@PORTLET-NAME@</param-value> 
     530    </init-param> 
     531  </servlet>]]> 
     532      </replacevalue> 
     533    </replace> 
     534 
     535    <!-- Add the portlet servlet mapping --> 
     536    <replace file="${app.temp.web.xml}"> 
     537      <replacetoken><![CDATA[<!-- add servlet mappings here -->]]></replacetoken> 
     538      <replacevalue><![CDATA[<!-- add servlet mappings here --> 
     539 
    492540  <servlet-mapping> 
    493541    <servlet-name>@PORTLET-NAME@</servlet-name> 

  • trunk/build/libjars.properties

    r1292 r1306  
    1818 
    1919pluto.jar=${org.bedework.default.lib}/pluto-1.0.1-rc2.jar 
    20  
    21 liferay4.lib=${org.bedework.default.lib}/liferay4 
    2220 
    2321portals-bridges.jars.dir.name=portals-bridges-1.0 

  • trunk/config/configs/democal.properties

    r1294 r1306  
    116116#org.bedework.global.genurl.taglib.tld=bedework-portlet-struts-html.tld 
    117117#org.bedework.global.liferay.company-id=liferay.com 
     118#liferay4.lib=${org.bedework.default.lib}/liferay4 
    118119 
    119120# 

  • trunk/deployment/dumprestore/shellscr/resources/dumpres.sh

    r1286 r1306  
    77# JAVA_HOME needs to be defined 
    88 
    9 cp=@CP@ 
     9cp=.:./classes:./resources 
     10 
     11for i in lib/* 
     12  do 
     13    cp=$cp:$i 
     14done 
    1015 
    1116DUMPCMD="$JAVA_HOME/bin/java -cp $cp @DUMP-CLASS@"