Changeset 1937

Show
Ignore:
Timestamp:
10/29/08 17:29:30
Author:
douglm
Message:

Major reorganization of the build process mostly affecting handling of portal builds.

Removed portal specific directories from teh deployment directory.

Removed portal sepcific code from buildwar.xml and added new portal specific files to be imported. These are in a section of teh bwbuild config directory.

All portal customization is now part of building the war file.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildfilters.xml

    r1933 r1937  
    2626    <filter token="DIRECTORY-BROWSING-DISALLOWED" 
    2727            value="${org.bedework.global.directory.browsing.disallowed}" /> 
    28  
    29     <filter token="PORTAL-PLATFORM" 
    30             value="${org.bedework.global.portal.platform}"/> 
    3128 
    3229    <filter token="SERVLET-CLASS" 
    …… 
    7875    <filter token="APP-NAME" 
    7976            value="${propval.app.name}"/> 
     77    <filter token="APP-DESCRIPTION" 
     78            value="${propval.app.description}"/> 
    8079    <filter token="APP-VERSION" 
    8180            value="${org.bedework.global.version}"/> 
    …… 
    8988    <filter token="NOXSLT" 
    9089            value="${propval.app.noxslt}" /> 
    91     <filter token="APPLICATION-ROOT" 
    92             value="${propval.app.root}" /> 
    9390 
    9491    <!-- Change this to be an app par --> 

  • trunk/build/buildwar.xml

    r1935 r1937  
    4242<project name="bedework.buildwar" default="build" > 
    4343  <import file="${build.dir}/buildfilters.xml" /> 
     44 
     45  <if> 
     46    <isset property="org.bedework.global.portal.platform" /> 
     47    <then> 
     48      <import file="${build.dir}/portals/${org.bedework.global.portal.platform}War.xml" /> 
     49    </then> 
     50  </if> 
    4451 
    4552  <target name="init" depends="init.common,init.j2ee,init.standalone" /> 
    …… 
    372379      <isset property="org.bedework.global.portal.platform" /> 
    373380      <then> 
    374         <!-- Add common portlet files --> 
    375  
    376         <copy todir="${app.dest.lib}" 
    377               file="${org.bedework.appjar.portals-bridges-common}"/> 
    378         <copy todir="${app.dest.lib}" 
    379               file="${org.bedework.appjar.portals-bridges-struts-1.2.7}"/> 
    380  
    381         <!-- Use generic bedework portlet tld --> 
    382         <copy todir="${app.dest.webinf}/tlds" 
    383               overwrite="yes" 
    384               failonerror="no" > 
    385           <fileset dir="${app.root.dir}/resources/portlet" > 
    386             <include name="*.tld"/> 
    387           </fileset> 
    388         </copy> 
    389  
    390         <copy todir="${app.dest.webinf}" 
    391               file="${org.bedework.deploy.type.dir}/portlet/struts-portlet-config.xml" 
    392               overwrite="yes" 
    393               failonerror="no" /> 
    394  
    395         <copy todir="${app.dest.webinf}" 
    396               file="${org.bedework.deploy.type.dir}/portlet/portlet.xml" 
    397               overwrite="yes" 
    398               failonerror="no" > 
    399           <filterset refid="property.filters" /> 
    400         </copy> 
    401  
    402         <!-- Add the portal bridge controller def --> 
    403         <replace file="${app.dest.webinf}/struts-config.xml"> 
    404           <replacetoken><![CDATA[<!-- portlet controller def here -->]]></replacetoken> 
    405           <replacevalue><![CDATA[<controller pagePattern="$M$P" inputForward="true" 
    406                   processorClass="org.apache.portals.bridges.struts.PortletRequestProcessor"/>]]> 
    407           </replacevalue> 
    408         </replace> 
    409  
    410         <antcall target="add.jetspeed2" inheritRefs="true" /> 
    411         <antcall target="add.uportal2" inheritRefs="true" /> 
    412         <antcall target="add.liferay4" inheritRefs="true" /> 
    413         <antcall target="add.liferay5" inheritRefs="true" /> 
     381        <antcall target="doPortal" inheritRefs="true" /> 
    414382      </then> 
    415383    </if> 
    …… 
    426394    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl}"/> 
    427395    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jstl-standard}"/> 
    428   </target> 
    429  
    430   <!-- ================================================================= 
    431        Jetspeed 2 modifications 
    432        ================================================================= --> 
    433  
    434   <target name="add.jetspeed2" if="org.bedework.build.for.jetspeed2" > 
    435     <copy todir="${app.dest.webinf}/tlds" > 
    436       <fileset dir="${org.bedework.default.lib}/${jetspeed2.jars.dir}/portals-bridges-struts"> 
    437         <include name="*.tld"/> 
    438       </fileset> 
    439     </copy> 
    440   </target> 
    441  
    442   <!-- ================================================================= 
    443        Uportal 2 modifications 
    444        ================================================================= --> 
    445  
    446   <target name="add.uportal2" if="org.bedework.build.for.uportal2" > 
    447     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.uportal}"/> 
    448  
    449     <!-- Add the portlet servlet mapping --> 
    450     <replace file="${app.temp.web.xml}"> 
    451       <replacetoken><![CDATA[<!-- portlet servlet mapping here -->]]></replacetoken> 
    452       <replacevalue><![CDATA[<servlet-mapping> 
    453     <servlet-name>@PORTLET-NAME@</servlet-name> 
    454     <url-pattern>/@PORTLET-NAME@/*</url-pattern> 
    455   </servlet-mapping>]]> 
    456       </replacevalue> 
    457     </replace> 
    458  
    459   </target> 
    460  
    461   <!-- ================================================================= 
    462        Liferay 4 modifications 
    463        ================================================================= --> 
    464  
    465   <target name="add.liferay4" if="org.bedework.build.for.liferay4" > 
    466    <!-- Add liferay config files --> 
    467     <copy todir="${app.dest.webinf}" > 
    468       <fileset dir="${app.sou.dir}/war/WEB-INF" > 
    469         <include name="liferay*"/> 
    470       </fileset> 
    471       <filterset refid="property.filters" /> 
    472     </copy> 
    473  
    474     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay}"/> 
    475     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-bridges}"/> 
    476     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-java}"/> 
    477  
    478     <!-- Add the context params --> 
    479     <replace file="${app.temp.web.xml}"> 
    480       <replacetoken><![CDATA[<!-- add context params here -->]]></replacetoken> 
    481       <replacevalue><![CDATA[<!-- add context params here --> 
    482  
    483   <context-param> 
    484     <param-name>company_id</param-name> 
    485     <param-value>@LIFERAY-COMPANY-ID@</param-value> 
    486   </context-param>]]> 
    487       </replacevalue> 
    488     </replace> 
    489  
    490     <!-- Add the portal listener --> 
    491     <replace file="${app.temp.web.xml}"> 
    492       <replacetoken><![CDATA[<!-- add listeners here -->]]></replacetoken> 
    493       <replacevalue><![CDATA[<!-- add listeners here --> 
    494  
    495   <listener> 
    496     <listener-class> 
    497       @PORTAL-SERVLET-CONTEXT-LISTENER@ 
    498     </listener-class> 
    499   </listener>]]> 
    500       </replacevalue> 
    501     </replace> 
    502  
    503     <!-- Add the portlet servlet definition --> 
    504     <replace file="${app.temp.web.xml}"> 
    505       <replacetoken><![CDATA[<!-- add servlet definitions here -->]]></replacetoken> 
    506       <replacevalue><![CDATA[<!-- add servlet definitions here --> 
    507  
    508   <!-- Servlet definition for portlet use. --> 
    509   <servlet> 
    510     <servlet-name>@PORTLET-NAME@</servlet-name> 
    511     <display-name>@PORTLET-NAME@ Wrapper</display-name> 
    512     <servlet-class>@PORTLET-SERVLET-CLASS@</servlet-class> 
    513     <init-param> 
    514       <param-name>portlet-class</param-name> 
    515       <param-value>@PORTLET-CLASS@</param-value> 
    516     </init-param> 
    517     <init-param> 
    518       <param-name>portlet-guid</param-name> 
    519       <param-value>@CONTEXT-ROOT@.@PORTLET-NAME@</param-value> 
    520     </init-param> 
    521   </servlet>]]> 
    522       </replacevalue> 
    523     </replace> 
    524  
    525     <!-- Add the portlet servlet mapping --> 
    526     <replace file="${app.temp.web.xml}"> 
    527       <replacetoken><![CDATA[<!-- add servlet mappings here -->]]></replacetoken> 
    528       <replacevalue><![CDATA[<!-- add servlet mappings here --> 
    529  
    530   <servlet-mapping> 
    531     <servlet-name>@PORTLET-NAME@</servlet-name> 
    532     <url-pattern>/@PORTLET-NAME@/*</url-pattern> 
    533   </servlet-mapping>]]> 
    534       </replacevalue> 
    535     </replace> 
    536   </target> 
    537  
    538   <!-- ================================================================= 
    539        Liferay 5 modifications 
    540        ================================================================= --> 
    541  
    542   <target name="add.liferay5" if="org.bedework.build.for.liferay5" > 
    543    <!-- Add liferay config files --> 
    544     <copy todir="${app.dest.webinf}" > 
    545       <fileset dir="${app.sou.dir}/war/WEB-INF" > 
    546         <include name="liferay*"/> 
    547       </fileset> 
    548       <filterset refid="property.filters" /> 
    549     </copy> 
    550  
    551     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-taglib}"/> 
    552     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-bridges}"/> 
    553     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-java}"/> 
    554  
    555     <!-- Add the context params --> 
    556     <replace file="${app.temp.web.xml}"> 
    557       <replacetoken><![CDATA[<!-- add context params here -->]]></replacetoken> 
    558       <replacevalue><![CDATA[<!-- add context params here --> 
    559  
    560   <context-param> 
    561     <param-name>company_id</param-name> 
    562     <param-value>@LIFERAY-COMPANY-ID@</param-value> 
    563   </context-param>]]> 
    564       </replacevalue> 
    565     </replace> 
    566  
    567     <!-- Add the portal listener --> 
    568     <replace file="${app.temp.web.xml}"> 
    569       <replacetoken><![CDATA[<!-- add listeners here -->]]></replacetoken> 
    570       <replacevalue><![CDATA[<!-- add listeners here --> 
    571  
    572   <listener> 
    573     <listener-class> 
    574       @PORTAL-SERVLET-CONTEXT-LISTENER@ 
    575     </listener-class> 
    576   </listener>]]> 
    577       </replacevalue> 
    578     </replace> 
    579  
    580     <!-- Add the portlet servlet definition --> 
    581     <replace file="${app.temp.web.xml}"> 
    582       <replacetoken><![CDATA[<!-- add servlet definitions here -->]]></replacetoken> 
    583       <replacevalue><![CDATA[<!-- add servlet definitions here --> 
    584  
    585   <!-- Servlet definition for portlet use. --> 
    586   <servlet> 
    587     <servlet-name>@PORTLET-NAME@</servlet-name> 
    588     <display-name>@PORTLET-NAME@ Wrapper</display-name> 
    589     <servlet-class>@PORTLET-SERVLET-CLASS@</servlet-class> 
    590     <init-param> 
    591       <param-name>portlet-class</param-name> 
    592       <param-value>@PORTLET-CLASS@</param-value> 
    593     </init-param> 
    594     <init-param> 
    595       <param-name>portlet-guid</param-name> 
    596       <param-value>@CONTEXT-ROOT@.@PORTLET-NAME@</param-value> 
    597     </init-param> 
    598   </servlet>]]> 
    599       </replacevalue> 
    600     </replace> 
    601  
    602     <!-- Add the portlet servlet mapping --> 
    603     <replace file="${app.temp.web.xml}"> 
    604       <replacetoken><![CDATA[<!-- add servlet mappings here -->]]></replacetoken> 
    605       <replacevalue><![CDATA[<!-- add servlet mappings here --> 
    606  
    607   <servlet-mapping> 
    608     <servlet-name>@PORTLET-NAME@</servlet-name> 
    609     <url-pattern>/@PORTLET-NAME@/*</url-pattern> 
    610   </servlet-mapping>]]> 
    611       </replacevalue> 
    612     </replace> 
    613396  </target> 
    614397 

  • trunk/build/loadDeployConfig.xml

    r1935 r1937  
    99  <macrodef name="loadDeployConfig"> 
    1010    <sequential> 
     11      <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
     12 
     13      <property environment="env"/> 
     14 
     15      <echo message="Load user properties from ${org.bedework.user.build.properties}" /> 
     16 
     17      <!-- Load user property definition overrides --> 
     18      <property file="${org.bedework.user.build.properties}" /> 
     19 
    1120      <property name="org.bedework.config.properties" 
    1221                location="${org.bedework.config.base}/configs/democal.properties" /> 
    …… 
    1625      <echo message="==========================================================" /> 
    1726      <echo message="Use config properties ${org.bedework.config.properties}" /> 
    18       <loadproperties srcFile="${org.bedework.config.properties}" > 
    19         <filterchain> 
    20           <expandproperties/> 
    21         </filterchain> 
    22       </loadproperties> 
     27      <property file="${org.bedework.config.properties}" /> 
    2328 
    2429      <!-- Load the run time options and define some properties based on some 
    …… 
    2732      <xmlproperty file="${org.bedework.config.options}"/> 
    2833 
     34      <if> 
     35        <isset property="bedework-options.org.bedework.global.portal.platform"/> 
     36        <then> 
     37          <property name="org.bedework.global.portal.platform" 
     38                    value="${bedework-options.org.bedework.global.portal.platform}" /> 
     39 
     40          <property name="org.bedework.config.portal.home" 
     41                    value="${org.bedework.config.home}/.portal/${org.bedework.global.portal.platform}" /> 
     42 
     43          <property name="org.bedework.config.portal.common.home" 
     44                    value="${org.bedework.config.home}/.portal/common-resources" /> 
     45 
     46          <echo message="******************* load from ${org.bedework.config.portal.home}/portal.properties" /> 
     47          <property file="${org.bedework.config.portal.home}/portal.properties" /> 
     48        </then> 
     49        <else> 
     50          <echo message="******************* load from ${org.bedework.config.home}/.standalone/standalone.properties" /> 
     51          <property file="${org.bedework.config.home}/.standalone/standalone.properties" /> 
     52        </else> 
     53      </if> 
     54 
    2955      <property name="org.bedework.global.version" 
    3056                value="${bedework-options.org.bedework.global.version}" /> 
     57 
     58      <property name="org.bedework.global.directory.browsing.disallowed" 
     59                value="${bedework-options.org.bedework.syspars.directoryBrowsingDisallowed}" /> 
    3160    </sequential> 
    3261  </macrodef> 

  • trunk/build/quickstart/build.xml

    r1935 r1937  
    109109    <property name="org.bedework.hsqldb.dir" 
    110110              location="${org.bedework.project.bedework}/../hsqldb-1.7.3.3" /> 
    111  
    112     <echo message="Load user properties from ${org.bedework.user.build.properties}" /> 
    113  
    114     <!-- Load user property definition overrides --> 
    115     <property file="${org.bedework.user.build.properties}" /> 
    116  
    117     <!-- ==================== config properties ========================= 
    118     <property name="org.bedework.config.properties" 
    119               location="${org.bedework.config.base}/configs/democal.properties" /> 
    120     <property name="org.bedework.config.options" 
    121               location="${org.bedework.config.base}/configs/democal.options.xml" /> 
    122  
    123     <echo message="==========================================================" /> 
    124     <echo message="Use config properties ${org.bedework.config.properties}" /> 
    125     <loadproperties 
    126           srcFile="${org.bedework.config.properties}" > 
    127       <filterchain> 
    128         <expandproperties/> 
    129       </filterchain> 
    130     </loadproperties> 
    131     --> 
    132111  </target> 
    133112 

  • trunk/build/quickstart/run-hsqldb.xml

    r1933 r1937  
    1919  </target> 
    2020 
     21  <target name="hsql.init" depends="run.init"> 
     22    <!--  Set this property in the configuration if you want to overrride the 
     23         quickstart hsql defs. --> 
     24    <property name="org.bedework.quickstart.hsql.defs" 
     25              location="${org.bedework.project.bedework}/build/quickstart/hsqldb.properties" /> 
     26 
     27    <echo message="load hsql properties from ${org.bedework.quickstart.hsql.defs}"/> 
     28 
     29    <property file="${org.bedework.quickstart.hsql.defs}" /> 
     30  </target> 
     31 
    2132  <!-- ================================================================= 
    2233       The "hsqldb" target starts the hsqldb server 
    2334       ================================================================= --> 
    2435 
    25   <target name="hsqldb" depends="run.init" 
     36  <target name="hsqldb" depends="hsql.init" 
    2637          description="starts the hsqldb server"> 
    27     <echo message="Starting hsqldb"/> 
     38    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/> 
     39 
    2840    <java fork="true" dir="${basedir}" classname="org.hsqldb.Server"> 
    2941      <classpath> 
    …… 
    3345      <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.dbname}"/> 
    3446      <arg value="-port"/> 
    35       <arg value="8887"/> 
     47      <arg value="${org.bedework.hsqldb.port}"/> 
    3648    </java> 
    3749  </target> 
    3850 
    39   <target name="hsqldb-trace" depends="run.init" 
     51  <target name="hsqldb-trace" depends="hsql.init" 
    4052          description="starts the hsqldb server"> 
    41     <echo message="Starting hsqldb"/> 
     53    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/> 
     54 
    4255    <java fork="true" dir="${basedir}" classname="org.hsqldb.Server"> 
    4356      <classpath> 
    …… 
    5164      <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.dbname}"/> 
    5265      <arg value="-port"/> 
    53       <arg value="8887"/> 
     66      <arg value="${org.bedework.hsqldb.port}"/> 
    5467    </java> 
    5568  </target> 
    5669 
    57   <target name="hsqldb-trace-9887" depends="run.init" 
     70  <target name="hsqldb-trace-9887" depends="hsql.init" 
    5871          description="starts the hsqldb server"> 
    5972    <echo message="Starting hsqldb"/> 
    …… 
    7386  </target> 
    7487 
    75   <target name="uportaldb" depends="run.init" 
     88  <target name="uportaldb" depends="hsql.init" 
    7689          description="starts the hsqldb server"> 
    7790    <echo message="Starting hsqldb"/> 
    …… 
    87100  </target> 
    88101 
    89   <target name="liferaydb" depends="run.init" 
     102  <target name="liferaydb" depends="hsql.init" 
    90103          description="starts the hsqldb server for likferay"> 
    91104    <echo message="Starting hsqldb"/> 
    …… 
    105118       ================================================================= --> 
    106119 
    107   <target name="hsqldb-test" depends="run.init" 
     120  <target name="hsqldb-test" depends="hsql.init" 
    108121          description="starts the hsqldb server for testing"> 
    109     <echo message="Starting hsqldb for testing"/> 
     122    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/> 
     123 
    110124    <delete dir="${org.bedework.hsqldb.dbdir}" /> 
    111125 
    …… 
    117131      <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.test.dbdir}/events"/> 
    118132      <arg value="-port"/> 
    119       <arg value="8887"/> 
     133      <arg value="${org.bedework.hsqldb.port}"/> 
    120134    </java> 
    121135  </target> 
    122136 
    123   <target name="hsqldb-test-trace" depends="run.init" 
     137  <target name="hsqldb-test-trace" depends="hsql.init" 
    124138          description="starts the hsqldb server for testing"> 
    125     <echo message="Starting hsqldb for testing"/> 
     139    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/> 
     140 
    126141    <delete dir="${org.bedework.hsqldb.dbdir}" /> 
    127142 
    …… 
    137152      <arg value="${org.bedework.hsqldb.dir}/${org.bedework.hsqldb.test.dbdir}/events"/> 
    138153      <arg value="-port"/> 
    139       <arg value="8887"/> 
     154      <arg value="${org.bedework.hsqldb.port}"/> 
    140155    </java> 
    141156  </target> 
    …… 
    146161       ================================================================= --> 
    147162 
    148   <target name="hsqldb-mngr" depends="run.init" 
     163  <target name="hsqldb-mngr" depends="hsql.init" 
    149164          description="Runs the DatabaseManager class which provides a 
    150165                       gui interface to the running hsqldb database"> 
    151166    <echo message="Starting hsqldb DatabaseManager"/> 
    152167    <echo message="Select type: HSQL Database Engine Server"/> 
    153     <echo message="Set the URL to jdbc:hsqldb:hsql://localhost:8887"/> 
     168    <echo message="Set the URL to jdbc:hsqldb:hsql://localhost:${org.bedework.hsqldb.port}"/> 
    154169    <java fork="true" dir="${basedir}" 
    155170          classname="org.hsqldb.util.DatabaseManager"> 

  • trunk/config/bwbuild/default/build.properties

    r1899 r1937  
    1010#   <various other distributed properties> 
    1111# 
     12# On entry 
     13#       env.BEDEWORK_CONFIGS is set to the directory containing all the confurations 
     14#       env.BEDEWORK_CONFIG is set to the directory containing the config files 
     15# 
    1216 
    1317compile.debug=yes 
    1418 
     19org.bedework.config.home=${env.BEDEWORK_CONFIGS_HOME} 
    1520org.bedework.config.properties=${env.BEDEWORK_CONFIG}/cal.properties 
    1621org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml 

  • trunk/config/bwbuild/default/cal.options.xml

    r1935 r1937  
    1515             them from user group names. --> 
    1616        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix> 
     17 
     18        <!-- Uncomment this and set the value to one of the supported portals 
     19             Values that will result in something happening are 
     20             liferay5 
     21             liferay4 
     22             uportal2 
     23        <portalPlatform>your-portal</portalPlatform> 
     24         --> 
    1725 
    1826        <module> 
    …… 
    134142        <usergroupsClass>org.bedework.calsvc.directory.GroupsDbImpl</usergroupsClass> 
    135143 
    136         <directoryBrowsingDisallowed>@DIRECTORY-BROWSING-DISALLOWED@</directoryBrowsingDisallowed> 
     144        <directoryBrowsingDisallowed>true</directoryBrowsingDisallowed> 
    137145 
    138146        <indexRoot>lucene/indexroot</indexRoot> 
    …… 
    140148 
    141149      <app> 
     150        <!-- ================================================================== 
     151                          Config web client 
     152             ================================================================== --> 
     153        <bwconfig classname="org.bedework.calfacade.configs.ConfigCommon"> 
     154          <appType>webconfig</appType> 
     155          <publicAdmin>false</publicAdmin> 
     156          <guestMode>false</guestMode> 
     157        </bwconfig> 
     158 
    142159        <!-- ================================================================== 
    143160                          Admin web client CalAdmin 
    …… 
    171188 
    172189          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    173           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    174190        </CalAdmin> 
    175191 
    …… 
    201217 
    202218          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    203           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    204219 
    205220          <refreshAction>setup.do</refreshAction> 
    …… 
    235250 
    236251          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    237           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    238252 
    239253          <refreshAction>setup.do</refreshAction> 
    …… 
    270284          <logPrefix>SoEDept</logPrefix> 
    271285 
    272           <appRoot>/calrsrc</appRoot> 
    273           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
     286          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    274287 
    275288          <refreshAction>setup.do</refreshAction> 
    …… 
    302315          <logPrefix>PersonalCalendar</logPrefix> 
    303316 
    304           <appRoot>/ucalrsrc</appRoot> 
    305           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
     317          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    306318 
    307319          <refreshAction>setup.do</refreshAction> 
    …… 
    313325             ================================================================== --> 
    314326        <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     327          <appType>usercaldav</appType> 
    315328          <publicAdmin>false</publicAdmin> 
    316329          <guestMode>false</guestMode> 
    …… 
    334347             ================================================================== --> 
    335348        <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     349          <appType>publiccaldav</appType> 
    336350          <publicAdmin>false</publicAdmin> 
    337351          <guestMode>true</guestMode> 
    …… 
    353367 
    354368        <!-- ================================================================== 
     369                          CalDAV test suite 
     370             ================================================================== --> 
     371        <caldavTest classname="org.bedework.calfacade.configs.ConfigCommon"> 
     372          <appType>caldavTest</appType> 
     373          <publicAdmin>false</publicAdmin> 
     374          <guestMode>false</guestMode> 
     375        </caldavTest> 
     376 
     377        <!-- ================================================================== 
     378                          bedework test suite 
     379             ================================================================== --> 
     380        <test classname="org.bedework.calfacade.configs.ConfigCommon"> 
     381          <appType>testsuite</appType> 
     382          <publicAdmin>false</publicAdmin> 
     383          <guestMode>false</guestMode> 
     384        </test> 
     385 
     386        <!-- ================================================================== 
    355387                          Dump restore program dumpres 
    356388             ================================================================== --> 
    357389        <dumpres classname="org.bedework.calfacade.configs.DumpRestoreConfig"> 
    358390          <debug>true</debug> 
     391          <appType>dumprestore</appType> 
     392          <guestMode>true</guestMode> 
    359393          <debugEntity>false</debugEntity> 
    360394          <superGroupName>campusAdminGroups</superGroupName> 

  • trunk/config/bwbuild/default/cal.properties

    r1935 r1937  
    3737org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    3838 
    39 # Uncomment this to enable building of a common context for common javascript. 
    40 # This context will be deployed along with the applications and makes common 
    41 # javascript available under, two paths at the contex defined here. 
    42 # 
    43 # This is necessary to deal with problems delivering commmon code from the same 
    44 # server when the root context is defined to be an application rather than the 
    45 # normal web server default. 
    46 # 
    47 # Don't work. Will try another approach or a modification of this. 
    48 #org.bedework.global.build.common.context=yes 
    49 #org.bedework.global.build.common.context.name=calcommon 
    50 #org.bedework.global.build.common.context.root=/calcommon 
    51 #org.bedework.global.build.common.context.war.name=calcommon 
    52 #org.bedework.global.build.common.context.deploy.dir=/webapps 
    53  
    54 org.bedework.global.directory.browsing.disallowed=false 
    55  
    5639# Comment this out for j2ee deploy 
    5740org.bedework.global.build.standalone.app=true 
    …… 
    6952org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common 
    7053 
    71 # 
    72 # Specify the portal platform we want to run on. Enable the appropriaet section. 
    73 # Properties rquired: 
    74 # org.bedework.build.for.XXX     Used to enable functions 
    75 # org.bedework.global.portal.platform Used by deployment process to pick 
    76 #                                appropriate build. Value is name of directory 
    77 #                                in deployment/<kind>  e.g. uportal2 
    78 # 
    79 # For each portlet define the portlet name, e.g. 
    80 #     org.bedework.app.Events.portlet.name=PublicCal 
    81 # 
    82 # If you want to build some struts applications standalone, and others as 
    83 # portlets you will need two configs and two builds 
    84  
    85 # These for standalone and for j2ee 
    86 org.bedework.global.servlet.class=org.apache.struts.action.ActionServlet 
    87 org.bedework.global.ignoreContentType=false 
    88 org.bedework.global.portlet.mapping= 
    89 org.bedework.global.genurl.taglib.tld=struts-html.tld 
    90  
    9154# enable this and standalone for jboss 
    9255#org.bedework.build.for.jboss=yes 
    9356 
    94 # These for uportal 
    95 #org.bedework.build.for.uportal2=yes 
    96 #org.bedework.global.portal.platform=uportal2 
    97 #org.bedework.global.servlet.class=org.apache.portals.bridges.struts.PortletServlet 
    98 #org.bedework.global.portlet-servlet.class=org.apache.pluto.core.PortletServlet 
    99 #org.bedework.global.portlet.class=org.apache.portals.bridges.struts.StrutsPortlet 
    100 #org.bedework.global.portal-servlet.context.provider=org.bedework.portal.uportal.PortalServletContextProvider 
    101 #org.bedework.global.ignoreContentType=true 
    102 #org.bedework.global.genurl.taglib.tld=bedework-portlet-struts-html.tld 
    103  
    104 # These for liferay 4 
    105 #org.bedework.build.for.liferay4=yes 
    106 #org.bedework.global.portal.platform=liferay4 
    107 # servlet-class is the action servlet in web.xml 
    108 #org.bedework.global.servlet.class=org.apache.portals.bridges.struts.PortletServlet 
    109 # portlet-servlet.class is the servlet-class element  for the portlet servlet in web.xml 
    110 #org.bedework.global.portlet-servlet.class=com.liferay.portal.servlet.PortletServlet 
    111 # portlet.class is in portlet.xml and the value for the portlet-class init par in web.xml 
    112 #org.bedework.global.portlet.class=com.liferay.portal.apache.bridges.LiferayStrutsPortlet 
    113 # portal-servlet.context.provider is in portlet.xml 
    114 #org.bedework.global.portal-servlet.context.provider=com.liferay.util.apache.bridges.struts.LiferayServletContextProviderWrapper 
    115 #org.bedework.global.portal-servlet.context.listener=com.liferay.portal.kernel.servlet.PortletContextListener 
    116 #org.bedework.global.ignoreContentType=true 
    117 #org.bedework.global.genurl.taglib.tld=bedework-portlet-struts-html.tld 
    118 #org.bedework.global.liferay.company-id=liferay.com 
    119 #liferay4.lib=${org.bedework.default.lib}/liferay4 
    12057# 
    12158# ------------------------------------------------------------------------ 
    …… 
    13875# A place to put jdbc drivers. This can be directed at any local directory 
    13976org.bedework.jdbc.lib=${org.bedework.project.bedework}/lib/jdbc 
    140  
    141 # ------------------------------------------------------------------------ 
    142 # hsqldb defs 
    143 # ------------------------------------------------------------------------ 
    144  
    145 #  where the default db is 
    146 org.bedework.hsqldb.dir=${org.bedework.project.bedework}/../hsqldb-1.7.3.3 
    147  
    148 #  hsqldb db name for bedework. 
    149 org.bedework.hsqldb.dbname=demo/events 
    150  
    151 #  If uPortal2 builds are enabled this is the default dbname 
    152 org.bedework.hsqldb.uportal2.dbname=uportal2/uportal 
    153  
    154 #  default db name for tests 
    155 org.bedework.hsqldb.test.dbdir=test 
    15677 
    15778# ------------------------------------------------------------------------ 
    …… 
    197118# 
    198119org.bedework.app.bwconfig.project=webapps 
    199 org.bedework.app.bwconfig.type=webconfig 
    200120org.bedework.app.bwconfig.sou.dir=webconfig 
    201121org.bedework.app.bwconfig.default.contenttype=text/xml 
    202122org.bedework.app.bwconfig.war.name=bwconfig 
    203123org.bedework.app.bwconfig.context.root=/bwconfig 
    204 org.bedework.app.bwconfig.root=/bwconfigrsrc 
    205124org.bedework.app.bwconfig.resources.dir=/webapps/ROOT/bwconfigrsrc 
    206125org.bedework.app.bwconfig.deploy.dir=/webapps 
    …… 
    216135# 
    217136org.bedework.app.CalAdmin.project=webapps 
    218 org.bedework.app.CalAdmin.type=webadmin 
    219137org.bedework.app.CalAdmin.sou.dir=webadmin 
    220138org.bedework.app.CalAdmin.default.contenttype=text/xml 
    …… 
    228146# Set for jboss 
    229147#org.bedework.app.CalAdmin.virtual.host= 
    230 org.bedework.app.CalAdmin.root=http://localhost:8080/caladminrsrc 
    231148org.bedework.app.CalAdmin.resources.dir=/webapps/ROOT/caladminrsrc 
    232149org.bedework.app.CalAdmin.deploy.dir=/webapps 
    …… 
    246163# 
    247164org.bedework.app.EventSubmit.project=webapps 
    248 org.bedework.app.EventSubmit.type=websubmit 
    249165org.bedework.app.EventSubmit.sou.dir=websubmit 
    250166org.bedework.app.EventSubmit.default.contenttype=text/xml 
    …… 
    258174# Set for jboss 
    259175#org.bedework.app.EventSubmit.virtual.host= 
    260 org.bedework.app.EventSubmit.root=http://localhost:8080/eventsubmitrsrc 
    261176org.bedework.app.EventSubmit.resources.dir=/webapps/ROOT/eventsubmitrsrc 
    262177org.bedework.app.EventSubmit.deploy.dir=/webapps 
    …… 
    276191# 
    277192org.bedework.app.Events.project=webapps 
    278 org.bedework.app.Events.type=webpublic 
    279193org.bedework.app.Events.sou.dir=webclient 
    280194org.bedework.app.Events.default.contenttype=text/xml 
    …… 
    288202# Set for jboss 
    289203#org.bedework.app.Events.virtual.host= 
    290 org.bedework.app.Events.root=http://localhost:8080/calrsrc 
    291204org.bedework.app.Events.resources.dir=/webapps/ROOT/calrsrc 
    292205org.bedework.app.Events.deploy.dir=/webapps 
    …… 
    303216# 
    304217org.bedework.app.SoEDept.project=webapps 
    305 org.bedework.app.SoEDept.type=webpublic 
    306218org.bedework.app.SoEDept.sou.dir=webclient 
    307219org.bedework.app.SoEDept.default.contenttype=text/xml 
    …… 
    315227# Set for jboss 
    316228#org.bedework.app.SoEDept.virtual.host= 
    317 org.bedework.app.SoEDept.root=http://localhost:8080//calrsrc 
    318229org.bedework.app.SoEDept.resources.dir=/webapps/ROOT/calrsrc 
    319230org.bedework.app.SoEDept.deploy.dir=/webapps 
    …… 
    330241# 
    331242org.bedework.app.UserCal.project=webapps 
    332 org.bedework.app.UserCal.type=webuser 
    333243org.bedework.app.UserCal.sou.dir=webclient 
    334244org.bedework.app.UserCal.default.contenttype=text/xml 
    …… 
    342252# Set for jboss 
    343253#org.bedework.app.UserCal.virtual.host= 
    344 org.bedework.app.UserCal.root=http://localhost:8080//ucalrsrc 
    345254org.bedework.app.UserCal.resources.dir=/webapps/ROOT/ucalrsrc 
    346255org.bedework.app.UserCal.deploy.dir=/webapps 
    …… 
    360269# 
    361270org.bedework.app.Pubcaldav.project=caldav 
    362 org.bedework.app.Pubcaldav.type=publiccaldav 
    363271org.bedework.app.Pubcaldav.sou.dir=server 
    364272org.bedework.app.Pubcaldav.interface.jar=bw-caldav 
    …… 
    384292# 
    385293org.bedework.app.Usercaldav.project=caldav 
    386 org.bedework.app.Usercaldav.type=usercaldav 
    387294org.bedework.app.Usercaldav.sou.dir=server 
    388295org.bedework.app.Usercaldav.interface.jar=bw-caldav 
    …… 
    413320 
    414321org.bedework.app.caldavTest.project=caldavTest 
    415 org.bedework.app.caldavTest.type=caldavTest 
    416322org.bedework.app.caldavTest.sou.dir=caldavTest 
    417323org.bedework.app.caldavTest.shellscr.name=bwruntest 
    …… 
    427333 
    428334org.bedework.app.test.project=testsuite 
    429 org.bedework.app.test.type=testsuite 
    430335org.bedework.app.test.sou.dir= 
    431336org.bedework.app.test.shellscr.name=bwruntest 
    …… 
    444349 
    445350org.bedework.app.dumpres.project=dumprestore 
    446 org.bedework.app.dumpres.type=dumprestore 
    447351org.bedework.app.dumpres.sou.dir= 
    448352org.bedework.app.dumpres.shellscr.name=bwrun 

  • trunk/config/bwbuild/jboss/democal.options.xml

    r1935 r1937  
    1515             them from user group names. --> 
    1616        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix> 
     17 
     18        <!-- Uncomment this and set the value to one of the supported portals 
     19             Values that will result in something happening are 
     20             liferay5 
     21             liferay4 
     22             uportal2 
     23        <portalPlatform>your-portal</portalPlatform> 
     24         --> 
    1725 
    1826        <module> 
    …… 
    126134        <usergroupsClass>org.bedework.calsvc.directory.GroupsDbImpl</usergroupsClass> 
    127135 
    128         <directoryBrowsingDisallowed>@DIRECTORY-BROWSING-DISALLOWED@</directoryBrowsingDisallowed> 
     136        <directoryBrowsingDisallowed>true</directoryBrowsingDisallowed> 
    129137 
    130138        <indexRoot>lucene/indexroot</indexRoot> 
    …… 
    163171 
    164172          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    165           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    166173        </CalAdmin> 
    167174 
    …… 
    193200 
    194201          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    195           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    196202 
    197203          <refreshAction>setup.do</refreshAction> 
    …… 
    227233 
    228234          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    229           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    230235 
    231236          <refreshAction>setup.do</refreshAction> 
    …… 
    262267          <logPrefix>SoEDept</logPrefix> 
    263268 
    264           <appRoot>/calrsrc</appRoot> 
    265           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
     269          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    266270 
    267271          <refreshAction>setup.do</refreshAction> 
    …… 
    294298          <logPrefix>PersonalCalendar</logPrefix> 
    295299 
    296           <appRoot>/ucalrsrc</appRoot> 
    297           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
     300          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    298301 
    299302          <refreshAction>setup.do</refreshAction> 

  • trunk/config/bwbuild/jboss/democal.properties

    r1935 r1937  
    3737org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    3838 
    39 # Uncomment this to enable building of a common context for common javascript. 
    40 # This context will be deployed along with the applications and makes common 
    41 # javascript available under, two paths at the contex defined here. 
    42 # 
    43 # This is necessary to deal with problems delivering commmon code from the same 
    44 # server when the root context is defined to be an application rather than the 
    45 # normal web server default. 
    46 # 
    47 # Don't work. Will try another approach or a modification of this. 
    48 #org.bedework.global.build.common.context=yes 
    49 #org.bedework.global.build.common.context.name=calcommon 
    50 #org.bedework.global.build.common.context.root=/calcommon 
    51 #org.bedework.global.build.common.context.war.name=calcommon 
    52 #org.bedework.global.build.common.context.deploy.dir=/webapps 
    53  
    54 org.bedework.global.directory.browsing.disallowed=true 
    55  
    5639# Comment this out for j2ee deploy 
    5740#org.bedework.global.build.standalone.app=true 
    …… 
    6851org.bedework.global.personal.calendar.uri=/ucal 
    6952 
    70 # 
    71 # Specify the portal platform we want to run on. Enable the appropriaet section. 
    72 # Properties rquired: 
    73 # org.bedework.build.for.XXX     Used to enable functions 
    74 # org.bedework.global.portal.platform Used by deployment process to pick 
    75 #                                appropriate build. Value is name of directory 
    76 #                                in deployment/<kind>  e.g. uportal2 
    77 # 
    78 # For each portlet define the portlet name, e.g. 
    79 #     org.bedework.app.Events.portlet.name=PublicCal 
    80 # 
    81 # If you want to build some struts applications standalone, and others as 
    82 # portlets you will need two configs and two builds 
    83  
    84 # These for standalone and for j2ee 
    85 org.bedework.global.servlet.class=org.apache.struts.action.ActionServlet 
    86 org.bedework.global.ignoreContentType=false 
    87 org.bedework.global.portlet.mapping= 
    88 org.bedework.global.genurl.taglib.tld=struts-html.tld 
    89  
    9053# enable this and standalone for jboss 
    9154org.bedework.build.for.jboss=yes 
    9255 
    93 # These for uportal 
    94 #org.bedework.build.for.uportal2=yes 
    95 #org.bedework.global.portal.platform=uportal2 
    96 #org.bedework.global.servlet.class=org.apache.portals.bridges.struts.PortletServlet 
    97 #org.bedework.global.portlet-servlet.class=org.apache.pluto.core.PortletServlet 
    98 #org.bedework.global.portlet.class=org.apache.portals.bridges.struts.StrutsPortlet 
    99 #org.bedework.global.portal-servlet.context.provider=org.bedework.portal.uportal.PortalServletContextProvider 
    100 #org.bedework.global.ignoreContentType=true 
    101 #org.bedework.global.genurl.taglib.tld=bedework-portlet-struts-html.tld 
    102  
    103 # These for liferay 4 
    104 #org.bedework.build.for.liferay4=yes 
    105 #org.bedework.global.portal.platform=liferay4 
    106 # servlet-class is the action servlet in web.xml 
    107 #org.bedework.global.servlet.class=org.apache.portals.bridges.struts.PortletServlet 
    108 # portlet-servlet.class is the servlet-class element  for the portlet servlet in web.xml 
    109 #org.bedework.global.portlet-servlet.class=com.liferay.portal.servlet.PortletServlet 
    110 # portlet.class is in portlet.xml and the value for the portlet-class init par in web.xml 
    111 #org.bedework.global.portlet.class=com.liferay.portal.apache.bridges.LiferayStrutsPortlet 
    112 # portal-servlet.context.provider is in portlet.xml 
    113 #org.bedework.global.portal-servlet.context.provider=com.liferay.util.apache.bridges.struts.LiferayServletContextProviderWrapper 
    114 #org.bedework.global.portal-servlet.context.listener=com.liferay.portal.kernel.servlet.PortletContextListener 
    115 #org.bedework.global.ignoreContentType=true 
    116 #org.bedework.global.genurl.taglib.tld=bedework-portlet-struts-html.tld 
    117 #org.bedework.global.liferay.company-id=liferay.com 
    118 #liferay4.lib=${org.bedework.default.lib}/liferay4 
    11956# 
    12057# ------------------------------------------------------------------------ 
    …… 
    13673# A place to put jdbc drivers. This can be directeed at any local directory 
    13774org.bedework.jdbc.lib=${org.bedework.project.bedework}/lib/jdbc 
    138  
    139 # ------------------------------------------------------------------------ 
    140 # hsqldb defs 
    141 # ------------------------------------------------------------------------ 
    142  
    143 #  where the default db is 
    144 org.bedework.hsqldb.dir=${org.bedework.project.bedework}/../hsqldb-1.7.3.3 
    145  
    146 #  hsqldb db name for bedework. 
    147 org.bedework.hsqldb.dbname=demo/events 
    148  
    149 #  If uPortal2 builds are enabled this is the default dbname 
    150 org.bedework.hsqldb.uportal2.dbname=uportal2/uportal 
    151  
    152 #  default db name for tests 
    153 org.bedework.hsqldb.test.dbdir=test 
    15475 
    15576# ------------------------------------------------------------------------ 
    …… 
    212133org.bedework.app.bwconfig.war.name=bwconfig 
    213134org.bedework.app.bwconfig.context.root=/bwconfig 
    214 org.bedework.app.bwconfig.root=/bwconfigrsrc 
    215135org.bedework.app.bwconfig.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/bwconfigrsrc 
    216136org.bedework.app.bwconfig.deploy.dir=/webapps 
    …… 
    238158# Set for jboss 
    239159#org.bedework.app.CalAdmin.virtual.host= 
    240 org.bedework.app.CalAdmin.root=http://localhost:8080/caladminrsrc 
    241160org.bedework.app.CalAdmin.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/caladminrsrc 
    242161org.bedework.app.CalAdmin.deploy.dir=/webapps 
    …… 
    268187# Set for jboss 
    269188#org.bedework.app.EventSubmit.virtual.host= 
    270 org.bedework.app.EventSubmit.root=http://localhost:8080/eventsubmitrsrc 
    271189org.bedework.app.EventSubmit.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/eventsubmitrsrc 
    272190org.bedework.app.EventSubmit.deploy.dir=/webapps 
    …… 
    298216# Set for jboss 
    299217#org.bedework.app.Events.virtual.host= 
    300 org.bedework.app.Events.root=http://localhost:8080/calrsrc 
    301218org.bedework.app.Events.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/calrsrc 
    302219org.bedework.app.Events.deploy.dir=/webapps 
    …… 
    325242# Set for jboss 
    326243#org.bedework.app.SoEDept.virtual.host= 
    327 org.bedework.app.SoEDept.root=/calrsrc 
    328244org.bedework.app.SoEDept.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/calrsrc 
    329245org.bedework.app.SoEDept.deploy.dir=/webapps 
    …… 
    352268# Set for jboss 
    353269#org.bedework.app.UserCal.virtual.host= 
    354 org.bedework.app.UserCal.root=/ucalrsrc 
    355270org.bedework.app.UserCal.resources.dir=server/${org.bedework.jboss.config}/deploy/jboss-web.deployer/ROOT.war/ucalrsrc 
    356271org.bedework.app.UserCal.deploy.dir=/webapps 

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

    r1935 r1937  
    1515             them from user group names. --> 
    1616        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix> 
     17 
     18        <!-- Uncomment this and set the value to one of the supported portals 
     19             Values that will result in something happening are 
     20             liferay5 
     21             liferay4 
     22             uportal2 
     23        <portalPlatform>your-portal</portalPlatform> 
     24         --> 
    1725 
    1826        <module> 
    …… 
    134142        <usergroupsClass>org.bedework.calsvc.directory.GroupsDbImpl</usergroupsClass> 
    135143 
    136         <directoryBrowsingDisallowed>@DIRECTORY-BROWSING-DISALLOWED@</directoryBrowsingDisallowed> 
     144        <directoryBrowsingDisallowed>true</directoryBrowsingDisallowed> 
    137145 
    138146        <indexRoot>lucene/indexroot</indexRoot> 
    …… 
    140148 
    141149      <app> 
     150        <!-- ================================================================== 
     151                          Config web client 
     152             ================================================================== --> 
     153        <bwconfig classname="org.bedework.calfacade.configs.ConfigCommon"> 
     154          <appType>webconfig</appType> 
     155          <publicAdmin>false</publicAdmin> 
     156          <guestMode>false</guestMode> 
     157        </bwconfig> 
     158 
    142159        <!-- ================================================================== 
    143160                          Admin web client CalAdmin 
    …… 
    171188 
    172189          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    173           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    174190        </CalAdmin> 
    175191 
    …… 
    201217 
    202218          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    203           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    204219 
    205220          <refreshAction>setup.do</refreshAction> 
    …… 
    235250 
    236251          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    237           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    238252 
    239253          <refreshAction>setup.do</refreshAction> 
    …… 
    270284          <logPrefix>SoEDept</logPrefix> 
    271285 
    272           <appRoot>/calrsrc</appRoot> 
    273           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
     286          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    274287 
    275288          <refreshAction>setup.do</refreshAction> 
    …… 
    302315          <logPrefix>PersonalCalendar</logPrefix> 
    303316 
    304           <appRoot>/ucalrsrc</appRoot> 
    305           <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
     317          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    306318 
    307319          <refreshAction>setup.do</refreshAction> 

  • trunk/config/configs/democal.properties

    r1935 r1937  
    3737org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    3838 
    39 # Uncomment this to enable building of a common context for common javascript. 
    40 # This context will be deployed along with the applications and makes common 
    41 # javascript available under, two paths at the contex defined here. 
    42 # 
    43 # This is necessary to deal with problems delivering commmon code from the same 
    44 # server when the root context is defined to be an application rather than the 
    45 # normal web server default. 
    46 # 
    47 # Don't work. Will try another approach or a modification of this. 
    48 #org.bedework.global.build.common.context=yes 
    49 #org.bedework.global.build.common.context.name=calcommon 
    50 #org.bedework.global.build.common.context.root=/calcommon 
    51 #org.bedework.global.build.common.context.war.name=calcommon 
    52 #org.bedework.global.build.common.context.deploy.dir=/webapps 
    53  
    54 org.bedework.global.directory.browsing.disallowed=false 
    55  
    5639# Comment this out for j2ee deploy 
    5740org.bedework.global.build.standalone.app=true 
    …… 
    6952org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common 
    7053 
    71 # 
    72 # Specify the portal platform we want to run on. Enable the appropriaet section. 
    73 # Properties rquired: 
    74 # org.bedework.build.for.XXX     Used to enable functions 
    75 # org.bedework.global.portal.platform Used by deployment process to pick 
    76 #                                appropriate build. Value is name of directory 
    77 #                                in deployment/<kind>  e.g. uportal2 
    78 # 
    79 # For each portlet define the portlet name, e.g. 
    80 #     org.bedework.app.Events.portlet.name=PublicCal 
    81 # 
    82 # If you want to build some struts applications standalone, and others as 
    83 # portlets you will need two configs and two builds 
    84  
    85 # These for standalone and for j2ee 
    86 org.bedework.global.servlet.class=org.apache.struts.action.ActionServlet 
    87 org.bedework.global.ignoreContentType=false 
    88 org.bedework.global.portlet.mapping= 
    89 org.bedework.global.genurl.taglib.tld=struts-html.tld 
    90  
    9154# enable this and standalone for jboss 
    9255#org.bedework.build.for.jboss=yes 
    93  
    94 # These for uportal 
    95 #org.bedework.build.for.uportal2=yes 
    96 #org.bedework.global.portal.platform=uportal2 
    97 #org.bedework.global.servlet.class=org.apache.portals.bridges.struts.PortletServlet 
    98 #org.bedework.global.portlet-servlet.class=org.apache.pluto.core.PortletServlet 
    99 #org.bedework.global.portlet.class=org.apache.portals.bridges.struts.StrutsPortlet 
    100 #org.bedework.global.portal-servlet.context.provider=org.bedework.portal.uportal.PortalServletContextProvider 
    101 #org.bedework.global.ignoreContentType=true 
    102 #org.bedework.global.genurl.taglib.tld=bedework-portlet-struts-html.tld 
    103  
    104 # These for liferay 4 
    105 #org.bedework.build.for.liferay4=yes 
    106 #org.bedework.global.portal.platform=liferay4 
    107 # servlet-class is the action servlet in web.xml 
    108 #org.bedework.global.servlet.class=org.apache.portals.bridges.struts.PortletServlet 
    109 # portlet-servlet.class is the servlet-class element  for the portlet servlet in web.xml 
    110 #org.bedework.global.portlet-servlet.class=com.liferay.portal.servlet.PortletServlet 
    111 # portlet.class is in portlet.xml and the value for the portlet-class init par in web.xml 
    112 #org.bedework.global.portlet.class=com.liferay.portal.apache.bridges.LiferayStrutsPortlet 
    113 # portal-servlet.context.provider is in portlet.xml 
    114 #org.bedework.global.portal-servlet.context.provider=com.liferay.util.apache.bridges.struts.LiferayServletContextProviderWrapper 
    115 #org.bedework.global.portal-servlet.context.listener=com.liferay.portal.kernel.servlet.PortletContextListener 
    116 #org.bedework.global.ignoreContentType=true 
    117 #org.bedework.global.genurl.taglib.tld=bedework-portlet-struts-html.tld 
    118 #org.bedework.global.liferay.company-id=liferay.com 
    119 #liferay4.lib=${org.bedework.default.lib}/liferay4 
    12056# 
    12157# ------------------------------------------------------------------------ 
    …… 
    13773# A place to put jdbc drivers. This can be directeed at any local directory 
    13874org.bedework.jdbc.lib=${org.bedework.project.bedework}/lib/jdbc 
    139  
    140 # ------------------------------------------------------------------------ 
    141 # hsqldb defs 
    142 # ------------------------------------------------------------------------ 
    143  
    144 #  where the default db is 
    145 org.bedework.hsqldb.dir=${org.bedework.project.bedework}/../hsqldb-1.7.3.3 
    146  
    147 #  hsqldb db name for bedework. 
    148 org.bedework.hsqldb.dbname=demo/events 
    149  
    150 #  If uPortal2 builds are enabled this is the default dbname 
    151 org.bedework.hsqldb.uportal2.dbname=uportal2/uportal 
    152  
    153 #  default db name for tests 
    154 org.bedework.hsqldb.test.dbdir=test 
    15575 
    15676# ------------------------------------------------------------------------ 
    …… 
    201121org.bedework.app.bwconfig.war.name=bwconfig 
    202122org.bedework.app.bwconfig.context.root=/bwconfig 
    203 org.bedework.app.bwconfig.root=/bwconfigrsrc 
    204123org.bedework.app.bwconfig.resources.dir=/webapps/ROOT/bwconfigrsrc 
    205124org.bedework.app.bwconfig.deploy.dir=/webapps 
    …… 
    227146# Set for jboss 
    228147#org.bedework.app.CalAdmin.virtual.host= 
    229 org.bedework.app.CalAdmin.root=http://localhost:8080/caladminrsrc 
    230148org.bedework.app.CalAdmin.resources.dir=/webapps/ROOT/caladminrsrc 
    231149org.bedework.app.CalAdmin.deploy.dir=/webapps 
    …… 
    257175# Set for jboss 
    258176#org.bedework.app.EventSubmit.virtual.host= 
    259 org.bedework.app.EventSubmit.root=http://localhost:8080/eventsubmitrsrc 
    260177org.bedework.app.EventSubmit.resources.dir=/webapps/ROOT/eventsubmitrsrc 
    261178org.bedework.app.EventSubmit.deploy.dir=/webapps 
    …… 
    287204# Set for jboss 
    288205#org.bedework.app.Events.virtual.host= 
    289 org.bedework.app.Events.root=http://localhost:8080/calrsrc 
    290206org.bedework.app.Events.resources.dir=/webapps/ROOT/calrsrc 
    291207org.bedework.app.Events.deploy.dir=/webapps 
    …… 
    314230# Set for jboss 
    315231#org.bedework.app.SoEDept.virtual.host= 
    316 org.bedework.app.SoEDept.root=http://localhost:8080//calrsrc 
    317232org.bedework.app.SoEDept.resources.dir=/webapps/ROOT/calrsrc 
    318233org.bedework.app.SoEDept.deploy.dir=/webapps 
    …… 
    341256# Set for jboss 
    342257#org.bedework.app.UserCal.virtual.host= 
    343 org.bedework.app.UserCal.root=http://localhost:8080//ucalrsrc 
    344258org.bedework.app.UserCal.resources.dir=/webapps/ROOT/ucalrsrc 
    345259org.bedework.app.UserCal.deploy.dir=/webapps 

  • trunk/deployment/appjars.xml

    r1935 r1937  
    102102 
    103103      <if> 
    104         <isset property="org.bedework.build.for.liferay4" /> 
     104        <equals arg1="${org.bedework.global.portal.platform}" 
     105                arg2="liferay4" /> 
    105106        <then> 
    106107          <getJar lib="${org.bedework.app.lib}" 
    …… 
    113114 
    114115      <if> 
    115         <isset property="org.bedework.build.for.liferay5" /> 
     116        <equals arg1="${org.bedework.global.portal.platform}" 
     117                arg2="liferay5" /> 
    116118        <then> 
    117119          <getJar lib="${org.bedework.app.lib}" 

  • trunk/deployment/build.xml

    r1935 r1937  
    5555    <loadDeployConfig /> 
    5656 
    57     <!-- ==================== config properties ========================= 
    58     <property name="org.bedework.config.properties" 
    59               location="${org.bedework.config.base}/configs/democal.properties" /> 
    60     <property name="org.bedework.config.options" 
    61               location="${org.bedework.config.base}/configs/democal.options.xml" /> 
    62  
    63     <echo message="==========================================================" /> 
    64     <echo message="Use config properties ${org.bedework.config.properties}" /> 
    65     <loadproperties srcFile="${org.bedework.config.properties}" > 
    66       <filterchain> 
    67         <expandproperties/> 
    68       </filterchain> 
    69     </loadproperties> 
    70 --> 
    71  
    7257    <!-- default to debug off --> 
    7358    <property name="app.debug.val" value="0" /> 
    …… 
    118103 
    119104    <antcall target="build.standalone.apps" inheritrefs="true" /> 
    120  
    121     <antcall target="build.portal.apps" inheritrefs="true" /> 
    122105 
    123106    <antcall target="build.j2ee.apps" inheritrefs="true" /> 
    …… 
    131114 
    132115  <target name="build.standalone.apps" if="org.bedework.global.build.standalone.app" > 
    133     <!-- ======================= webconfig - only standalone ================= 
    134     <ant antfile="${org.bedework.deployment.base}/webconfig/webapp/build.xml" 
    135          inheritrefs="true" target="build.configured" /> 
    136           --> 
    137  
    138116    <property name="org.bedework.deploy.kind" value="webapp" /> 
    139     <antcall target="build.configured.apps" inheritrefs="true" /> 
    140   </target> 
    141  
    142   <target name="build.portal.apps" if="org.bedework.global.portal.platform" > 
    143     <property name="org.bedework.deploy.kind" 
    144               value="${org.bedework.global.portal.platform}" /> 
    145117    <antcall target="build.configured.apps" inheritrefs="true" /> 
    146118  </target> 
    …… 
    176148                 check="true" /> 
    177149 
    178     <echo message="LLLLLLLLLLLLLLLLLLLL locales=${org.bedework.locales}" /> 
    179  
    180     <!--<antcall target="deploy.standalone.apps" inheritrefs="true" />--> 
    181150    <if> 
    182151      <isset property="org.bedework.global.build.standalone.app" /> 
    …… 
    188157    </if> 
    189158 
    190     <!--<antcall target="deploy.shellscr.apps" inheritrefs="true" />--> 
    191159    <!-- Always build the shellscr stuff.--> 
    192160    <antcall target="deploy.apps" inheritrefs="true" > 
    …… 
    194162    </antcall> 
    195163 
    196     <!-- <antcall target="deploy.portal.apps" inheritrefs="true" />--> 
    197     <if> 
    198       <isset property="org.bedework.global.portal.platform" /> 
    199       <then> 
    200         <antcall target="deploy.apps" inheritrefs="true" > 
    201           <param name="org.bedework.deploy.kind" 
    202                  value="${org.bedework.global.portal.platform}" /> 
    203         </antcall> 
    204       </then> 
    205     </if> 
    206  
    207     <!-- <antcall target="deploy.j2ee.apps" inheritrefs="true" />--> 
    208164    <if> 
    209165      <isset property="org.bedework.global.j2ee.platform" /> 
    …… 
    264220                projectPrefix="org.bedework.project"> 
    265221      <sequential> 
    266         <available file="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 
    267                    property="app.kind.available" /> 
    268222        <antcall target="build.available.configured.app" inheritrefs="true" /> 
    269223      </sequential> 
    …… 
    271225 
    272226    <!-- ======================= termination tasks ================= --> 
    273     <!-- 
    274     <property name="org.bedework.deploy.type.dir" 
    275               location="${org.bedework.deployment.base}/termination" /> 
    276               --> 
    277227 
    278228    <ant antfile="${org.bedework.deployment.base}/termination/build.xml" 
    …… 
    280230  </target> 
    281231 
    282   <target name="build.available.configured.app" if="app.kind.available"> 
    283     <!-- Pick out the application build properties based on the prefix "org.bedework.app." 
    284          and the deployment name --> 
    285     <propertyset id="build-app-properties"> 
    286       <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/> 
    287       <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/> 
    288     </propertyset> 
     232  <target name="build.available.configured.app"> 
     233    <propertycopy name="propval.app.type" 
     234                  from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.appType" /> 
     235    <property name="org.bedework.deploy.type.dir" 
     236              location="${app.root.dir}/${org.bedework.deploy.name}/${propval.app.type}" /> 
     237    <echo message="*********************************** deploy directory is ${org.bedework.deploy.type.dir}" /> 
     238 
     239    <if> 
     240      <available file="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"/> 
     241      <then> 
     242        <propertyset id="deploy-app-properties"> 
     243          <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/> 
     244          <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/> 
     245        </propertyset> 
     246 
     247        <propertycopy name="propval.app.unauthenticated" 
     248                      from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" /> 
     249 
     250        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 
     251             inheritrefs="true" target="build.configured" > 
     252          <propertyset refid="deploy-app-properties" /> 
     253        </ant> 
     254      </then> 
     255    </if> 
    289256  </target> 
    290257 
    …… 
    306273 
    307274  <target name="deploy.available.app"> 
     275    <propertycopy name="propval.app.type" 
     276                  from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.appType" /> 
     277    <property name="org.bedework.deploy.type.dir" 
     278              location="${app.root.dir}/${propval.app.type}" /> 
     279    <echo message="*********************************** deploy directory is ${org.bedework.deploy.type.dir}" /> 
     280 
    308281    <if> 
    309282      <available file="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"/> 
    …… 
    314287        </propertyset> 
    315288 
     289        <propertycopy name="propval.app.unauthenticated" 
     290                      from="bedework-options.org.bedework.app.${org.bedework.deploy.name}.guestMode" /> 
     291 
    316292        <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 
    317293             inheritrefs="true" target="deploy" > 

  • trunk/deployment/resources/build.xml

    r1935 r1937  
    2424 
    2525    <property name="org.bedework.use.dojo" value="true" /> 
    26  
    27     <!-- This should be in the config stuff --> 
    28     <property name="propval.directory.browsing.disallowed" 
    29               value="${app.directory.browsing.disallowed}" /> 
    3026 
    3127    <property name="common.war.name" 

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

    r1895 r1937  
    2525    <property name="org.bedework.strutsapp" value="true" /> 
    2626 
    27     <!-- This should be in the config stuff --> 
    28     <property name="propval.directory.browsing.disallowed" 
    29               value="${app.directory.browsing.disallowed}" /> 
    30  
    3127    <property name="app.resources.dir" 
    3228              location="${this.dir}/resources" /> 
    …… 
    5248          <fileset dir="${app.resources.dir}" /> 
    5349        </copy> 
     50 
     51        <if> 
     52          <isset property="org.bedework.global.portal.platform" /> 
     53          <then> 
     54            <!-- The intent is to have a set of quickstart skins configured for 
     55                 portal use. So far we've not managed that so for the time being we 
     56                 will just use the standalone skin set. --> 
     57            <property name="dest.skins.dir" 
     58                      location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${org.bedework.global.portal.platform}.${propval.app.cal.suite}" /> 
     59            <delete dir="${dest.skins.dir}" /> 
     60            <copy todir="${dest.skins.dir}"> 
     61              <fileset dir="${app.resources.dir}" /> 
     62            </copy> 
     63          </then> 
     64        </if> 
    5465      </then> 
    5566    </if> 

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

    r1933 r1937  
    2929              value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    3030              --> 
    31  
    32     <!-- This should be in the config stuff --> 
    33     <property name="propval.directory.browsing.disallowed" 
    34               value="${app.directory.browsing.disallowed}" /> 
    3531 
    3632    <property name="app.resources.dir" 

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

    r1933 r1937  
    3131              --> 
    3232 
    33     <!-- This should be in the config stuff --> 
    34     <property name="propval.directory.browsing.disallowed" 
    35               value="${app.directory.browsing.disallowed}" /> 
    36  
    3733    <property name="app.resources.dir" 
    3834              location="${this.dir}/resources" /> 
    …… 
    6056          <fileset dir="${app.resources.dir}/demoskins/${propval.app.cal.suite}" /> 
    6157        </copy> 
     58 
     59        <if> 
     60          <isset property="org.bedework.global.portal.platform" /> 
     61          <then> 
     62            <!-- The intent is to have a set of quickstart skins configured for 
     63                 portal use. So far we've not managed that so for the time being we 
     64                 will just use the standalone skin set. --> 
     65            <property name="dest.skins.dir" 
     66                      location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${org.bedework.global.portal.platform}.${propval.app.cal.suite}" /> 
     67            <delete dir="${dest.skins.dir}" /> 
     68            <copy todir="${dest.skins.dir}"> 
     69              <fileset dir="${app.resources.dir}/demoskins/${propval.app.cal.suite}" /> 
     70            </copy> 
     71          </then> 
     72        </if> 
    6273      </then> 
    6374    </if> 

  • trunk/deployment/websubmit/webapp/build.xml

    r1933 r1937  
    5656          <fileset dir="${app.resources.dir}/demoskins" /> 
    5757        </copy> 
     58 
     59        <if> 
     60          <isset property="org.bedework.global.portal.platform" /> 
     61          <then> 
     62            <!-- The intent is to have a set of quickstart skins configured for 
     63                 portal use. So far we've not managed that so for the time being we 
     64                 will just use the standalone skin set. --> 
     65            <property name="dest.skins.dir" 
     66                      location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${org.bedework.global.portal.platform}.${propval.app.cal.suite}" /> 
     67            <delete dir="${dest.skins.dir}" /> 
     68            <copy todir="${dest.skins.dir}"> 
     69              <fileset dir="${app.resources.dir}/demoskins" /> 
     70            </copy> 
     71          </then> 
     72        </if> 
    5873      </then> 
    5974    </if> 

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

    r1933 r1937  
    5656          <fileset dir="${app.resources.dir}/demoskins" /> 
    5757        </copy> 
     58 
     59 
     60        <if> 
     61          <isset property="org.bedework.global.portal.platform" /> 
     62          <then> 
     63            <!-- The intent is to have a set of quickstart skins configured for 
     64                 portal use. So far we've not managed that so for the time being we 
     65                 will just use the standalone skin set. --> 
     66            <property name="dest.skins.dir" 
     67                      location="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${org.bedework.global.portal.platform}" /> 
     68            <delete dir="${dest.skins.dir}" /> 
     69            <copy todir="${dest.skins.dir}"> 
     70              <fileset dir="${app.resources.dir}/demoskins" /> 
     71            </copy> 
     72          </then> 
     73        </if> 
    5874      </then> 
    5975    </if> 

  • trunk/deployutil/src/org/bedework/deployment/ForEachAppTask.java

    r1076 r1937  
    7676 * <p>Generated properties are all prefixed by the prefix attribute and are:<ul> 
    7777 * <li>project.path     Path to project</li> 
    78  * <li>type             type of application</li> 
    79  * <li>type.dir         location of application type deployment directory</li> 
    8078 * <li>name             name of the application</li> 
    8179 * </ul> 
    …… 
    167165        String name = (String)nit.next(); 
    168166 
    169         String appTypeProperty = appPrefix + name + ".type"; 
    170         String type = (String)props.getProperty(null, appTypeProperty); 
    171  
    172         if (type == null) { 
    173           throw new BuildException("Must supply property " + appTypeProperty); 
    174         } 
    175  
    176167        String appProjectProperty = appPrefix + name + ".project"; 
    177168        String project = (String)props.getProperty(null, appProjectProperty); 
    …… 
    210201        props.setProperty(null, prefix + "project.path", projectPath, false); 
    211202        props.setProperty(null, prefix + "app.sou", appSou, false); 
    212         props.setProperty(null, prefix + "type", type, false); 
    213         props.setProperty(null, prefix + "type.dir", 
    214                           bedeworkHome + "/deployment/" + type, 
    215                           false); 
    216203 
    217204        super.execute();