Dan, Glad to see some commits!
I hate to nitpick, but the copyrights on these should all be 2008. On Sun, Mar 2, 2008 at 5:38 PM, <[EMAIL PROTECTED]> wrote: > Author: dadams > Date: Sun Mar 2 17:38:12 2008 > New Revision: 632915 > > URL: http://svn.apache.org/viewvc?rev=632915&view=rev > Log: > TAPESTRY-1933: Setup infrastructure for integration tests in > tapestry-hibernate > > Added: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/webdefault.xml > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/hibernate/ > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/hibernate/integration/ > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/hibernate/integration/TapestryHibernateIntegrationTests.java > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/ > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/ > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/ > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/Start.tml > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/ > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml > Modified: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/entities/User.java > > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/hibernate.cfg.xml > > Modified: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml?rev=632915&r1=632914&r2=632915&view=diff > > ============================================================================== > --- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml > (original) > +++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml Sun > Mar 2 17:38:12 2008 > @@ -15,11 +15,16 @@ > limitations under the License. > --> > > -<suite name="Tapestry Hibernate Integration" parallel="false" > thread-count="10" annotations="1.5" verbose="2"> > - <parameter name="tapestry.integration-webapp" value="src/test/app1"/> > - <test name="Tapestry Hibernate Integration"> > +<suite name="Tapestry Hibernate" parallel="false" thread-count="10" > annotations="1.5" verbose="2"> > + <parameter name="tapestry.integration-webapp" value="src/test/webapp"/> > + <test name="Tapestry Hibernate Internal APIs"> > <packages> > <package name="org.apache.tapestry.internal.hibernate"/> > </packages> > </test> > + <test name="Tapestry Hibernate Integration Tests"> > + <packages> > + <package name="org.apache.tapestry.hibernate.integration"/> > + </packages> > + </test> > </suite> > > Added: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/webdefault.xml > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/webdefault.xml?rev=632915&view=auto > > ============================================================================== > --- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/webdefault.xml > (added) > +++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/webdefault.xml > Sun Mar 2 17:38:12 2008 > @@ -0,0 +1,294 @@ > +<?xml version="1.0" encoding="ISO-8859-1"?> > +<!-- > + Copyright 2007 The Apache Software Foundation > + > + Licensed under the Apache License, Version 2.0 (the "License"); > + you may not use this file except in compliance with the License. > + You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > + Unless required by applicable law or agreed to in writing, software > + distributed under the License is distributed on an "AS IS" BASIS, > + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > + See the License for the specific language governing permissions and > + limitations under the License. > +--> > + > +<web-app > + xmlns="http://java.sun.com/xml/ns/j2ee"; > + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; > + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee > http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; > + version="2.4"> > + > + <description> > + Default web.xml file. > + This file is applied to a Web application before it's own > WEB_INF/web.xml file > + </description> > + > + > + <!-- > ==================================================================== --> > + <!-- Context params to control Session Cookies > --> > + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - --> > + <!-- UNCOMMENT TO ACTIVATE > + <context-param> > + <param-name>org.mortbay.jetty.servlet.SessionDomain</param-name> > + <param-value>127.0.0.1</param-value> > + </context-param> > + > + <context-param> > + <param-name>org.mortbay.jetty.servlet.SessionPath</param-name> > + <param-value>/</param-value> > + </context-param> > + > + <context-param> > + <param-name>org.mortbay.jetty.servlet.MaxAge</param-name> > + <param-value>-1</param-value> > + </context-param> > + --> > + > + > + <!-- > ==================================================================== --> > + <!-- The default servlet. > --> > + <!-- This servlet, normally mapped to /, provides the handling for > static --> > + <!-- content, OPTIONS and TRACE methods for the context. > --> > + <!-- The following initParameters are supported: > --> > + <!-- > --> > + <!-- acceptRanges If true, range requests and responses are > --> > + <!-- supported > --> > + <!-- > --> > + <!-- dirAllowed If true, directory listings are returned if no > --> > + <!-- welcome file is found. Else 403 Forbidden. > --> > + <!-- > --> > + <!-- putAllowed If true, the PUT method is allowed > --> > + <!-- > --> > + <!-- delAllowed If true, the DELETE method is allowed > --> > + <!-- > --> > + <!-- redirectWelcome If true, redirect welcome file requests > --> > + <!-- else use request dispatcher forwards > --> > + <!-- > --> > + <!-- minGzipLength If set to a positive integer, then static > content --> > + <!-- larger than this will be served as gzip content > --> > + <!-- encoded if a matching resource is found ending > --> > + <!-- with ".gz" > --> > + <!-- > --> > + <!-- resoureBase Can be set to replace the context resource base > --> > + <!-- > --> > + <!-- relativeResourceBase > --> > + <!-- Set with a pathname relative to the base of the > --> > + <!-- servlet context root. Useful for only serving > --> > + <!-- static content from only specific > subdirectories. --> > + <!-- > --> > + <!-- The MOVE method is allowed if PUT and DELETE are allowed > --> > + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - --> > + <servlet> > + <servlet-name>default</servlet-name> > + <servlet-class>org.mortbay.jetty.servlet.Default</servlet-class> > + <init-param> > + <param-name>acceptRanges</param-name> > + <param-value>true</param-value> > + </init-param> > + <init-param> > + <param-name>dirAllowed</param-name> > + <param-value>true</param-value> > + </init-param> > + <init-param> > + <param-name>putAllowed</param-name> > + <param-value>false</param-value> > + </init-param> > + <init-param> > + <param-name>delAllowed</param-name> > + <param-value>false</param-value> > + </init-param> > + <init-param> > + <param-name>redirectWelcome</param-name> > + <param-value>false</param-value> > + </init-param> > + <init-param> > + <param-name>minGzipLength</param-name> > + <param-value>8192</param-value> > + </init-param> > + <load-on-startup>0</load-on-startup> > + </servlet> > + > + > + <servlet-mapping> > + <servlet-name>default</servlet-name> > + <url-pattern>/</url-pattern> > + </servlet-mapping> > + > + <!-- > ==================================================================== --> > + <session-config> > + <session-timeout>30</session-timeout> > + </session-config> > + > + > + <!-- > ==================================================================== --> > + <welcome-file-list> > + <welcome-file>index.html</welcome-file> > + <welcome-file>index.htm</welcome-file> > + </welcome-file-list> > + > + <!-- > ==================================================================== --> > + <locale-encoding-mapping-list> > + <locale-encoding-mapping> > + <locale>ar</locale> > + <encoding>ISO-8859-6</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>be</locale> > + <encoding>ISO-8859-5</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>bg</locale> > + <encoding>ISO-8859-5</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>ca</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>cs</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>da</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>de</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>el</locale> > + <encoding>ISO-8859-7</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>en</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>es</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>et</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>fi</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>fr</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>hr</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>hu</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>is</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>it</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>iw</locale> > + <encoding>ISO-8859-8</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>ja</locale> > + <encoding>Shift_JIS</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>ko</locale> > + <encoding>EUC-KR</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>lt</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>lv</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>mk</locale> > + <encoding>ISO-8859-5</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>nl</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>no</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>pl</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>pt</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>ro</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>ru</locale> > + <encoding>ISO-8859-5</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>sh</locale> > + <encoding>ISO-8859-5</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>sk</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>sl</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>sq</locale> > + <encoding>ISO-8859-2</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>sr</locale> > + <encoding>ISO-8859-5</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>sv</locale> > + <encoding>ISO-8859-1</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>tr</locale> > + <encoding>ISO-8859-9</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>uk</locale> > + <encoding>ISO-8859-5</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>zh</locale> > + <encoding>GB2312</encoding> > + </locale-encoding-mapping> > + <locale-encoding-mapping> > + <locale>zh_TW</locale> > + <encoding>Big5</encoding> > + </locale-encoding-mapping> > + </locale-encoding-mapping-list> > + > + > +</web-app> > + > > Added: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/hibernate/integration/TapestryHibernateIntegrationTests.java > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/hibernate/integration/TapestryHibernateIntegrationTests.java?rev=632915&view=auto > > ============================================================================== > --- > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/hibernate/integration/TapestryHibernateIntegrationTests.java > (added) > +++ > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/hibernate/integration/TapestryHibernateIntegrationTests.java > Sun Mar 2 17:38:12 2008 > @@ -0,0 +1,36 @@ > +// Copyright 2007 The Apache Software Foundation > +// > +// Licensed under the Apache License, Version 2.0 (the "License"); > +// you may not use this file except in compliance with the License. > +// You may obtain a copy of the License at > +// > +// http://www.apache.org/licenses/LICENSE-2.0 > +// > +// Unless required by applicable law or agreed to in writing, software > +// distributed under the License is distributed on an "AS IS" BASIS, > +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +// See the License for the specific language governing permissions and > +// limitations under the License. > + > +package org.apache.tapestry.hibernate.integration; > + > +import org.apache.tapestry.test.AbstractIntegrationTestSuite; > +import org.testng.annotations.Test; > + > [EMAIL PROTECTED] > +public class TapestryHibernateIntegrationTests extends > AbstractIntegrationTestSuite > +{ > + public TapestryHibernateIntegrationTests() > + { > + super("src/test/webapp"); > + } > + > + /** Only needed until actual integration tests are put in. Just proves > the integration > + * tests are set up correctly. > + */ > + public void test_placeholder() throws Exception { > + open("/"); > + // just make sure we can get the hibernate Session > + assertTrue(getText("//[EMAIL PROTECTED]'session']").length() > > 0); > + } > +} > > Modified: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/entities/User.java > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/entities/User.java?rev=632915&r1=632914&r2=632915&view=diff > > ============================================================================== > --- > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/entities/User.java > (original) > +++ > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/entities/User.java > Sun Mar 2 17:38:12 2008 > @@ -15,13 +15,14 @@ > package org.example.app0.entities; > > import javax.persistence.Entity; > +import javax.persistence.GeneratedValue; > import javax.persistence.Id; > import javax.persistence.Version; > > @Entity > public class User > { > - @Id > + @Id @GeneratedValue > private Long _id; > > private String _firstName; > > Added: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java?rev=632915&view=auto > > ============================================================================== > --- > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java > (added) > +++ > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java > Sun Mar 2 17:38:12 2008 > @@ -0,0 +1,26 @@ > +// Copyright 2007 The Apache Software Foundation > +// > +// Licensed under the Apache License, Version 2.0 (the "License"); > +// you may not use this file except in compliance with the License. > +// You may obtain a copy of the License at > +// > +// http://www.apache.org/licenses/LICENSE-2.0 > +// > +// Unless required by applicable law or agreed to in writing, software > +// distributed under the License is distributed on an "AS IS" BASIS, > +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +// See the License for the specific language governing permissions and > +// limitations under the License. > + > +package org.example.app0.pages; > + > +import org.apache.tapestry.annotations.GenerateAccessors; > +import org.apache.tapestry.ioc.annotations.Inject; > +import org.hibernate.Session; > + > +public class Start { > + @GenerateAccessors > + @Inject > + private Session _session; > + > +} > > Added: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java?rev=632915&view=auto > > ============================================================================== > --- > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java > (added) > +++ > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java > Sun Mar 2 17:38:12 2008 > @@ -0,0 +1,23 @@ > +// Copyright 2007 The Apache Software Foundation > +// > +// Licensed under the Apache License, Version 2.0 (the "License"); > +// you may not use this file except in compliance with the License. > +// You may obtain a copy of the License at > +// > +// http://www.apache.org/licenses/LICENSE-2.0 > +// > +// Unless required by applicable law or agreed to in writing, software > +// distributed under the License is distributed on an "AS IS" BASIS, > +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +// See the License for the specific language governing permissions and > +// limitations under the License. > + > +package org.example.app0.services; > + > +import org.apache.tapestry.hibernate.HibernateModule; > +import org.apache.tapestry.ioc.annotations.SubModule; > + > [EMAIL PROTECTED](HibernateModule.class) > +public class AppModule { > + > +} > > Modified: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/hibernate.cfg.xml > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/hibernate.cfg.xml?rev=632915&r1=632914&r2=632915&view=diff > > ============================================================================== > --- > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/hibernate.cfg.xml > (original) > +++ > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/hibernate.cfg.xml > Sun Mar 2 17:38:12 2008 > @@ -29,6 +29,7 @@ > > <property name="show_sql">true</property> > <property name="format_sql">true</property> > + <property name="hbm2ddl.auto">create-drop</property> > > <property name="hibernate.c3p0.min_size">5</property> > <property name="hibernate.c3p0.max_size">20</property> > > Added: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/Start.tml > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/Start.tml?rev=632915&view=auto > > ============================================================================== > --- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/Start.tml > (added) > +++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/Start.tml > Sun Mar 2 17:38:12 2008 > @@ -0,0 +1,9 @@ > +<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";> > + <head> > + <title>Start Page</title> > + </head> > + <body> > + <h2>Test application for tapestry-hibernate integration tests</h2> > + The Hibernate session: <span id="session">${session}</span> > + </body> > +</html> > > Added: > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml > URL: > http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml?rev=632915&view=auto > > ============================================================================== > --- > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml > (added) > +++ > tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml > Sun Mar 2 17:38:12 2008 > @@ -0,0 +1,35 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > + Copyright 2007 The Apache Software Foundation > + > + Licensed under the Apache License, Version 2.0 (the "License"); > + you may not use this file except in compliance with the License. > + You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > + Unless required by applicable law or agreed to in writing, software > + distributed under the License is distributed on an "AS IS" BASIS, > + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > + See the License for the specific language governing permissions and > + limitations under the License. > +--> > + > +<!DOCTYPE web-app > + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" > + "http://java.sun.com/dtd/web-app_2_3.dtd";> > +<web-app> > + <display-name>Tapestry-Hibernate Integration Test > Application</display-name> > + <context-param> > + <param-name>tapestry.app-package</param-name> > + <param-value>org.example.app0</param-value> > + </context-param> > + <filter> > + <filter-name>app</filter-name> > + <filter-class>org.apache.tapestry.TapestryFilter</filter-class> > + </filter> > + <filter-mapping> > + <filter-name>app</filter-name> > + <url-pattern>/*</url-pattern> > + </filter-mapping> > +</web-app> > > > -- Howard M. Lewis Ship Creator Apache Tapestry and Apache HiveMind --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
