Changeset 1213

Show
Ignore:
Timestamp:
01/10/07 10:59:24
Author:
douglm
Message:

Changes to get liferay build working (better)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildfilters.xml

    r1191 r1213  
    3535    <filter token="PORTAL-SERVLET-CONTEXT-PROVIDER" 
    3636            value="${org.bedework.global.portal-servlet.context.provider}"/> 
     37 
     38    <filter token="PORTAL-SERVLET-CONTEXT-LISTENER" 
     39            value="${org.bedework.global.portal-servlet.context.listener}"/> 
    3740 
    3841    <filter token="PORTLET-CLASS" 

  • trunk/build/buildwar.xml

    r1191 r1213  
    398398        </replace> 
    399399 
     400        <antcall target="add.jetspeed2" inheritRefs="true" /> 
     401        <antcall target="add.uportal2" inheritRefs="true" /> 
     402        <antcall target="add.liferay4" inheritRefs="true" /> 
     403 
    400404        <replace file="${app.dest.webinf}/web.xml"> 
    401405          <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}"/> 
    402408        </replace> 
    403409      </then> 
    404410    </if> 
    405     <antcall target="add.jetspeed2" inheritRefs="true" /> 
    406     <antcall target="add.uportal2" inheritRefs="true" /> 
    407     <antcall target="add.liferay4" inheritRefs="true" /> 
    408411 
    409412    <copy todir="${app.dest.lib}"> 
    …… 
    422425  </target> 
    423426 
     427  <!-- ================================================================= 
     428       Jetspeed 2 modifications 
     429       ================================================================= --> 
     430 
    424431  <target name="add.jetspeed2" if="org.bedework.build.for.jetspeed2" > 
    425432    <copy todir="${app.dest.webinf}/tlds" > 
    …… 
    430437  </target> 
    431438 
     439  <!-- ================================================================= 
     440       Uportal 2 modifications 
     441       ================================================================= --> 
     442 
    432443  <target name="add.uportal2" if="org.bedework.build.for.uportal2" > 
    433444    <copy todir="${app.dest.lib}" > 
    …… 
    439450    <!-- Add the portlet servlet mapping --> 
    440451    <replace file="${app.dest.webinf}/web.xml"> 
    441       <replacetoken><![CDATA[<!-- uPortal2 portlet servlet mapping here -->]]></replacetoken> 
     452      <replacetoken><![CDATA[<!-- portlet servlet mapping here -->]]></replacetoken> 
    442453      <replacevalue><![CDATA[<servlet-mapping> 
    443454    <servlet-name>@PORTLET-NAME@</servlet-name> 
    …… 
    449460  </target> 
    450461 
     462  <!-- ================================================================= 
     463       Liferay 4 modifications 
     464       ================================================================= --> 
     465 
    451466  <target name="add.liferay4" if="org.bedework.build.for.liferay4" > 
    452467   <!-- Add liferay config files --> 
    …… 
    462477        <include name="bw-liferay*.jar"/> 
    463478      </fileset> 
     479      <fileset dir="${liferay4.lib}"> 
     480        <include name="*.jar"/> 
     481      </fileset> 
    464482    </copy> 
    465483 
    466484    <!-- Add the portlet servlet mapping --> 
    467485    <replace file="${app.dest.webinf}/web.xml"> 
    468       <replacetoken><![CDATA[<!-- liferay4 portlet servlet mapping here -->]]></replacetoken> 
     486      <replacetoken><![CDATA[<!-- portlet servlet mapping here -->]]></replacetoken> 
    469487      <replacevalue><![CDATA[<listener> 
    470488    <listener-class> 
    471       com.liferay.portal.servlet.PortletContextListener 
     489      @PORTAL-SERVLET-CONTEXT-LISTENER@ 
    472490    </listener-class> 
    473491  </listener> 

  • trunk/build/libjars.properties

    r1186 r1213  
    1919pluto.jar=${org.bedework.default.lib}/pluto-1.0.1-rc2.jar 
    2020 
    21 liferay.lib=${org.bedework.default.lib}/liferay4 
     21liferay4.lib=${org.bedework.default.lib}/liferay4 
    2222 
    2323portals-bridges.jars.dir.name=portals-bridges-1.0 

  • trunk/config/configs/democal.properties

    r1205 r1213  
    103103#org.bedework.build.for.liferay4=yes 
    104104#org.bedework.global.portal.platform=liferay4 
     105# servlet-class is the action servlet in web.xml 
    105106#org.bedework.global.servlet.class=org.apache.portals.bridges.struts.PortletServlet 
     107# portlet-servlet.class is the servlet-class element  for the portlet servlet in web.xml 
    106108#org.bedework.global.portlet-servlet.class=com.liferay.portal.servlet.PortletServlet 
     109# portlet.class is in portlet.xml and the value for the portlet-class init par in web.xml 
    107110#org.bedework.global.portlet.class=com.liferay.portal.apache.bridges.LiferayStrutsPortlet 
    108 #org.bedework.global.portal-servlet.context.provider=org.bedework.portal.liferay.PortalServletContextProvider 
     111# portal-servlet.context.provider is in portlet.xml 
     112#org.bedework.global.portal-servlet.context.provider=com.liferay.util.apache.bridges.struts.LiferayServletContextProviderWrapper 
     113#org.bedework.global.portal-servlet.context.listener=com.liferay.portal.kernel.servlet.PortletContextListener 
    109114#org.bedework.global.ignoreContentType=true 
    110115#org.bedework.global.genurl.taglib.tld=bedework-portlet-struts-html.tld 

  • trunk/deployment/webuser/liferay4/build.xml

    r1105 r1213  
    2525              location="${portlet.build.dir}/../portlet/resources" /> 
    2626 
     27    <!-- The intent is to have a set of quickstart skins configured for 
     28         portal use. So far we've not managed that so for th etime being we 
     29         will just use the standalone skin set. 
    2730    <property name="portlet.skins.dir" 
    2831              location="${portlet.resources.dir}/demoskins" /> 
     32              --> 
     33    <property name="portlet.skins.dir" 
     34              location="${portlet.build.dir}/../webapp/resources/demoskins" /> 
    2935  </target> 
    3036