xlawrence 2005/05/17 16:04:30 CEST
Modified files:
. maven.xml
war/src/conf/java client.properties
war/src/webapp/WEB-INF web.xml
Log:
updated skins and config files
Revision Changes Path
1.3 +4 -4 calUser/maven.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/calUser/maven.xml.diff?r1=1.2&r2=1.3&f=h
1.2 +5 -5 calUser/war/src/conf/java/client.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/calUser/war/src/conf/java/client.properties.diff?r1=1.1&r2=1.2&f=h
1.2 +8 -1 calUser/war/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/calUser/war/src/webapp/WEB-INF/web.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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 17 May 2005 12:52:41 -0000 1.2
+++ maven.xml 17 May 2005 14:04:29 -0000 1.3
@@ -35,7 +35,7 @@
<copy file="${basedir}/war/src/conf/tomcat/caluser.xml"
toDir="${catalina.home.dir}/conf/Catalina/localhost"/>
- <copy todir="${catalina.home.dir}/webapps/ROOT/ucalsrc">
+ <copy todir="${catalina.home.dir}/webapps/ROOT/ucalrsrc">
<fileset dir="${basedir}/war/src/ucalsrc"/>
</copy>
</goal>
@@ -50,7 +50,7 @@
<copy file="${basedir}/war/src/conf/tomcat/caluser.xml"
toDir="${catalina.home.dir}/conf/Catalina/localhost"/>
- <copy todir="${catalina.home.dir}/webapps/ROOT/ucalsrc">
+ <copy todir="${catalina.home.dir}/webapps/ROOT/ucalrsrc">
<fileset dir="${basedir}/war/src/ucalsrc"/>
</copy>
</goal>
@@ -60,7 +60,7 @@
<delete dir="${catalina.home.dir}/webapps/caluser"/>
- <delete dir="${catalina.home.dir}/webapps/ROOT/ucalsrc"/>
+ <delete dir="${catalina.home.dir}/webapps/ROOT/ucalrsrc"/>
</goal>
<goal name="undeploy:jetspeed2">
@@ -70,7 +70,7 @@
<delete
file="${catalina.home.dir}/webapps/jetspeed/WEB-INF/pages/caluser.psml"/>
- <delete dir="${catalina.home.dir}/webapps/ROOT/ucalsrc"/>
+ <delete dir="${catalina.home.dir}/webapps/ROOT/ucalrsrc"/>
</goal>
</project>
Index: client.properties
===================================================================
RCS file: /home/cvs/repository/calUser/war/src/conf/java/client.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- client.properties 17 May 2005 11:45:56 -0000 1.1
+++ client.properties 17 May 2005 14:04:29 -0000 1.2
@@ -24,14 +24,14 @@
edu.rpi.sss.util.action.nocache=yes
# true if this application should run in guest mode only
-org.ucal.calendar.guestmode=true
+org.ucal.calendar.guestmode=false
# application name
-org.ucal.calendar.app.name=DemoCal
-edu.rpi.sss.util.action.logprefix=DemoCal
+org.ucal.calendar.app.name=DemoUserCal
+edu.rpi.sss.util.action.logprefix=DemoUserCal
# stylesheets and other files are found below this root
-org.ucal.calendar.app.root=http://localhost:8080/calrsrc
+org.ucal.calendar.app.root=http://localhost:8080/ucalrsrc
org.ucal.calendar.security.prefix=demo
@@ -42,7 +42,7 @@
org.ucal.calendar.app.showyeardata=false
# set the default view
-org.ucal.calendar.defaultview=week
+org.ucal.calendar.defaultview=day
# Refresh interval and action
org.ucal.calendar.refreshinterval=300
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/calUser/war/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 17 May 2005 11:46:04 -0000 1.1
+++ web.xml 17 May 2005 14:04:30 -0000 1.2
@@ -31,6 +31,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
version="2.4">
+
+ <context-param>
+ <param-name>rpiappname</param-name>
+ <param-value>DemoUserCal</param-value>
+ </context-param>
+
<filter>
<filter-name>XSLT Filter</filter-name>
<filter-class>edu.rpi.sss.util.servlets.ConfiguredXSLTFilter</filter-class>
@@ -192,6 +198,7 @@
<security-role>
<description>Somebody who owns a personal calendar</description>
- <role-name>demo.user</role-name>
+ <role-name>demo.user</role-name>
+ </security-role>
</web-app>
