tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r1196368 - in /tapestry/tapestry5/trunk: tapestry-hibernate-core/ tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/ tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/
Date Tue, 01 Nov 2011 23:10:55 GMT
Author: hlship
Date: Tue Nov  1 23:10:55 2011
New Revision: 1196368

URL: http://svn.apache.org/viewvc?rev=1196368&view=rev
Log:
Adjust dependencies, adding Javassist back in as a dependency of tapestry-hibernate-core
Update use of Hibernate APIs to no longer use AnnotationConfigurer

Modified:
    tapestry/tapestry5/trunk/tapestry-hibernate-core/build.gradle
    tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
    tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java

Modified: tapestry/tapestry5/trunk/tapestry-hibernate-core/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate-core/build.gradle?rev=1196368&r1=1196367&r2=1196368&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate-core/build.gradle (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate-core/build.gradle Tue Nov  1 23:10:55 2011
@@ -12,6 +12,7 @@ dependencies {
   runtime "geronimo-spec:geronimo-spec-jta:1.0-M1"  
   runtime "antlr:antlr:2.7.6"
   runtime "dom4j:dom4j:1.6.1"
+  runtime "javassist:javassist:3.12.1.GA"
   
     
   testCompile project(':tapestry-test')

Modified: tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java?rev=1196368&r1=1196367&r2=1196368&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
Tue Nov  1 23:10:55 2011
@@ -36,7 +36,7 @@ public class HibernateSessionSourceImpl 
     {
         long startTime = System.currentTimeMillis();
 
-        configuration = new AnnotationConfiguration();
+        configuration = new Configuration();
 
         for (HibernateConfigurer configurer : hibernateConfigurers)
             configurer.configure(configuration);

Modified: tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java?rev=1196368&r1=1196367&r2=1196368&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
Tue Nov  1 23:10:55 2011
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2010 The Apache Software Foundation
+// Copyright 2007, 2008, 2010, 2011 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.
@@ -38,13 +38,11 @@ public final class PackageNameHibernateC
 
     public void configure(Configuration configuration)
     {
-        AnnotationConfiguration cfg = (AnnotationConfiguration) configuration;
-
         ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 
         for (String packageName : packageManager.getPackageNames())
         {
-            cfg.addPackage(packageName);
+            configuration.addPackage(packageName);
 
             for (String className : classNameLocator.locateClassNames(packageName))
             {
@@ -52,7 +50,7 @@ public final class PackageNameHibernateC
                 {
                     Class entityClass = contextClassLoader.loadClass(className);
 
-                    cfg.addAnnotatedClass(entityClass);
+                    configuration.addAnnotatedClass(entityClass);
                 }
                 catch (ClassNotFoundException ex)
                 {

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java?rev=1196368&r1=1196367&r2=1196368&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java
(original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java
Tue Nov  1 23:10:55 2011
@@ -34,7 +34,6 @@ import org.apache.tapestry5.ioc.services
 import org.apache.tapestry5.ioc.services.TypeCoercer;
 import org.apache.tapestry5.services.ApplicationStateContribution;
 import org.apache.tapestry5.services.ApplicationStatePersistenceStrategy;
-import org.apache.tapestry5.services.ComponentClassTransformWorker;
 import org.apache.tapestry5.services.LibraryMapping;
 import org.apache.tapestry5.services.PersistentFieldStrategy;
 import org.apache.tapestry5.services.ValueEncoderFactory;



Mime
View raw message