JPA bytecode enhancement
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/8d9f4743 Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/8d9f4743 Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/8d9f4743 Branch: refs/heads/master Commit: 8d9f47436ed7d1e76c5f14b4e0af4c90275f056c Parents: e2581cd Author: Martin Stockhammer <[email protected]> Authored: Sun Oct 9 21:13:18 2016 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Sun Oct 9 21:13:18 2016 +0200 ---------------------------------------------------------------------- .../src/main/resources/META-INF/persistence.xml | 6 +- .../redback-rbac-jpa/pom.xml | 107 +++++++++++------- .../redback-users-jpa/pom.xml | 111 ++++++++++++------- 3 files changed, 144 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/8d9f4743/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml b/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml index 46878e8..817eb20 100644 --- a/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml +++ b/redback-common/redback-common-jpa/src/main/resources/META-INF/persistence.xml @@ -20,7 +20,7 @@ <persistence xmlns="http://java.sun.com/xml/ns/persistence"; version="2.0"> <persistence-unit name="redback-jpa"> <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> - <jta-data-source>java:comp/env/jdbc/redbackjpa</jta-data-source> + <non-jta-data-source>java:comp/env/jdbc/redbackjpa</non-jta-data-source> <class>org.apache.archiva.redback.users.jpa.model.JpaUser</class> <class>org.apache.archiva.redback.rbac.jpa.model.JpaOperation</class> <class>org.apache.archiva.redback.rbac.jpa.model.JpaResource</class> @@ -28,9 +28,11 @@ <class>org.apache.archiva.redback.rbac.jpa.model.JpaRole</class> <class>org.apache.archiva.redback.rbac.jpa.model.JpaUserAssignment</class> <properties> - <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)" /> + <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/> + <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)" /> <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=restrict,JoinForeignKeyDeleteAction=restrict"/> + <property name="openjpa.Log" value="DefaultLevel=TRACE, Runtime=TRACE, Tool=INFO"/> </properties> </persistence-unit> </persistence> http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/8d9f4743/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml index 77045ab..ba1c0bd 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml @@ -20,51 +20,82 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>redback-rbac-providers</artifactId> - <groupId>org.apache.archiva.redback</groupId> - <version>2.5-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>redback-rbac-providers</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <version>2.5-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>redback-rbac-jpa</artifactId> + <artifactId>redback-rbac-jpa</artifactId> <packaging>jar</packaging> <name>Redback :: RBAC Provider :: JPA</name> - <dependencies> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-rbac-model</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-rbac-tests</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-common-jpa</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-rbac-model</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-rbac-tests</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-common-jpa</artifactId> + </dependency> - <dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <version>${openjpa.version}</version> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-maven-plugin</artifactId> + <version>2.4.1</version> + <configuration> + <includes>**/model/*.class</includes> + <addDefaultConstructor>true</addDefaultConstructor> + <enforcePropertyRestrictions>true</enforcePropertyRestrictions> + </configuration> + <executions> + <execution> + <id>enhancer</id> + <phase>process-classes</phase> + <goals> + <goal>enhance</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> + <!-- set the version to be the same as the level in your runtime --> <version>${openjpa.version}</version> - </dependency> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - + </dependency> + </dependencies> + </plugin> + </plugins> + </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/8d9f4743/redback-users/redback-users-providers/redback-users-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/redback-users/redback-users-providers/redback-users-jpa/pom.xml b/redback-users/redback-users-providers/redback-users-jpa/pom.xml index 2606b71..4d23718 100644 --- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml +++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml @@ -20,49 +20,80 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>redback-users-providers</artifactId> - <groupId>org.apache.archiva.redback</groupId> - <version>2.5-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>redback-users-providers</artifactId> + <groupId>org.apache.archiva.redback</groupId> + <version>2.5-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>redback-users-jpa</artifactId> - <packaging>jar</packaging> - <name>Redback :: Users Provider :: JPA</name> + <artifactId>redback-users-jpa</artifactId> + <packaging>jar</packaging> + <name>Redback :: Users Provider :: JPA</name> - <dependencies> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-policy</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-common-jpa</artifactId> - </dependency> - <dependency> + <dependencies> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-policy</artifactId> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-common-jpa</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <version>${openjpa.version}</version> + </dependency> + + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-users-tests</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-maven-plugin</artifactId> + <version>2.4.1</version> + <configuration> + <includes>**/model/*.class</includes> + <addDefaultConstructor>true</addDefaultConstructor> + <enforcePropertyRestrictions>true</enforcePropertyRestrictions> + </configuration> + <executions> + <execution> + <id>enhancer</id> + <phase>process-classes</phase> + <goals> + <goal>enhance</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> + <!-- set the version to be the same as the level in your runtime --> <version>${openjpa.version}</version> - </dependency> - - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva.redback</groupId> - <artifactId>redback-users-tests</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> </project> \ No newline at end of file
