xlawrence 2005/05/17 14:52:42 CEST
Modified files:
. maven.xml
war/src/webapp/WEB-INF portlet.xml
Added files:
war/src/conf/jetspeed2 caluser.psml
Log:
Added jetspeed deploy goal and config file
Revision Changes Path
1.2 +25 -0 calUser/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/calUser/maven.xml.diff?r1=1.1&r2=1.2&f=h
1.1 +37 -0 calUser/war/src/conf/jetspeed2/caluser.psml (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/calUser/war/src/conf/jetspeed2/caluser.psml?rev=1.1&content-type=text/plain
1.2 +3 -3 calUser/war/src/webapp/WEB-INF/portlet.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/calUser/war/src/webapp/WEB-INF/portlet.xml.diff?r1=1.1&r2=1.2&f=h
Index: maven.xml
===================================================================
RCS file: /home/cvs/repository/calUser/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 17 May 2005 11:45:56 -0000 1.1
+++ maven.xml 17 May 2005 12:52:41 -0000 1.2
@@ -40,6 +40,21 @@
</copy>
</goal>
+ <goal name="deploy:jetspeed2">
+ <copy file="${basedir}/war/target/caluser.war"
+ toDir="${catalina.home.dir}/webapps/jetspeed/WEB-INF/deploy"/>
+
+ <copy file="${basedir}/war/src/conf/jetspeed2/caluser.psml"
+ toDir="${catalina.home.dir}/webapps/jetspeed/WEB-INF/pages"/>
+
+ <copy file="${basedir}/war/src/conf/tomcat/caluser.xml"
+ toDir="${catalina.home.dir}/conf/Catalina/localhost"/>
+
+ <copy todir="${catalina.home.dir}/webapps/ROOT/ucalsrc">
+ <fileset dir="${basedir}/war/src/ucalsrc"/>
+ </copy>
+ </goal>
+
<goal name="undeploy:tomcat">
<delete
file="${catalina.home.dir}/conf/Catalina/localhost/caluser.xml"/>
@@ -48,4 +63,14 @@
<delete dir="${catalina.home.dir}/webapps/ROOT/ucalsrc"/>
</goal>
+ <goal name="undeploy:jetspeed2">
+ <delete
file="${catalina.home.dir}/conf/Catalina/localhost/caluser.xml"/>
+
+ <delete
file="${catalina.home.dir}/webapps/jetspeed/WEB-INF/deploy/caluser.war"/>
+
+ <delete
file="${catalina.home.dir}/webapps/jetspeed/WEB-INF/pages/caluser.psml"/>
+
+ <delete dir="${catalina.home.dir}/webapps/ROOT/ucalsrc"/>
+ </goal>
+
</project>
Index: portlet.xml
===================================================================
RCS file: /home/cvs/repository/calUser/war/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portlet.xml 17 May 2005 11:46:04 -0000 1.1
+++ portlet.xml 17 May 2005 12:52:41 -0000 1.2
@@ -25,8 +25,8 @@
Author: Xavier Lawrence @ jahia . com
-->
-<portlet-app id="ucalApp" version="1.0">
- <portlet id="CalPortlet">
+<portlet-app id="caluser" version="1.0">
+ <portlet id="caluserPortlet">
<init-param>
<name>ServletContextProvider</name>
<value>org.apache.jetspeed.portlet.ServletContextProviderImpl</value>
@@ -35,7 +35,7 @@
<name>ViewPage</name>
<value>/initialise.rdo</value>
</init-param>
- <portlet-name>PersonalEvents</portlet-name>
+ <portlet-name>CalUserPortlet</portlet-name>
<display-name>Personal Events Calendar</display-name>
<description>
The UWCal personal calendar application allows a user to manage
Index: caluser.psml
====================================================================
<!--
BEGIN LICENSE BLOCK
Version: JCSL 1.0
The contents of this file are subject to the Jahia Community Source License
1.0 or later (the "License"); you may not use this file except in
compliance with the License. You may obtain a copy of the License at
http://www.jahia.org/license
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the rights, obligations and limitations governing use of the contents
of the file. The Original and Upgraded Code is the Jahia CMS and Portal
Server. The developer of the Original and Upgraded Code is JAHIA Ltd. JAHIA
Ltd. owns the copyrights in the portions it created. All Rights Reserved.
The Shared Modifications are Jahia View Helper.
The Developer of the Shared Modifications is Jahia Solution Sarl.
Portions created by the Initial Developer are Copyright (C) 2002 by the
Initial Developer. All Rights Reserved.
END LICENSE BLOCK
Author: Xavier Lawrence @ jahia . com
-->
<page id="caluserPage">
<defaults
skin="orange"
layout-decorator="tigris"
portlet-decorator="tigris"
/>
<title>UWCal Client Application</title>
<fragment id="caluser-1" type="layout" name="jetspeed::VelocityOneColumn">
<fragment id="caluser-2" type="portlet" name="caluser::CalUserPortlet"/>
</fragment>
</page>
