[Webical-commits] SF.net SVN: webical: [663] trunk/webical-war/etc/environments/demo

[<mat...@us...>]

Revision: 663
          http://webical.svn.sourceforge.net/webical/?rev=663&view=rev
Author:   mattijshoitink
Date:     2008-01-22 03:15:40 -0800 (Tue, 22 Jan 2008)

Log Message:
-----------
updated demo context files

Modified Paths:
--------------
    trunk/webical-war/etc/environments/demo/META-INF/context.xml
    trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml
    trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo.xml
    trunk/webical-war/etc/environments/demo/WEB-INF/etc/webicaldemocleaner.sh

Modified: trunk/webical-war/etc/environments/demo/META-INF/context.xml
===================================================================
--- trunk/webical-war/etc/environments/demo/META-INF/context.xml	2008-01-22 08:59:47 UTC (rev 662)
+++ trunk/webical-war/etc/environments/demo/META-INF/context.xml	2008-01-22 11:15:40 UTC (rev 663)
@@ -1,14 +1,18 @@
 <Context path="/webical-refactoring" debug="5" reloadable="true" crossContext="true">
 
         <!-- Authentication realm -->
-        <!--<Realm className="org.apache.catalina.realm.MemoryRealm"/>-->
-
-        <Realm className="org.apache.catalina.realm.JDBCRealm" debug="99"
-            driverName="com.mysql.jdbc.Driver"
-                connectionURL="jdbc:mysql://localhost:3306/org_webical_demo?autoReconnect=true&amp;user=org_webical_demo&amp;password=org_webical_demo"
-            userTable="_auth_user" userNameCol="username" userCredCol="userpass"
-            userRoleTable="auth_userrole" roleNameCol="role"/>
-
+		<Realm className="org.apache.catalina.realm.JDBCRealm" 
+			debug="4" 
+		    driverName="com.mysql.jdbc.Driver"
+			connectionName="org_webical_demo" 
+			connectionPassword="org_webical_demo" 
+			connectionURL="jdbc:mysql://localhost:3306/org_webical_demo?autoReconnect=true" 
+		    userTable="_auth_user" 
+			userNameCol="username" 
+			userCredCol="userpass" 
+		    userRoleTable="_auth_userrole" 
+			roleNameCol="role"/>
+			
         <!-- The database resource for hibernate -->
         <Resource 
                 name="jdbc/calendarDataBase" 

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-22 08:59:47 UTC (rev 662)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo-bootstrap.xml	2008-01-22 11:15:40 UTC (rev 663)
@@ -14,7 +14,7 @@
 					Referenced beans before referers
 				-->
 				<ref bean="applicationSettings"/>
-				<ref bean="demoUserr"/>
+				<ref bean="demoUser"/>
 				<ref bean="calendar_demoUser"/>
 				<ref bean="userSettings_demoUser" />
 			</list>
@@ -30,26 +30,26 @@
 		<property name="calendarRefreshTimeMs" value="50000"/>
 	</bean>
 
-	<!-- Add a fixed user for development -->	
+	<!-- Add a fixed user for demo -->	
 	<bean id="demoUser" class="org.webical.User">
 	    <property name="userId" value="webical" />
-	    <property name="firstName" value="Nightly"/>
-	    <property name="lastNamePrefix" value="Build"/>
+	    <property name="firstName" value="Demo"/>
+	    <property name="lastNamePrefix" value=""/>
 	    <property name="lastName" value="User"/>
 	    <property name="birthDate"><ref bean="birthDate" /></property>
 	</bean>
 	
-    <!-- Birth Date for the fixed user -->
+    <!-- Birth Date for the demo user -->
     <bean id="birthDate" class="java.util.Date">
-		<constructor-arg><value>January 11, 2008, 00:00:00 GMT</value></constructor-arg>
+		<constructor-arg><value>January 18, 2008, 00:00:00 GMT</value></constructor-arg>
 		<!-- <constructor-arg><value type="long">60242569200000</value></constructor-arg> -->
 	</bean>
 	
-	<!-- A test calendar for fixedUser -->
+	<!-- A test calendar for demo user -->
 	<bean id="calendar_demoUser" class="org.webical.Calendar">
-		<property name="name" value="Webical Roadmap"/>
+		<property name="name" value="Webical Demo Calendar"/>
 		<property name="type" value="ical-webdav"/>
-		<property name="url" value="http://nightly.webical.org/dav/webicalnightly.ics"/>
+		<property name="url" value="http://demo.webical.org/dav/webicaldemo.ics"/>
 		<property name="visible" value="true"/>
 		<property name="user"><ref bean="demoUser"/></property>
 	</bean>

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-22 08:59:47 UTC (rev 662)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/applicationContext-demo.xml	2008-01-22 11:15:40 UTC (rev 663)
@@ -34,7 +34,7 @@
                 <prop key="hibernate.format_sql">true</prop>
                 <prop key="hibernate.max_fetch_depth">1</prop>
                 <!-- set to validate for production -->
-  				<prop key="hibernate.hbm2ddl.auto">update</prop>
+  				<prop key="hibernate.hbm2ddl.auto">create</prop>
                 <prop key="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</prop>
             </props>
         </property>

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-22 08:59:47 UTC (rev 662)
+++ trunk/webical-war/etc/environments/demo/WEB-INF/etc/webicaldemocleaner.sh	2008-01-22 11:15:40 UTC (rev 663)
@@ -18,8 +18,9 @@
 echo "demo.webical.org cleaning time!"
 echo "==============================="
 
-echo "inserting new data"
-/usr/bin/mysql -u$db_user -p$db_pass $db < $insert_script
+# 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"
 /bin/cp $clean_ical_file $demo_ical_file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.