Author: hlship
Date: Fri Jun 6 16:44:42 2008
New Revision: 664200
URL: http://svn.apache.org/viewvc?rev=664200&view=rev
Log:
TAPESTRY-2428: tapestry-hibernate should include as a dependency a default
version of Hibernate with docs for how to override
Modified:
tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml
tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/index.apt
tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml
tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml?rev=664200&r1=664199&r2=664200&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml Fri Jun 6 16:44:42 2008
@@ -51,9 +51,6 @@
<scope>test</scope>
</dependency>
-
- <!-- Provided -->
-
<!-- The Hibernate dependencies are provided; which gives the final
application
the ability to choose the appropriate version. Further, in many cases
(such as JBoss deployment), they are, in fact, provided by the
@@ -63,7 +60,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>3.2.2.ga</version>
- <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.transaction</groupId>
@@ -76,7 +72,6 @@
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-jta</artifactId>
<version>1.0-M1</version>
- <scope>test</scope>
</dependency>
<!-- The annotation should be compatible with the 3.2.2.ga release of
the
@@ -85,14 +80,12 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
<version>3.2.1.ga</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>c3p0</groupId>
<artifactId>c3p0</artifactId>
<version>0.9.1</version>
- <scope>provided</scope>
</dependency>
</dependencies>
@@ -163,15 +156,6 @@
</reportSet>
</reportSets>
</plugin>
-
- <!-- <plugin>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-component-report</artifactId>
- <version>5.0.2</version>
- <configuration>
- <rootPackage>org.apache.tapestry5.corelib</rootPackage>
- </configuration>
- </plugin>-->
</plugins>
</reporting>
</project>
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/index.apt?rev=664200&r1=664199&r2=664200&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/index.apt
(original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/index.apt Fri Jun
6 16:44:42 2008
@@ -19,10 +19,11 @@
License used by the rest of Tapestry. The restrictions mostly apply to
redistricuting Hibernate, especially in
any altered form, and will likely be irrelvant to the vast majority of
users, but you should be aware.
- This library is compiled against version <<3.2.2.ga>> of Hibernate, but does
not establish that as a dependency (it
- uses the "provided" scope);
- you will have to manually setup a dependency against your preferred version
of Hibernate in your project's Maven POM.
- Once the library has stabilized, a Maven archetype (project template) will
be created to help with this step.
+ This library is compiled against version <<3.2.2.ga>> of Hibernate (and
version 3.2.1.ga of hibernate-annotations),
+ but should work with more recent versions.
+
+ You will have to manually setup a dependency against your preferred version
of Hibernate in your project's Maven POM,
+ to override the default dependencies provided by tapestry-hibernate.
What's New?
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml?rev=664200&r1=664199&r2=664200&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml Fri Jun 6 16:44:42 2008
@@ -30,37 +30,6 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.2.ga</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
- </dependency>
-
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.5</version>
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt?rev=664200&r1=664199&r2=664200&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt
(original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt Fri Jun
6 16:44:42 2008
@@ -57,7 +57,7 @@
* Updating the Dependencies
First, we must update the POM to list a new set of dependencies, that
includes Hibernate,
- the Tapestry/Hibernate integration library, and the MySQL JDBC driver.
+ the Tapestry/Hibernate integration library, and the MySQL JDBC driver:
<<src/pom.xml (partial):>>
@@ -70,59 +70,16 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.2.ga</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.2.1.ga</version>
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.5</version>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.1</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.3</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
----
+ The tapestry-hibernate library includes, as transitive dependencies,
Hibernate and tapestry-core.
+
* Hibernate Configuration
Hibernate has a master configuration file used to store connection and other
data.
