|
From: <mat...@us...> - 2008-01-25 12:33:53
|
Revision: 665
http://webical.svn.sourceforge.net/webical/?rev=665&view=rev
Author: mattijshoitink
Date: 2008-01-25 04:33:15 -0800 (Fri, 25 Jan 2008)
Log Message:
-----------
updated demo environment data
Modified Paths:
--------------
trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml
trunk/webical-war/etc/environments/demo/WEB-INF/etc/defaultwebicaldemodata.sql
trunk/webical-war/etc/environments/demo/WEB-INF/etc/webicaldemocleaner.sh
Modified: trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml
===================================================================
--- trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml 2008-01-23 17:23:31 UTC (rev 664)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml 2008-01-25 12:33:15 UTC (rev 665)
@@ -23,10 +23,12 @@
<!-- ApplicationSettings -->
<bean id="applicationSettings" class="org.webical.ApplicationSettings">
+ <property name="customPageTitle" value="Webical Demo" />
<property name="pluginWorkPath" value="${java.io.tmpdir}" />
+ <property name="pluginPackageExtension" value=".zip" />
<property name="pluginCleanupEnabled" value="false"/>
<property name="configurationUsername" value="admin"/>
- <property name="configurationPassword" value="admin"/>
+ <property name="configurationPassword" value="noneofyourbusiness"/>
<property name="calendarRefreshTimeMs" value="50000"/>
</bean>
@@ -41,7 +43,7 @@
<!-- Birth Date for the demo user -->
<bean id="birthDate" class="java.util.Date">
- <constructor-arg><value>January 18, 2008, 00:00:00 GMT</value></constructor-arg>
+ <constructor-arg><value>January 25, 2008, 00:00:00 GMT</value></constructor-arg>
<!-- <constructor-arg><value type="long">60242569200000</value></constructor-arg> -->
</bean>
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-23 17:23:31 UTC (rev 664)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/etc/defaultwebicaldemodata.sql 2008-01-25 12:33:15 UTC (rev 665)
@@ -1,158 +1,6 @@
--- phpMyAdmin SQL Dump
--- version 2.8.0.4
--- http://www.phpmyadmin.net
---
--- Host: 127.0.0.1:3307
--- Generation Time: Jan 16, 2007 at 10:44 PM
--- Server version: 4.1.15
--- PHP Version: 4.4.4-0.dotdeb.3
---
--- Database: `org_webical_demo`
---
+-- Clean Webical Demo data
-- --------------------------------------------------------
---
--- Table structure for table `_auth_user`
---
-
-DROP TABLE IF EXISTS `_auth_user`;
-CREATE TABLE IF NOT EXISTS `_auth_user` (
- `username` varchar(250) NOT NULL default '',
- `userpass` varchar(250) NOT NULL default '',
- PRIMARY KEY (`username`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `_auth_user`
---
-
-INSERT INTO `_auth_user` (`username`, `userpass`) VALUES ('webical', 'webical');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `application_settings`
---
-
-DROP TABLE IF EXISTS `application_settings`;
-CREATE TABLE IF NOT EXISTS `application_settings` (
- `applicationSettingsId` bigint(20) NOT NULL auto_increment,
- `customPageTitle` varchar(255) default NULL,
- `pluginWorkPath` varchar(255) default NULL,
- `pluginPackageExtension` varchar(255) default NULL,
- `calendarRefreshTimeMs` int(11) default NULL,
- `pluginCleanupEnabled` tinyint(1) default NULL,
- `configurationUsername` varchar(255) default NULL,
- `configurationPassword` varchar(255) default NULL,
- PRIMARY KEY (`applicationSettingsId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
-
---
--- Dumping data for table `application_settings`
---
-
--- The admin password needs to be filled in!!!
-INSERT INTO `application_settings`
-(`applicationSettingsId`, `customPageTitle`, `pluginWorkPath`,
-`pluginPackageExtension`, `calendarRefreshTimeMs`, `pluginCleanupEnabled`,
-`configurationUsername`, `configurationPassword`)
-VALUES
-(1, 'Webical release 0.4 >>> data is deleted every night! <<<', '/tmp',
-'.zip', 60000, 0,
-'admin', '');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `auth_userrole`
---
-
-DROP TABLE IF EXISTS `auth_userrole`;
-CREATE TABLE IF NOT EXISTS `auth_userrole` (
- `username` varchar(250) NOT NULL default '',
- `role` varchar(250) NOT NULL default '',
- PRIMARY KEY (`username`,`role`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `auth_userrole`
---
-
-INSERT INTO `auth_userrole` (`username`, `role`) VALUES ('webical', 'webicaluser');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `calendar`
---
-
-DROP TABLE IF EXISTS `calendar`;
-CREATE TABLE IF NOT EXISTS `calendar` (
- `calendarId` bigint(20) NOT NULL auto_increment,
- `name` varchar(255) NOT NULL default '',
- `type` varchar(255) NOT NULL default '',
- `url` varchar(255) NOT NULL default '',
- `username` varchar(255) default NULL,
- `password` varchar(255) default NULL,
- `visible` tinyint(1) default NULL,
- `offSetFrom` bigint(20) default NULL,
- `offSetTo` bigint(20) default NULL,
- `lastRefreshTimeStamp` bigint(20) default NULL,
- `userId` varchar(255) NOT NULL default '',
- PRIMARY KEY (`calendarId`),
- KEY `FKF55EFB3EF4310590` (`userId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
-
---
--- Dumping data for table `calendar`
---
-
-INSERT INTO `calendar` (`calendarId`, `name`, `type`, `url`, `username`, `password`, `visible`, `offSetFrom`, `offSetTo`, `lastRefreshTimeStamp`, `userId`) VALUES (1, 'webical demo', 'ical-webdav', 'http://demo.webical.org/dav/webicaldemo.ics', NULL, NULL, 1, -1, 0, 1168983765938, 'webical');
-
--- --------------------------------------------------------
-
---
--- Table structure for table `user`
---
-
-DROP TABLE IF EXISTS `user`;
-CREATE TABLE IF NOT EXISTS `user` (
- `userId` varchar(255) NOT NULL default '',
- `firstName` varchar(255) default NULL,
- `lastNamePrefix` varchar(255) default NULL,
- `lastName` varchar(255) default NULL,
- `birthDate` date default NULL,
- PRIMARY KEY (`userId`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `user`
---
-
-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');
+-- Change the admin password to something secret
+UPDATE `application_settings` SET configurationPassword = 'noneofyourbusiness' WHERE `applicationSettingsId` = '1';
Modified: trunk/webical-war/etc/environments/demo/WEB-INF/etc/webicaldemocleaner.sh
===================================================================
--- trunk/webical-war/etc/environments/demo/WEB-INF/etc/webicaldemocleaner.sh 2008-01-23 17:23:31 UTC (rev 664)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/etc/webicaldemocleaner.sh 2008-01-25 12:33:15 UTC (rev 665)
@@ -18,19 +18,19 @@
echo "demo.webical.org cleaning time!"
echo "==============================="
-# as of verson 0.4 not needed anymore . A context reload will clean the demo
-#echo "inserting new data"
-#/usr/bin/mysql -u$db_user -p$db_pass $db < $insert_script
-
-echo "copying the clean file over the demo file"
+echo "copying the clean ics file over the demo file"
/bin/cp $clean_ical_file $demo_ical_file
echo "reloading context"
-result=`/usr/bin/wget -q --http-user=$tomcat_user --http-pass=$tomcat_pass $url/manager/reload?path=$context_path -O -`
+result=`/usr/bin/wget -q --user=$tomcat_user --password=$tomcat_pass $url/manager/reload?path=$context_path -O -`
echo ${result}
if [[ "${result:0:4}" == "FAIL" ]] ; then
echo "context not started yet, starting up"
/usr/bin/wget -q --user=$tomcat_user --password=$tomcat_pass $url/manager/start?path=$context_path -O -
fi
+
+echo "inserting private data"
+/usr/bin/mysql -u$db_user -p$db_pass $db < $insert_script
+
echo "=================================="
echo "demo.webical.org cleaning is done!"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|