You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2009/01/11 17:37:54 UTC
svn commit: r733488 - in
/incubator/click/trunk/examples/click-spring-cayenne: ./
cayenne/src/org/springframework/orm/cayenne/
cayenne/test/org/springframework/orm/cayenne/ petclinic/src/
petclinic/src/org/springframework/samples/petclinic/control/ pet...
Author: sabob
Date: Sun Jan 11 08:37:53 2009
New Revision: 733488
URL: http://svn.apache.org/viewvc?rev=733488&view=rev
Log:
migrated click-spring-cayenne example to Apache namespace
Added:
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.properties
Modified:
incubator/click/trunk/examples/click-spring-cayenne/build.properties
incubator/click/trunk/examples/click-spring-cayenne/build.xml
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneAccessor.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneCallback.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneExpressionException.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOperations.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOptimisticLockingFailureException.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneTemplate.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneValidationException.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/ConfigurationFactory.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/DataContextFilter.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/WebInterceptor.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneAccessorTests.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneTemplateTests.java
incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/WebInterceptorTests.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/cayenne.xml
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ActionButton.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ObjectBinder.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/model/Entity.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/AddVisit.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/BasePage.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditOwner.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditPet.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/FindOwners.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/service/impl/ClinicServiceImpl.java
incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/petclinic.map.xml
incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/petclinic.log
incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/web.xml
Modified: incubator/click/trunk/examples/click-spring-cayenne/build.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/build.properties?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/build.properties (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/build.properties Sun Jan 11 08:37:53 2009
@@ -1,5 +1,16 @@
-# Version - should be the same as the Click version.
-version=0.19
+# Version of the Click JARs
+click.version=2.0.1
+
+# Third party library versions
+ashwood.version=2.0
+cayenne.version=2.0.4
+servlet.api.version=2.4
+hsqldb.version=1.8.0.1
+log4j.version=1.2.15
+logging.version=1.0.4
+spring.version=1.2.6
+oro.version=2.0.8
+junit.version=3.8.1
# App Server deployment directory by Ant target 'deploy-webapps'
dir.appserver=C:/java/apache-tomcat-5.5.12/webapps
Modified: incubator/click/trunk/examples/click-spring-cayenne/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/build.xml?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/build.xml (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/build.xml Sun Jan 11 08:37:53 2009
@@ -3,19 +3,20 @@
<!-- Project Properties -->
<property file="build.properties"/>
<property name="name" value="click-spring-cayenne"/>
- <property name="jar.ashwood" value="ashwood-1.1.jar"/>
- <property name="jar.cayenne" value="cayenne-nodeps-1.2M9.jar"/>
- <property name="jar.click" value="click-0.19.jar"/>
- <property name="jar.click-extras" value="click-extras-0.19.jar"/>
- <property name="jar.hsqldb" value="hsqldb-1.8.0.1.jar"/>
- <property name="jar.junit" value="junit-3.8.1.jar"/>
- <property name="jar.logging" value="commons-logging-1.0.4.jar"/>
- <property name="jar.log4j" value="log4j-1.2.9.jar"/>
- <property name="jar.oro" value="oro-2.0.8.jar"/>
- <property name="jar.servlet" value="servlet-api-2.4.jar"/>
- <property name="jar.spring" value="spring-1.2.6.jar"/>
+ <property name="jar.ashwood" value="ashwood-${ashwood.version}.jar"/>
+ <property name="jar.cayenne" value="cayenne-nodeps-${cayenne.version}.jar"/>
+ <property name="jar.click" value="click-${click.version}-incubating.jar"/>
+ <property name="jar.click-extras" value="click-extras-${click.version}-incubating.jar"/>
+ <property name="jar.hsqldb" value="hsqldb-${hsqldb.version}.jar"/>
+ <property name="jar.junit" value="junit-${junit.version}.jar"/>
+ <property name="jar.logging" value="commons-logging-${logging.version}.jar"/>
+ <property name="jar.log4j" value="log4j-${log4j.version}.jar"/>
+ <property name="jar.oro" value="oro-${oro.version}.jar"/>
+ <property name="jar.servlet" value="servlet-api-${servlet.api.version}.jar"/>
+ <property name="jar.spring" value="spring-${spring.version}.jar"/>
<property name="dir.weblib" value="petclinic/war/WEB-INF/lib"/>
-
+ <property name="repository" value="http://repo1.maven.org"/>
+
<path id="classpath">
<pathelement location="lib/${jar.servlet}"/>
<pathelement location="${dir.weblib}/${jar.cayenne}"/>
@@ -24,7 +25,19 @@
<pathelement location="${dir.weblib}/${jar.log4j}"/>
<pathelement location="${dir.weblib}/${jar.spring}"/>
</path>
-
+
+ <!-- Macro Definitions -->
+ <macrodef name="downloadMacro">
+ <attribute name="name"/>
+ <attribute name="path"/>
+ <sequential>
+ <get src="${repository}/maven2/@{path}/@{name}"
+ dest="${dir.weblib}/@{name}"
+ verbose="true"
+ usetimestamp="true"/>
+ </sequential>
+ </macrodef>
+
<!-- Tasks -->
<target name="build" description="build web application WAR file" depends="compile">
@@ -45,7 +58,7 @@
<link href="http://click.sourceforge.net/docs/click-api/"/>
<link href="http://click.sourceforge.net/docs/extras-api/"/>
<link href="http://www.objectstyle.org/cayenne/api/cayenne/"/>
- <link href="http://static.springframework.org/spring/docs/1.2.x/api/"/>
+ <link href="http://static.springframework.org/spring/docs/2.5.x/api/"/>
</javadoc>
<delete dir="deploy" quiet="false"/>
<mkdir dir="deploy"/>
@@ -61,85 +74,69 @@
</fileset>
</war>
</target>
-
+
<target name="compile" description="compile Java source">
<delete dir="petclinic/war/WEB-INF/classes" quiet="false"/>
<mkdir dir="petclinic/war/WEB-INF/classes"/>
- <javac srcdir="petclinic/src:cayenne/src"
- destdir="petclinic/war/WEB-INF/classes"
+ <javac srcdir="petclinic/src:cayenne/src"
+ destdir="petclinic/war/WEB-INF/classes"
+ source="1.4"
debug="true">
<classpath refid="classpath"/>
- </javac>
+ </javac>
<copy todir="petclinic/war/WEB-INF/classes">
<fileset dir="petclinic/src">
<exclude name="**/package.html"/>
</fileset>
</copy>
</target>
-
- <target name="deploy" description="copy WAR files to application server">
+
+ <target name="deploy" description="copy WAR files to application server">
<copy file="deploy/click-spring-cayenne.war" todir="${dir.appserver}" overwrite="true"/>
</target>
-
+
<target name="get-deps" description="download JAR dependencies">
<mkdir dir="petclinic/war/WEB-INF/lib"/>
<property name="repository" value="http://www.ibiblio.org/maven"/>
- <get src="${repository}/net.sf.click/jars/${jar.click}" verbose="true"
- dest="${dir.weblib}/${jar.click}"
- usetimestamp="true"/>
- <get src="${repository}/net.sf.click/jars/${jar.click-extras}" verbose="true"
- dest="${dir.weblib}/${jar.click-extras}"
- usetimestamp="true"/>
- <get src="${repository}/org.objectstyle.cayenne/jars/${jar.cayenne}" verbose="true"
- dest="${dir.weblib}/${jar.cayenne}"
- usetimestamp="true"/>
- <get src="${repository}/org.objectstyle.ashwood/jars/${jar.ashwood}" verbose="true"
- dest="${dir.weblib}/${jar.ashwood}"
- usetimestamp="true"/>
- <get src="${repository}/hsqldb/jars/${jar.hsqldb}" verbose="true"
- dest="${dir.weblib}/${jar.hsqldb}"
- usetimestamp="true"/>
- <get src="${repository}/commons-logging/jars/${jar.logging}" verbose="true"
- dest="${dir.weblib}/${jar.logging}"
- usetimestamp="true"/>
- <get src="${repository}/log4j/jars/${jar.log4j}" verbose="true"
- dest="${dir.weblib}/${jar.log4j}"
- usetimestamp="true"/>
- <get src="${repository}/oro/jars/${jar.oro}" verbose="true"
- dest="${dir.weblib}/${jar.oro}"
- usetimestamp="true"/>
- <get src="${repository}/junit/jars/${jar.junit}" verbose="true"
+ <downloadMacro name="${jar.click}" path="org/apache/click/click/${click.version}"/>
+ <downloadMacro name="${jar.click-extras}" path="org/apache/click/click-extras/${click.version}"/>
+ <downloadMacro name="${jar.ashwood}" path="org/objectstyle/ashwood/ashwood/${ashwood.version}"/>
+ <downloadMacro name="${jar.cayenne}" path="org/apache/cayenne/cayenne-nodeps/${cayenne.version}"/>
+ <downloadMacro name="${jar.log4j}" path="log4j/log4j/${log4j.version}"/>
+ <downloadMacro name="${jar.hsqldb}" path="hsqldb/hsqldb/${hsqldb.version}"/>
+ <downloadMacro name="${jar.oro}" path="oro/oro/${oro.version}"/>
+ <downloadMacro name="${jar.logging}" path="commons-logging/commons-logging/${logging.version}"/>
+ <downloadMacro name="${jar.spring}" path="org/springframework/spring/${spring.version}"/>
+ <get src="${repository}/maven2/junit/junit/${junit.version}/${jar.junit}" verbose="true"
dest="lib/${jar.junit}"
usetimestamp="true"/>
- <get src="${repository}/javax.servlet/jars/${jar.servlet}" verbose="true"
+ <get src="${repository}/maven2/javax/servlet/servlet-api/${servlet.api.version}/${jar.servlet}" verbose="true"
dest="lib/${jar.servlet}"
usetimestamp="true"/>
- <get src="${repository}/springframework/jars/${jar.spring}" verbose="true"
- dest="${dir.weblib}/${jar.spring}"
- usetimestamp="true"/>
+
</target>
<target name="get-deps-proxy" description="download JAR dependencies via proxy">
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
<antcall target="get-deps"/>
</target>
-
+
<target name="help" description="display the Help message">
<echo message="Click Spring Cayenne example web application"/>
- <echo message="============================================"/>
- <echo/>
- <echo message="Main targets:"/>
- <echo/>
- <echo message="build build web application WAR file"/>
+ <echo message="============================================"/>
+ <echo/>
+ <echo message="Main targets:"/>
+ <echo/>
+ <echo message="build build web application WAR file"/>
<echo message="compile compile Java code"/>
<echo message="deploy copy WAR file to application server"/>
- <echo message="get-deps download JAR dependencies"/>
- <echo message="get-deps-proxy download JAR dependencies via proxy"/>
- <echo message="help display the Help message"/>
+ <echo message="get-deps download JAR dependencies"/>
+ <echo message="get-deps-proxy download JAR dependencies via proxy"/>
+ <echo message="help display the Help message"/>
+ <echo/>
<echo/>
+ <echo message="Please ensure you have configured build.properties"/>
<echo/>
- <echo message="Please ensure you have configured build.properties"/>
- <echo/>
- </target>
-
+ </target>
+
</project>
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneAccessor.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneAccessor.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneAccessor.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneAccessor.java Sun Jan 11 08:37:53 2009
@@ -2,14 +2,14 @@
import java.sql.SQLException;
-import org.objectstyle.cayenne.CayenneException;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.access.DeleteDenyException;
-import org.objectstyle.cayenne.access.OptimisticLockException;
-import org.objectstyle.cayenne.exp.ExpressionException;
-import org.objectstyle.cayenne.util.Util;
-import org.objectstyle.cayenne.validation.ValidationException;
+import org.apache.cayenne.CayenneException;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DeleteDenyException;
+import org.apache.cayenne.access.OptimisticLockException;
+import org.apache.cayenne.exp.ExpressionException;
+import org.apache.cayenne.util.Util;
+import org.apache.cayenne.validation.ValidationException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.support.SQLExceptionTranslator;
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneCallback.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneCallback.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneCallback.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneCallback.java Sun Jan 11 08:37:53 2009
@@ -1,8 +1,8 @@
package org.springframework.orm.cayenne;
-import org.objectstyle.cayenne.CayenneException;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.access.DataContext;
+import org.apache.cayenne.CayenneException;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.DataContext;
/**
* An interface allowing to execute Cayenne operations via CayenneTemplate. This
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneExpressionException.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneExpressionException.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneExpressionException.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneExpressionException.java Sun Jan 11 08:37:53 2009
@@ -1,6 +1,6 @@
package org.springframework.orm.cayenne;
-import org.objectstyle.cayenne.exp.ExpressionException;
+import org.apache.cayenne.exp.ExpressionException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
/**
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOperations.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOperations.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOperations.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOperations.java Sun Jan 11 08:37:53 2009
@@ -4,10 +4,10 @@
import java.util.List;
import java.util.Map;
-import org.objectstyle.cayenne.access.OperationObserver;
-import org.objectstyle.cayenne.access.ResultIterator;
-import org.objectstyle.cayenne.query.GenericSelectQuery;
-import org.objectstyle.cayenne.query.Query;
+import org.apache.cayenne.access.OperationObserver;
+import org.apache.cayenne.access.ResultIterator;
+import org.apache.cayenne.query.GenericSelectQuery;
+import org.apache.cayenne.query.Query;
import org.springframework.dao.DataAccessException;
/**
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOptimisticLockingFailureException.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOptimisticLockingFailureException.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOptimisticLockingFailureException.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneOptimisticLockingFailureException.java Sun Jan 11 08:37:53 2009
@@ -2,7 +2,7 @@
import java.util.Map;
-import org.objectstyle.cayenne.access.OptimisticLockException;
+import org.apache.cayenne.access.OptimisticLockException;
import org.springframework.dao.OptimisticLockingFailureException;
/**
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneTemplate.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneTemplate.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneTemplate.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneTemplate.java Sun Jan 11 08:37:53 2009
@@ -6,15 +6,15 @@
import java.util.List;
import java.util.Map;
-import org.objectstyle.cayenne.CayenneException;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.access.DeleteDenyException;
-import org.objectstyle.cayenne.access.OperationObserver;
-import org.objectstyle.cayenne.access.ResultIterator;
-import org.objectstyle.cayenne.query.GenericSelectQuery;
-import org.objectstyle.cayenne.query.Query;
+import org.apache.cayenne.CayenneException;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DeleteDenyException;
+import org.apache.cayenne.access.OperationObserver;
+import org.apache.cayenne.access.ResultIterator;
+import org.apache.cayenne.query.GenericSelectQuery;
+import org.apache.cayenne.query.Query;
import org.springframework.dao.DataAccessException;
/**
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneValidationException.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneValidationException.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneValidationException.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/CayenneValidationException.java Sun Jan 11 08:37:53 2009
@@ -1,8 +1,8 @@
package org.springframework.orm.cayenne;
-import org.objectstyle.cayenne.access.DeleteDenyException;
-import org.objectstyle.cayenne.validation.ValidationException;
-import org.objectstyle.cayenne.validation.ValidationResult;
+import org.apache.cayenne.access.DeleteDenyException;
+import org.apache.cayenne.validation.ValidationException;
+import org.apache.cayenne.validation.ValidationResult;
import org.springframework.dao.InvalidDataAccessResourceUsageException;
/**
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/ConfigurationFactory.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/ConfigurationFactory.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/ConfigurationFactory.java Sun Jan 11 08:37:53 2009
@@ -3,9 +3,9 @@
import javax.sql.DataSource;
import org.apache.log4j.Level;
-import org.objectstyle.cayenne.conf.Configuration;
-import org.objectstyle.cayenne.conf.DataSourceFactory;
-import org.objectstyle.cayenne.conf.DefaultConfiguration;
+import org.apache.cayenne.conf.Configuration;
+import org.apache.cayenne.conf.DataSourceFactory;
+import org.apache.cayenne.conf.DefaultConfiguration;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/DataContextFilter.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/DataContextFilter.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/DataContextFilter.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/DataContextFilter.java Sun Jan 11 08:37:53 2009
@@ -27,10 +27,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.access.DataDomain;
-import org.objectstyle.cayenne.conf.BasicServletConfiguration;
-import org.objectstyle.cayenne.conf.Configuration;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.conf.BasicServletConfiguration;
+import org.apache.cayenne.conf.Configuration;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/WebInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/WebInterceptor.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/WebInterceptor.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/src/org/springframework/orm/cayenne/WebInterceptor.java Sun Jan 11 08:37:53 2009
@@ -4,10 +4,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.access.DataDomain;
-import org.objectstyle.cayenne.conf.BasicServletConfiguration;
-import org.objectstyle.cayenne.conf.Configuration;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.conf.BasicServletConfiguration;
+import org.apache.cayenne.conf.Configuration;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneAccessorTests.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneAccessorTests.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneAccessorTests.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneAccessorTests.java Sun Jan 11 08:37:53 2009
@@ -2,9 +2,9 @@
import java.sql.SQLException;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.access.OptimisticLockException;
-import org.objectstyle.cayenne.exp.ExpressionException;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.OptimisticLockException;
+import org.apache.cayenne.exp.ExpressionException;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.support.SQLExceptionTranslator;
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneTemplateTests.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneTemplateTests.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneTemplateTests.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/CayenneTemplateTests.java Sun Jan 11 08:37:53 2009
@@ -1,8 +1,8 @@
package org.springframework.orm.cayenne;
-import org.objectstyle.cayenne.CayenneException;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.access.DataContext;
+import org.apache.cayenne.CayenneException;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.DataContext;
import org.springframework.dao.DataAccessException;
import junit.framework.TestCase;
Modified: incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/WebInterceptorTests.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/WebInterceptorTests.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/WebInterceptorTests.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/cayenne/test/org/springframework/orm/cayenne/WebInterceptorTests.java Sun Jan 11 08:37:53 2009
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.objectstyle.cayenne.access.DataDomain;
+import org.apache.cayenne.access.DataDomain;
public class WebInterceptorTests extends TestCase {
public void testDomain() {
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/cayenne.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/cayenne.xml?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/cayenne.xml (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/cayenne.xml Sun Jan 11 08:37:53 2009
@@ -8,8 +8,8 @@
<node name="hsqldb"
datasource="hsqldb.driver.xml"
- adapter="org.objectstyle.cayenne.dba.hsqldb.HSQLDBAdapter"
- factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+ adapter="org.apache.cayenne.dba.hsqldb.HSQLDBAdapter"
+ factory="org.apache.cayenne.conf.DriverDataSourceFactory">
<map-ref name="petclinic"/>
</node>
</domain>
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ActionButton.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ActionButton.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ActionButton.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ActionButton.java Sun Jan 11 08:37:53 2009
@@ -2,9 +2,9 @@
import org.apache.commons.lang.StringUtils;
-import net.sf.click.control.Button;
-import net.sf.click.util.ClickUtils;
-import net.sf.click.util.HtmlStringBuffer;
+import org.apache.click.control.Button;
+import org.apache.click.util.ClickUtils;
+import org.apache.click.util.HtmlStringBuffer;
public class ActionButton extends Button {
@@ -167,7 +167,7 @@
* ActionButton was clicked, and if an action callback listener was set
* this will be invoked.
*
- * @see net.sf.click.Control#onProcess()
+ * @see org.apache.click.Control#onProcess()
*
* @return true to continue Page event processing or false otherwise
*/
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.java Sun Jan 11 08:37:53 2009
@@ -1,7 +1,6 @@
package org.springframework.samples.petclinic.control;
-import net.sf.click.Context;
-import net.sf.click.control.Form;
+import org.apache.click.control.Form;
public class CustomForm extends Form {
@@ -17,24 +16,19 @@
public CustomForm(String name) {
super(name);
- setLabelRequiredPrefix("<b>");
- setLabelRequiredSuffix("</b>");
setLabelsPosition(Form.POSITION_TOP);
setErrorsPosition(Form.POSITION_TOP);
}
public CustomForm() {
super();
- setLabelRequiredPrefix("<b>");
- setLabelRequiredSuffix("</b>");
setLabelsPosition(Form.POSITION_TOP);
setErrorsPosition(Form.POSITION_TOP);
}
-
+
// --------------------------------------------------------- Public Methods
-
- public void setContext(Context context) {
- super.setContext(context);
+
+ public void onInit() {
bindObject();
if (getBoundObject() != null && !isFormSubmission()) {
copyFrom(getBoundObject());
@@ -45,11 +39,7 @@
if (boundObject != null) {
return boundObject;
}
-
- if (getContext() == null) {
- throw new IllegalStateException("Context has not been set");
- }
-
+
String key = getContext().getResourcePath() + BOUND_OBJECT_KEY;
boundObject = getContext().getSessionAttribute(key);
@@ -77,8 +67,9 @@
if (getBoundObject() != null && !isFormSubmission()) {
copyFrom(getBoundObject());
}
-
- return super.onProcess();
+ boolean continueProcessing = super.onProcess();
+ onAfterProcess();
+ return continueProcessing;
}
// ------------------------------------------------------ Protected Methods
@@ -96,12 +87,9 @@
}
}
- /**
- * @see net.sf.click.control.Form#onAfterProcessFields()
- */
- protected void onAfterProcessFields() {
+ protected void onAfterProcess() {
if (getBoundObject() != null) {
- copyTo(getBoundObject());
+ copyTo(getBoundObject());
}
}
Added: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.properties?rev=733488&view=auto
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.properties (added)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/CustomForm.properties Sun Jan 11 08:37:53 2009
@@ -0,0 +1,4 @@
+label-required-prefix=<b>
+label-required-suffix=</b>
+label-not-required-prefix=
+label-not-required-suffix=
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ObjectBinder.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ObjectBinder.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ObjectBinder.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/control/ObjectBinder.java Sun Jan 11 08:37:53 2009
@@ -1,6 +1,6 @@
package org.springframework.samples.petclinic.control;
-import net.sf.click.Context;
+import org.apache.click.Context;
public interface ObjectBinder {
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/model/Entity.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/model/Entity.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/model/Entity.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/model/Entity.java Sun Jan 11 08:37:53 2009
@@ -1,10 +1,10 @@
package org.springframework.samples.petclinic.model;
-import org.objectstyle.cayenne.CayenneDataObject;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.DataObject;
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.cayenne.PersistenceState;
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.PersistenceState;
/**
* Superclass of Pet Clinic entity objects.
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/AddVisit.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/AddVisit.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/AddVisit.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/AddVisit.java Sun Jan 11 08:37:53 2009
@@ -1,10 +1,9 @@
package org.springframework.samples.petclinic.page;
-import net.sf.click.Context;
-import net.sf.click.Page;
-import net.sf.click.control.Submit;
-import net.sf.click.control.TextArea;
-import net.sf.click.extras.control.DateField;
+import org.apache.click.Context;
+import org.apache.click.control.Submit;
+import org.apache.click.control.TextArea;
+import org.apache.click.extras.control.DateField;
import org.springframework.samples.petclinic.control.CustomForm;
import org.springframework.samples.petclinic.control.ObjectBinder;
@@ -14,7 +13,6 @@
public class AddVisit extends BasePage implements ObjectBinder {
private CustomForm form = new CustomForm("form");
- private Visit visit;
public AddVisit() {
form.add(new DateField("date", "Date:", true));
@@ -25,15 +23,7 @@
addControl(form);
}
-
- /**
- * @see Page#onInit()
- */
- public void onInit() {
- visit = (Visit) form.getBoundObject();
- addModel("pet", visit.getPet());
- }
-
+
/**
* @see ObjectBinder#getObject(Context)
*/
@@ -47,6 +37,7 @@
public boolean onSubmitClick() {
if (form.isValid()) {
+ Visit visit = getVisit();
getClinic().storeVisit(visit);
form.removeBoundObject();
@@ -58,7 +49,8 @@
return true;
}
- public boolean onCancelClick() {
+ public boolean onCancelClick() {
+ Visit visit = getVisit();
Pet pet = visit.getPet();
pet.removeFromVisits(visit);
form.removeBoundObject();
@@ -67,4 +59,13 @@
setRedirect(url + "?owner.id=" + pet.getOwner().getId());
return false;
}
+
+ public void onRender() {
+ Visit visit = getVisit();
+ addModel("pet", visit.getPet());
+ }
+
+ public Visit getVisit() {
+ return (Visit) form.getBoundObject();
+ }
}
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/BasePage.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/BasePage.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/BasePage.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/BasePage.java Sun Jan 11 08:37:53 2009
@@ -1,6 +1,6 @@
package org.springframework.samples.petclinic.page;
-import net.sf.click.Page;
+import org.apache.click.Page;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditOwner.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditOwner.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditOwner.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditOwner.java Sun Jan 11 08:37:53 2009
@@ -1,9 +1,9 @@
package org.springframework.samples.petclinic.page;
-import net.sf.click.Context;
-import net.sf.click.control.Submit;
-import net.sf.click.control.TextField;
-import net.sf.click.extras.control.LongField;
+import org.apache.click.Context;
+import org.apache.click.control.Submit;
+import org.apache.click.control.TextField;
+import org.apache.click.extras.control.LongField;
import org.springframework.samples.petclinic.control.CustomForm;
import org.springframework.samples.petclinic.control.ObjectBinder;
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditPet.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditPet.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditPet.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/EditPet.java Sun Jan 11 08:37:53 2009
@@ -1,11 +1,11 @@
package org.springframework.samples.petclinic.page;
-import net.sf.click.Context;
-import net.sf.click.Page;
-import net.sf.click.control.Select;
-import net.sf.click.control.Submit;
-import net.sf.click.control.TextField;
-import net.sf.click.extras.control.DateField;
+import org.apache.click.Context;
+import org.apache.click.Page;
+import org.apache.click.control.Select;
+import org.apache.click.control.Submit;
+import org.apache.click.control.TextField;
+import org.apache.click.extras.control.DateField;
import org.springframework.samples.petclinic.control.CustomForm;
import org.springframework.samples.petclinic.control.ObjectBinder;
@@ -24,7 +24,6 @@
private CustomForm form = new CustomForm("form");
private Select typeSelect = new Select("type.id", "Type:");
- private Pet pet;
/**
* Create a new Edit Pet page.
@@ -51,8 +50,6 @@
*/
public void onInit() {
typeSelect.addAll(getClinic().getPetTypes(), "id", "name");
- pet = (Pet) form.getBoundObject();
- addModel("pet", pet);
}
/**
@@ -84,6 +81,8 @@
public boolean onSubmitClick() {
int typeId = Integer.parseInt(typeSelect.getValue());
+ Pet pet = getPet();
+ pet = (Pet) form.getBoundObject();
pet.setType((PetType) EntityUtils.getById(getClinic().getPetTypes(),
PetType.class,
typeId));
@@ -101,9 +100,8 @@
return true;
}
-
public boolean onCancelClick() {
- Pet pet = (Pet) form.getBoundObject();
+ Pet pet = getPet();
form.removeBoundObject();
String url = getContext().getPagePath(OwnerDetails.class);
@@ -111,4 +109,12 @@
return false;
}
+ public void onRender() {
+ Pet pet = getPet();
+ addModel("pet", pet);
+ }
+
+ public Pet getPet() {
+ return (Pet) form.getBoundObject();
+ }
}
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/FindOwners.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/FindOwners.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/FindOwners.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/page/FindOwners.java Sun Jan 11 08:37:53 2009
@@ -2,9 +2,9 @@
import java.util.Collection;
-import net.sf.click.control.Form;
-import net.sf.click.control.Submit;
-import net.sf.click.control.TextField;
+import org.apache.click.control.Form;
+import org.apache.click.control.Submit;
+import org.apache.click.control.TextField;
import org.springframework.samples.petclinic.control.CustomForm;
import org.springframework.samples.petclinic.model.Owner;
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/service/impl/ClinicServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/service/impl/ClinicServiceImpl.java?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/service/impl/ClinicServiceImpl.java (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/org/springframework/samples/petclinic/service/impl/ClinicServiceImpl.java Sun Jan 11 08:37:53 2009
@@ -3,7 +3,7 @@
import java.util.Collection;
import java.util.Collections;
-import org.objectstyle.cayenne.query.SelectQuery;
+import org.apache.cayenne.query.SelectQuery;
import org.springframework.dao.DataAccessException;
import org.springframework.orm.cayenne.CayenneTemplate;
import org.springframework.samples.petclinic.model.Owner;
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/petclinic.map.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/petclinic.map.xml?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/petclinic.map.xml (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/src/petclinic.map.xml Sun Jan 11 08:37:53 2009
@@ -101,7 +101,7 @@
<obj-relationship name="visits" source="Pet" target="Visit" deleteRule="Cascade" db-relationship-path="visitsArray"/>
<obj-relationship name="specialties" source="Vet" target="Specialty" db-relationship-path="vetSpecialtiesArray.toSpecialties"/>
<obj-relationship name="pet" source="Visit" target="Pet" db-relationship-path="toPets"/>
- <query name="OwnerSearch" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Owner">
+ <query name="OwnerSearch" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Owner">
<prefetch>pets</prefetch>
<qualifier><![CDATA[lastName likeIgnoreCase $name]]></qualifier>
<ordering><![CDATA[firstName]]></ordering>
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/petclinic.log
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/petclinic.log?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/petclinic.log (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/petclinic.log Sun Jan 11 08:37:53 2009
@@ -11,33 +11,33 @@
2006-02-16 16:01:42,984 INFO [org.springframework.ui.context.support.UiApplicationContextUtils] - Unable to locate ThemeSource with name 'themeSource': using default [org.springframework.ui.context.support.ResourceBundleThemeSource@dc3b82]
2006-02-16 16:01:42,984 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in factory [org.springframework.beans.factory.support.DefaultListableBeanFactory defining beans [propertyConfigurer,dataSource,transactionManager,cayenneWebInterceptor,cayenneConfig,clinicTarget,clinic]; root of BeanFactory hierarchy]
2006-02-16 16:01:43,015 INFO [org.springframework.jdbc.datasource.DriverManagerDataSource] - Loaded JDBC driver: org.hsqldb.jdbcDriver
-2006-02-16 16:01:43,250 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - started configuration loading.
-2006-02-16 16:01:43,281 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded domain: domain
-2006-02-16 16:01:43,687 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded <map name='petclinic' location='petclinic.map.xml'>.
-2006-02-16 16:01:43,687 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loading <node name='hsqldb' datasource='hsqldb.driver.xml' factory='org.objectstyle.cayenne.conf.DriverDataSourceFactory'>.
-2006-02-16 16:01:43,750 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - using factory: org.springframework.orm.cayenne.ConfigurationFactory$ExternalDataSourceFactory
-2006-02-16 16:01:43,750 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded datasource.
-2006-02-16 16:01:43,890 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded map-ref: petclinic.
-2006-02-16 16:01:43,906 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - finished configuration loading in 656 ms.
+2006-02-16 16:01:43,250 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - started configuration loading.
+2006-02-16 16:01:43,281 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded domain: domain
+2006-02-16 16:01:43,687 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded <map name='petclinic' location='petclinic.map.xml'>.
+2006-02-16 16:01:43,687 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loading <node name='hsqldb' datasource='hsqldb.driver.xml' factory='org.apache.cayenne.conf.DriverDataSourceFactory'>.
+2006-02-16 16:01:43,750 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - using factory: org.springframework.orm.cayenne.ConfigurationFactory$ExternalDataSourceFactory
+2006-02-16 16:01:43,750 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded datasource.
+2006-02-16 16:01:43,890 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded map-ref: petclinic.
+2006-02-16 16:01:43,906 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - finished configuration loading in 656 ms.
2006-02-16 16:01:44,203 INFO [org.springframework.aop.framework.DefaultAopProxyFactory] - CGLIB2 not available: proxyTargetClass feature disabled
2006-02-16 16:01:44,406 INFO [org.springframework.web.context.ContextLoader] - Using context class [org.springframework.web.context.support.XmlWebApplicationContext] for root WebApplicationContext
2006-02-16 16:01:44,421 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 2437 ms
2006-02-16 16:02:30,000 INFO [org.springframework.jdbc.datasource.JdbcTransactionObjectSupport] - JDBC 3.0 Savepoint class is available
-2006-02-16 16:06:33,484 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 2 queries.
-2006-02-16 16:06:33,562 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.ADDRESS, t0.CITY, t0.FIRST_NAME, t0.LAST_NAME, t0.TELEPHONE, t0.ID FROM OWNERS t0 WHERE UPPER(t0.LAST_NAME) LIKE UPPER(?) ORDER BY t0.FIRST_NAME, t0.LAST_NAME [bind: '%%'] - prepared in 16 ms.
-2006-02-16 16:06:33,671 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 8 rows. - took 140 ms.
-2006-02-16 16:06:33,687 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.BIRTH_DATE, t0.NAME, t0.OWNER_ID, t0.TYPE_ID, t0.ID FROM PETS t0, OWNERS t1 WHERE t0.OWNER_ID = t1.ID AND (UPPER(t1.LAST_NAME) LIKE UPPER(?)) [bind: '%%'] - prepared in 16 ms.
-2006-02-16 16:06:33,687 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 16 rows. - took 16 ms.
-2006-02-16 16:06:33,687 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
-2006-02-16 16:06:36,328 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 1 query.
-2006-02-16 16:06:36,328 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- transaction started.
-2006-02-16 16:06:36,328 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0 WHERE t0.ID = ? [bind: 3]
-2006-02-16 16:06:36,343 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 1 row. - took 15 ms.
-2006-02-16 16:06:36,343 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ transaction committed.
-2006-02-16 16:06:36,343 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 1 query.
-2006-02-16 16:06:36,359 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.VISIT_DATE, t0.DESCRIPTION, t0.PET_ID, t0.ID FROM VISITS t0 WHERE t0.PET_ID = ? [bind: 5] - prepared in 16 ms.
-2006-02-16 16:06:36,359 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 0 rows. - took 16 ms.
-2006-02-16 16:06:36,359 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:06:33,484 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 2 queries.
+2006-02-16 16:06:33,562 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.ADDRESS, t0.CITY, t0.FIRST_NAME, t0.LAST_NAME, t0.TELEPHONE, t0.ID FROM OWNERS t0 WHERE UPPER(t0.LAST_NAME) LIKE UPPER(?) ORDER BY t0.FIRST_NAME, t0.LAST_NAME [bind: '%%'] - prepared in 16 ms.
+2006-02-16 16:06:33,671 INFO [org.apache.cayenne.access.QueryLogger] - === returned 8 rows. - took 140 ms.
+2006-02-16 16:06:33,687 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.BIRTH_DATE, t0.NAME, t0.OWNER_ID, t0.TYPE_ID, t0.ID FROM PETS t0, OWNERS t1 WHERE t0.OWNER_ID = t1.ID AND (UPPER(t1.LAST_NAME) LIKE UPPER(?)) [bind: '%%'] - prepared in 16 ms.
+2006-02-16 16:06:33,687 INFO [org.apache.cayenne.access.QueryLogger] - === returned 16 rows. - took 16 ms.
+2006-02-16 16:06:33,687 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:06:36,328 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 1 query.
+2006-02-16 16:06:36,328 INFO [org.apache.cayenne.access.QueryLogger] - --- transaction started.
+2006-02-16 16:06:36,328 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0 WHERE t0.ID = ? [bind: 3]
+2006-02-16 16:06:36,343 INFO [org.apache.cayenne.access.QueryLogger] - === returned 1 row. - took 15 ms.
+2006-02-16 16:06:36,343 INFO [org.apache.cayenne.access.QueryLogger] - +++ transaction committed.
+2006-02-16 16:06:36,343 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 1 query.
+2006-02-16 16:06:36,359 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.VISIT_DATE, t0.DESCRIPTION, t0.PET_ID, t0.ID FROM VISITS t0 WHERE t0.PET_ID = ? [bind: 5] - prepared in 16 ms.
+2006-02-16 16:06:36,359 INFO [org.apache.cayenne.access.QueryLogger] - === returned 0 rows. - took 16 ms.
+2006-02-16 16:06:36,359 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
2006-02-16 16:07:39,546 INFO [org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/click-spring-cayenne]] - Closing Spring root WebApplicationContext
2006-02-16 16:07:39,546 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Closing application context [Root WebApplicationContext]
2006-02-16 16:07:39,546 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in factory {org.springframework.beans.factory.support.DefaultListableBeanFactory defining beans [propertyConfigurer,dataSource,transactionManager,cayenneWebInterceptor,cayenneConfig,clinicTarget,clinic]; root of BeanFactory hierarchy}
@@ -54,50 +54,50 @@
2006-02-16 16:24:54,437 INFO [org.springframework.ui.context.support.UiApplicationContextUtils] - Unable to locate ThemeSource with name 'themeSource': using default [org.springframework.ui.context.support.ResourceBundleThemeSource@1555185]
2006-02-16 16:24:54,437 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in factory [org.springframework.beans.factory.support.DefaultListableBeanFactory defining beans [propertyConfigurer,dataSource,transactionManager,cayenneWebInterceptor,cayenneConfig,clinicTarget,clinic]; root of BeanFactory hierarchy]
2006-02-16 16:24:54,468 INFO [org.springframework.jdbc.datasource.DriverManagerDataSource] - Loaded JDBC driver: org.hsqldb.jdbcDriver
-2006-02-16 16:24:54,625 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - started configuration loading.
-2006-02-16 16:24:54,625 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded domain: domain
-2006-02-16 16:24:54,906 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded <map name='petclinic' location='petclinic.map.xml'>.
-2006-02-16 16:24:54,921 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loading <node name='hsqldb' datasource='hsqldb.driver.xml' factory='org.objectstyle.cayenne.conf.DriverDataSourceFactory'>.
-2006-02-16 16:24:55,140 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - using factory: org.springframework.orm.cayenne.ConfigurationFactory$ExternalDataSourceFactory
-2006-02-16 16:24:55,281 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded datasource.
-2006-02-16 16:24:55,406 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded map-ref: petclinic.
-2006-02-16 16:24:55,406 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - finished configuration loading in 781 ms.
+2006-02-16 16:24:54,625 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - started configuration loading.
+2006-02-16 16:24:54,625 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded domain: domain
+2006-02-16 16:24:54,906 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded <map name='petclinic' location='petclinic.map.xml'>.
+2006-02-16 16:24:54,921 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loading <node name='hsqldb' datasource='hsqldb.driver.xml' factory='org.apache.cayenne.conf.DriverDataSourceFactory'>.
+2006-02-16 16:24:55,140 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - using factory: org.springframework.orm.cayenne.ConfigurationFactory$ExternalDataSourceFactory
+2006-02-16 16:24:55,281 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded datasource.
+2006-02-16 16:24:55,406 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded map-ref: petclinic.
+2006-02-16 16:24:55,406 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - finished configuration loading in 781 ms.
2006-02-16 16:24:55,500 INFO [org.springframework.aop.framework.DefaultAopProxyFactory] - CGLIB2 not available: proxyTargetClass feature disabled
2006-02-16 16:24:55,687 INFO [org.springframework.web.context.ContextLoader] - Using context class [org.springframework.web.context.support.XmlWebApplicationContext] for root WebApplicationContext
2006-02-16 16:24:55,687 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 2016 ms
2006-02-16 16:27:12,359 INFO [org.springframework.jdbc.datasource.JdbcTransactionObjectSupport] - JDBC 3.0 Savepoint class is available
-2006-02-16 16:27:13,171 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 2 queries.
-2006-02-16 16:27:13,265 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.ADDRESS, t0.CITY, t0.FIRST_NAME, t0.LAST_NAME, t0.TELEPHONE, t0.ID FROM OWNERS t0 WHERE UPPER(t0.LAST_NAME) LIKE UPPER(?) ORDER BY t0.FIRST_NAME, t0.LAST_NAME [bind: '%%'] - prepared in 31 ms.
-2006-02-16 16:27:13,343 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 8 rows. - took 109 ms.
-2006-02-16 16:27:13,343 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.BIRTH_DATE, t0.NAME, t0.OWNER_ID, t0.TYPE_ID, t0.ID FROM PETS t0, OWNERS t1 WHERE t0.OWNER_ID = t1.ID AND (UPPER(t1.LAST_NAME) LIKE UPPER(?)) [bind: '%%']
-2006-02-16 16:27:13,359 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 16 rows. - took 16 ms.
-2006-02-16 16:27:13,359 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
-2006-02-16 16:27:16,421 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 1 query.
-2006-02-16 16:27:16,421 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- transaction started.
-2006-02-16 16:27:16,421 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0 WHERE t0.ID = ? [bind: 5]
-2006-02-16 16:27:16,437 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 1 row. - took 16 ms.
-2006-02-16 16:27:16,437 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ transaction committed.
-2006-02-16 16:27:16,437 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 1 query.
-2006-02-16 16:27:16,453 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.VISIT_DATE, t0.DESCRIPTION, t0.PET_ID, t0.ID FROM VISITS t0 WHERE t0.PET_ID = ? [bind: 9] - prepared in 16 ms.
-2006-02-16 16:27:16,453 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 0 rows. - took 16 ms.
-2006-02-16 16:27:16,453 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
-2006-02-16 16:27:24,578 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 1 query.
-2006-02-16 16:27:24,578 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0
-2006-02-16 16:27:24,578 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 6 rows. - took 0 ms.
-2006-02-16 16:27:24,578 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
-2006-02-16 16:27:28,109 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 1 query.
-2006-02-16 16:27:28,109 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0
-2006-02-16 16:27:28,109 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 6 rows. - took 0 ms.
-2006-02-16 16:27:28,109 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
-2006-02-16 16:27:28,156 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 1 query.
-2006-02-16 16:27:28,156 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0
-2006-02-16 16:27:28,156 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 6 rows. - took 0 ms.
-2006-02-16 16:27:28,156 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
-2006-02-16 16:27:28,468 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 1 query.
-2006-02-16 16:27:28,500 INFO [org.objectstyle.cayenne.access.QueryLogger] - UPDATE PETS SET TYPE_ID = ? WHERE ID = ?
-2006-02-16 16:27:28,500 INFO [org.objectstyle.cayenne.access.QueryLogger] - [bind: 2, 9]
-2006-02-16 16:27:28,515 INFO [org.objectstyle.cayenne.access.QueryLogger] - === updated 1 row.
-2006-02-16 16:27:28,515 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:27:13,171 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 2 queries.
+2006-02-16 16:27:13,265 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.ADDRESS, t0.CITY, t0.FIRST_NAME, t0.LAST_NAME, t0.TELEPHONE, t0.ID FROM OWNERS t0 WHERE UPPER(t0.LAST_NAME) LIKE UPPER(?) ORDER BY t0.FIRST_NAME, t0.LAST_NAME [bind: '%%'] - prepared in 31 ms.
+2006-02-16 16:27:13,343 INFO [org.apache.cayenne.access.QueryLogger] - === returned 8 rows. - took 109 ms.
+2006-02-16 16:27:13,343 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.BIRTH_DATE, t0.NAME, t0.OWNER_ID, t0.TYPE_ID, t0.ID FROM PETS t0, OWNERS t1 WHERE t0.OWNER_ID = t1.ID AND (UPPER(t1.LAST_NAME) LIKE UPPER(?)) [bind: '%%']
+2006-02-16 16:27:13,359 INFO [org.apache.cayenne.access.QueryLogger] - === returned 16 rows. - took 16 ms.
+2006-02-16 16:27:13,359 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:27:16,421 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 1 query.
+2006-02-16 16:27:16,421 INFO [org.apache.cayenne.access.QueryLogger] - --- transaction started.
+2006-02-16 16:27:16,421 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0 WHERE t0.ID = ? [bind: 5]
+2006-02-16 16:27:16,437 INFO [org.apache.cayenne.access.QueryLogger] - === returned 1 row. - took 16 ms.
+2006-02-16 16:27:16,437 INFO [org.apache.cayenne.access.QueryLogger] - +++ transaction committed.
+2006-02-16 16:27:16,437 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 1 query.
+2006-02-16 16:27:16,453 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.VISIT_DATE, t0.DESCRIPTION, t0.PET_ID, t0.ID FROM VISITS t0 WHERE t0.PET_ID = ? [bind: 9] - prepared in 16 ms.
+2006-02-16 16:27:16,453 INFO [org.apache.cayenne.access.QueryLogger] - === returned 0 rows. - took 16 ms.
+2006-02-16 16:27:16,453 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:27:24,578 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 1 query.
+2006-02-16 16:27:24,578 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0
+2006-02-16 16:27:24,578 INFO [org.apache.cayenne.access.QueryLogger] - === returned 6 rows. - took 0 ms.
+2006-02-16 16:27:24,578 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:27:28,109 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 1 query.
+2006-02-16 16:27:28,109 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0
+2006-02-16 16:27:28,109 INFO [org.apache.cayenne.access.QueryLogger] - === returned 6 rows. - took 0 ms.
+2006-02-16 16:27:28,109 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:27:28,156 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 1 query.
+2006-02-16 16:27:28,156 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.NAME, t0.ID FROM TYPES t0
+2006-02-16 16:27:28,156 INFO [org.apache.cayenne.access.QueryLogger] - === returned 6 rows. - took 0 ms.
+2006-02-16 16:27:28,156 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:27:28,468 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 1 query.
+2006-02-16 16:27:28,500 INFO [org.apache.cayenne.access.QueryLogger] - UPDATE PETS SET TYPE_ID = ? WHERE ID = ?
+2006-02-16 16:27:28,500 INFO [org.apache.cayenne.access.QueryLogger] - [bind: 2, 9]
+2006-02-16 16:27:28,515 INFO [org.apache.cayenne.access.QueryLogger] - === updated 1 row.
+2006-02-16 16:27:28,515 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
2006-02-16 16:45:39,859 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization started
2006-02-16 16:45:39,859 INFO [org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/click-spring-cayenne]] - Loading Spring root WebApplicationContext
2006-02-16 16:45:40,093 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from ServletContext resource [/WEB-INF/applicationContext.xml]
@@ -111,21 +111,21 @@
2006-02-16 16:45:40,656 INFO [org.springframework.ui.context.support.UiApplicationContextUtils] - Unable to locate ThemeSource with name 'themeSource': using default [org.springframework.ui.context.support.ResourceBundleThemeSource@c7057c]
2006-02-16 16:45:40,656 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Pre-instantiating singletons in factory [org.springframework.beans.factory.support.DefaultListableBeanFactory defining beans [propertyConfigurer,dataSource,transactionManager,cayenneWebInterceptor,cayenneConfig,clinicTarget,clinic]; root of BeanFactory hierarchy]
2006-02-16 16:45:40,671 INFO [org.springframework.jdbc.datasource.DriverManagerDataSource] - Loaded JDBC driver: org.hsqldb.jdbcDriver
-2006-02-16 16:45:40,828 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - started configuration loading.
-2006-02-16 16:45:40,843 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded domain: domain
-2006-02-16 16:45:41,250 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded <map name='petclinic' location='petclinic.map.xml'>.
-2006-02-16 16:45:41,250 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loading <node name='hsqldb' datasource='hsqldb.driver.xml' factory='org.objectstyle.cayenne.conf.DriverDataSourceFactory'>.
-2006-02-16 16:45:41,312 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - using factory: org.springframework.orm.cayenne.ConfigurationFactory$ExternalDataSourceFactory
-2006-02-16 16:45:41,312 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded datasource.
-2006-02-16 16:45:41,437 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - loaded map-ref: petclinic.
-2006-02-16 16:45:41,437 INFO [org.objectstyle.cayenne.conf.RuntimeLoadDelegate] - finished configuration loading in 609 ms.
+2006-02-16 16:45:40,828 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - started configuration loading.
+2006-02-16 16:45:40,843 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded domain: domain
+2006-02-16 16:45:41,250 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded <map name='petclinic' location='petclinic.map.xml'>.
+2006-02-16 16:45:41,250 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loading <node name='hsqldb' datasource='hsqldb.driver.xml' factory='org.apache.cayenne.conf.DriverDataSourceFactory'>.
+2006-02-16 16:45:41,312 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - using factory: org.springframework.orm.cayenne.ConfigurationFactory$ExternalDataSourceFactory
+2006-02-16 16:45:41,312 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded datasource.
+2006-02-16 16:45:41,437 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - loaded map-ref: petclinic.
+2006-02-16 16:45:41,437 INFO [org.apache.cayenne.conf.RuntimeLoadDelegate] - finished configuration loading in 609 ms.
2006-02-16 16:45:41,718 INFO [org.springframework.aop.framework.DefaultAopProxyFactory] - CGLIB2 not available: proxyTargetClass feature disabled
2006-02-16 16:45:41,906 INFO [org.springframework.web.context.ContextLoader] - Using context class [org.springframework.web.context.support.XmlWebApplicationContext] for root WebApplicationContext
2006-02-16 16:45:41,906 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 2047 ms
2006-02-16 16:46:13,109 INFO [org.springframework.jdbc.datasource.JdbcTransactionObjectSupport] - JDBC 3.0 Savepoint class is available
-2006-02-16 16:46:39,562 INFO [org.objectstyle.cayenne.access.QueryLogger] - --- will run 2 queries.
-2006-02-16 16:46:39,625 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.ADDRESS, t0.CITY, t0.FIRST_NAME, t0.LAST_NAME, t0.TELEPHONE, t0.ID FROM OWNERS t0 WHERE UPPER(t0.LAST_NAME) LIKE UPPER(?) ORDER BY t0.FIRST_NAME, t0.LAST_NAME [bind: '%%'] - prepared in 16 ms.
-2006-02-16 16:46:39,718 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 8 rows. - took 125 ms.
-2006-02-16 16:46:39,718 INFO [org.objectstyle.cayenne.access.QueryLogger] - SELECT t0.BIRTH_DATE, t0.NAME, t0.OWNER_ID, t0.TYPE_ID, t0.ID FROM PETS t0, OWNERS t1 WHERE t0.OWNER_ID = t1.ID AND (UPPER(t1.LAST_NAME) LIKE UPPER(?)) [bind: '%%']
-2006-02-16 16:46:39,718 INFO [org.objectstyle.cayenne.access.QueryLogger] - === returned 16 rows. - took 0 ms.
-2006-02-16 16:46:39,718 INFO [org.objectstyle.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
+2006-02-16 16:46:39,562 INFO [org.apache.cayenne.access.QueryLogger] - --- will run 2 queries.
+2006-02-16 16:46:39,625 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.ADDRESS, t0.CITY, t0.FIRST_NAME, t0.LAST_NAME, t0.TELEPHONE, t0.ID FROM OWNERS t0 WHERE UPPER(t0.LAST_NAME) LIKE UPPER(?) ORDER BY t0.FIRST_NAME, t0.LAST_NAME [bind: '%%'] - prepared in 16 ms.
+2006-02-16 16:46:39,718 INFO [org.apache.cayenne.access.QueryLogger] - === returned 8 rows. - took 125 ms.
+2006-02-16 16:46:39,718 INFO [org.apache.cayenne.access.QueryLogger] - SELECT t0.BIRTH_DATE, t0.NAME, t0.OWNER_ID, t0.TYPE_ID, t0.ID FROM PETS t0, OWNERS t1 WHERE t0.OWNER_ID = t1.ID AND (UPPER(t1.LAST_NAME) LIKE UPPER(?)) [bind: '%%']
+2006-02-16 16:46:39,718 INFO [org.apache.cayenne.access.QueryLogger] - === returned 16 rows. - took 0 ms.
+2006-02-16 16:46:39,718 INFO [org.apache.cayenne.access.QueryLogger] - +++ no commit - transaction controlled externally.
Modified: incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/web.xml?rev=733488&r1=733487&r2=733488&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/web.xml (original)
+++ incubator/click/trunk/examples/click-spring-cayenne/petclinic/war/WEB-INF/web.xml Sun Jan 11 08:37:53 2009
@@ -73,7 +73,7 @@
<servlet>
<servlet-name>springClickServlet</servlet-name>
- <servlet-class>net.sf.click.extras.spring.SpringClickServlet</servlet-class>
+ <servlet-class>org.apache.click.extras.spring.SpringClickServlet</servlet-class>
<load-on-startup>3</load-on-startup>
</servlet>