6:20 a.m.
Author: manaRH
Date: 2013-05-29 07:20:18 -0400 (Wed, 29 May 2013)
New Revision: 15506
Modified:
branches/enterprise/WFK-2_1/bom/pom.xml
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
branches/enterprise/WFK-2_1/pom.xml
Log:
updated to WFK BOM 1.0.4.Final-redhat-wfk-2 and related changes
Modified: branches/enterprise/WFK-2_1/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/bom/pom.xml 2013-05-16 04:34:19 UTC (rev 15505)
+++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-05-29 11:20:18 UTC (rev 15506)
@@ -34,15 +34,15 @@
<!-- Version string properties -->
<version.seam>2.3.1.Final-redhat-2</version.seam>
<version.drools>5.3.0.BRMS</version.drools>
- <version.resteasy>2.3.4.Final-redhat-2</version.resteasy>
+ <version.resteasy>2.3.6.Final-redhat-1</version.resteasy>
<version.spring>3.1.4.RELEASE</version.spring>
- <version.jbossas7>7.1.1.Final</version.jbossas7>
- <version.jsf2>2.1.13-redhat-1</version.jsf2>
+ <version.jbossas7>7.2.0.Final-redhat-8</version.jbossas7>
+ <version.jsf2>2.1.19-redhat-1</version.jsf2>
<!-- <version.webdriver>0.9.7376</version.webdriver> -->
<version.infinispan>5.1.8.Final-redhat-1</version.infinispan>
<version.junit>4.10</version.junit>
<version.testng>5.14.10</version.testng>
- <version.org.jboss.bom>1.0.4.Final-redhat-wfk-1</version.org.jboss.bom>
+ <version.org.jboss.bom>1.0.4.Final-redhat-wfk-2</version.org.jboss.bom>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
<!-- ***************** -->
@@ -93,13 +93,13 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>1.0.0-beta-5</version>
+ <version>2.0.0-beta-3</version>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <version>1.0.0-beta-5</version>
+ <version>2.0.0-beta-3</version>
</dependency>
<dependency>
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2013-05-16
04:34:19 UTC (rev 15505)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2013-05-29
11:20:18 UTC (rev 15506)
@@ -845,4 +845,16 @@
return delegate.bySimpleNaturalId(entityClass);
}
+ @Override
+ public ScrollableResults scroll(Criteria criteria, ScrollMode scrollMode)
+ {
+ return ( (SessionImplementor) delegate).scroll(criteria, scrollMode);
+ }
+
+ @Override
+ public List list(Criteria criteria)
+ {
+ return ( (SessionImplementor) delegate).list(criteria);
+ }
+
}
Modified: branches/enterprise/WFK-2_1/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/pom.xml 2013-05-16 04:34:19 UTC (rev 15505)
+++ branches/enterprise/WFK-2_1/pom.xml 2013-05-29 11:20:18 UTC (rev 15506)
@@ -45,13 +45,14 @@
<pdf.name>${project.artifactId}.pdf</pdf.name>
<!-- Version string properties -->
- <version.seam>2.3.1.Final-redhat-2</version.seam>
+ <version.seam>2.3.1.Final-redhat-2</version.seam>
<version.testng>5.14.10</version.testng>
- <version.jacoco>0.5.8.201207111220</version.jacoco>
+ <version.jacoco>0.5.8.201207111220</version.jacoco>
<version.jbossas7>7.1.1.Final</version.jbossas7>
<version.emma>2.0.5312</version.emma>
<version.junit>4.8.2</version.junit>
- <version.richfaces>4.3.1.Final-redhat-1</version.richfaces>
+ <version.richfaces>4.3.1.Final-redhat-2</version.richfaces>
+ <version.slf4j>1.6.1</version.slf4j>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
@@ -142,6 +143,18 @@
<artifactId>jboss-as-arquillian-container-remote</artifactId>
<version>${version.jbossas7}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${version.slf4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.5-redhat-5</version>
+ </dependency>
</dependencies>
</dependencyManagement>