Changeset 594

Show
Ignore:
Timestamp:
06/18/06 20:38:14
Author:
douglm
Message:

Upgrade xalan to 2.6.0
Add portal-bridges-struts to lib
Copy into there portal-bridges-struts-1.2.7.jar portal-bridges-common-1.0.jar
Also copy struts-1.2.7-portlet-1.0.tld as struts-portlet.tld
Add pluto and portlet-api.jar to lib, define in defjars as...
portlet.jar=${org.bedework.default.lib}/portlet-api-1.0.jar
pluto.jar=${org.bedework.default.lib}/pluto-1.0.1-rc2.jar

Add uportaldb target to quickstart/build.xml

Copy quickstart build.xml into calendar3/bldfiles.
Import it into new quickstart build file stripped of all content.
Ensures we always commit build.xml changes.
Also created new README in docs - added an ant README target.
Pointed at both in quickstart README
Delete quickstartfiles/root

Add uportal component to calendar3. Add mun source and other stuff.
Change bldfiles/globalDefs.xml to define it
Change calendar3/build.xml to build it

Change mun rewrite tag to remove ?be=d from url

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/defjars.properties

    r531 r594  
    1212 
    1313servlet.jsp.jar=${org.bedework.default.lib}/servlet.jsp.jar 
     14 
     15portlet.jar=${org.bedework.default.lib}/portlet-api-1.0.jar 
     16 
     17pluto.jar=${org.bedework.default.lib}/pluto-1.0.1-rc2.jar 
     18 
     19portals-bridges.jars.dir.name=portals-bridges-1.0 
     20portals-bridges.jars.dir=${org.bedework.default.lib}/${portals-bridges.jars.dir.name} 
     21 
     22portals-bridges-common.jar=${portals-bridges.jars.dir}/portals-bridges-common-1.0.jar 
     23 
     24portals-bridges-struts.jar=${portals-bridges.jars.dir}/portals-bridges-struts-1.2.7-1.0.jar 
    1425 
    1526ant.jar=${org.bedework.default.lib}/ant-1.6.5.jar 
    …… 
    108119webdavlib.jar=${org.bedework.default.lib}/${webdavlib.jar.name} 
    109120 
    110 xalan.jar=${org.bedework.default.lib}/xalan.jar 
     121xalan.jar=${org.bedework.default.lib}/xalan-2-6-0.jar 
    111122 
    112123# jetspeed2 jars 
    …… 
    174185org.bedework.mail.jar=${org.bedework.temp.jars}/${org.bedework.mail.jar.name} 
    175186 
     187org.bedework.uportal.jar.name=bwuportal-support-${product.version}.jar 
     188org.bedework.uportal.jar=${org.bedework.temp.jars}/${org.bedework.uportal.jar.name} 
     189 
    176190org.bedework.webadmin.jar.name=bwwebadmin-${product.version}.jar 
    177191org.bedework.webadmin.jar=${org.bedework.temp.jars}/${org.bedework.webadmin.jar.name} 

  • trunk/calendar3/bldfiles/globalDefs.xml

    r463 r594  
    8888    <property name="org.bedework.timers.base" location="${calendar.dir}/timers" /> 
    8989    <property name="org.bedework.tools.base" location="${calendar.dir}/tools" /> 
     90    <property name="org.bedework.uportal.base" location="${calendar.dir}/uportal" /> 
    9091    <property name="org.bedework.webadmin.base" location="${calendar.dir}/webadmin" /> 
    9192    <property name="org.bedework.webclient.base" location="${calendar.dir}/webclient" /> 

  • trunk/calendar3/build.xml

    r492 r594  
    108108                   bld.http,bld.caldavclientapi, 
    109109                   bld.calsvci,bld.mail,bld.logging, 
    110                    bld.calsvc,bld.appcommon, 
     110                   bld.calsvc,bld.appcommon,bld.uportal, 
    111111                   bld.webadmin,bld.webclient, 
    112112                   bld.synchml,bld.caldav, 
    …… 
    259259                         ${org.bedework.timers.base}/src: 
    260260                         ${org.bedework.tools.base}/src: 
     261                         ${org.bedework.uportal.base}/src: 
    261262                         ${org.bedework.webadmin.base}/src: 
    262263                         ${org.bedework.webclient.base}/src: 
    …… 
    447448  </target> 
    448449 
     450  <!-- ======================== uportal target ======================= 
     451       This builds the uportal support classes jar. 
     452       ================================================================= --> 
     453 
     454  <target name="bld.uportal" 
     455          depends="init,bld.locale" 
     456          description="Build calendar uportal support classes jar"> 
     457      <ant antfile="${org.bedework.uportal.base}/build.xml" inheritrefs="true" 
     458           target="build" /> 
     459  </target> 
     460 
    449461  <!-- ======================== webcommon target ======================= 
    450462       This builds the web common classes jar.