Skip to content
This repository has been archived by the owner on Nov 10, 2017. It is now read-only.

Upgrade the jbpm-jpdl 3.2.10.SP3_seam2 release to Hibernate 5 #2

Open
wants to merge 11 commits into
base: development
Choose a base branch
from
Open

Upgrade the jbpm-jpdl 3.2.10.SP3_seam2 release to Hibernate 5 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
51496ef
Upgrade Hibernate from 4.1.0.Final to 5.0.10.Final (Target wildfly-10…
mark1900 Oct 27, 2016
87265d7
Update Maven version values to 3.2.10.SP3_seam2_hibernate5
mark1900 Oct 27, 2016
33a7cd7
Import jsf-console-3.2.10
mark1900 Nov 4, 2016
8c6d4ad
Update jsf-console for dependency in org.jbpm.jbpm3:jbpm-distribution
mark1900 Nov 7, 2016
7bf5946
Fix code comments
mark1900 Nov 7, 2016
d532b28
Update Eclipse plugin execution
mark1900 Nov 7, 2016
172ec3c
Update versioning
mark1900 Nov 7, 2016
82123ef
Update Drools from 4.0.7 to 5.3.3.Final
mark1900 Nov 8, 2016
cd339f5
Update Test Configuration
mark1900 Nov 9, 2016
aeaa947
add postgresql hibernate type
omidp Feb 14, 2017
6e3c298
Merge pull request #1 from omidp/3.2.10.SP3_seam2_hibernate5
mark1900 Mar 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions core/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
19 changes: 19 additions & 0 deletions core/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
Expand All @@ -20,16 +25,30 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.jboss.tools.jst.web.kb.kbbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.hibernate.eclipse.console.hibernateNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
</natures>
</projectDescription>
110 changes: 67 additions & 43 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm</artifactId>
<version>3.2.10.SP3_seam2</version>
<version>3.2.10-1-SP3_seam2_hibernate5-SNAPSHOT</version>
</parent>

<!-- Dependencies -->
Expand Down Expand Up @@ -46,7 +46,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>

<!-- Provided Dependencies -->
<dependency>
<groupId>org.apache.ant</groupId>
Expand All @@ -63,14 +62,19 @@
<artifactId>jta</artifactId>
<scope>provided</scope>
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.jboss.spec.javax.transaction</groupId> -->
<!-- <artifactId>jboss-transaction-api_1.2_spec</artifactId> -->
<!-- <scope>provided</scope> -->
<!-- </dependency> -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -86,7 +90,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Expand All @@ -98,24 +102,42 @@
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp-wiser</artifactId>
<classifier>java14</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.subethamail</groupId>
<artifactId>subethasmtp-smtp</artifactId>
<classifier>java14</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2.2</version>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
<version>5.0.10.Final</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<version>2.4.8</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -214,42 +236,44 @@
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
<!-- performance test is slow; misplaced along functional tests -->
<exclude>org/jbpm/perf/PerformanceTest.java</exclude>
<!-- Ignored Test Failures... -->
<exclude>org/jbpm/jbpm2908/JBPM2908Test.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-antrun-plugin
</artifactId>
<versionRange>[1.3,)</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-antrun-plugin
</artifactId>
<versionRange>[1.3,)</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

Expand Down
15 changes: 15 additions & 0 deletions core/scripts/antrun-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,20 @@
token="Timer.hbm.xml" value="Timer.calendar.hbm.xml" />
<comment-out file="${project.test.output.dir}/org/jbpm/jbpm2958/hibernate.cfg.xml"
section="Automatic schema creation" />

<copy file="${project.output.dir}/hibernate.cfg.xml"
todir="${project.test.output.dir}/org/jbpm/context/exe" />
<replace file="${project.test.output.dir}/org/jbpm/context/exe/hibernate.cfg.xml">
<replacetoken><![CDATA[<mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>]]></replacetoken>
<replacevalue><![CDATA[
<mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/CustomLongClass.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/CustomStringClass.hbm.xml"/>
]]></replacevalue>
</replace>
<comment-out file="${project.test.output.dir}/org/jbpm/context/exe/hibernate.cfg.xml"
section="Automatic schema creation" />


</target>
</project>
1 change: 1 addition & 0 deletions core/src/main/java/org/jbpm/AbstractJbpmTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public abstract class AbstractJbpmTestCase extends TestCase {

protected void setUp() throws Exception {
log.info("### START " + getName() + " ####################");
System.setProperty("net.sf.ehcache.skipUpdateCheck", "true");
}

protected void tearDown() throws Exception {
Expand Down
Loading