Changeset 609

Show
Ignore:
Timestamp:
06/20/06 09:42:12
Author:
douglm
Message:

More uportal integration

When running as a portlet will now suffix the approot with "_" + protletPlatform.

Allows us to have a separate set of stylesheets for portlet mode as against stand-alone mode.

Committed a copy of the current set of standalone stylesheets ready for customization.

Also made more run-time properties available via the options object.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/buildwar.xml

    r597 r609  
    4444 
    4545  <target name="init.common"> 
     46    <!-- 
    4647    <condition property="org.bedework.build.for.jetspeed2"> 
    4748      <equals arg1="jetspeed2" arg2="${propval.app.portal.platform}"/> 
    …… 
    5556      <equals arg1="jboss" arg2="${org.bedework.global.j2ee.platform}"/> 
    5657    </condition> 
     58    --> 
    5759 
    5860    <!-- Destinations - where we build an unwrapped war --> 
    …… 
    152154              value="${propval.app.description}" /> 
    153155 
     156      <filter token="PORTAL-PLATFORM" 
     157              value="${propval.app.portal.platform}"/> 
     158 
    154159      <filter token="SERVLET-CLASS" 
    155160              value="${propval.app.servlet.class}"/> 
    …… 
    178183      <filter token="NOXSLT" 
    179184              value="${propval.app.noxslt}" /> 
     185      <filter token="APPLICATION-ROOT" 
     186              value="${propval.app.root}" /> 
    180187 
    181188      <filter token="APP-GUESTMODE" 
    …… 
    217224 
    218225    <copy tofile="${app.dest.properties}/options.xml" 
    219           file="${org.bedework.config.options}" /> 
     226          file="${org.bedework.config.options}" > 
     227      <filterset> 
     228        <filter token="RPI-DEBUG" value="${app.debug.val}"/> 
     229      </filterset> 
     230      <filterset refid="property.filters" /> 
     231    </copy> 
    220232 
    221233    <!-- Make a modified copy of the web.xml file --> 

  • trunk/calendar3/common/src/edu/rpi/sss/util/jsp/UtilAbstractAction.java

    r415 r609  
    183183  private boolean noActionErrors = false; 
    184184 
    185   private boolean isPortlet; 
     185  protected boolean isPortlet; 
    186186 
    187187  /** This is the routine which does the work. 

  • trunk/calendar3/config/configs/democal.options.xml

    r526 r609  
    8686 
    8787          <logPrefix>PubEventsAdmin</logPrefix> 
     88 
     89          <appRoot>@APPLICATION-ROOT@</appRoot> 
     90          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    8891        </CalAdmin> 
    8992 
    …… 
    106109 
    107110          <logPrefix>PubEvents</logPrefix> 
     111 
     112          <appRoot>@APPLICATION-ROOT@</appRoot> 
     113          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    108114 
    109115          <refreshAction>setup.do</refreshAction> 
    …… 
    132138          <logPrefix>SoEDept</logPrefix> 
    133139 
     140          <appRoot>@APPLICATION-ROOT@</appRoot> 
     141          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
     142 
    134143          <refreshAction>setup.do</refreshAction> 
    135144          <refreshInterval>300</refreshInterval> 
    …… 
    156165 
    157166          <logPrefix>PersonalCalendar</logPrefix> 
     167 
     168          <appRoot>@APPLICATION-ROOT@</appRoot> 
     169          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    158170 
    159171          <refreshAction>setup.do</refreshAction> 

  • trunk/calendar3/config/configs/democal.properties

    r526 r609  
    9999org.bedework.app.Events.default.contenttype=text/xml 
    100100org.bedework.app.Events.web.xml=guest/web.xml 
     101#org.bedework.app.Events.portal.platform=uportal2 
     102#org.bedework.app.Events.portlet.name=PublicCal 
    101103 
    102104org.bedework.app.Events.war.name=cal 

  • trunk/calendar3/deployment/build.xml

    r597 r609  
    243243    </propertyset> 
    244244 
     245    <!-- 
     246    <property name="${propval.app.portal.platform}" value="" /> 
     247 
     248    <condition property="org.bedework.build.for.jetspeed2"> 
     249      <equals arg1="jetspeed2" arg2="${propval.app.portal.platform}"/> 
     250    </condition> 
     251 
     252    <condition property="org.bedework.build.for.uportal2"> 
     253      <equals arg1="uportal2" arg2="${propval.app.portal.platform}"/> 
     254    </condition> 
     255 
     256    <condition property="org.bedework.build.for.jboss"> 
     257      <equals arg1="jboss" arg2="${org.bedework.global.j2ee.platform}"/> 
     258    </condition> 
     259    --> 
     260 
    245261    <property name="org.bedework.deploy.type.dir" 
    246262              location="${org.bedework.deployment.base}/termination" /> 
    …… 
    286302    </propertyset> 
    287303 
     304    <!-- 
     305    <property name="${propval.app.portal.platform}" value="" /> 
     306 
     307    <condition property="org.bedework.build.for.jetspeed2"> 
     308      <equals arg1="jetspeed2" arg2="${propval.app.portal.platform}"/> 
     309    </condition> 
     310 
     311    <condition property="org.bedework.build.for.uportal2"> 
     312      <equals arg1="uportal2" arg2="${propval.app.portal.platform}"/> 
     313    </condition> 
     314 
     315    <condition property="org.bedework.build.for.jboss"> 
     316      <equals arg1="jboss" arg2="${org.bedework.global.j2ee.platform}"/> 
     317    </condition> 
     318    --> 
     319 
    288320    <property name="org.bedework.deploy.type.dir" 
    289321              location="${org.bedework.deployment.base}/${org.bedework.deploy.type}" /> 

  • trunk/calendar3/deployment/dumprestore/shellscr/build.xml

    r463 r609  
    66 
    77<project name="bwdumpres.deploy" default="deploy" > 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
    810  <target name="init" > 
    911    <dirname property="this.dir" file="${ant.file}"/> 

  • trunk/calendar3/deployment/publiccaldav/webapp/build.xml

    r293 r609  
    66 
    77<project name="bwpubcaldav.deploy" default="deploy" > 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
    810  <target name="init" > 
    911    <!-- and define some properties based on those --> 

  • trunk/calendar3/deployment/termination/webapp/build.xml

    r293 r609  
    66 
    77<project name="bwpubcaldav.deploy" default="deploy" > 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
    810  <target name="init"> 
    911  </target> 

  • trunk/calendar3/deployment/usercaldav/webapp/build.xml

    r293 r609  
    66 
    77<project name="bwusercaldav.deploy" default="deploy" > 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
    810  <target name="init" > 
    911    <!-- and define some properties based on those --> 

  • trunk/calendar3/deployment/webadmin/webapp/build.xml

    r293 r609  
    66 
    77<project name="bwadmin.deploy" default="deploy" > 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
    810  <target name="init"> 
    911    <!-- and define some properties based on those --> 

  • trunk/calendar3/deployment/webconfig/webapp/build.xml

    r293 r609  
    66 
    77<project name="bwconfig.deploy" default="deploy" > 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
    810  <target name="init" > 
    911    <!-- and define some properties based on those --> 

  • trunk/calendar3/deployment/webpublic/webapp/build.xml

    r293 r609  
    66 
    77<project name="bwpublic.deploy" default="deploy" > 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
    810  <target name="init"> 
    911    <!-- and define some properties based on those --> 
    …… 
    5961    <!-- Delete expanded version --> 
    6062    <delete dir="${org.bedework.appserver.dir}/${propval.app.deploy.dir}/${propval.app.context.root}" /> 
     63 
     64    <antcall target="deploy.uportal2" inheritRefs="true" /> 
     65  </target> 
     66 
     67  <target name="deploy.uportal2" if="org.bedework.build.for.uportal2" > 
     68    <ant antfile="${org.bedework.deploy.type.dir}/${propval.app.portal.platform}/build.xml" 
     69         inheritrefs="true" target="deploy" /> 
    6170  </target> 
    6271 

  • trunk/calendar3/deployment/webuser/webapp/build.xml

    r293 r609  
    66 
    77<project name="bwpersonal.deploy" default="deploy" > 
     8  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
     9 
    810  <target name="init" > 
    911    <!-- and define some properties based on those --> 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

    r585 r609  
    13121312      form.assignNewSession(true); 
    13131313 
    1314       CalEnv env = getEnv(request, form); 
    1315       String appRoot = env.getAppProperty("root"); 
     1314      String appRoot = form.retrieveConfig().getAppRoot(); 
     1315 
     1316      /* If we're running as a portlet change the app root to point to a 
     1317       * portlet specific directory. 
     1318       */ 
     1319      String portalPlatform = form.retrieveConfig().getPortalPlatform(); 
     1320      if (isPortlet && (portalPlatform != null)) { 
     1321        appRoot += "." + portalPlatform; 
     1322      } 
    13161323 
    13171324      /** The actual session class used is possibly site dependent 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/ConfigBase.java

    r519 r609  
    9696  private String logPrefix; 
    9797 
     98  private String appRoot; 
     99 
     100  private String portalPlatform; 
     101 
    98102  private String refreshAction; 
    99103 
    …… 
    233237  public String getLogPrefix() { 
    234238    return logPrefix; 
     239  } 
     240 
     241  /** Where the xslt and resources are based. 
     242   * 
     243   * @param val 
     244   */ 
     245  public void setAppRoot(String val) { 
     246    appRoot = val; 
     247  } 
     248 
     249  /** 
     250   * @return String 
     251   */ 
     252  public String getAppRoot() { 
     253    return appRoot; 
     254  } 
     255 
     256  /** Define the name of the portal platform. 
     257   * 
     258   * @param val 
     259   */ 
     260  public void setPortalPlatform(String val) { 
     261    portalPlatform = val; 
     262  } 
     263 
     264  /** 
     265   * @return String 
     266   */ 
     267  public String getPortalPlatform() { 
     268    return portalPlatform; 
    235269  } 
    236270