[ZKforge-subversion-log] SF.net SVN: zkforge:[1104] trunk/zktodo2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 1104
          http://zkforge.svn.sourceforge.net/zkforge/?rev=1104&view=rev
Author:   simon_massey
Date:     2010-11-22 22:49:06 +0000 (Mon, 22 Nov 2010)

Log Message:
-----------
tidy up of web.xml to get passed fussy sax parsers. 

Modified Paths:
--------------
    trunk/zktodo2/pom.xml
    trunk/zktodo2/src/main/resources/spring-context.xml
    trunk/zktodo2/src/main/webapp/WEB-INF/web.xml

Added Paths:
-----------
    trunk/zktodo2/src/main/resources/META-INF/persistence-spring.xml

Removed Paths:
-------------
    trunk/zktodo2/src/main/resources/META-INF/persistence.xml

Modified: trunk/zktodo2/pom.xml
===================================================================

--- trunk/zktodo2/pom.xml	2010-11-22 21:34:05 UTC (rev 1103)
+++ trunk/zktodo2/pom.xml	2010-11-22 22:49:06 UTC (rev 1104)
@@ -4,9 +4,9 @@
 	<groupId>org.zkforge.zktodo2</groupId>
 	<artifactId>zktodo2</artifactId>
 	<packaging>war</packaging>
-	<version>1.2</version>
+	<version>1.3</version>
 	<name>zktodo2</name>
-	<url>http://www.zkoss.org/smalltalks/mvc4/</url>
+	<url>http://java.dzone.com/articles/using-desktop-model-view</url>
 	<repositories>
 		<repository>
 			<id>zk repository</id>
@@ -18,7 +18,7 @@
 		<zkel.version>1.0.2</zkel.version>
 		<spring.version>3.0.5.RELEASE</spring.version>
 		<hsqldb.version>1.8.0.7</hsqldb.version>
-		<hibernate.version>3.3.2.GA</hibernate.version>
+		<hibernate.version>3.3.1.ga</hibernate.version>
 		<commons-dbcp.version>1.2.2</commons-dbcp.version>
 		<geronimo-jta.version>1.1.1</geronimo-jta.version>
 		<commons-lang.version>2.4</commons-lang.version>
@@ -27,6 +27,7 @@
 		<commons-io.version>1.4</commons-io.version>
 		<servlet-api.version>2.4</servlet-api.version>
 		<junit.version>4.7</junit.version>
+		<concurrent.version>1.3.4</concurrent.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -50,6 +51,12 @@
 			<version>${commons-io.version}</version>
 		</dependency>
 		<dependency>
+			<groupId>concurrent</groupId>
+			<artifactId>concurrent</artifactId>
+			<version>${concurrent.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<version>${spring.version}</version>

Copied: trunk/zktodo2/src/main/resources/META-INF/persistence-spring.xml (from rev 1101, trunk/zktodo2/src/main/resources/META-INF/persistence.xml)
===================================================================
--- trunk/zktodo2/src/main/resources/META-INF/persistence-spring.xml	                        (rev 0)
+++ trunk/zktodo2/src/main/resources/META-INF/persistence-spring.xml	2010-11-22 22:49:06 UTC (rev 1104)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" 
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
+             version="1.0">
+   <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL" />
+</persistence>
\ No newline at end of file

Deleted: trunk/zktodo2/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/zktodo2/src/main/resources/META-INF/persistence.xml	2010-11-22 21:34:05 UTC (rev 1103)
+++ trunk/zktodo2/src/main/resources/META-INF/persistence.xml	2010-11-22 22:49:06 UTC (rev 1104)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" 
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" 
-             version="1.0">
-   <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL" />
-</persistence>
\ No newline at end of file

Modified: trunk/zktodo2/src/main/resources/spring-context.xml
===================================================================
--- trunk/zktodo2/src/main/resources/spring-context.xml	2010-11-22 21:34:05 UTC (rev 1103)
+++ trunk/zktodo2/src/main/resources/spring-context.xml	2010-11-22 22:49:06 UTC (rev 1104)
@@ -19,7 +19,7 @@
 
 	<bean id="entityManagerFactory"
 		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
-		p:persistence-xml-location="classpath:META-INF/persistence.xml"
+		p:persistence-xml-location="classpath:META-INF/persistence-spring.xml"
 		p:data-source-ref="dataSource"
 		>
 		<property name="jpaVendorAdapter">

Modified: trunk/zktodo2/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/zktodo2/src/main/webapp/WEB-INF/web.xml	2010-11-22 21:34:05 UTC (rev 1103)
+++ trunk/zktodo2/src/main/webapp/WEB-INF/web.xml	2010-11-22 22:49:06 UTC (rev 1104)
@@ -3,10 +3,10 @@
  "http://java.sun.com/dtd/web-app_2_3.dtd" >
 <web-app>
 	<display-name>zktodo2</display-name>
-	<welcome-file-list>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>index.zul</welcome-file>
-	</welcome-file-list>
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>classpath:dataSourceContext.xml,classpath:spring-context.xml</param-value>
+	</context-param>
 	<!-- Spring -->
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
@@ -17,19 +17,13 @@
 		within zk.xml -->
 		<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
 	</listener>
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>classpath:dataSourceContext.xml,classpath:spring-context.xml</param-value>
-	</context-param>
 	<!-- ZK -->
 	<listener>
-		<description>ZK listener for cleanup when a session is destroyed</description>
 		<listener-class>
 			org.zkoss.zk.ui.http.HttpSessionListener
 		</listener-class>
 	</listener>
 	<servlet>
-		<description>ZK loader for ZUML pages</description>
 		<servlet-name>zkLoader</servlet-name>
 		<servlet-class>
 			org.zkoss.zk.ui.http.DHtmlLayoutServlet
@@ -40,23 +34,26 @@
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-	<servlet-mapping>
-		<servlet-name>zkLoader</servlet-name>
-		<url-pattern>*.zul</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>zkLoader</servlet-name>
-		<url-pattern>*.zhtml</url-pattern>
-	</servlet-mapping>
 	<servlet>
-		<description>The asynchronous update engine for ZK</description>
 		<servlet-name>auEngine</servlet-name>
 		<servlet-class>
 			org.zkoss.zk.au.http.DHtmlUpdateServlet
 		</servlet-class>
 	</servlet>
+	<servlet-mapping>
+		<servlet-name>zkLoader</servlet-name>
+		<url-pattern>*.zul</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>zkLoader</servlet-name>
+		<url-pattern>*.zhtml</url-pattern>
+	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>auEngine</servlet-name>
 		<url-pattern>/zkau/*</url-pattern>
 	</servlet-mapping>
+	<welcome-file-list>
+		<welcome-file>index.jsp</welcome-file>
+		<welcome-file>index.zul</welcome-file>
+	</welcome-file-list>
 </web-app>


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


