Permalink
Browse files

HHH-7387 - Integrate Draft 6 of the JPA 2.1 spec + HEM boot cleanup (…

…HHH-6159)
  • Loading branch information...
1 parent 9ce3afd commit cb13cea1aca09512359eb886f59121f596ae3532 @sebersole sebersole committed Jul 12, 2012
Showing 461 changed files with 6,007 additions and 7,769 deletions.
@@ -159,7 +159,7 @@ public boolean isSynchronizationRegistered() {
@Override
@SuppressWarnings( {"unchecked"})
public boolean isTransactionInProgress() {
- return getTransaction().isActive() && getTransaction().getJoinStatus() == JoinStatus.JOINED;
+ return open && getTransaction().isActive() && getTransaction().getJoinStatus() == JoinStatus.JOINED;
}
@Override
@@ -188,7 +188,7 @@ public static List toList(Iterator iter) {
}
@SuppressWarnings( {"unchecked"})
- public static <T> T[] join(T[] x, T[] y) {
+ public static <T> T[] join(T[] x, T... y) {
T[] result = (T[]) Array.newInstance( x.getClass().getComponentType(), x.length + y.length );
System.arraycopy( x, 0, result, 0, x.length );
System.arraycopy( y, 0, result, x.length, y.length );
@@ -372,8 +372,6 @@ public static boolean isEquals(byte[] b1, byte[] b2) {
}
return true;
}
-
-
}
@@ -71,3 +71,16 @@ task copyBundleResources (type: Copy) {
}
processTestResources.dependsOn copyBundleResources
+// create an artifact configuration composed of the test classes so that envers can access hem test classes
+task testJar(type: Jar, dependsOn: testClasses) {
+ classifier = 'test'
+ from sourceSets.test.classes
+}
+
+configurations {
+ tests
+}
+
+artifacts {
+ tests testJar
+}
Oops, something went wrong.

0 comments on commit cb13cea

Please sign in to comment.