Menu
▾
▴
[Webical-commits] SF.net SVN: webical: [646] trunk/webical-war
|
From: <mat...@us...> - 2008-01-11 09:08:15
|
Revision: 646
http://webical.svn.sourceforge.net/webical/?rev=646&view=rev
Author: mattijshoitink
Date: 2008-01-11 01:08:10 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
updated application contexts and bootstraps for several environments
Modified Paths:
--------------
trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo.xml
trunk/webical-war/etc/environments/demo/WEB-INF/classes/log4j.properties
trunk/webical-war/etc/environments/demo/WEB-INF/etc/defaultwebicaldemodata.sql
trunk/webical-war/etc/environments/demo/WEB-INF/web.xml
trunk/webical-war/etc/environments/demo/login.jsp
trunk/webical-war/etc/environments/nightly/WEB-INF/classes/log4j.properties
trunk/webical-war/etc/environments/nightly/WEB-INF/web.xml
trunk/webical-war/etc/environments/nightly/login.jsp
trunk/webical-war/etc/environments/release/WEB-INF/applicationContext-release.xml
trunk/webical-war/src/main/webapp/WEB-INF/applicationContext.xml
trunk/webical-war/src/main/webapp/css/style.css
trunk/webical-war/src/main/webapp/login.jsp
Added Paths:
-----------
trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml
Added: trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml
===================================================================
--- trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml (rev 0)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml 2008-01-11 09:08:10 UTC (rev 646)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+
+ <!--
+ Bootstrap the applciation for demo
+ -->
+ <bean id="databaseBootStrapDao" class="org.webical.dao.hibernateImpl.DatabaseBootstrapDao">
+ <property name="objectsToPersist">
+ <list>
+ <!--
+ Order is important!
+ Referenced beans before referers
+ -->
+ <ref bean="applicationSettings"/>
+ <ref bean="demoUserr"/>
+ <ref bean="calendar_demoUser"/>
+ <ref bean="userSettings_demoUser" />
+ </list>
+ </property>
+ </bean>
+
+ <!-- ApplicationSettings -->
+ <bean id="applicationSettings" class="org.webical.ApplicationSettings">
+ <property name="pluginWorkPath" value="${java.io.tmpdir}" />
+ <property name="pluginCleanupEnabled" value="false"/>
+ <property name="configurationUsername" value="admin"/>
+ <property name="configurationPassword" value="admin"/>
+ <property name="calendarRefreshTimeMs" value="50000"/>
+ </bean>
+
+ <!-- Add a fixed user for development -->
+ <bean id="demoUser" class="org.webical.User">
+ <property name="userId" value="webical" />
+ <property name="firstName" value="Nightly"/>
+ <property name="lastNamePrefix" value="Build"/>
+ <property name="lastName" value="User"/>
+ <property name="birthDate"><ref bean="birthDate" /></property>
+ </bean>
+
+ <!-- Birth Date for the fixed user -->
+ <bean id="birthDate" class="java.util.Date">
+ <constructor-arg><value>January 11, 2008, 00:00:00 GMT</value></constructor-arg>
+ <!-- <constructor-arg><value type="long">60242569200000</value></constructor-arg> -->
+ </bean>
+
+ <!-- A test calendar for fixedUser -->
+ <bean id="calendar_demoUser" class="org.webical.Calendar">
+ <property name="name" value="Webical Roadmap"/>
+ <property name="type" value="ical-webdav"/>
+ <property name="url" value="http://nightly.webical.org/dav/webicalnightly.ics"/>
+ <property name="visible" value="true"/>
+ <property name="user"><ref bean="demoUser"/></property>
+ </bean>
+
+ <!-- Settings for the fixed user -->
+ <bean id="userSettings_demoUser" class="org.webical.UserSettings">
+ <property name="defaultCalendarView" value="1" />
+ <property name="firstDayOfWeek" value="2"/>
+ <property name="numberOfAgendaDays" value="4"/>
+ <property name="dateFormat" value="dd/MM/yyyy"/>
+ <property name="timeFormat" value="HH:mm"/>
+ <property name="user"><ref bean="demoUser"/></property>
+ </bean>
+
+</beans>
\ No newline at end of file
Property changes on: trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo.xml
===================================================================
--- trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo.xml 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo.xml 2008-01-11 09:08:10 UTC (rev 646)
@@ -20,6 +20,7 @@
<value>org/webical/Settings.hbm.xml</value>
<value>org/webical/PluginSettings.hbm.xml</value>
<value>org/webical/UserPluginSettings.hbm.xml</value>
+ <value>org/webical/UserSettings.hbm.xml</value>
</list>
</property>
Modified: trunk/webical-war/etc/environments/demo/WEB-INF/classes/log4j.properties
===================================================================
--- trunk/webical-war/etc/environments/demo/WEB-INF/classes/log4j.properties 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/classes/log4j.properties 2008-01-11 09:08:10 UTC (rev 646)
@@ -20,7 +20,7 @@
log4j.appender.SMTP.SMTPHost=localhost
log...@fu...
log...@fu...
-log4j.appender.SMTP.Subject=Webical ERROR log
+log4j.appender.SMTP.Subject=Webical Demo ERROR log
log4j.appender.SMTP.BufferSize=512
log4j.appender.SMTP.EvaluatorClass=org.webical.logging.SmtpTriggeringEventEvaluator
log4j.appender.SMTP.LocationInfo=true
Modified: trunk/webical-war/etc/environments/demo/WEB-INF/etc/defaultwebicaldemodata.sql
===================================================================
--- trunk/webical-war/etc/environments/demo/WEB-INF/etc/defaultwebicaldemodata.sql 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/etc/defaultwebicaldemodata.sql 2008-01-11 09:08:10 UTC (rev 646)
@@ -58,7 +58,7 @@
`pluginPackageExtension`, `calendarRefreshTimeMs`, `pluginCleanupEnabled`,
`configurationUsername`, `configurationPassword`)
VALUES
-(1, 'Webical release 0.2 >>> data is deleted every night! <<<', '/tmp',
+(1, 'Webical release 0.4 >>> data is deleted every night! <<<', '/tmp',
'.zip', 60000, 0,
'admin', '');
@@ -132,3 +132,27 @@
INSERT INTO `user` (`userId`, `firstName`, `lastNamePrefix`, `lastName`, `birthDate`) VALUES ('webical', NULL, NULL, NULL, NULL);
+--
+-- Table structure for table `user_settings`
+--
+
+DROP TABLE IF EXISTS `user_settings`;
+CREATE TABLE `user_settings` (
+ `id` bigint(20) NOT NULL,
+ `defaultCalendarView` int(11) default NULL,
+ `firstDayOfWeek` int(11) default NULL,
+ `numberOfAgendaDays` int(11) default NULL,
+ `dateFormat` varchar(255) default NULL,
+ `timeFormat` varchar(255) default NULL,
+ `user` varchar(255) default NULL,
+ PRIMARY KEY (`id`),
+ KEY `FK58861617263CBF35` (`user`),
+ KEY `FK58861617A446C95D` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+--
+-- Dumping data for table `user_settings`
+--
+
+INSERT INTO `user_settings` (`id`, `defaultCalendarView`, `firstDayOfWeek`, `numberOfAgendaDays`, `dateFormat`, `timeFormat`, `user`) VALUES(1, 1, 2, 4, 'dd/MM/yyyy', 'HH:mm', 'webical');
Modified: trunk/webical-war/etc/environments/demo/WEB-INF/web.xml
===================================================================
--- trunk/webical-war/etc/environments/demo/WEB-INF/web.xml 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/web.xml 2008-01-11 09:08:10 UTC (rev 646)
@@ -65,6 +65,7 @@
<param-value>
/WEB-INF/applicationContext.xml
/WEB-INF/applicationContext-demo.xml
+ /WEB-INF/applicationContext-demo-bootstrap.xml
</param-value>
</context-param>
Modified: trunk/webical-war/etc/environments/demo/login.jsp
===================================================================
--- trunk/webical-war/etc/environments/demo/login.jsp 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/demo/login.jsp 2008-01-11 09:08:10 UTC (rev 646)
@@ -1,30 +1,34 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>webical demo-site login</title>
+ <title>Webical Demo-site login</title>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
<link href="http://demo.webical.org/css/style.css" rel="stylesheet" type="text/css" />
</head>
<body>
- <div id="login">
- <form method="post" action="j_security_check">
- <h1>Login</h1>
- <div class="formItem">
- <label for="username">Username: </label>
- <span class="formElement"><input type="text" name="j_username" id="username" value="webical" /></span>
+ <div id="settingsPanel">
+ <div id="settingsPanelContentBlock">
+ <div id="login" class="panelContent">
+ <form method="post" action="j_security_check">
+ <h1>Login</h1>
+ <div class="formItem">
+ <label for="username">Username: </label>
+ <span class="formElement"><input type="text" name="j_username" id="username" value="webical" /></span>
+ </div>
+ <div class="formItem">
+ <label for="password">Password: </label>
+ <span class="formElement"><input id="password" type="password" name="j_password" value="webical" /></span>
+ </div>
+ <div class="formItem">
+ <span class="formElement"><input type="submit" value="login" class="button"/></span>
+ </div>
+ </form>
+ <p>
+ This is the public demo-site used to display webical's progress. Use webical/webical as the username/password
+ </p>
+ </div>
</div>
- <div class="formItem">
- <label for="password">Password: </label>
- <span class="formElement"><input id="password" type="password" name="j_password" value="webical" /></span>
- </div>
- <div class="formItem">
- <span class="formElement"><input type="submit" value="login" class="button"/></span>
- </div>
- </form>
- <p>
- This is the public demo-site used to display webical's progress. Use webical/webical as the username/password
- </p>
</div>
</body>
</html>
\ No newline at end of file
Modified: trunk/webical-war/etc/environments/nightly/WEB-INF/classes/log4j.properties
===================================================================
--- trunk/webical-war/etc/environments/nightly/WEB-INF/classes/log4j.properties 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/nightly/WEB-INF/classes/log4j.properties 2008-01-11 09:08:10 UTC (rev 646)
@@ -1,6 +1,7 @@
log4j.rootLogger=ERROR, SMTP
log4j.logger.org.webical=DEBUG, R
+log4j.logger.org.webical.plugin.classloading.PluginClassLoader=ERROR, R
log4j.logger.org.apache.catalina=WARN, R
log4j.logger.org.codehaus=WARN, R
log4j.logger.org.springframework=INFO, R
Modified: trunk/webical-war/etc/environments/nightly/WEB-INF/web.xml
===================================================================
--- trunk/webical-war/etc/environments/nightly/WEB-INF/web.xml 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/nightly/WEB-INF/web.xml 2008-01-11 09:08:10 UTC (rev 646)
@@ -52,7 +52,7 @@
<servlet-mapping>
<servlet-name>webdav</servlet-name>
- <url-pattern>/dav/webicaldemo.ics</url-pattern>
+ <url-pattern>/dav/webicalnightly.ics</url-pattern>
</servlet-mapping>
<!--
Modified: trunk/webical-war/etc/environments/nightly/login.jsp
===================================================================
--- trunk/webical-war/etc/environments/nightly/login.jsp 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/nightly/login.jsp 2008-01-11 09:08:10 UTC (rev 646)
@@ -1,32 +1,36 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>webical nightly-build login</title>
+ <title>Webical Nightly-build login</title>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
- <link href="http://demo.webical.org/css/style.css" rel="stylesheet" type="text/css" />
+ <link href="/css/style.css" rel="stylesheet" type="text/css" />
</head>
<body>
- <div id="login">
- <form method="post" action="j_security_check">
- <h1>Login</h1>
- <div class="formItem">
- <label for="username">Username: </label>
- <span class="formElement"><input type="text" name="j_username" id="username" value="webical" /></span>
+ <div id="settingsPanel">
+ <div id="settingsPanelContentBlock">
+ <div id="login" class="panelContent">
+ <form method="post" action="j_security_check">
+ <h1>Login</h1>
+ <div class="formItem">
+ <label for="username">Username: </label>
+ <span class="formElement"><input type="text" name="j_username" id="username" value="webical" /></span>
+ </div>
+ <div class="formItem">
+ <label for="password">Password: </label>
+ <span class="formElement"><input id="password" type="password" name="j_password" value="webical" /></span>
+ </div>
+ <div class="formItem">
+ <span class="formElement"><input type="submit" value="login" class="button"/></span>
+ </div>
+ </form>
+ <p>
+ This is a public demo site used to display webical's progress. This is a nightly build and it could very well be broken:).
+ To see the last release go to <a href="http://demo.webical.org">The main demo site</a> Use webical/webical as the username/
+ password to login here.
+ </p>
+ </div>
</div>
- <div class="formItem">
- <label for="password">Password: </label>
- <span class="formElement"><input id="password" type="password" name="j_password" value="webical" /></span>
- </div>
- <div class="formItem">
- <span class="formElement"><input type="submit" value="login" class="button"/></span>
- </div>
- </form>
- <p>
- This is a public demo site used to display webical's progress. This is a nightly build and it could very well be broken:).
- To see the last release go to <a href="http://demo.webical.org">The main demo site</a> Use webical/webical as the username/
- password to login here.
- </p>
</div>
</body>
</html>
\ No newline at end of file
Modified: trunk/webical-war/etc/environments/release/WEB-INF/applicationContext-release.xml
===================================================================
--- trunk/webical-war/etc/environments/release/WEB-INF/applicationContext-release.xml 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/etc/environments/release/WEB-INF/applicationContext-release.xml 2008-01-11 09:08:10 UTC (rev 646)
@@ -25,6 +25,7 @@
<value>org/webical/Settings.hbm.xml</value>
<value>org/webical/PluginSettings.hbm.xml</value>
<value>org/webical/UserPluginSettings.hbm.xml</value>
+ <value>org/webical/UserSettings.hbm.xml</value>
</list>
</property>
Modified: trunk/webical-war/src/main/webapp/WEB-INF/applicationContext.xml
===================================================================
--- trunk/webical-war/src/main/webapp/WEB-INF/applicationContext.xml 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/src/main/webapp/WEB-INF/applicationContext.xml 2008-01-11 09:08:10 UTC (rev 646)
@@ -22,7 +22,7 @@
<property name="pluginManifestReader"><ref bean="pluginManifestReader" /></property>
<property name="daoFactory"><ref bean="daoFactory" /></property>
<!-- replaced by maven when building -->
- <property name="webicalVersion"><value>@WEBICAL_VERSION@</value></property>
+ <property name="webicalVersion"><value>0.4-SNAPSHOT</value></property>
</bean>
<!-- The manifest reader -->
Modified: trunk/webical-war/src/main/webapp/css/style.css
===================================================================
--- trunk/webical-war/src/main/webapp/css/style.css 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/src/main/webapp/css/style.css 2008-01-11 09:08:10 UTC (rev 646)
@@ -994,12 +994,14 @@
font-weight: bold;
}
-.datatable {
+.datatable {
+ width: 100%;
}
.datatable .label {
font-weight: bold;
- padding-right: 20px;
+ padding-right: 20px;
+ width: 200px;
}
/* Progress indicator */
Modified: trunk/webical-war/src/main/webapp/login.jsp
===================================================================
--- trunk/webical-war/src/main/webapp/login.jsp 2008-01-10 16:26:54 UTC (rev 645)
+++ trunk/webical-war/src/main/webapp/login.jsp 2008-01-11 09:08:10 UTC (rev 646)
@@ -1,27 +1,31 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
- <title>webical login</title>
+ <title>Webical login</title>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
<link href="../css/style.css" rel="stylesheet" type="text/css" />
</head>
<body>
- <div id="login">
- <form method="post" action="j_security_check">
- <h1>Login</h1>
- <div class="formItem">
- <label for="username">Username: </label>
- <span class="formElement"><input type="text" name="j_username" id="username" /></span>
- </div>
- <div class="formItem">
- <label for="password">Password: </label>
- <span class="formElement"><input id="password" type="password" name="j_password" /></span>
- </div>
- <div class="formItem">
- <span class="formElement"><input type="submit" value="login" class="button"/></span>
+ <div id="settingsPanel">
+ <div id="settingsPanelContentBlock">
+ <div id="login" class="panelContent">
+ <form method="post" action="j_security_check">
+ <h1>Login</h1>
+ <div class="formItem">
+ <label for="username">Username: </label>
+ <span class="formElement"><input type="text" name="j_username" id="username" /></span>
+ </div>
+ <div class="formItem">
+ <label for="password">Password: </label>
+ <span class="formElement"><input id="password" type="password" name="j_password" /></span>
+ </div>
+ <div class="formItem">
+ <span class="formElement"><input type="submit" value="login" class="button"/></span>
+ </div>
+ </form>
+ </div>
</div>
- </form>
</div>
</body>
</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
