xlawrence 2005/05/17 16:03:55 CEST
Modified files:
. maven.xml
war/src/conf/jetspeed2 calpublic.psml
Log:
Small config changes
Revision Changes Path
1.3 +6 -6 calPublic/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/calPublic/maven.xml.diff?r1=1.2&r2=1.3&f=h
1.2 +2 -2 calPublic/war/src/conf/jetspeed2/calpublic.psml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/calPublic/war/src/conf/jetspeed2/calpublic.psml.diff?r1=1.1&r2=1.2&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/calPublic/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 17 May 2005 12:51:52 -0000 1.2
+++ maven.xml 17 May 2005 14:03:55 -0000 1.3
@@ -35,8 +35,8 @@
<copy file="${basedir}/war/src/conf/tomcat/calpublic.xml"
toDir="${catalina.home.dir}/conf/Catalina/localhost"/>
- <copy todir="${catalina.home.dir}/webapps/ROOT/calsrc">
- <fileset dir="${basedir}/war/src/calsrc"/>
+ <copy todir="${catalina.home.dir}/webapps/ROOT/calrsrc">
+ <fileset dir="${basedir}/war/src/calrsrc"/>
</copy>
</goal>
@@ -50,8 +50,8 @@
<copy file="${basedir}/war/src/conf/tomcat/calpublic.xml"
toDir="${catalina.home.dir}/conf/Catalina/localhost"/>
- <copy todir="${catalina.home.dir}/webapps/ROOT/calsrc">
- <fileset dir="${basedir}/war/src/calsrc"/>
+ <copy todir="${catalina.home.dir}/webapps/ROOT/calrsrc">
+ <fileset dir="${basedir}/war/src/calrsrc"/>
</copy>
</goal>
@@ -60,7 +60,7 @@
<delete dir="${catalina.home.dir}/webapps/calpublic"/>
- <delete dir="${catalina.home.dir}/webapps/ROOT/calsrc"/>
+ <delete dir="${catalina.home.dir}/webapps/ROOT/calrsrc"/>
</goal>
<goal name="undeploy:jetspeed2">
@@ -70,7 +70,7 @@
<delete
file="${catalina.home.dir}/webapps/jetspeed/WEB-INF/pages/calpublic.psml"/>
- <delete dir="${catalina.home.dir}/webapps/ROOT/calsrc"/>
+ <delete dir="${catalina.home.dir}/webapps/ROOT/calrsrc"/>
</goal>
</project>
Index: calpublic.psml
===================================================================
RCS file:
/home/cvs/repository/calPublic/war/src/conf/jetspeed2/calpublic.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calpublic.psml 17 May 2005 12:51:53 -0000 1.1
+++ calpublic.psml 17 May 2005 14:03:55 -0000 1.2
@@ -31,7 +31,7 @@
portlet-decorator="tigris"
/>
<title>UWCal Public Events Demo</title>
- <fragment id="pubcal-1" type="layout" name="jetspeed::VelocityOneColumn">
- <fragment id="pubcal-2" type="portlet"
name="calpublic::CalPublicPortlet"/>
+ <fragment id="calpublic-1" type="layout"
name="jetspeed::VelocityTwoColumns">
+ <fragment id="calpublic-2" type="portlet"
name="calpublic::CalPublicPortlet"/>
</fragment>
</page>
