[seam-commits] Seam SVN: r14392 - in branches/community/Seam_2_3: examples and 31 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Wed Mar 14 13:41:04 EDT 2012
Author: manaRH
Date: 2012-03-14 13:41:01 -0400 (Wed, 14 Mar 2012)
New Revision: 14392
Removed:
branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java
Modified:
branches/community/Seam_2_3/distribution/pom.xml
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/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/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-gen/pom.xml
branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java
branches/community/Seam_2_3/jboss-seam-mail/pom.xml
branches/community/Seam_2_3/jboss-seam-mail/src/test/java/org/jboss/seam/test/unit/MailTest.java
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-remoting/src/main/java/org/jboss/seam/remoting/wrapper/BagWrapper.java
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/src/main/java/org/jboss/seam/wicket/ModelValidator.java
branches/community/Seam_2_3/jboss-seam/pom.xml
branches/community/Seam_2_3/seam-integration-tests/pom.xml
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
Log:
refactored ee6 artifacts into standard Seam modules
refactored ee6 artifacts into standard Seam modules
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/distribution/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -26,8 +26,7 @@
<configuration>
<finalName>jboss-seam-${project.version}</finalName>
<descriptors>
- <!-- Assembly is controlled by profile for jsf2 and jsf12 -->
- <descriptor>src/main/assembly/${assembly-config}</descriptor>
+ <descriptor>src/main/assembly/dist.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
@@ -264,67 +263,25 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>examples</artifactId>
+ <classifier>project</classifier>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>jsf2</id>
- <properties>
- <assembly-config>dist-jsf2.xml</assembly-config>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug-jsf2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>examples-ee6</artifactId>
- <classifier>project</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>jsf12</id>
- <properties>
- <assembly-config>dist-jsf12.xml</assembly-config>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>examples</artifactId>
- <classifier>project</classifier>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- </dependencies>
- </profile>
-
-</profiles>
-
</project>
Modified: branches/community/Seam_2_3/examples/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -146,19 +146,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>${jsf.version}</version>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
<exclusions>
@@ -126,7 +126,7 @@
</ejbModule>
<ejbModule>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<bundleFileName>jboss-seam.jar</bundleFileName>
</ejbModule>
</modules>
@@ -135,7 +135,7 @@
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.1.0.CR1b</version>
+ <version>7.1.0.Final</version>
<executions>
<!-- This requires to be enabled manually as <enabled>true</enabled> doesn't
work -->
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
</dependency>
<dependency>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>test</scope>
</dependency>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <artifactId>jboss-seam-ui</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.seam</groupId>
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug-jsf2</artifactId>
+ <artifactId>jboss-seam-debug</artifactId>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
<exclusions>
@@ -76,7 +76,7 @@
<modules>
<ejbModule>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<bundleFileName>jboss-seam.jar</bundleFileName>
</ejbModule>
<webModule>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
</dependency>
<dependency>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>test</scope>
</dependency>
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <artifactId>jboss-seam-ui</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
</dependency>
<dependency>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <artifactId>jboss-seam-ui</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.seam</groupId>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug-jsf2</artifactId>
+ <artifactId>jboss-seam-debug</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -150,7 +150,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
<exclusions>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>compile</scope>
<exclusions>
@@ -74,7 +74,7 @@
</ejbModule>
<ejbModule>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<bundleFileName>jboss-seam.jar</bundleFileName>
</ejbModule>
</modules>
@@ -83,7 +83,7 @@
<plugin>
<groupId>org.jboss.as.plugins</groupId>
<artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.1.0.CR1b</version>
+ <version>7.1.0.Final</version>
<executions>
<!-- This requires to be enabled manually as <enabled>true</enabled> doesn't
work -->
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
</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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>test</scope>
</dependency>
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-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <artifactId>jboss-seam-ui</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.seam</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<version>${project.version}</version>
<type>ejb</type>
<scope>provided</scope>
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -9,7 +9,7 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<packaging>ejb</packaging>
<name>Seam Core JSF2</name>
<description>Seam core module for Seam framework integrated with JSF2</description>
Modified: branches/community/Seam_2_3/jboss-seam-debug/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -6,18 +6,30 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-seam-debug-jsf2</artifactId>
+ <artifactId>jboss-seam-debug</artifactId>
<name>Seam Debug for JSF2</name>
<dependencies>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
</dependency>
-
+
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
@@ -28,11 +40,6 @@
<artifactId>el-api</artifactId>
<scope>provided</scope>
</dependency>
-
-<!-- <dependency> -->
-<!-- <groupId>org.jboss.seam</groupId> -->
-<!-- <artifactId>jboss-seam-debug</artifactId> -->
-<!-- </dependency> -->
</dependencies>
<profiles>
@@ -78,25 +85,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jsf2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: branches/community/Seam_2_3/jboss-seam-excel/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -13,6 +13,21 @@
<name>Seam Excel</name>
<dependencies>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
@@ -107,53 +122,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jsf12</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf2</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: branches/community/Seam_2_3/jboss-seam-flex/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-flex/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-flex/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -91,43 +91,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jsf12</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>jsf2</id>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: branches/community/Seam_2_3/jboss-seam-gen/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -68,7 +68,7 @@
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.richfaces.samples</groupId>
<artifactId>darkX</artifactId>
<scope>runtime</scope>
@@ -166,7 +166,7 @@
</exclusion>
</exclusions>
</dependency>
-
+ -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
Modified: branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java 2012-03-14 17:41:01 UTC (rev 14392)
@@ -193,7 +193,7 @@
List<Class> interfaces = new ArrayList<Class>(Arrays.asList(ClassUtils
.getAllInterfaces(session)));
//Have to bend Session implementation since HiberanteSessionProxy doesn't implement classic.Session.
- interfaces.add(org.hibernate.classic.Session.class);
+ interfaces.add(Session.class);
return Proxy.newProxyInstance(this.getClass().getClassLoader(), interfaces
.toArray(new Class[interfaces.size()]), new SeamManagedSessionHandler(
(SessionFactory) proxy, session));
@@ -215,8 +215,8 @@
}
try
{
- if(method.getDeclaringClass().equals(org.hibernate.classic.Session.class) &&
- !(delegate instanceof org.hibernate.classic.Session)) {
+ if(method.getDeclaringClass().equals(Session.class) &&
+ !(delegate instanceof Session)) {
throw new UnsupportedOperationException("Unable to execute method: "+method.toString()+" Seam managed session does not support classic.Session methods.");
}
return method.invoke(delegate, args);
Modified: branches/community/Seam_2_3/jboss-seam-mail/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -19,6 +19,15 @@
<dependency>
<groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-pdf</artifactId>
<optional>true</optional>
<exclusions>
@@ -51,6 +60,10 @@
<classifier>jdk15</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </dependency>
</dependencies>
<profiles>
@@ -104,44 +117,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jsf12</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>jsf2</id>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: branches/community/Seam_2_3/jboss-seam-mail/src/test/java/org/jboss/seam/test/unit/MailTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-mail/src/test/java/org/jboss/seam/test/unit/MailTest.java 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-mail/src/test/java/org/jboss/seam/test/unit/MailTest.java 2012-03-14 17:41:01 UTC (rev 14392)
@@ -1,13 +1,10 @@
package org.jboss.seam.test.unit;
-import java.util.ArrayList;
-
import javax.mail.NoSuchProviderException;
import javax.mail.Session;
import javax.naming.NamingException;
import org.jboss.seam.mail.MailSession;
-import org.jboss.seam.mail.MeldwareUser;
import org.testng.annotations.Test;
import com.sun.mail.smtp.SMTPSSLTransport;
@@ -367,7 +364,7 @@
assert failure;
}
- @Test
+ /*@Test
public void testMeldwareUser()
{
MeldwareUser meldwareUser = new MeldwareUser();
@@ -394,7 +391,7 @@
assert meldwareUser.getRoles().contains("calendaruser");
assert meldwareUser.getRoles().contains("adminuser");
- }
+ }*/
// TODO Write tests for Meldware
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -40,7 +40,7 @@
<!-- Version string properties -->
<version.arquillian_core>1.0.0.CR7</version.arquillian_core>
- <version.richfaces>3.3.3.Final</version.richfaces>
+ <version.richfaces>4.1.0.Final</version.richfaces>
<version.wicket>1.4.14</version.wicket>
<version.drools>5.0.1</version.drools>
<version.testng>5.10</version.testng>
@@ -49,9 +49,10 @@
<version.jbossembedded>beta3.SP15</version.jbossembedded>
<version.jbossas7>7.1.0.Final</version.jbossas7>
<version.emma>2.0.5312</version.emma>
- <version.jsf12>1.2_12</version.jsf12>
<version.jsf2>2.1.5</version.jsf2>
- <version.junit>4.8.1</version.junit>
+ <version.junit>4.8.2</version.junit>
+ <version.hibernatevalidator>4.2.0.Final</version.hibernatevalidator>
+ <version.hcore>4.0.1.Final</version.hcore>
<!-- ***************** -->
<!-- Repository Deployment URLs -->
@@ -143,30 +144,16 @@
</exclusion>
</exclusions>
</dependency>
+<<<<<<< HEAD
+
+=======
+>>>>>>> 28045d7... refactored ee6 artifacts into standard Seam modules
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</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>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug-jsf2</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -235,64 +222,19 @@
<version>1.7.0</version>
</dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>${version.richfaces}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.richfaces.core</groupId> -->
+<!-- <artifactId>richfaces-core-api</artifactId> -->
+<!-- <version>${version.richfaces}</version> -->
+<!-- </dependency> -->
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${version.richfaces}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+<!-- <dependency> -->
+<!-- <groupId>org.richfaces.core</groupId> -->
+<!-- <artifactId>richfaces-core-impl</artifactId> -->
+<!-- <version>${version.richfaces}</version> -->
+<!-- </dependency> -->
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>${version.richfaces}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </exclusion>
-
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-jpdl</artifactId>
<version>3.2.2</version>
@@ -434,81 +376,20 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.3.1.GA</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>${version.hcore}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
+ <version>${version.hcore}</version>
+
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>3.1.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
+ <version>${version.hibernatevalidator}</version>
</dependency>
<dependency>
@@ -518,12 +399,6 @@
</dependency>
<dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.15.B1</version>
- </dependency>
-
- <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>1.0</version>
@@ -859,18 +734,6 @@
</dependency>
<dependency>
- <groupId>org.buni.meldware</groupId>
- <artifactId>meldware-mailjmx</artifactId>
- <version>1.0M8</version>
- </dependency>
-
- <dependency>
- <groupId>org.buni.meldware</groupId>
- <artifactId>meldware-mailapi</artifactId>
- <version>1.0M8</version>
- </dependency>
-
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<version>${version.drools}</version>
@@ -999,7 +862,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2</version>
</dependency>
@@ -1542,31 +1405,6 @@
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.jsf12}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${version.jsf12}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>${version.jsf2}</version>
@@ -1579,13 +1417,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
<groupId>org.jboss.spec</groupId>
<artifactId>jboss-javaee-6.0</artifactId>
<version>1.0.0.Final</version>
@@ -1671,13 +1502,6 @@
<source>${java.compiler.version}</source>
<target>${java.compiler.version}</target>
</configuration>
- <dependencies>
-<!-- <dependency> -->
-<!-- <groupId>org.codehaus.plexus</groupId> -->
-<!-- <artifactId>plexus-compiler-eclipse</artifactId> -->
-<!-- <version>1.8.2</version> -->
-<!-- </dependency> -->
- </dependencies>
</plugin>
<plugin>
@@ -1821,6 +1645,9 @@
</build>
<modules>
+ <module>../jboss-seam</module>
+ <module>../jboss-seam-ui</module>
+ <module>../jboss-seam-debug</module>
<module>../jboss-seam-gen</module>
<module>../jboss-seam-excel</module>
<module>../jboss-seam-flex</module>
@@ -1834,6 +1661,8 @@
<module>../jboss-seam-jul</module>
<module>../jboss-embedded-bootstrap</module>
<module>../functional-tests</module>
+ <module>../examples-ee6</module>
+ <module>../seam-integration-tests</module>
</modules>
<profiles>
@@ -1874,29 +1703,6 @@
</profile>
<profile>
- <id>jsf12</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../jboss-seam</module>
- <module>../jboss-seam-ui</module>
- <module>../jboss-seam-debug</module>
- <module>../examples</module>
- <module>../seam-integration-tests</module>
- </modules>
- </profile>
- <profile>
- <id>jsf2</id>
- <modules>
- <module>../jboss-seam-jsf2</module>
- <module>../jboss-seam-ui-jsf2</module>
- <module>../jboss-seam-debug-jsf2</module>
- <module>../examples-ee6</module>
- <module>../seam-integration-tests-ee6</module>
- </modules>
- </profile>
- <profile>
<id>code-coverage</id>
<activation>
<property>
@@ -1938,7 +1744,6 @@
</executions>
</plugin>
<plugin>
-
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Modified: branches/community/Seam_2_3/jboss-seam-pdf/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -44,6 +44,15 @@
<artifactId>el-api</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
</dependencies>
<profiles>
@@ -89,44 +98,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jsf12</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>jsf2</id>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
Modified: branches/community/Seam_2_3/jboss-seam-remoting/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -84,6 +84,12 @@
<artifactId>jboss-el</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ </dependency>
</dependencies>
<profiles>
@@ -137,36 +143,7 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jsf12</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
-
- </dependencies>
-
- </profile>
- <profile>
- <id>jsf2</id>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- </dependency>
-
- </dependencies>
-
- </profile>
</profiles>
</project>
Modified: branches/community/Seam_2_3/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/wrapper/BagWrapper.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/wrapper/BagWrapper.java 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/wrapper/BagWrapper.java 2012-03-14 17:41:01 UTC (rev 14392)
@@ -14,7 +14,7 @@
import java.util.Set;
import org.dom4j.Element;
-import org.hibernate.collection.PersistentCollection;
+import org.hibernate.collection.spi.PersistentCollection;
/**
* Wrapper for collections, arrays, etc.
Modified: branches/community/Seam_2_3/jboss-seam-rss/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -35,6 +35,11 @@
<type>ejb</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -46,6 +51,10 @@
<artifactId>el-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
</dependencies>
<profiles>
@@ -91,44 +100,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jsf12</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>jsf2</id>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -6,16 +6,20 @@
<version>2.3.0.Beta1-SNAPSHOT</version>
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <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>
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>${version.richfaces}</version>
+ <version>3.3.3.Final</version>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -84,7 +88,7 @@
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
+ <artifactId>jboss-seam</artifactId>
<type>ejb</type>
</dependency>
@@ -99,33 +103,36 @@
<optional>true</optional>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
+ <version>${version.richfaces}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
+ <version>${version.richfaces}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
+ <version>${version.richfaces}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+<!-- <version>2.1.5</version> -->
+ </dependency>
+
<dependency>
<groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</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> -->
@@ -148,7 +155,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<optional>true</optional>
- <version>4.0.1.Final</version>
</dependency>
<dependency>
@@ -162,12 +168,22 @@
<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>
<optional>true</optional>
- <version>4.2.0.Final</version>
</dependency>
<dependency>
Deleted: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java 2012-03-14 17:41:01 UTC (rev 14392)
@@ -1,27 +0,0 @@
-package org.jboss.seam.ui.filter;
-
-import static org.jboss.seam.annotations.Install.FRAMEWORK;
-
-import javax.servlet.Filter;
-
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Unwrap;
-import org.jboss.seam.annotations.intercept.BypassInterceptors;
-
- at Name("org.jboss.seam.web.ajax4jsfFilterInstantiator")
- at Install(precedence = FRAMEWORK, classDependencies={"org.ajax4jsf.Filter", "org.apache.commons.digester.Digester"})
- at BypassInterceptors
- at Scope(ScopeType.STATELESS)
-public class Ajax4jsfFilterInstantiator
-{
-
- @Unwrap
- public Filter create()
- {
- return new org.ajax4jsf.Filter();
- }
-
-}
Modified: branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/ModelValidator.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/ModelValidator.java 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/ModelValidator.java 2012-03-14 17:41:01 UTC (rev 14392)
@@ -1,13 +1,15 @@
package org.jboss.seam.wicket;
+import java.util.Set;
+
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidationError;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
-import org.hibernate.validator.ClassValidator;
-import org.hibernate.validator.InvalidValue;
+import org.jboss.seam.core.ClassValidator;
import org.jboss.seam.core.Validators;
+import javax.validation.ConstraintViolation;
/**
@@ -20,7 +22,7 @@
public class ModelValidator implements IValidator
{
- private Class clazz;
+ private Class<?> clazz;
private String property;
/**
@@ -47,11 +49,13 @@
*/
public void validate(IValidatable validatable)
{
- ClassValidator classValidator = Validators.instance().getValidator(clazz);
- InvalidValue[] invalidValues = classValidator.getPotentialInvalidValues(property, validatable.getValue());
- if (invalidValues.length > 0)
+ ClassValidator<?> classValidator = Validators.instance().getValidator(clazz);
+ Set<?> invalidValues = classValidator.getPotentialInvalidValues(property, validatable.getValue());
+
+ if (invalidValues.size() > 0)
{
- String message = invalidValues[0].getMessage();
+ ConstraintViolation constraintViolation = (ConstraintViolation) invalidValues.iterator().next();
+ String message = constraintViolation.getMessage();
IValidationError validationError = new ValidationError().setMessage(message);
validatable.error(validationError);
}
Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392)
@@ -8,7 +8,7 @@
<relativePath>../jboss-seam-parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.seam</groupId>
- <artifactId>seam-integration-tests-ee6</artifactId>
+ <artifactId>seam-integration-tests</artifactId>
<name>Seam Integration Tests</name>
<properties>
@@ -110,6 +110,21 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ <exclusions>
+ <exclusion>
+ <artifactId>testng</artifactId>
+ <groupId>org.testng</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
</dependencies>
<profiles>
@@ -150,7 +165,7 @@
<configuration>
<sourceSets>
<sourceSet>
- <directory>${basedir}/../jboss-seam-jsf2/src/main/java</directory>
+ <directory>${basedir}/../jboss-seam/src/main/java</directory>
<directory>${basedir}/../jboss-seam-debug/src/main/java</directory>
<directory>${basedir}/../jboss-seam-excel/src/main/java</directory>
<directory>${basedir}/../jboss-seam-flex/src/main/java</directory>
@@ -174,54 +189,9 @@
</build>
</profile>
<profile>
- <id>jsf2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <version>${project.version}</version>
-
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </dependency>
-
- </dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
- </profile>
-
- <profile>
<id>integration-test</id>
<activation>
- <activeByDefault>true</activeByDefault>
+<!-- <activeByDefault>true</activeByDefault> -->
<property>
<name>arquillian</name>
</property>
@@ -261,7 +231,7 @@
<profile>
<id>arq-jbossas-7-managed</id>
<activation>
- <activeByDefault>true</activeByDefault>
+<!-- <activeByDefault>true</activeByDefault> -->
<property>
<name>arquillian</name>
<value>jbossas-managed-7</value>
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-14 17:39:25 UTC (rev 14391)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-14 17:41:01 UTC (rev 14392)
@@ -35,7 +35,7 @@
.addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class)
.configureFrom("pom.xml")
.goOffline()
- .artifact("org.jboss.seam:jboss-seam-jsf2:2.3.0-SNAPSHOT")
+ .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta1-SNAPSHOT")
.resolveAsFiles());
}
@@ -72,7 +72,7 @@
.addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class)
.configureFrom("pom.xml")
.goOffline()
- .artifact("org.jboss.seam:jboss-seam-jsf2:2.3.0-SNAPSHOT")
+ .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta1-SNAPSHOT")
.artifact("org.jbpm.jbpm3:jbpm-jpdl:3.2.10.SP3-seam2")
.exclusion("org.hibernate:hibernate-core")
.resolveAsFiles());
More information about the seam-commits
mailing list