[seam-commits] Seam SVN: r14252 - in branches/community/Seam_2_3: jboss-seam-debug-jsf2 and 4 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri Dec 16 04:18:19 EST 2011
Author: manaRH
Date: 2011-12-16 04:18:18 -0500 (Fri, 16 Dec 2011)
New Revision: 14252
Modified:
branches/community/Seam_2_3/jboss-seam-debug-jsf2/pom.xml
branches/community/Seam_2_3/jboss-seam-excel/pom.xml
branches/community/Seam_2_3/jboss-seam-jsf2/pom.xml
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
branches/community/Seam_2_3/jboss-seam-remoting/pom.xml
branches/community/Seam_2_3/jboss-seam/pom.xml
Log:
JBSEAM-4722 fixing jsf2 profile build
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2011-12-15 22:23:53 UTC (rev 14251)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2011-12-16 09:18:18 UTC (rev 14252)
@@ -62,9 +62,9 @@
<version>1.6</version>
<configuration>
<target>
- <jar destfile="${project.build.directory}/jboss-seam-wls-compatible.jar">
+ <jar destfile="${project.build.directory}/${project.artifactId}-wls-compatible.jar">
<zipfileset includes="**/*"
- excludes="org/jboss/seam/async/TimerServiceDispatcher*" src="${project.build.directory}/jboss-seam.jar" />
+ excludes="org/jboss/seam/async/TimerServiceDispatcher*" src="${project.build.directory}/${project.artifactId}.jar" />
<manifest>
<attribute name="Built-By" value="${user.name}" />
<attribute name="Implementation-Vendor" value="${project.organization.name}" />
@@ -73,9 +73,9 @@
</manifest>
</jar>
<jar
- destfile="${project.build.directory}/jboss-seam-wls-compatible-sources.jar">
+ destfile="${project.build.directory}/${project.artifactId}-wls-compatible-sources.jar">
<zipfileset includes="**/*"
- excludes="org/jboss/seam/async/TimerServiceDispatcher.java" src="${project.build.directory}/jboss-seam-sources.jar" />
+ excludes="org/jboss/seam/async/TimerServiceDispatcher.java" src="${project.build.directory}/${project.artifactId}-sources.jar" />
<manifest>
<attribute name="Built-By" value="${user.name}" />
<attribute name="Implementation-Vendor" value="${project.organization.name}" />
Modified: branches/community/Seam_2_3/jboss-seam-debug-jsf2/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-debug-jsf2/pom.xml 2011-12-15 22:23:53 UTC (rev 14251)
+++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/pom.xml 2011-12-16 09:18:18 UTC (rev 14252)
@@ -80,6 +80,9 @@
</profile>
<profile>
<id>jsf2</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<dependencies>
<dependency>
<groupId>com.sun.faces</groupId>
Modified: branches/community/Seam_2_3/jboss-seam-excel/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2011-12-15 22:23:53 UTC (rev 14251)
+++ branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2011-12-16 09:18:18 UTC (rev 14252)
@@ -25,10 +25,9 @@
</dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -129,17 +128,27 @@
<artifactId>jboss-seam-ui</artifactId>
</dependency>
- </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>
+
+ <dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui-jsf2</artifactId>
Modified: branches/community/Seam_2_3/jboss-seam-jsf2/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-jsf2/pom.xml 2011-12-15 22:23:53 UTC (rev 14251)
+++ branches/community/Seam_2_3/jboss-seam-jsf2/pom.xml 2011-12-16 09:18:18 UTC (rev 14252)
@@ -62,9 +62,9 @@
<version>1.6</version>
<configuration>
<target>
- <jar destfile="${project.build.directory}/jboss-seam-wls-compatible.jar">
+ <jar destfile="${project.build.directory}/${project.artifactId}-wls-compatible.jar">
<zipfileset includes="**/*"
- excludes="org/jboss/seam/async/TimerServiceDispatcher*" src="${project.build.directory}/jboss-seam.jar" />
+ excludes="org/jboss/seam/async/TimerServiceDispatcher*" src="${project.build.directory}/${project.artifactId}.jar" />
<manifest>
<attribute name="Built-By" value="${user.name}" />
<attribute name="Implementation-Vendor" value="${project.organization.name}" />
@@ -73,9 +73,9 @@
</manifest>
</jar>
<jar
- destfile="${project.build.directory}/jboss-seam-wls-compatible-sources.jar">
+ destfile="${project.build.directory}/${project.artifactId}-wls-compatible-sources.jar">
<zipfileset includes="**/*"
- excludes="org/jboss/seam/async/TimerServiceDispatcher.java" src="${project.build.directory}/jboss-seam-sources.jar" />
+ excludes="org/jboss/seam/async/TimerServiceDispatcher.java" src="${project.build.directory}/${project.artifactId}-sources.jar" />
<manifest>
<attribute name="Built-By" value="${user.name}" />
<attribute name="Implementation-Vendor" value="${project.organization.name}" />
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-12-15 22:23:53 UTC (rev 14251)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-12-16 09:18:18 UTC (rev 14252)
@@ -1804,7 +1804,6 @@
<module>../jboss-seam-wicket</module>
<module>../jboss-seam-ioc</module>
<module>../jboss-seam-jul</module>
- <module>../jboss-seam</module>
<module>../jboss-embedded-bootstrap</module>
<module>../seam-integration-tests</module>
<module>../functional-tests</module>
@@ -1851,10 +1850,11 @@
</profile>
<profile>
<id>jsf12</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+<!-- <activation> -->
+<!-- <activeByDefault>true</activeByDefault> -->
+<!-- </activation> -->
<modules>
+ <module>../jboss-seam</module>
<module>../jboss-seam-ui</module>
<module>../jboss-seam-debug</module>
</modules>
@@ -1915,9 +1915,15 @@
<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>
- <artifactId>jboss-seam</artifactId>
+ <artifactId>jboss-seam-jsf2</artifactId>
<version>${project.version}</version>
<type>ejb</type>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam-remoting/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2011-12-15 22:23:53 UTC (rev 14251)
+++ branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2011-12-16 09:18:18 UTC (rev 14252)
@@ -33,12 +33,6 @@
<dependencies>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
-
- <dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<optional>true</optional>
@@ -85,6 +79,11 @@
<type>jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
@@ -138,6 +137,33 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jsf12</id>
+ <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>
More information about the seam-commits
mailing list