You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by dr...@apache.org on 2011/03/11 17:06:22 UTC
svn commit: r1080633 - in /tapestry/tapestry5/trunk/tapestry-jpa/src:
main/java/org/apache/tapestry5/internal/jpa/
main/java/org/apache/tapestry5/jpa/
main/java/org/apache/tapestry5/jpa/annotations/
test/java/org/apache/tapestry5/internal/jpa/ test/jav...
Author: drobiazko
Date: Fri Mar 11 16:06:21 2011
New Revision: 1080633
URL: http://svn.apache.org/viewvc?rev=1080633&view=rev
Log:
TAP5-1472: Extracted TapestryPersistenceUnitInfo to an interface, moved @CommitAfter to another package and used PersistenceUnitConfigurer to add managed class in tests.
Added:
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java (contents, props changed)
- copied, changed from r1080014, tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/TapestryPersistenceUnitInfo.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java (with props)
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/annotations/
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/annotations/CommitAfter.java (contents, props changed)
- copied, changed from r1080014, tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/CommitAfter.java
Removed:
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/TapestryPersistenceUnitInfo.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/CommitAfter.java
Modified:
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceParser.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaModule.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaTransactionAdvisor.java
tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/PersistenceUnitConfigurer.java
tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/CommitAfterDemo.java
tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/EncodeEntities.java
tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/GridDemo.java
tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/PersistEntity.java
tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/AppModule.java
tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/UserDAO.java
tapestry/tapestry5/trunk/tapestry-jpa/src/test/resources/META-INF/persistence.xml
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/CommitAfterWorker.java Fri Mar 11 16:06:21 2011
@@ -14,8 +14,8 @@
package org.apache.tapestry5.internal.jpa;
-import org.apache.tapestry5.jpa.CommitAfter;
import org.apache.tapestry5.jpa.EntityManagerManager;
+import org.apache.tapestry5.jpa.annotations.CommitAfter;
import org.apache.tapestry5.model.MutableComponentModel;
import org.apache.tapestry5.services.ClassTransformation;
import org.apache.tapestry5.services.ComponentClassTransformWorker;
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java Fri Mar 11 16:06:21 2011
@@ -34,6 +34,7 @@ import org.apache.tapestry5.ioc.services
import org.apache.tapestry5.jpa.EntityManagerSource;
import org.apache.tapestry5.jpa.JpaConstants;
import org.apache.tapestry5.jpa.PersistenceUnitConfigurer;
+import org.apache.tapestry5.jpa.TapestryPersistenceUnitInfo;
import org.slf4j.Logger;
public class EntityManagerSourceImpl implements EntityManagerSource, RegistryShutdownListener
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImpl.java Fri Mar 11 16:06:21 2011
@@ -17,9 +17,9 @@ package org.apache.tapestry5.internal.jp
import java.lang.reflect.Method;
import org.apache.tapestry5.ioc.MethodAdviceReceiver;
-import org.apache.tapestry5.jpa.CommitAfter;
import org.apache.tapestry5.jpa.EntityManagerManager;
import org.apache.tapestry5.jpa.JpaTransactionAdvisor;
+import org.apache.tapestry5.jpa.annotations.CommitAfter;
public class JpaTransactionAdvisorImpl implements JpaTransactionAdvisor
{
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceContentHandler.java Fri Mar 11 16:06:21 2011
@@ -7,6 +7,7 @@ import javax.persistence.ValidationMode;
import javax.persistence.spi.PersistenceUnitTransactionType;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.jpa.TapestryPersistenceUnitInfo;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -67,7 +68,7 @@ public class PersistenceContentHandler i
{
if (ELEMENT_PERSISTENCE_UNIT.equals(localName))
{
- persistenceUnitInfo = new TapestryPersistenceUnitInfo();
+ persistenceUnitInfo = new PersistenceUnitInfoImpl();
persistenceUnitInfo.setPersistenceUnitName(atts.getValue(ATTRIBUTE_NAME));
persistenceUnitInfo
.setPersistenceXMLSchemaVersion(atts.getValue(ATTRIBUTE_VERSION));
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceParser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceParser.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceParser.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceParser.java Fri Mar 11 16:06:21 2011
@@ -18,6 +18,7 @@ import java.io.InputStream;
import java.util.List;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.jpa.TapestryPersistenceUnitInfo;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
Copied: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java (from r1080014, tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/TapestryPersistenceUnitInfo.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java?p2=tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java&p1=tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/TapestryPersistenceUnitInfo.java&r1=1080014&r2=1080633&rev=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/TapestryPersistenceUnitInfo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java Fri Mar 11 16:06:21 2011
@@ -24,11 +24,12 @@ import java.util.Properties;
import javax.persistence.SharedCacheMode;
import javax.persistence.ValidationMode;
import javax.persistence.spi.ClassTransformer;
-import javax.persistence.spi.PersistenceUnitInfo;
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.sql.DataSource;
-public class TapestryPersistenceUnitInfo implements PersistenceUnitInfo
+import org.apache.tapestry5.jpa.TapestryPersistenceUnitInfo;
+
+public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo
{
private String persistenceUnitName;
@@ -145,6 +146,11 @@ public class TapestryPersistenceUnitInfo
managedClassNames.add(className);
}
+ public void addManagedClass(final Class<?> clazz)
+ {
+ addManagedClassName(clazz.getName());
+ }
+
/**
* {@inheritDoc}
*/
Propchange: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaModule.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaModule.java Fri Mar 11 16:06:21 2011
@@ -70,11 +70,11 @@ public class JpaModule
final Map<String, PersistenceUnitConfigurer> configuration,
final RegistryShutdownHub hub)
{
- final EntityManagerSourceImpl hss = new EntityManagerSourceImpl(logger, configuration);
+ final EntityManagerSourceImpl ems = new EntityManagerSourceImpl(logger, configuration);
- hub.addRegistryShutdownListener(hss);
+ hub.addRegistryShutdownListener(ems);
- return hss;
+ return ems;
}
@Scope(ScopeConstants.PERTHREAD)
@@ -192,13 +192,8 @@ public class JpaModule
for (final PersistenceUnitInfo info : entityManagerSource.getPersistenceUnitInfos())
{
- final EntityManagerFactory emf = entityManagerSource.getEntityManagerFactory(info
- .getPersistenceUnitName());
-
for (final String className : info.getManagedClassNames())
{
- final Metamodel metamodel = emf.getMetamodel();
-
final Class<?> clazz = loadClass(info, className);
configuration.add(clazz, new ApplicationStateContribution(
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaTransactionAdvisor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaTransactionAdvisor.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaTransactionAdvisor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/JpaTransactionAdvisor.java Fri Mar 11 16:06:21 2011
@@ -19,7 +19,7 @@ import org.apache.tapestry5.ioc.MethodAd
/**
* Service that can create an interceptor that wraps around a service implementation. After invoking
* service methods
- * marked by {@link org.apache.tapestry5.jpa.CommitAfter} the current transaction is committed.
+ * marked by {@link org.apache.tapestry5.jpa.annotations.CommitAfter} the current transaction is committed.
* Declared exceptions will also {@linkplain javax.persistence.EntityTransaction#commit() commit the
* transaction}; runtime exceptions will {@linkplain javax.persistence.EntityTransaction#rollback()
* roll back the transaction}.
@@ -29,7 +29,7 @@ import org.apache.tapestry5.ioc.MethodAd
public interface JpaTransactionAdvisor
{
/**
- * Identifies any methods with the {@link org.apache.tapestry5.jpa.CommitAfter} annotation and
+ * Identifies any methods with the {@link org.apache.tapestry5.jpa.annotations.CommitAfter} annotation and
* applies the transaction logic to those methods.
*
* @param receiver
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/PersistenceUnitConfigurer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/PersistenceUnitConfigurer.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/PersistenceUnitConfigurer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/PersistenceUnitConfigurer.java Fri Mar 11 16:06:21 2011
@@ -14,7 +14,6 @@
package org.apache.tapestry5.jpa;
-import org.apache.tapestry5.internal.jpa.TapestryPersistenceUnitInfo;
public interface PersistenceUnitConfigurer
{
Added: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java?rev=1080633&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java (added)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java Fri Mar 11 16:06:21 2011
@@ -0,0 +1,42 @@
+// Copyright 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.
+// 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.tapestry5.jpa;
+
+import javax.persistence.SharedCacheMode;
+import javax.persistence.ValidationMode;
+import javax.persistence.spi.PersistenceUnitInfo;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import javax.sql.DataSource;
+
+public interface TapestryPersistenceUnitInfo extends PersistenceUnitInfo
+{
+ void setPersistenceUnitName(String persistenceUnitName);
+
+ void setPersistenceProviderClassName(String persistenceProviderClassName);
+
+ void setTransactionType(PersistenceUnitTransactionType transactionType);
+
+ void setNonJtaDataSource(DataSource nonJtaDataSource);
+
+ void addManagedClassName(String className);
+
+ void addManagedClass(Class<?> clazz);
+
+ void setSharedCacheMode(SharedCacheMode cacheMode);
+
+ void setValidationMode(ValidationMode validationMode);
+
+ void setPersistenceXMLSchemaVersion(String version);
+}
Propchange: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/annotations/CommitAfter.java (from r1080014, tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/CommitAfter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/annotations/CommitAfter.java?p2=tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/annotations/CommitAfter.java&p1=tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/CommitAfter.java&r1=1080014&r2=1080633&rev=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/CommitAfter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/annotations/CommitAfter.java Fri Mar 11 16:06:21 2011
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry5.jpa;
+package org.apache.tapestry5.jpa.annotations;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
Propchange: tapestry/tapestry5/trunk/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/annotations/CommitAfter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/JpaTransactionAdvisorImplTest.java Fri Mar 11 16:06:21 2011
@@ -26,9 +26,9 @@ import org.apache.tapestry5.ioc.services
import org.apache.tapestry5.ioc.services.AspectInterceptorBuilder;
import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.apache.tapestry5.ioc.test.TestBase;
-import org.apache.tapestry5.jpa.CommitAfter;
import org.apache.tapestry5.jpa.EntityManagerManager;
import org.apache.tapestry5.jpa.JpaTransactionAdvisor;
+import org.apache.tapestry5.jpa.annotations.CommitAfter;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/CommitAfterDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/CommitAfterDemo.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/CommitAfterDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/CommitAfterDemo.java Fri Mar 11 16:06:21 2011
@@ -4,7 +4,7 @@ import java.sql.SQLException;
import javax.persistence.PersistenceUnit;
-import org.apache.tapestry5.jpa.CommitAfter;
+import org.apache.tapestry5.jpa.annotations.CommitAfter;
import org.example.app.AppConstants;
import org.example.app.entities.User;
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/EncodeEntities.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/EncodeEntities.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/EncodeEntities.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/EncodeEntities.java Fri Mar 11 16:06:21 2011
@@ -21,7 +21,7 @@ import javax.persistence.PersistenceUnit
import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.jpa.CommitAfter;
+import org.apache.tapestry5.jpa.annotations.CommitAfter;
import org.example.app.AppConstants;
import org.example.app.entities.User;
import org.example.app.services.UserDAO;
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/GridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/GridDemo.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/GridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/GridDemo.java Fri Mar 11 16:06:21 2011
@@ -22,8 +22,8 @@ import javax.persistence.criteria.Root;
import org.apache.tapestry5.grid.GridDataSource;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.jpa.CommitAfter;
import org.apache.tapestry5.jpa.JpaGridDataSource;
+import org.apache.tapestry5.jpa.annotations.CommitAfter;
import org.example.app.AppConstants;
import org.example.app.entities.User;
import org.example.app.services.UserDAO;
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/PersistEntity.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/PersistEntity.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/PersistEntity.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/pages/PersistEntity.java Fri Mar 11 16:06:21 2011
@@ -21,7 +21,7 @@ import javax.persistence.PersistenceUnit
import org.apache.tapestry5.annotations.Persist;
import org.apache.tapestry5.annotations.Property;
-import org.apache.tapestry5.jpa.CommitAfter;
+import org.apache.tapestry5.jpa.annotations.CommitAfter;
import org.example.app.AppConstants;
import org.example.app.entities.User;
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/AppModule.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/AppModule.java Fri Mar 11 16:06:21 2011
@@ -23,8 +23,13 @@ import org.apache.tapestry5.ioc.annotati
import org.apache.tapestry5.ioc.annotations.SubModule;
import org.apache.tapestry5.ioc.services.ApplicationDefaults;
import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.jpa.EntityManagerSource;
import org.apache.tapestry5.jpa.JpaModule;
import org.apache.tapestry5.jpa.JpaTransactionAdvisor;
+import org.apache.tapestry5.jpa.PersistenceUnitConfigurer;
+import org.apache.tapestry5.jpa.TapestryPersistenceUnitInfo;
+import org.example.app.AppConstants;
+import org.example.app.entities.User;
import org.example.app.services.impl.UserDAOImpl;
@SubModule(JpaModule.class)
@@ -44,6 +49,21 @@ public class AppModule
configuration.add(SymbolConstants.PRODUCTION_MODE, "false");
}
+ @Contribute(EntityManagerSource.class)
+ public static void configurePersistenceUnitInfos(
+ final MappedConfiguration<String, PersistenceUnitConfigurer> configuration)
+ {
+ final PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
+ {
+ public void configure(final TapestryPersistenceUnitInfo unitInfo)
+ {
+ unitInfo.addManagedClass(User.class);
+ }
+ };
+ configuration.add(AppConstants.TEST_PERSISTENCE_UNIT, configurer);
+
+ }
+
@Match("*DAO")
public static void adviseTransactionally(final JpaTransactionAdvisor advisor,
final MethodAdviceReceiver receiver)
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/UserDAO.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/UserDAO.java?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/UserDAO.java (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/test/java/org/example/app/services/UserDAO.java Fri Mar 11 16:06:21 2011
@@ -4,7 +4,7 @@ import java.util.List;
import javax.persistence.PersistenceUnit;
-import org.apache.tapestry5.jpa.CommitAfter;
+import org.apache.tapestry5.jpa.annotations.CommitAfter;
import org.example.app.AppConstants;
import org.example.app.entities.User;
Modified: tapestry/tapestry5/trunk/tapestry-jpa/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-jpa/src/test/resources/META-INF/persistence.xml?rev=1080633&r1=1080632&r2=1080633&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-jpa/src/test/resources/META-INF/persistence.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-jpa/src/test/resources/META-INF/persistence.xml Fri Mar 11 16:06:21 2011
@@ -3,7 +3,6 @@
version="2.0">
<persistence-unit name="TestUnit" transaction-type="RESOURCE_LOCAL">
- <class>org.example.app.entities.User</class>
<properties>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test" />