You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2013/06/10 18:30:10 UTC
svn commit: r1491528 - in /oozie/trunk: core/pom.xml
core/src/main/resources/META-INF/persistence.xml pom.xml release-log.txt
Author: tucu
Date: Mon Jun 10 16:30:09 2013
New Revision: 1491528
URL: http://svn.apache.org/r1491528
Log:
OOZIE-1377 OpenJPA runtime enhancement should be disabled and update OpenJPA to 2.2.2 (tucu)
Modified:
oozie/trunk/core/pom.xml
oozie/trunk/core/src/main/resources/META-INF/persistence.xml
oozie/trunk/pom.xml
oozie/trunk/release-log.txt
Modified: oozie/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/core/pom.xml?rev=1491528&r1=1491527&r2=1491528&view=diff
==============================================================================
--- oozie/trunk/core/pom.xml (original)
+++ oozie/trunk/core/pom.xml Mon Jun 10 16:30:09 2013
@@ -354,52 +354,49 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
<executions>
<execution>
+ <id>enhancer</id>
<phase>process-classes</phase>
- <configuration>
- <target>
- <path id="cp">
- <path refid="maven.test.classpath"/>
- <path refid="maven.compile.classpath"/>
- <path refid="maven.dependency.classpath"/>
- </path>
- <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
- <classpath refid="cp"/>
- </taskdef>
- <fileset id="enhance.path.ref" dir="../core/target/classes">
- <include name="**/JsonWorkflowJob.class"/>
- <include name="**/JsonWorkflowAction.class"/>
- <include name="**/JsonCoordinatorJob.class"/>
- <include name="**/JsonCoordinatorAction.class"/>
- <include name="**/JsonSLAEvent.class"/>
- <include name="**/JsonSLARegistrationEvent.class"/>
- <include name="**/JsonBundleJob.class"/>
-
- <include name="**/WorkflowJobBean.class"/>
- <include name="**/WorkflowActionBean.class"/>
- <include name="**/CoordinatorJobBean.class"/>
- <include name="**/CoordinatorActionBean.class"/>
- <include name="**/SLAEventBean.class"/>
- <include name="**/SLARegistrationBean.class"/>
- <include name="**/SLACalculatorBean.class"/>
- <include name="**/SLASummaryBean.class"/>
- <include name="**/BundleJobBean.class"/>
- <include name="**/BundleActionBean.class"/>
- </fileset>
- <openjpac>
- <classpath refid="cp"/>
- <fileset refid="enhance.path.ref"/>
- </openjpac>
- </target>
- </configuration>
<goals>
- <goal>run</goal>
+ <goal>enhance</goal>
</goals>
+ <configuration>
+ <includes>
+ **/JsonWorkflowJob.class,
+ **/JsonWorkflowAction.class,
+ **/JsonCoordinatorJob.class,
+ **/JsonCoordinatorAction.class,
+ **/JsonSLAEvent.class,
+ **/JsonSLARegistrationEvent.class,
+ **/JsonBundleJob.class,
+
+ **/WorkflowJobBean.class,
+ **/WorkflowActionBean.class,
+ **/CoordinatorJobBean.class,
+ **/CoordinatorActionBean.class,
+ **/SLAEventBean.class,
+ **/SLARegistrationBean.class,
+ **/SLACalculatorBean.class,
+ **/SLASummaryBean.class,
+ **/BundleJobBean.class,
+ **/BundleActionBean.class,
+ **/ValidateConnectionBean.class,
+ </includes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ </configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: oozie/trunk/core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/resources/META-INF/persistence.xml?rev=1491528&r1=1491527&r2=1491528&view=diff
==============================================================================
--- oozie/trunk/core/src/main/resources/META-INF/persistence.xml (original)
+++ oozie/trunk/core/src/main/resources/META-INF/persistence.xml Mon Jun 10 16:30:09 2013
@@ -78,7 +78,7 @@
<property name="openjpa.jdbc.DBDictionary" value="UseSetBytesForBlobs=true"/>
<property name="openjpa.jdbc.DBDictionary" value="BlobBufferSize=500000"/>
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
- <property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
+ <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
<property name="openjpa.Log" value="log4j"/>
</properties>
</persistence-unit>
@@ -142,7 +142,7 @@
<property name="openjpa.jdbc.DBDictionary" value="BlobBufferSize=500000"/>
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
<property name="openjpa.jdbc.DBDictionary" value="ClobTypeName =MEDIUMTEXT"/>
- <property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
+ <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
<property name="openjpa.Log" value="log4j"/>
</properties>
</persistence-unit>
@@ -205,7 +205,7 @@
<property name="openjpa.jdbc.DBDictionary" value="UseSetBytesForBlobs=true"/>
<property name="openjpa.jdbc.DBDictionary" value="BlobBufferSize=500000"/>
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
- <property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
+ <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
<property name="openjpa.Log" value="log4j"/>
</properties>
</persistence-unit>
@@ -269,7 +269,7 @@
<property name="openjpa.jdbc.DBDictionary" value="BlobBufferSize=500000"/>
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
<property name="openjpa.jdbc.DBDictionary" value="TimestampTypeName=TIMESTAMP"/>
- <property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
+ <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
<property name="openjpa.Log" value="log4j"/>
</properties>
</persistence-unit>
@@ -332,7 +332,7 @@
<property name="openjpa.jdbc.DBDictionary" value="UseSetBytesForBlobs=true"/>
<property name="openjpa.jdbc.DBDictionary" value="BlobBufferSize=500000"/>
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=50"/>
- <property name="openjpa.RuntimeUnenhancedClasses" value="supported"/>
+ <property name="openjpa.RuntimeUnenhancedClasses" value="unsupported"/>
<property name="openjpa.Log" value="log4j"/>
</properties>
</persistence-unit>
Modified: oozie/trunk/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1491528&r1=1491527&r2=1491528&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Mon Jun 10 16:30:09 2013
@@ -94,6 +94,8 @@
<!-- Tomcat version -->
<tomcat.version>6.0.36</tomcat.version>
+
+ <openjpa.version>2.2.2</openjpa.version>
</properties>
<modules>
@@ -316,7 +318,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence</artifactId>
- <version>2.1.0</version>
+ <version>${openjpa.version}</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
@@ -334,7 +336,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
- <version>2.1.0</version>
+ <version>${openjpa.version}</version>
<exclusions>
<exclusion>
<groupId>postgresql</groupId>
@@ -346,7 +348,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
- <version>2.1.0</version>
+ <version>${openjpa.version}</version>
</dependency>
<dependency>
@@ -707,7 +709,7 @@
<build>
<pluginManagement>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -785,6 +787,11 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>${openjpa.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1491528&r1=1491527&r2=1491528&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Jun 10 16:30:09 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1377 OpenJPA runtime enhancement should be disabled and update OpenJPA to 2.2.2 (tucu)
OOZIE-1339 Implement SLA Bootstrap Service and fix bugs in SLACalculator (virag)
OOZIE-1400 REST API to fetch SLA (rohini)
OOZIE-1375 Generate Job notification events for Workflow Actions (mona)