Author: cschneider Date: Tue May 19 09:47:49 2015 New Revision: 1680218 URL: http://svn.apache.org/r1680218 Log: [ARIES-1325] Redesign of aries jpa for next major version Added: aries/trunk/jpa/examples/ aries/trunk/jpa/examples/README.md aries/trunk/jpa/examples/org.ops4j.datasource-tasklist.cfg aries/trunk/jpa/examples/pom.xml aries/trunk/jpa/examples/tasklist-blueprint/ aries/trunk/jpa/examples/tasklist-blueprint/pom.xml aries/trunk/jpa/examples/tasklist-blueprint/src/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceImpl.java aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceWithSupplier.java aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/ aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml aries/trunk/jpa/examples/tasklist-blueprint/src/test/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/ aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml aries/trunk/jpa/examples/tasklist-ds/ aries/trunk/jpa/examples/tasklist-ds/README.txt - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/drop.sql aries/trunk/jpa/examples/tasklist-ds/pom.xml aries/trunk/jpa/examples/tasklist-ds/src/ aries/trunk/jpa/examples/tasklist-ds/src/main/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImpl.java aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TasklistAdder.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java aries/trunk/jpa/examples/tasklist-ds/src/test/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java aries/trunk/jpa/examples/tasklist-ds/src/test/resources/ aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/ aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml aries/trunk/jpa/examples/tasklist-model/ aries/trunk/jpa/examples/tasklist-model/pom.xml aries/trunk/jpa/examples/tasklist-model/src/ aries/trunk/jpa/examples/tasklist-model/src/main/ aries/trunk/jpa/examples/tasklist-model/src/main/java/ aries/trunk/jpa/examples/tasklist-model/src/main/java/org/ aries/trunk/jpa/examples/tasklist-model/src/main/java/org/apache/ aries/trunk/jpa/examples/tasklist-model/src/main/java/org/apache/aries/ aries/trunk/jpa/examples/tasklist-model/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/examples/tasklist-model/src/main/java/org/apache/aries/jpa/example/ aries/trunk/jpa/examples/tasklist-model/src/main/java/org/apache/aries/jpa/example/tasklist/ aries/trunk/jpa/examples/tasklist-model/src/main/java/org/apache/aries/jpa/example/tasklist/model/ aries/trunk/jpa/examples/tasklist-model/src/main/java/org/apache/aries/jpa/example/tasklist/model/Task.java aries/trunk/jpa/examples/tasklist-model/src/main/java/org/apache/aries/jpa/example/tasklist/model/TaskService.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/NLS.java aries/trunk/jpa/examples/tasklist-model/src/main/resources/ aries/trunk/jpa/examples/tasklist-model/src/main/resources/META-INF/ aries/trunk/jpa/examples/tasklist-model/src/main/resources/META-INF/persistence.xml aries/trunk/jpa/itests/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/.gitignore - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle/.gitignore aries/trunk/jpa/itests/jpa-container-advancedtestbundle/LICENSE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle/LICENSE aries/trunk/jpa/itests/jpa-container-advancedtestbundle/NOTICE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle/NOTICE aries/trunk/jpa/itests/jpa-container-advancedtestbundle/pom.xml - copied, changed from r1680054, aries/trunk/jpa/jpa-container-advancedtestbundle/pom.xml aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/bundle/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/bundle/entities/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/bundle/entities/Car.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/bundle/entities/Car.java aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/bundle/entities/packageinfo - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/resources/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/resources/META-INF/ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/src/main/resources/META-INF/persistence.xml aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/.gitignore - copied, changed from r1680054, aries/trunk/jpa/jpa-container-advancedtestbundle/.gitignore aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/LICENSE - copied, changed from r1680054, aries/trunk/jpa/jpa-blueprint-testbundle/LICENSE aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/NOTICE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/NOTICE aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/pom.xml aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/entities/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/entities/Car.java - copied, changed from r1680054, aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/Car.java aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/CarService.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/DestroyCallback.java aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceImpl.java aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/java/org/apache/aries/jpa/itest/testbundle/service/impl/CarServiceWithSupplierImpl.java aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/META-INF/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/META-INF/persistence.xml aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/ aries/trunk/jpa/itests/jpa-container-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml aries/trunk/jpa/itests/jpa-container-itest/ aries/trunk/jpa/itests/jpa-container-itest/LICENSE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/LICENSE aries/trunk/jpa/itests/jpa-container-itest/NOTICE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/NOTICE aries/trunk/jpa/itests/jpa-container-itest/pom.xml - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/pom.xml aries/trunk/jpa/itests/jpa-container-itest/src/ aries/trunk/jpa/itests/jpa-container-itest/src/test/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/EclipseLinkWeavingAndAnnotationScanningTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/EclipseLinkWeavingAndAnnotationScanningTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/OpenjpaWeavingAndAnnotationScanningTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/OpenjpaWeavingAndAnnotationScanningTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/BlueprintTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/EMFBuilderTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/EclipseLinkStartupTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/OpenJPAContainerTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkContextTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/OpenjpaContextTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/OpenjpaContextTest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/OpenjpaContextTest.java aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/ aries/trunk/jpa/itests/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java aries/trunk/jpa/itests/jpa-container-testbundle/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/LICENSE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-itest/LICENSE aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/NOTICE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-context/NOTICE aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/pom.xml aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/apache/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/itest/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/itest/entities/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/itest/entities/Car.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/Car.java aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/resources/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/persistence.xml aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/create.sql - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/create.sql aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/data.sql - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/data.sql aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/drop.sql - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/drop.sql aries/trunk/jpa/itests/jpa-container-testbundle/.gitignore - copied, changed from r1680054, aries/trunk/jpa/jpa-blueprint-testbundle/.gitignore aries/trunk/jpa/itests/jpa-container-testbundle/LICENSE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-context/LICENSE aries/trunk/jpa/itests/jpa-container-testbundle/NOTICE - copied, changed from r1680054, aries/trunk/jpa/jpa-container-advancedtestbundle/NOTICE aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle/pom.xml aries/trunk/jpa/itests/jpa-container-testbundle/src/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/apache/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/apache/aries/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/Car.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/itest/entities/Car.java aries/trunk/jpa/itests/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo - copied, changed from r1680054, aries/trunk/jpa/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/bundle/entities/packageinfo aries/trunk/jpa/itests/jpa-container-testbundle/src/main/resources/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/resources/META-INF/ aries/trunk/jpa/itests/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml - copied, changed from r1680054, aries/trunk/jpa/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml aries/trunk/jpa/itests/pom.xml aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/supplier/ aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/supplier/EmSupplier.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/CountdownCallback.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/supplier/packageinfo - copied, changed from r1680054, aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/template/ aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/template/EmConsumer.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/DestroyCallback.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/template/EmFunction.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/NLS.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/template/JpaTemplate.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/DestroyCallback.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/template/TransactionType.java - copied, changed from r1680054, aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/sync/Synchronization.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/template/packageinfo - copied, changed from r1680054, aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/sync/packageinfo aries/trunk/jpa/jpa-blueprint/ aries/trunk/jpa/jpa-blueprint/pom.xml aries/trunk/jpa/jpa-blueprint/src/ aries/trunk/jpa/jpa-blueprint/src/main/ aries/trunk/jpa/jpa-blueprint/src/main/java/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/Activator.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaBeanProcessor.java aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/supplier/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/supplier/impl/ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/supplier/impl/EmProxy.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/supplier/impl/EmProxyFactory.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/util/FakeManagedPersistenceUnitFactory.java aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/supplier/impl/EmSupplierProxy.java aries/trunk/jpa/jpa-blueprint/src/main/resources/ aries/trunk/jpa/jpa-blueprint/src/main/resources/jpa10.xsd - copied, changed from r1680054, aries/trunk/jpa/jpa-blueprint-aries/src/test/resources/jpa.xml aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/AriesEntityManagerFactoryBuilder.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/DSFTracker.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/DataSourceTracker.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedEMF.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleTracker.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceProviderTracker.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/StoredPerProvider.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/ aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/JPAAnnotationScanner.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/JPAAnnotationScannerXbean.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/JPAHandler.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnit.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/PersistenceUnitParser.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parser/impl/TempBundleDelegatingClassLoader.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/TempBundleDelegatingClassLoader.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/DummyDataSource.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistrySingleton.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/DestroyCallback.java aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/DataSourceTrackerTest.java aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/PropsConfigurationTest.java aries/trunk/jpa/jpa-support/ aries/trunk/jpa/jpa-support/pom.xml aries/trunk/jpa/jpa-support/src/ aries/trunk/jpa/jpa-support/src/main/ aries/trunk/jpa/jpa-support/src/main/java/ aries/trunk/jpa/jpa-support/src/main/java/org/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/AbstractJpaTemplate.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/ResourceLocalJpaTemplate.java aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/Activator.java - copied, changed from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/annotation/impl/AnnotationScanner.java aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/EMFTracker.java aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/osgi/impl/TMTracker.java aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/impl/ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/impl/TransactionAttribute.java aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/xa/impl/TransactionToken.java aries/trunk/jpa/jpa-support/src/test/ aries/trunk/jpa/jpa-support/src/test/java/ aries/trunk/jpa/jpa-support/src/test/java/org/ aries/trunk/jpa/jpa-support/src/test/java/org/apache/ aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/ aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/ aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/ aries/trunk/jpa/jpa-support/src/test/java/org/apache/aries/jpa/impl/EmSupplierTest.java Removed: aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfo.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/ManagedPersistenceUnitInfoFactory.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/PersistenceUnitConstants.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/JTAPersistenceContextManager.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/PersistenceContextProvider.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/context/packageinfo aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/packageinfo aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/ParsedPersistenceUnit.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptor.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParser.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/PersistenceDescriptorParserException.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/parsing/packageinfo aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/sync/Synchronization.java aries/trunk/jpa/jpa-api/src/main/java/org/apache/aries/jpa/container/sync/packageinfo aries/trunk/jpa/jpa-blueprint-aries/LICENSE aries/trunk/jpa/jpa-blueprint-aries/NOTICE aries/trunk/jpa/jpa-blueprint-aries/pom.xml aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/EMFServiceRefFactory.java aries/trunk/jpa/jpa-blueprint-aries/src/main/java/org/apache/aries/jpa/blueprint/aries/impl/NSHandler.java aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/org/apache/aries/jpa/blueprint/aries/nls/ariesBlueprintJpaMessages.properties aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/org/apache/aries/jpa/blueprint/namespace/jpa.xsd aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/org/apache/aries/jpa/blueprint/namespace/jpa_110.xsd aries/trunk/jpa/jpa-blueprint-aries/src/test/java/org/apache/aries/jpa/blueprint/aries/test/NSHandlerTest.java aries/trunk/jpa/jpa-blueprint-aries/src/test/resources/jpa.xml aries/trunk/jpa/jpa-blueprint-aries/src/test/resources/jpa_110.xml aries/trunk/jpa/jpa-blueprint-testbundle/.gitignore aries/trunk/jpa/jpa-blueprint-testbundle/LICENSE aries/trunk/jpa/jpa-blueprint-testbundle/NOTICE aries/trunk/jpa/jpa-blueprint-testbundle/pom.xml aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/JPATestBean.java aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/Car.java aries/trunk/jpa/jpa-blueprint-testbundle/src/main/java/org/apache/aries/jpa/blueprint/itest/entities/packageinfo aries/trunk/jpa/jpa-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/injection.xml aries/trunk/jpa/jpa-blueprint-testbundle/src/main/resources/OSGI-INF/blueprint/injection2.xml aries/trunk/jpa/jpa-blueprint-testbundle/src/main/resources/OSGI-INF/persistence/persistence.xml aries/trunk/jpa/jpa-container-advancedtestbundle/.gitignore aries/trunk/jpa/jpa-container-advancedtestbundle/LICENSE aries/trunk/jpa/jpa-container-advancedtestbundle/NOTICE aries/trunk/jpa/jpa-container-advancedtestbundle/pom.xml aries/trunk/jpa/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/bundle/entities/Car.java aries/trunk/jpa/jpa-container-advancedtestbundle/src/main/java/org/apache/aries/jpa/container/advanced/itest/bundle/entities/packageinfo aries/trunk/jpa/jpa-container-advancedtestbundle/src/main/resources/META-INF/persistence.xml aries/trunk/jpa/jpa-container-context/LICENSE aries/trunk/jpa/jpa-container-context/NOTICE aries/trunk/jpa/jpa-container-context/pom.xml aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManager.java aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/ManagedPersistenceContextFactory.java aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/NLS.java aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/PersistenceContextManager.java aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/impl/QuiesceParticipantImpl.java aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/DestroyCallback.java aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManagerClose.java aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAEntityManagerHandler.java aries/trunk/jpa/jpa-container-context/src/main/java/org/apache/aries/jpa/container/context/transaction/impl/JTAPersistenceContextRegistry.java aries/trunk/jpa/jpa-container-context/src/main/resources/org/apache/aries/jpa/container/context/nls/jpaContainerContextMessages.properties aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/impl/GlobalPersistenceManagerTest.java aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/impl/PersistenceContextManagerTest.java aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/transaction/impl/JTAPersistenceContextRegistryTest.java aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/jpa/container/context/transaction/impl/TranSyncRegistryMock.java aries/trunk/jpa/jpa-container-context/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java aries/trunk/jpa/jpa-container-itest/LICENSE aries/trunk/jpa/jpa-container-itest/NOTICE aries/trunk/jpa/jpa-container-itest/pom.xml aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/EclipseLinkWeavingAndAnnotationScanningTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/JPAWeavingAndAnnotationScanningTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/advanced/features/itest/OpenjpaWeavingAndAnnotationScanningTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/blueprint/aries/itest/JPAInjectionTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerDataSourceFactoryTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerHibernateTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/container/itest/JPAContainerTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkContextTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/EclipseLinkStartupTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/JPAContextTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/context/itest/OpenjpaContextTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/AbstractQuiesceJPATest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPAInteractionTest.java aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/quiesce/itest/QuiesceJPATest.java aries/trunk/jpa/jpa-container-testbundle-eclipselink/LICENSE aries/trunk/jpa/jpa-container-testbundle-eclipselink/NOTICE aries/trunk/jpa/jpa-container-testbundle-eclipselink/pom.xml aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/itest/entities/Car.java aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/persistence.xml aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/create.sql aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/data.sql aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/drop.sql aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/OSGI-INF/blueprint/config.xml aries/trunk/jpa/jpa-container-testbundle/.gitignore aries/trunk/jpa/jpa-container-testbundle/LICENSE aries/trunk/jpa/jpa-container-testbundle/NOTICE aries/trunk/jpa/jpa-container-testbundle/pom.xml aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/Car.java aries/trunk/jpa/jpa-container-testbundle/src/main/java/org/apache/aries/jpa/container/itest/entities/packageinfo aries/trunk/jpa/jpa-container-testbundle/src/main/resources/META-INF/persistence.xml aries/trunk/jpa/jpa-container-testbundle/src/main/resources/OSGI-INF/blueprint/config.xml aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/annotation/impl/AnnotationScanner.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/annotation/impl/AnnotationScannerFactory.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/annotation/impl/JPAAnnotationScanner.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/EntityManagerFactoryManager.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidRangeCombination.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/ManagedPersistenceUnitFactoryFactory.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/NLS.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleHelper.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceBundleManager.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/PersistenceDescriptorImpl.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/EarlyParserReturn.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/JPAHandler.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/PersistenceDescriptorParserImpl.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/PersistenceUnitImpl.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/parsing/impl/SchemaLocatingHandler.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/CountdownCallback.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/DestroyCallback.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/EMFProxyFactory.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/EntityManagerProxyFactory.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/NamedCallback.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/QuiesceEMF.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/QuiesceEMFHandler.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/QuiesceHandler.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/QuiesceParticipantFactory.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/quiesce/impl/QuiesceParticipantImpl.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/ConnectionKey.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/ConnectionWrapper.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/OSGiTransactionManager.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/tx/impl/XADatasourceEnlistingWrapper.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/DataSourceFactoryDataSource.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/DelayedLookupDataSource.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/JndiDataSource.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/ManagedPersistenceUnitInfoFactoryImpl.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/ManagedPersistenceUnitInfoImpl.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/PersistenceUnitInfoImpl.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/unit/impl/TempBundleDelegatingClassLoader.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistryFactory.java aries/trunk/jpa/jpa-container/src/main/resources/org/apache/aries/jpa/container/nls/jpaContainerMessages.properties aries/trunk/jpa/jpa-container/src/main/resources/org/apache/aries/jpa/container/parsing/impl/persistence.xsd.rsrc aries/trunk/jpa/jpa-container/src/main/resources/org/apache/aries/jpa/container/parsing/impl/persistence_2_0.xsd.rsrc aries/trunk/jpa/jpa-container/src/main/resources/org/apache/aries/jpa/container/parsing/impl/persistence_2_1.xsd.rsrc aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/impl/PersistenceBundleLifecycleTest.java aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/parsing/PersistenceXMLParsingTest.java aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/quiesce/impl/QuiesceEMFHandlerTest.java aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/util/FakeManagedPersistenceUnitFactory.java aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/weaving/JPAWeavingHookTest.java aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/util/AriesFrameworkUtil.java aries/trunk/jpa/jpa-container/src/test/resources/file1/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file10/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file11/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file12/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file13/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file14/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file15/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file16/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file17/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file18/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file19/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file2/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file20/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file21/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file21/OSGI-INF/found.xml aries/trunk/jpa/jpa-container/src/test/resources/file21/OSGI-INF/not-found.xml aries/trunk/jpa/jpa-container/src/test/resources/file21/persistence/another.xml aries/trunk/jpa/jpa-container/src/test/resources/file22/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file23/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/notOnClasspath/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file23/WEB-INF/classes/onClasspath/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file24/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file25/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file26/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file27/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file3/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file4/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file5/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file6/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file7/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file8/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/file9/META-INF/persistence.xml aries/trunk/jpa/jpa-container/src/test/resources/testProps.props Modified: aries/trunk/jpa/jpa-api/pom.xml aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml aries/trunk/jpa/jpa-container/pom.xml aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/Activator.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/JPAWeavingHook.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/TransformerRegistry.java aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/weaving/impl/WrappingTransformer.java aries/trunk/jpa/pom.xml Added: aries/trunk/jpa/examples/README.md URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/README.md?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/README.md (added) +++ aries/trunk/jpa/examples/README.md Tue May 19 09:47:49 2015 @@ -0,0 +1,53 @@ +# jpa-experiments +Exploring better ways than current aries-jpa to support jpa in OSGi + +# copy DataSource config +cat https://raw.githubusercontent.com/cschneider/jpa-experiments/master/org.ops4j.datasource-tasklist.cfg | tac -f etc/org.ops4j.datasource-tasklist.cfg + +feature:repo-add mvn:org.ops4j.pax.jdbc/pax-jdbc-features/0.5.0/xml/features +feature:install scr transaction pax-jdbc-config pax-jdbc-h2 pax-jdbc-pool-dbcp2 http-whiteboard + +install -s mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final + +# Hibernate + Dependencies +# Normally we would use the karaf feature but it install aries jpa which we do not want +install -s mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5 +install -s mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.8.2_2 +install -s mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5 +install -s mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/1.14.1_1 +install -s mvn:com.fasterxml/classmate/0.9.0 +install -s mvn:org.javassist/javassist/3.18.1-GA +install -s mvn:org.jboss.spec.javax.security.jacc/jboss-jacc-api_1.4_spec/1.0.2.Final +install -s mvn:org.jboss/jandex/1.2.2.Final +install -s mvn:org.jboss.logging/jboss-logging/3.1.4.GA +install -s mvn:org.hibernate.common/hibernate-commons-annotations/4.0.4.Final +install -s mvn:org.hibernate/hibernate-core/4.3.6.Final +install -s mvn:org.hibernate/hibernate-entitymanager/4.3.6.Final +install -s mvn:org.hibernate/hibernate-osgi/4.3.6.Final + +# Eclipselink + Dependencies +install -s mvn:org.eclipse.persistence/javax.persistence/2.1.0 +install -s mvn:org.eclipse.persistence/org.eclipse.persistence.core/2.6.0 +install -s mvn:org.eclipse.persistence/org.eclipse.persistence.asm/2.6.0 +install -s mvn:org.eclipse.persistence/org.eclipse.persistence.jpa/2.6.0 +install -s mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/2.6.0 +install -s mvn:org.eclipse.persistence/org.eclipse.persistence.jpa.jpql/2.6.0 +install -s mvn:org.apache.aries.jpa/org.apache.aries.jpa.eclipselink.adapter/1.0.0-SNAPSHOT + + +# Our JPA service implementation +install -s mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/2.0.0-SNAPSHOT +install -s mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/2.0.0-SNAPSHOT +install -s mvn:org.apache.aries.jpa/org.apache.aries.jpa.support/2.0.0-SNAPSHOT + +# Closure based example. (Make sure to start karaf with JDK 8) +install -s mvn:org.apache.aries.jpa.example/jpa-example-tasklist-model/2.0.0-SNAPSHOT +install -s mvn:org.apache.aries.jpa.example/jpa-example-tasklist-closure/2.0.0-SNAPSHOT +install -s mvn:org.apache.aries.jpa.example/jpa-example-tasklist-ui/2.0.0-SNAPSHOT + +# Blueprint based example +install -s mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint/2.0.0-SNAPSHOT +install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.model/2.0.0-SNAPSHOT +install -s mvn:org.apache.aries.jpa.example/org.apache.aries.jpa.example.tasklist.blueprint/2.0.0-SNAPSHOT +install -s mvn:org.apache.aries.jpa.example/jpa-example-tasklist-ui/2.0.0-SNAPSHOT + Added: aries/trunk/jpa/examples/org.ops4j.datasource-tasklist.cfg URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/org.ops4j.datasource-tasklist.cfg?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/org.ops4j.datasource-tasklist.cfg (added) +++ aries/trunk/jpa/examples/org.ops4j.datasource-tasklist.cfg Tue May 19 09:47:49 2015 @@ -0,0 +1,3 @@ +osgi.jdbc.driver.name = H2-pool-xa +databaseName = tasklist;create=true +dataSourceName = tasklist Added: aries/trunk/jpa/examples/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/pom.xml?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/pom.xml (added) +++ aries/trunk/jpa/examples/pom.xml Tue May 19 09:47:49 2015 @@ -0,0 +1,29 @@ + + + + 4.0.0 + + org.apache.aries.jpa.example + org.apache.aries.jpa.example.parent + Apache Aries JPA example parent + pom + + + org.apache.aries.jpa + org.apache.aries.jpa.parent + 2.0.0-SNAPSHOT + + + + true + + + + tasklist-blueprint + tasklist-ds + tasklist-model + + + + Added: aries/trunk/jpa/examples/tasklist-blueprint/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/pom.xml?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-blueprint/pom.xml (added) +++ aries/trunk/jpa/examples/tasklist-blueprint/pom.xml Tue May 19 09:47:49 2015 @@ -0,0 +1,69 @@ + + 4.0.0 + + org.apache.aries.jpa.example + org.apache.aries.jpa.example.parent + 2.0.0-SNAPSHOT + .. + + org.apache.aries.jpa.example.tasklist.blueprint + Apache Aries JPA example tasklist blueprint + bundle + + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.apache.aries.jpa.example + org.apache.aries.jpa.example.tasklist.model + ${project.version} + + + org.apache.aries.jpa + org.apache.aries.jpa.api + ${project.version} + + + org.apache.aries.transaction + org.apache.aries.transaction.blueprint + 1.0.2 + + + + org.apache.aries.jpa + org.apache.aries.jpa.support + ${project.version} + test + + + junit + junit + 4.11 + test + + + org.hibernate + hibernate-entitymanager + 4.3.8.Final + test + + + org.apache.derby + derby + 10.11.1.1 + test + + + + \ No newline at end of file Added: aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceImpl.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceImpl.java?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceImpl.java (added) +++ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceImpl.java Tue May 19 09:47:49 2015 @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 WARRANTIESOR 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.aries.jpa.example.tasklist.blueprint.impl; + +import java.util.Collection; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.apache.aries.jpa.example.tasklist.model.Task; +import org.apache.aries.jpa.example.tasklist.model.TaskService; +import org.apache.aries.transaction.annotations.Transaction; + + +public class TaskServiceImpl implements TaskService { + + @PersistenceContext(unitName="tasklist") + EntityManager em; + + @Override + public Task getTask(Integer id) { + return em.find(Task.class, id); + } + + @Transaction + @Override + public void addTask(Task task) { + em.persist(task); + em.flush(); + } + + public Collection getTasks() { + return em.createQuery("select t from Task t", Task.class) + .getResultList(); + } + + @Transaction + @Override + public void updateTask(Task task) { + em.persist(task); + } + + @Transaction + @Override + public void deleteTask(Integer id) { + em.remove(getTask(id)); + } + + public void setEm(EntityManager em) { + this.em = em; + } +} Added: aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceWithSupplier.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceWithSupplier.java?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceWithSupplier.java (added) +++ aries/trunk/jpa/examples/tasklist-blueprint/src/main/java/org/apache/aries/jpa/example/tasklist/blueprint/impl/TaskServiceWithSupplier.java Tue May 19 09:47:49 2015 @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 WARRANTIESOR 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.aries.jpa.example.tasklist.blueprint.impl; + +import java.util.Collection; + +import javax.persistence.PersistenceContext; + +import org.apache.aries.jpa.example.tasklist.model.Task; +import org.apache.aries.jpa.example.tasklist.model.TaskService; +import org.apache.aries.jpa.supplier.EmSupplier; +import org.apache.aries.transaction.annotations.Transaction; + + +public class TaskServiceWithSupplier implements TaskService { + + @PersistenceContext(unitName = "tasklist") + EmSupplier em; + + @Override + public Task getTask(Integer id) { + return em.get().find(Task.class, id); + } + + @Transaction + @Override + public void addTask(Task task) { + em.get().persist(task); + em.get().flush(); + } + + public Collection getTasks() { + return em.get().createQuery("select t from Task t", Task.class).getResultList(); + } + + @Override + public void updateTask(Task task) { + em.get().persist(task); + } + + @Override + public void deleteTask(Integer id) { + em.get().remove(getTask(id)); + } + + public void setEm(EmSupplier em) { + this.em = em; + } + + public void init() { + addTask(new Task(1, "Test", "Testdescription")); + } +} Added: aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml (added) +++ aries/trunk/jpa/examples/tasklist-blueprint/src/main/resources/OSGI-INF/blueprint/context.xml Tue May 19 09:47:49 2015 @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + \ No newline at end of file Added: aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java (added) +++ aries/trunk/jpa/examples/tasklist-blueprint/src/test/java/org/apache/aries/jpa/tasklist/blueprint/impl/TaskServiceImplTest.java Tue May 19 09:47:49 2015 @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 WARRANTIESOR 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.aries.jpa.tasklist.blueprint.impl; + +import java.util.HashMap; +import java.util.Map; + +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; + +import org.apache.aries.jpa.example.tasklist.blueprint.impl.TaskServiceImpl; +import org.apache.aries.jpa.example.tasklist.model.Task; +import org.apache.aries.jpa.example.tasklist.model.TaskService; +import org.apache.aries.jpa.supplier.EmSupplier; +import org.apache.aries.jpa.support.impl.EMSupplierImpl; +import org.junit.Assert; +import org.junit.Test; + +public class TaskServiceImplTest { + @Test + public void testPersistence() { + TaskServiceImpl taskServiceImpl = new TaskServiceImpl(); + EntityManagerFactory emf = createTestEMF(); + EmSupplier emSupplier = new EMSupplierImpl(emf); + emSupplier.preCall(); + emSupplier.get().getTransaction().begin(); + taskServiceImpl.setEm(emSupplier.get()); + + TaskService taskService = taskServiceImpl; + + Task task = new Task(); + task.setId(1); + task.setTitle("test"); + taskService.addTask(task); + + Task task2 = taskService.getTask(1); + Assert.assertEquals(task.getTitle(), task2.getTitle()); + emSupplier.get().getTransaction().commit(); + emSupplier.postCall(); + } + + private EntityManagerFactory createTestEMF() { + Map properties = new HashMap<>(); + properties.put("javax.persistence.jdbc.driver", "org.apache.derby.jdbc.EmbeddedDriver"); + properties.put("javax.persistence.jdbc.url", "jdbc:derby:target/test;create=true"); + EntityManagerFactory emf = Persistence.createEntityManagerFactory("tasklist", properties); + return emf; + } +} Added: aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml (added) +++ aries/trunk/jpa/examples/tasklist-blueprint/src/test/resources/META-INF/persistence.xml Tue May 19 09:47:49 2015 @@ -0,0 +1,15 @@ + + + + + org.hibernate.jpa.HibernatePersistenceProvider + org.apache.aries.jpa.example.tasklist.model.Task + + + + + + + Copied: aries/trunk/jpa/examples/tasklist-ds/README.txt (from r1680054, aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/drop.sql) URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/README.txt?p2=aries/trunk/jpa/examples/tasklist-ds/README.txt&p1=aries/trunk/jpa/jpa-container-testbundle-eclipselink/src/main/resources/META-INF/sql/drop.sql&r1=1680054&r2=1680218&rev=1680218&view=diff ============================================================================== (empty) Added: aries/trunk/jpa/examples/tasklist-ds/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/pom.xml?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-ds/pom.xml (added) +++ aries/trunk/jpa/examples/tasklist-ds/pom.xml Tue May 19 09:47:49 2015 @@ -0,0 +1,88 @@ + + 4.0.0 + + + org.apache.aries.jpa.example + org.apache.aries.jpa.example.parent + 2.0.0-SNAPSHOT + .. + + org.apache.aries.jpa.example.tasklist.ds + Apache Aries JPA example tasklist DS + bundle + + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + + + org.osgi + org.osgi.core + + + org.osgi + org.osgi.compendium + + + org.apache.aries.jpa.example + org.apache.aries.jpa.example.tasklist.model + ${project.version} + + + org.apache.aries.jpa + org.apache.aries.jpa.api + ${project.version} + + + + org.apache.aries.jpa + org.apache.aries.jpa.support + ${project.version} + test + + + junit + junit + 4.11 + test + + + org.hibernate + hibernate-entitymanager + 4.3.8.Final + test + + + org.apache.derby + derby + 10.11.1.1 + test + + + org.slf4j + slf4j-jdk14 + 1.7.10 + + + + + + + org.apache.felix + maven-bundle-plugin + 2.5.3 + true + + + + *, org.hibernate.proxy, + javassist.util.proxy + <_dsannotations>* + + + + + + \ No newline at end of file Added: aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImpl.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImpl.java?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImpl.java (added) +++ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImpl.java Tue May 19 09:47:49 2015 @@ -0,0 +1,115 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 WARRANTIESOR 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.aries.jpa.tasklist.closure.impl; + +import java.util.Collection; + +import javax.persistence.EntityManager; + +import org.apache.aries.jpa.example.tasklist.model.Task; +import org.apache.aries.jpa.example.tasklist.model.TaskService; +import org.apache.aries.jpa.template.EmConsumer; +import org.apache.aries.jpa.template.EmFunction; +import org.apache.aries.jpa.template.JpaTemplate; +import org.apache.aries.jpa.template.TransactionType; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; + +@Component +public class TaskServiceImpl implements TaskService { + + private JpaTemplate jpa; + + public Task getTask(final Integer id) { + return jpa.txExpr(TransactionType.Required, new EmFunction() { + public Task apply(EntityManager em) { + return em.find(Task.class, id); + } + }); + } + + public void addTask(final Task task) { + jpa.tx(new EmConsumer() { + public void accept(EntityManager em) { + em.persist(task); + em.flush(); + } + }); + } + + public Collection getTasks() { + return jpa.txExpr(new EmFunction>() { + public Collection apply(EntityManager em) { + return em.createQuery("select t from Task t", Task.class).getResultList(); + } + }); + } + + public void updateTask(final Task task) { + jpa.tx(new EmConsumer() { + public void accept(EntityManager em) { + em.persist(task); + } + }); + } + + public void deleteTask(final Integer id) { + jpa.tx(new EmConsumer() { + public void accept(EntityManager em) { + em.remove(getTask(id)); + } + }); + } + + @Reference(target = "(osgi.unit.name=tasklist)") + public void setJpaTemplate(JpaTemplate jpa) { + this.jpa = jpa; + } + + // See below for the Java 8 version with closures + /* + public Task getTask(Integer id) { + return jpa.txExpr(TransactionType.Required, em -> em.find(Task.class, id)); + } + + public void addTask(Task task) { + jpa.tx(em -> { + em.persist(task); + em.flush(); + }); + } + + public Collection getTasks() { + return jpa.txExpr(em -> em.createQuery("select t from Task t", Task.class).getResultList()); + } + + public void updateTask(Task task) { + jpa.tx(em -> em.persist(task)); + } + + public void deleteTask(Integer id) { + jpa.tx(em -> em.remove(getTask(id))); + } + + @Reference(target = "(osgi.unit.name=tasklist)") + public void setJpaTemplate(JpaTemplate jpa) { + this.jpa = jpa; + } + */ +} Copied: aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TasklistAdder.java (from r1680054, aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java) URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TasklistAdder.java?p2=aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TasklistAdder.java&p1=aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java&r1=1680054&r2=1680218&rev=1680218&view=diff ============================================================================== --- aries/trunk/jpa/jpa-container/src/main/java/org/apache/aries/jpa/container/impl/InvalidPersistenceUnitException.java (original) +++ aries/trunk/jpa/examples/tasklist-ds/src/main/java/org/apache/aries/jpa/tasklist/closure/impl/TasklistAdder.java Tue May 19 09:47:49 2015 @@ -16,24 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.aries.jpa.container.impl; +package org.apache.aries.jpa.tasklist.closure.impl; -/** - * This exception is thrown if an {@link EntityManagerFactoryManager} has - * entered an invalid state and needs to be destroyed - */ -public class InvalidPersistenceUnitException extends Exception { - - /** - * For serialization - */ - private static final long serialVersionUID = 6523462131213055375L; +import org.apache.aries.jpa.example.tasklist.model.Task; +import org.apache.aries.jpa.example.tasklist.model.TaskService; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; - public InvalidPersistenceUnitException(Exception e) { - super(e); - } +@Component(immediate = true) +public class TasklistAdder { + TaskService taskService; - public InvalidPersistenceUnitException() { - } + @Reference + public void setTaskService(TaskService taskService) { + this.taskService = taskService; + } + @Activate + public void addDemoTask() { + if (taskService.getTask(1) == null) { + Task task = new Task(); + task.setId(1); + task.setTitle("Task1"); + taskService.addTask(task); + } + } } Added: aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java (added) +++ aries/trunk/jpa/examples/tasklist-ds/src/test/java/org/apache/aries/jpa/tasklist/closure/impl/TaskServiceImplTest.java Tue May 19 09:47:49 2015 @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 WARRANTIESOR 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.aries.jpa.tasklist.closure.impl; + +import java.util.HashMap; +import java.util.Map; + +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; + +import org.apache.aries.jpa.example.tasklist.model.Task; +import org.apache.aries.jpa.support.impl.EMSupplierImpl; +import org.apache.aries.jpa.support.impl.ResourceLocalJpaTemplate; +import org.apache.aries.jpa.template.JpaTemplate; +import org.junit.Assert; +import org.junit.Test; + +public class TaskServiceImplTest { + @Test + public void testPersistence() { + TaskServiceImpl taskService = new TaskServiceImpl(); + EntityManagerFactory emf = createTestEMF(); + EMSupplierImpl emSupplier = new EMSupplierImpl(emf); + JpaTemplate txManager = new ResourceLocalJpaTemplate(emSupplier); + taskService.setJpaTemplate(txManager); + + Task task = new Task(); + task.setId(1); + task.setTitle("test"); + taskService.addTask(task); + + Task task2 = taskService.getTask(1); + Assert.assertEquals(task.getTitle(), task2.getTitle()); + } + + private EntityManagerFactory createTestEMF() { + Map properties = new HashMap<>(); + properties.put("javax.persistence.jdbc.driver", "org.apache.derby.jdbc.EmbeddedDriver"); + properties.put("javax.persistence.jdbc.url", "jdbc:derby:target/test;create=true"); + EntityManagerFactory emf = Persistence.createEntityManagerFactory("tasklist", properties); + return emf; + } +} Added: aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml?rev=1680218&view=auto ============================================================================== --- aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml (added) +++ aries/trunk/jpa/examples/tasklist-ds/src/test/resources/META-INF/persistence.xml Tue May 19 09:47:49 2015 @@ -0,0 +1,15 @@ + + + + + org.hibernate.jpa.HibernatePersistenceProvider + org.apache.aries.jpa.example.tasklist.model.Task + + + + + + +