[seam-commits] Seam SVN: r14477 - in branches/community/Seam_2_3: examples-ee6/booking/booking-ear and 51 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Apr 2 18:43:29 EDT 2012
Author: manaRH
Date: 2012-04-02 18:43:26 -0400 (Mon, 02 Apr 2012)
New Revision: 14477
Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml
branches/community/Seam_2_3/examples-ee6/excel/excel-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml
branches/community/Seam_2_3/examples-ee6/pom.xml
branches/community/Seam_2_3/examples-ee6/todo/todo-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/todo/todo-web/pom.xml
branches/community/Seam_2_3/examples-ee6/ui/ui-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml
branches/community/Seam_2_3/jboss-seam-debug/pom.xml
branches/community/Seam_2_3/jboss-seam-excel/pom.xml
branches/community/Seam_2_3/jboss-seam-flex/pom.xml
branches/community/Seam_2_3/jboss-seam-ioc/pom.xml
branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedEntityManagerFactory.java
branches/community/Seam_2_3/jboss-seam-jul/pom.xml
branches/community/Seam_2_3/jboss-seam-mail/pom.xml
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
branches/community/Seam_2_3/jboss-seam-pdf/pom.xml
branches/community/Seam_2_3/jboss-seam-remoting/pom.xml
branches/community/Seam_2_3/jboss-seam-resteasy/pom.xml
branches/community/Seam_2_3/jboss-seam-rss/pom.xml
branches/community/Seam_2_3/jboss-seam-ui/pom.xml
branches/community/Seam_2_3/jboss-seam-wicket/pom.xml
branches/community/Seam_2_3/jboss-seam/pom.xml
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockServletContext.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/web/ConditionalRequestTest.java
branches/community/Seam_2_3/seam-integration-tests/pom.xml
branches/community/Seam_2_3/seam-reference-guide/pom.xml
Log:
tidy-up-global-dependencies-and-aligned-with-spec-APIs from AS7
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -23,70 +23,21 @@
<groupId>org.jboss.seam.examples-ee6.booking</groupId>
<artifactId>booking-ejb</artifactId>
<type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
<exclusions>
<exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
<groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
+ <artifactId>hibernate-validator</artifactId>
</exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
</exclusions>
</dependency>
- <dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.jboss.seam</groupId> -->
+<!-- <artifactId>jboss-seam</artifactId> -->
+<!-- <type>ejb</type> -->
+<!-- <scope>compile</scope> -->
+<!-- </dependency> -->
+
+<!-- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>provided</scope>
@@ -95,7 +46,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
</dependencies>
<build>
@@ -104,7 +55,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.6</version>
<configuration>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -16,34 +16,57 @@
<dependencies>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -31,8 +31,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -52,12 +56,6 @@
<artifactId>functional-tests</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
@@ -88,6 +86,10 @@
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -34,11 +34,21 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-jul</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -61,7 +71,11 @@
<dependency>
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-impl</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-api</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -4,7 +4,7 @@
<parent>
<artifactId>dvdstore</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -4,7 +4,7 @@
<parent>
<artifactId>dvdstore</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -4,7 +4,7 @@
<parent>
<artifactId>dvdstore</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -4,7 +4,7 @@
<parent>
<artifactId>dvdstore</artifactId>
<groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -3,7 +3,7 @@
<parent>
<artifactId>examples-ee6</artifactId>
<groupId>org.jboss.seam</groupId>
- <version>2.3.0.Beta1-SNAPSHOT</version>
+ <version>2.3.0.Beta2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/community/Seam_2_3/examples-ee6/excel/excel-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/excel/excel-ear/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -28,17 +28,6 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
@@ -68,6 +57,11 @@
<artifactId>excel-ejb</artifactId>
<bundleFileName>excel-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
Modified: branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -19,37 +19,28 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-ui</artifactId>
- <version>4.1.0.Final</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- <version>4.1.0.Final</version>
- </dependency>
--->
</dependencies>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -36,8 +36,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -103,6 +103,10 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-rss</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -29,9 +29,14 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-excel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<exclusions>
<exclusion>
@@ -52,20 +57,14 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-excel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-components-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.core</groupId>
- <artifactId>richfaces-core-impl</artifactId>
- </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -33,26 +33,12 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
</dependencies>
<build>
@@ -62,17 +48,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
- <version>5</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
<earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>
<!-- use maven generated application.xml instead -->
<generateApplicationXml>true</generateApplicationXml>
<filtering>true</filtering>
-<!-- <jboss>
- <version>4.2</version>
- <loader-repository>seam.jboss.org:loader=seam-mail</loader-repository>
- </jboss>-->
<modules>
<ejbModule>
<groupId>org.jboss.seam</groupId>
@@ -173,14 +154,4 @@
</profile>
</profiles>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>3.1.0.GA</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -18,24 +18,26 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -63,15 +63,8 @@
<artifactId>subethasmtp-wiser</artifactId>
<version>1.2</version>
</dependency>
-
+
<dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>functional-tests</artifactId>
<scope>test</scope>
@@ -112,6 +105,11 @@
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -29,6 +29,7 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -39,17 +40,13 @@
<groupId>org.jboss.seam</groupId>
</exclusion>
<exclusion>
- <artifactId>jsf-facelets</artifactId>
- <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <groupId>com.sun.faces</groupId>
</exclusion>
<exclusion>
- <artifactId>jboss-seam</artifactId>
- <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
</exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -75,46 +72,32 @@
<groupId>org.jboss.seam</groupId>
</exclusion>
<exclusion>
- <artifactId>jsf-facelets</artifactId>
- <groupId>com.sun.facelets</groupId>
- </exclusion>
- <exclusion>
<artifactId>jboss-seam</artifactId>
<groupId>org.jboss.seam</groupId>
</exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-excel</artifactId>
- <exclusions>
<exclusion>
- <artifactId>jboss-seam-ui</artifactId>
- <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
</exclusion>
- <exclusion>
- <artifactId>jsf-facelets</artifactId>
- <groupId>com.sun.facelets</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-seam</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
</exclusions>
+ <scope>runtime</scope>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>com.sun.facelets</groupId> -->
-<!-- <artifactId>jsf-facelets</artifactId> -->
-<!-- </dependency> -->
-
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-excel</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -153,16 +136,6 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -34,16 +34,6 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
@@ -54,7 +44,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
- <version>6</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
<earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -18,20 +18,21 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -31,8 +31,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -67,6 +67,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -33,6 +33,10 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-jul</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -46,8 +50,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.jboss.spec.javax.servlet.jstl</groupId>
+ <artifactId>jboss-jstl-api_1.2_spec</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -12,7 +12,7 @@
<packaging>pom</packaging>
<name>Seam 2 EE 6 examples</name>
- <description>Examples for Seam 2 Framework in Java EE6 enviroment</description>
+ <description>Examples for Seam 2 Framework in Java EE6 environment</description>
<modules>
<!--<module>blog</module>-->
@@ -75,7 +75,7 @@
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.1.0.Final</version>
+ <version>7.1.1.Final</version>
<executions>
<execution>
<phase></phase>
@@ -91,6 +91,35 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>el-api</artifactId>
+ <groupId>javax.el</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${richfaces.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- common provided scope dependencies -->
<dependency>
<groupId>commons-logging</groupId>
@@ -104,38 +133,7 @@
<version>3.2</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- <type>jar</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.jsf2}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${version.jsf2}</version>
- <scope>provided</scope>
- </dependency>
+
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-components-ui</artifactId>
@@ -146,44 +144,43 @@
<artifactId>richfaces-core-impl</artifactId>
<version>${richfaces.version}</version>
</dependency>
+
+ <!-- common test scope dependencies -->
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.2</version>
- <scope>provided</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-web-api</artifactId>
- <version>6.0</version>
- <scope>provided</scope>
- </dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>4.0.1.Final</version>
+ <groupId>org.metawidget</groupId>
+ <artifactId>metawidget-backend</artifactId>
+ <version>0.95</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>4.2.0.Final</version>
- </dependency>
-
- <!-- common test scope dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
+ <groupId>org.metawidget</groupId>
+ <artifactId>metawidget-frontend</artifactId>
+ <version>0.95</version>
</dependency>
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
+ <groupId>org.metawidget</groupId>
+ <artifactId>metawidget</artifactId>
+ <version>0.95</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>1.2.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>1.2.5</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -970,15 +967,11 @@
</profiles>
<properties>
- <!-- artifact versions -->
- <hibernate.version>3.3.2.GA</hibernate.version>
- <hibernate-em.version>3.4.0.GA</hibernate-em.version>
- <richfaces.version>4.1.0.Final</richfaces.version>
- <slf4j.version>1.5.8</slf4j.version>
- <java.version>1.5</java.version>
<!-- Excluded TestNG groups (ex: slow annotated tests won't run during
the test phase) -->
- <tests.excludedGroups>slow</tests.excludedGroups>
+ <tests.excludedGroups>slow</tests.excludedGroups>
+ <richfaces.version>4.2.0.Final</richfaces.version>
+ <slf4j.version>1.6.1</slf4j.version>
<!-- dependencies for functional tests -->
<ant.junit.version>1.6.2</ant.junit.version>
Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/todo/todo-ear/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -34,16 +34,6 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
@@ -71,6 +61,11 @@
<artifactId>todo-ejb</artifactId>
<bundleFileName>todo-ejb.jar</bundleFileName>
</ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
</modules>
</configuration>
</plugin>
Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -15,7 +15,6 @@
<build>
<plugins>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -48,10 +47,11 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -60,29 +60,43 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackrabbit-core</artifactId>
+ <groupId>org.apache.jackrabbit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-logging</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ </dependency>
</dependencies>
<profiles>
Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -31,8 +31,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium.server</groupId>
@@ -63,6 +63,10 @@
<artifactId>arquillian-protocol-servlet</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/todo/todo-web/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/todo/todo-web/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -24,14 +24,27 @@
<artifactId>todo-ejb</artifactId>
<type>ejb</type>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hibernate-ehcache</artifactId>
+ <groupId>org.hibernate</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>dom4j</artifactId>
+ <groupId>dom4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>cglib</artifactId>
+ <groupId>cglib</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<exclusions>
<exclusion>
@@ -42,15 +55,9 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <exclusions>
<exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
</exclusion>
</exclusions>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-ear/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-ear/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -29,37 +29,8 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<scope>runtime</scope>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -19,23 +19,21 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
</dependency>
- <!-- TODO: fix when seam parent is updated -->
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
- <version>1.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -36,8 +36,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium.server</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -44,7 +44,6 @@
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
- <version>${project.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -55,8 +54,8 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -85,26 +85,17 @@
<!-- Maven's "nearest" dependency resolution doesn't take into account
parent dependency management! -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
+ <artifactId>hibernate-search-orm</artifactId>
<optional>true</optional>
</dependency>
@@ -132,12 +123,14 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
+
+
<dependency>
<groupId>javax.mail</groupId>
@@ -153,26 +146,27 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
@@ -181,9 +175,9 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -195,12 +189,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -214,11 +202,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
@@ -227,11 +210,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-antlr</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
@@ -256,11 +234,6 @@
<!-- This is actually a dep of jboss-cache, but it doesn't declare it -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <optional>true</optional>
- </dependency>
<!-- This is actually a dep of jboss-cache, but it doesn't declare it -->
<dependency>
@@ -268,6 +241,12 @@
<artifactId>jboss-jmx</artifactId>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- This is actually a dep of jboss-cache, but it doesn't declare it -->
<dependency>
@@ -307,15 +286,7 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
@@ -377,7 +348,7 @@
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
+ <groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<optional>true</optional>
</dependency>
@@ -388,17 +359,7 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.openid4java</groupId>
@@ -407,23 +368,24 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- <version>1.6.1</version>
- </dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<optional>true</optional>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<profiles>
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import javax.ejb.EJBException;
import javax.ejb.NoSuchObjectLocalException;
+import javax.ejb.ScheduleExpression;
import javax.ejb.Stateless;
import javax.ejb.Timeout;
import javax.ejb.Timer;
@@ -185,6 +186,24 @@
}
});
}
+
+ @Override
+ public ScheduleExpression getSchedule() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+ {
+ return null;
+ }
+
+ @Override
+ public boolean isCalendarTimer() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+ {
+ return false;
+ }
+
+ @Override
+ public boolean isPersistent() throws IllegalStateException, NoSuchObjectLocalException, EJBException
+ {
+ return false;
+ }
}
static class TimerHandleProxy
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -104,22 +104,30 @@
if (pageContext.get() == null)
{
log.debug("isPageContextActive is null");
- // lazy initialize the page context during restore view
- javax.faces.context.FacesContext facesContext = javax.faces.context.FacesContext.getCurrentInstance();
- if (facesContext != null)
+
+ try
{
- if (FacesLifecycle.getPhaseId() == RESTORE_VIEW )
+ // lazy initialize the page context during restore view
+ javax.faces.context.FacesContext facesContext = javax.faces.context.FacesContext.getCurrentInstance();
+ if (facesContext != null)
{
- log.debug("Page Context will be lazilly created");
- FacesLifecycle.resumePage();
- Map<String, String> parameters = facesContext.getExternalContext().getRequestParameterMap();
- ConversationPropagation.instance().restoreConversationId(parameters);
- boolean conversationFound = Manager.instance().restoreConversation();
- pageContext.get().set("org.jboss.seam.jsf.SeamPhaseListener.conversationFound", conversationFound);
-
- FacesLifecycle.resumeConversation(facesContext.getExternalContext());
+ if (FacesLifecycle.getPhaseId() == RESTORE_VIEW )
+ {
+ log.debug("Page Context will be lazilly created");
+ FacesLifecycle.resumePage();
+ Map<String, String> parameters = facesContext.getExternalContext().getRequestParameterMap();
+ ConversationPropagation.instance().restoreConversationId(parameters);
+ boolean conversationFound = Manager.instance().restoreConversation();
+ pageContext.get().set("org.jboss.seam.jsf.SeamPhaseListener.conversationFound", conversationFound);
+
+ FacesLifecycle.resumeConversation(facesContext.getExternalContext());
+ }
}
}
+ catch (NoClassDefFoundError e)
+ {
+ // do nothing as this context is supposed to be active only with JSF view layer
+ }
}
return pageContext.get() != null;
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -9,6 +9,7 @@
* @author Gavin King
*
*/
+ at SuppressWarnings("unchecked")
class EE5SeamInvocationContext extends SeamInvocationContext implements javax.interceptor.InvocationContext
{
@@ -17,4 +18,10 @@
super(context, type, userInterceptors, interceptors);
}
+ public Object getTimer()
+ {
+ // not supported method
+ return null;
+ }
+
}
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -48,4 +48,10 @@
{
context.setParameters(params);
}
+
+ @Override
+ public Object getTimer()
+ {
+ return context.getTimer();
+ }
}
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -16,12 +16,20 @@
package org.jboss.seam.mock;
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -1090,4 +1098,81 @@
return true;
}
+ @Override
+ public AsyncContext startAsync() throws IllegalStateException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isAsyncStarted()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean isAsyncSupported()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public AsyncContext getAsyncContext()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public DispatcherType getDispatcherType()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void login(String username, String password) throws ServletException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void logout() throws ServletException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Collection<Part> getParts() throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Part getPart(String name) throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
\ No newline at end of file
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -297,9 +297,9 @@
* @param name the name of the header
* @return the associated header value, or <code>null<code> if none
*/
- public Object getHeader(String name) {
+ public String getHeader(String name) {
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
- return (header != null ? header.getValue() : null);
+ return (header != null ? header.getValue().toString() : null);
}
/**
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -12,6 +12,7 @@
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
@@ -21,11 +22,19 @@
import javax.faces.context.ExternalContext;
import javax.portlet.PortletRequest;
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
import org.jboss.seam.util.IteratorEnumeration;
@@ -456,4 +465,88 @@
{
return headers;
}
+
+ @Override
+ public ServletContext getServletContext()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync() throws IllegalStateException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) throws IllegalStateException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isAsyncStarted()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean isAsyncSupported()
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public AsyncContext getAsyncContext()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public DispatcherType getDispatcherType()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean authenticate(HttpServletResponse response) throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void login(String username, String password) throws ServletException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void logout() throws ServletException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Collection<Part> getParts() throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Part getPart(String name) throws IOException, ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Collection;
import java.util.Locale;
import javax.servlet.ServletOutputStream;
@@ -202,4 +203,28 @@
}
+ public int getStatus()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public String getHeader(String name)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Collection<String> getHeaders(String name)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Collection<String> getHeaderNames()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockServletContext.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockServletContext.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockServletContext.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -8,16 +8,24 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Enumeration;
+import java.util.EventListener;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
import org.dom4j.DocumentException;
import org.dom4j.Element;
@@ -323,4 +331,187 @@
return null;
}
+ @Override
+ public int getEffectiveMajorVersion()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public int getEffectiveMinorVersion()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public boolean setInitParameter(String name, String value)
+ {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, String className)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, Servlet servlet)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public ServletRegistration getServletRegistration(String servletName)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Map<String, ? extends ServletRegistration> getServletRegistrations()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public FilterRegistration getFilterRegistration(String filterName)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Map<String, ? extends FilterRegistration> getFilterRegistrations()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SessionCookieConfig getSessionCookieConfig()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void addListener(String className)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public <T extends EventListener> void addListener(T t)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void addListener(Class<? extends EventListener> listenerClass)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public JspConfigDescriptor getJspConfigDescriptor()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public ClassLoader getClassLoader()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void declareRoles(String... roleNames)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+
}
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -11,14 +11,22 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Enumeration;
+import java.util.EventListener;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
import org.jboss.seam.util.IteratorEnumeration;
@@ -144,4 +152,134 @@
attributes.put(key, value);
}
}
+
+ public int getEffectiveMajorVersion()
+ {
+ return delegate.getEffectiveMajorVersion();
+ }
+
+ public int getEffectiveMinorVersion()
+ {
+ return delegate.getEffectiveMinorVersion();
+ }
+
+ public boolean setInitParameter(String name, String value)
+ {
+ return delegate.setInitParameter(name, value);
+ }
+
+ public Dynamic addServlet(String servletName, String className)
+ {
+ return delegate.addServlet(servletName, className);
+ }
+
+ public Dynamic addServlet(String servletName, Servlet servlet)
+ {
+ return delegate.addServlet(servletName, servlet);
+ }
+
+ public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass)
+ {
+ return delegate.addServlet(servletName, servletClass);
+ }
+
+ public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException
+ {
+ return delegate.createServlet(clazz);
+ }
+
+ public ServletRegistration getServletRegistration(String servletName)
+ {
+ return delegate.getServletRegistration(servletName);
+ }
+
+ public Map<String, ? extends ServletRegistration> getServletRegistrations()
+ {
+ return delegate.getServletRegistrations();
+ }
+
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className)
+ {
+ return delegate.addFilter(filterName, className);
+ }
+
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter)
+ {
+ return delegate.addFilter(filterName, filter);
+ }
+
+ public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass)
+ {
+ return delegate.addFilter(filterName, filterClass);
+ }
+
+ public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException
+ {
+ return delegate.createFilter(clazz);
+ }
+
+ public FilterRegistration getFilterRegistration(String filterName)
+ {
+ return delegate.getFilterRegistration(filterName);
+ }
+
+ public Map<String, ? extends FilterRegistration> getFilterRegistrations()
+ {
+ return delegate.getFilterRegistrations();
+ }
+
+ public SessionCookieConfig getSessionCookieConfig()
+ {
+ return delegate.getSessionCookieConfig();
+ }
+
+ public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes)
+ {
+ delegate.setSessionTrackingModes(sessionTrackingModes);
+ }
+
+ public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
+ {
+ return delegate.getDefaultSessionTrackingModes();
+ }
+
+ public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
+ {
+ return delegate.getEffectiveSessionTrackingModes();
+ }
+
+ public void addListener(String className)
+ {
+ delegate.addListener(className);
+ }
+
+ public <T extends EventListener> void addListener(T t)
+ {
+ delegate.addListener(t);
+ }
+
+ public void addListener(Class<? extends EventListener> listenerClass)
+ {
+ delegate.addListener(listenerClass);
+ }
+
+ public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException
+ {
+ return delegate.createListener(clazz);
+ }
+
+ public JspConfigDescriptor getJspConfigDescriptor()
+ {
+ return delegate.getJspConfigDescriptor();
+ }
+
+ public ClassLoader getClassLoader()
+ {
+ return delegate.getClassLoader();
+ }
+
+ public void declareRoles(String... roleNames)
+ {
+ delegate.declareRoles(roleNames);
+ }
}
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -15,10 +15,12 @@
import org.hibernate.Filter;
import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
+import org.hibernate.IdentifierLoadAccess;
import org.hibernate.Interceptor;
import org.hibernate.LobHelper;
import org.hibernate.LockMode;
import org.hibernate.LockOptions;
+import org.hibernate.NaturalIdLoadAccess;
import org.hibernate.Query;
import org.hibernate.ReplicationMode;
import org.hibernate.SQLQuery;
@@ -27,6 +29,7 @@
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.SharedSessionBuilder;
+import org.hibernate.SimpleNaturalIdLoadAccess;
import org.hibernate.Transaction;
import org.hibernate.TypeHelper;
import org.hibernate.cache.spi.CacheKey;
@@ -812,4 +815,34 @@
return ((EventSource) delegate).getLobHelper();
}
+ public IdentifierLoadAccess byId(String entityName)
+ {
+ return delegate.byId(entityName);
+ }
+
+ public IdentifierLoadAccess byId(Class entityClass)
+ {
+ return delegate.byId(entityClass);
+ }
+
+ public NaturalIdLoadAccess byNaturalId(String entityName)
+ {
+ return delegate.byNaturalId(entityName);
+ }
+
+ public NaturalIdLoadAccess byNaturalId(Class entityClass)
+ {
+ return delegate.byNaturalId(entityClass);
+ }
+
+ public SimpleNaturalIdLoadAccess bySimpleNaturalId(String entityName)
+ {
+ return delegate.bySimpleNaturalId(entityName);
+ }
+
+ public SimpleNaturalIdLoadAccess bySimpleNaturalId(Class entityClass)
+ {
+ return delegate.bySimpleNaturalId(entityClass);
+ }
+
}
Modified: branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/web/ConditionalRequestTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/web/ConditionalRequestTest.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/web/ConditionalRequestTest.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -117,7 +117,7 @@
resource.getResource(request, response);
assertEquals(response.getStatus(), HttpServletResponse.SC_NOT_MODIFIED);
- assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime);
+ assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime.toString());
}
@@ -151,7 +151,7 @@
resource.getResource(request, response);
assertEquals(response.getStatus(), HttpServletResponse.SC_OK);
- assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime + 5000);
+ assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime + 5000 +"");
}
@@ -186,7 +186,7 @@
resource.getResource(request, response);
assertEquals(response.getStatus(), HttpServletResponse.SC_NOT_MODIFIED);
- assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime);
+ assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime.toString());
assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_ETAG), "\"5678\"");
}
@@ -222,7 +222,7 @@
resource.getResource(request, response);
assertEquals(response.getStatus(), HttpServletResponse.SC_OK);
- assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime + 5000);
+ assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime + 5000+"");
assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_ETAG), "\"5678\"");
}
Modified: branches/community/Seam_2_3/jboss-seam-debug/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -18,8 +18,8 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -30,14 +30,14 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/jboss-seam-excel/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -7,7 +7,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-excel</artifactId>
<packaging>jar</packaging>
<name>Seam Excel</name>
@@ -25,8 +24,8 @@
<type>ejb</type>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
@@ -45,21 +44,20 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>${version.testng}</version>
<classifier>jdk15</classifier>
<optional>true</optional>
<exclusions>
Modified: branches/community/Seam_2_3/jboss-seam-flex/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-flex/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-flex/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -6,7 +6,7 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam</groupId>
+
<artifactId>jboss-seam-flex</artifactId>
<name>Seam Flex</name>
@@ -35,14 +35,14 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam-ioc/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ioc/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-ioc/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -6,7 +6,7 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam</groupId>
+
<artifactId>jboss-seam-ioc</artifactId>
<name>Seam IoC</name>
@@ -30,15 +30,15 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -69,15 +69,15 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-jmx</artifactId>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>jboss</groupId> -->
+<!-- <artifactId>jboss-jmx</artifactId> -->
+<!-- </dependency> -->
</dependencies>
Modified: branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedEntityManagerFactory.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedEntityManagerFactory.java 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedEntityManagerFactory.java 2012-04-02 22:43:26 UTC (rev 14477)
@@ -7,9 +7,14 @@
import java.lang.reflect.Proxy;
import java.util.Map;
+import javax.persistence.Cache;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnitUtil;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.metamodel.Metamodel;
+import org.hibernate.id.SequenceIdentityGenerator.Delegate;
import org.jboss.seam.Component;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
@@ -147,4 +152,34 @@
}
}
}
+
+ public CriteriaBuilder getCriteriaBuilder()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Metamodel getMetamodel()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Map<String, Object> getProperties()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Cache getCache()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public PersistenceUnitUtil getPersistenceUnitUtil()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified: branches/community/Seam_2_3/jboss-seam-jul/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-jul/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-jul/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -6,7 +6,7 @@
<version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam</groupId>
+
<artifactId>jboss-seam-jul</artifactId>
<name>Seam JUL</name>
Modified: branches/community/Seam_2_3/jboss-seam-mail/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -6,7 +6,7 @@
<version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam</groupId>
+
<artifactId>jboss-seam-mail</artifactId>
<name>Seam Mail</name>
@@ -22,8 +22,8 @@
<artifactId>jboss-seam-ui</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
<dependency>
@@ -49,8 +49,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -60,6 +60,7 @@
<classifier>jdk15</classifier>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -40,20 +40,16 @@
<!-- Version string properties -->
<version.arquillian_core>1.0.0.CR7</version.arquillian_core>
- <version.richfaces>4.1.0.Final</version.richfaces>
<version.wicket>1.4.14</version.wicket>
<version.drools>5.1.1</version.drools>
<version.testng>5.10</version.testng>
- <version.resteasy>2.0-beta-2</version.resteasy>
- <version.spring>2.5.6.SEC02</version.spring>
+ <version.resteasy>2.0.1.GA</version.resteasy>
+ <version.spring>2.5.6.SEC03</version.spring>
<version.jbossembedded>beta3.SP15</version.jbossembedded>
- <version.jbossas7>7.1.0.Final</version.jbossas7>
+ <version.jbossas7>7.1.1.Final</version.jbossas7>
<version.emma>2.0.5312</version.emma>
- <version.jsf2>2.1.5</version.jsf2>
+ <version.jsf2>2.1.7</version.jsf2>
<version.junit>4.8.2</version.junit>
- <version.hibernatevalidator>4.2.0.Final</version.hibernatevalidator>
- <version.hibernatesearch>4.0.0.Final</version.hibernatesearch>
- <version.hcore>4.0.1.Final</version.hcore>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
@@ -70,6 +66,14 @@
<dependencies>
<dependency>
+ <groupId>org.jboss.bom</groupId>
+ <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
+ <version>1.0.0.M6</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>${version.arquillian_core}</version>
@@ -77,6 +81,7 @@
<scope>import</scope>
</dependency>
+ <!-- All Seam modules -->
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>distribution</artifactId>
@@ -89,7 +94,6 @@
<version>${project.version}</version>
</dependency>
- <!-- All Seam modules -->
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
@@ -137,13 +141,8 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
@@ -180,19 +179,8 @@
<version>${project.version}</version>
</dependency>
+ <!-- thirdparty dependencies -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- </dependency>
-
- <dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6</version>
@@ -217,18 +205,6 @@
<version>1.7.0</version>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.richfaces.core</groupId> -->
-<!-- <artifactId>richfaces-core-api</artifactId> -->
-<!-- <version>${version.richfaces}</version> -->
-<!-- </dependency> -->
-
-<!-- <dependency> -->
-<!-- <groupId>org.richfaces.core</groupId> -->
-<!-- <artifactId>richfaces-core-impl</artifactId> -->
-<!-- <version>${version.richfaces}</version> -->
-<!-- </dependency> -->
-
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
@@ -369,37 +345,6 @@
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${version.hcore}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${version.hcore}</version>
-
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>${version.hibernatevalidator}</version>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>${version.hibernatesearch}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
@@ -416,18 +361,6 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.1</version>
@@ -449,22 +382,10 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1-jbossorg-1</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-system</artifactId>
- <version>4.2.3.GA</version>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>1.0.0.CR8</version>
<exclusions>
@@ -511,12 +432,19 @@
</exclusions>
</dependency>
+ <!-- these 2 dependencies are for jboss-seam functionality -->
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-jmx</artifactId>
<version>4.2.3.GA</version>
</dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>4.2.3.GA</version>
+ </dependency>
+
<!-- Excel export module dependency -->
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
@@ -579,64 +507,18 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <version>3.0</version>
- </dependency>
-
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
<version>1.3</version>
</dependency>
<dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>1.5.4</version>
@@ -801,18 +683,6 @@
</dependency>
<dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- <version>1.1.3.4.O</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
<version>1.0_02.CR6</version>
@@ -861,55 +731,13 @@
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>jboss.jboss-aop</groupId>
<artifactId>jboss-aop</artifactId>
<version>1.5.0.GA</version>
</dependency>
-
+-->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>2.0.0.Beta11</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- <version>2.0.4.GA</version>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>2.0.4.GA</version>
- <exclusions>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-slide</groupId>
- <artifactId>webdavlib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>com.adobe.blazeds</groupId>
<artifactId>blazeds-common</artifactId>
<version>3.2.0.3978</version>
@@ -992,17 +820,6 @@
<artifactId>openid4java-consumer</artifactId>
<version>0.9.6</version>
<type>pom</type>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -1029,7 +846,6 @@
</exclusions>
</dependency>
-
<dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
@@ -1163,7 +979,7 @@
</dependency>
<dependency>
- <groupId>oswego-concurrent</groupId>
+ <groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4</version>
</dependency>
@@ -1307,15 +1123,9 @@
<artifactId>functional-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.1</version>
@@ -1331,45 +1141,9 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.icefaces</groupId>
- <artifactId>icefaces</artifactId>
- <version>1.8.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.icefaces</groupId>
- <artifactId>icefaces-comps</artifactId>
- <version>1.8.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.icefaces</groupId>
- <artifactId>icefaces-facelets</artifactId>
- <version>1.8.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>1.2.5</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>1.2.5</version>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.1</version>
@@ -1379,45 +1153,13 @@
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.metawidget</groupId>
- <artifactId>metawidget-backend</artifactId>
- <version>0.95</version>
- </dependency>
-
- <dependency>
- <groupId>org.metawidget</groupId>
- <artifactId>metawidget-frontend</artifactId>
- <version>0.95</version>
- </dependency>
-
- <dependency>
- <groupId>org.metawidget</groupId>
- <artifactId>metawidget</artifactId>
- <version>0.95</version>
- </dependency>
-
- <dependency>
<groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.jsf2}</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>${version.jsf2}</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Final</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.jboss.as</groupId>
Modified: branches/community/Seam_2_3/jboss-seam-pdf/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -7,7 +7,6 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-pdf</artifactId>
<name>Seam PDF</name>
@@ -34,14 +33,14 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -49,9 +48,10 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
</dependency>
+
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/jboss-seam-remoting/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -6,7 +6,7 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam</groupId>
+
<artifactId>jboss-seam-remoting</artifactId>
<name>Seam Remoting</name>
@@ -50,14 +50,14 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -68,17 +68,20 @@
<classifier>jdk15</classifier>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<type>jar</type>
</dependency>
+
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
<type>jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
Modified: branches/community/Seam_2_3/jboss-seam-resteasy/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-resteasy/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-resteasy/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -38,15 +38,15 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -59,6 +59,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
<optional>true</optional>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam-rss/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -7,7 +7,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-rss</artifactId>
<name>Seam RSS</name>
@@ -24,12 +23,6 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
@@ -41,19 +34,20 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -8,11 +8,11 @@
</parent>
<artifactId>jboss-seam-ui</artifactId>
<name>Seam UI JSF2 support</name>
-
+
<properties>
<version.richfaces>3.3.3.Final</version.richfaces>
</properties>
-
+
<build>
<!-- <finalName>jboss-seam-ui</finalName> -->
<plugins>
@@ -51,15 +51,15 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
<optional>true</optional>
<scope>provided</scope>
</dependency>
@@ -103,17 +103,15 @@
</dependency>
<dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
-<!-- <version>2.1.5</version> -->
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<scope>provided</scope>
-<!-- <version>2.1.5</version> -->
</dependency>
@@ -132,12 +130,13 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -146,21 +145,10 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
-<!-- This prepared RF dependencies for Full suport of Richfaces 4.x with CDK templating -->
-<!-- <dependency> -->
-<!-- <groupId>org.richfaces.core</groupId> -->
-<!-- <artifactId>richfaces-core-api</artifactId> -->
-<!-- <optional>true</optional> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.richfaces.core</groupId> -->
-<!-- <artifactId>richfaces-core-impl</artifactId> -->
-<!-- <optional>true</optional> -->
-<!-- </dependency> -->
-
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
<optional>true</optional>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam-wicket/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-wicket/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/jboss-seam-wicket/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -7,7 +7,6 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-wicket</artifactId>
<name>Seam Wicket</name>
@@ -60,8 +59,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -72,14 +71,14 @@
</dependency>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -7,12 +7,9 @@
<version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam</groupId>
+
<artifactId>seam-integration-tests</artifactId>
<name>Seam Integration Tests</name>
-
- <properties>
- </properties>
<build>
<testResources>
@@ -78,6 +75,31 @@
<artifactId>javassist</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
@@ -104,13 +126,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
@@ -125,6 +140,11 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
</dependencies>
<profiles>
Modified: branches/community/Seam_2_3/seam-reference-guide/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-reference-guide/pom.xml 2012-04-02 19:54:24 UTC (rev 14476)
+++ branches/community/Seam_2_3/seam-reference-guide/pom.xml 2012-04-02 22:43:26 UTC (rev 14477)
@@ -6,9 +6,8 @@
<version>2.3.0.Beta2-SNAPSHOT</version>
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam</groupId>
+
<artifactId>seam-reference-guide</artifactId>
- <version>2.3.0.Beta2-SNAPSHOT</version>
<name>Seam Reference Guide</name>
<packaging>jar</packaging>
More information about the seam-commits
mailing list