Author: manaRH
Date: 2011-10-28 11:33:26 -0400 (Fri, 28 Oct 2011)
New Revision: 14237
Added:
branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml
branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml
Removed:
branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
Modified:
branches/community/Seam_2_3/distribution/pom.xml
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java
branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java
branches/community/Seam_2_3/jboss-seam-parent/pom.xml
Log:
created jsf2 distribution, changed jboss-debug-jsf2 for JSF2
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2011-10-19 21:34:20 UTC
(rev 14236)
+++ branches/community/Seam_2_3/distribution/pom.xml 2011-10-28 15:33:26 UTC
(rev 14237)
@@ -26,11 +26,11 @@
<configuration>
<finalName>jboss-seam-${project.version}</finalName>
<descriptors>
-
<descriptor>src/main/assembly/assembly.xml</descriptor>
+ <!-- Assembly is
controlled by profile for jsf2 and jsf12 -->
+
<descriptor>src/main/assembly/${assembly-config}</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
-
</execution>
</executions>
</plugin>
@@ -97,10 +97,6 @@
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-excel</artifactId>
</dependency>
<dependency>
@@ -137,10 +133,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-wicket</artifactId>
</dependency>
@@ -287,4 +279,42 @@
</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-debug-jsf2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui-jsf2</artifactId>
+ </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-debug</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+
<artifactId>jboss-seam-ui</artifactId>
+ </dependency>
+ </dependencies>
+
+ </profile>
+
+</profiles>
+
</project>
Deleted: branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
2011-10-19 21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml
2011-10-28 15:33:26 UTC (rev 14237)
@@ -1,287 +0,0 @@
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2
http://maven.apache.org/xsd/assembly-2.2.xsd";>
-
- <id>distribution</id>
- <formats>
-<!-- <format>dir</format> -->
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
-
- <!-- Add distribution files -->
- <fileSets>
-
- <!-- All module sources defined in dependencies except examples -->
- <fileSet>
- <directory>target/dependency</directory>
- <outputDirectory>src</outputDirectory>
- <excludes>
- <exclude>examples/</exclude>
- </excludes>
- </fileSet>
-
- <!-- Examples only -->
- <fileSet>
- <directory>target/dependency</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>examples/</include>
- </includes>
- <excludes>
- <exclude>examples/wiki/</exclude>
- </excludes>
- </fileSet>
-
- <!-- Distribution related files -->
- <fileSet>
- <directory>src/main/assembly</directory>
- <outputDirectory>.</outputDirectory>
- <includes>
- <include>readme.txt</include>
- <include>lgpl.txt</include>
- <include>copyright.txt</include>
- <include>changelog.txt</include>
- <include>seam21migration.txt</include>
- <include>seam2migration.txt</include>
- <include>clustering-howto.txt</include>
- <include>seam</include>
- <include>seam.bat</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../extras</directory>
- <outputDirectory>extras</outputDirectory>
- <includes>
- <include>mail-ra.rar</include>
- <include>jsUnit/**</include>
- <include>readme.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../jboss-seam/target</directory>
- <outputDirectory>lib/interop</outputDirectory>
- <includes>
- <include>jboss-seam-wls-compatible.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../jboss-seam/target</directory>
- <outputDirectory>lib/interop/src</outputDirectory>
- <includes>
- <include>jboss-seam-wls-compatible-sources.jar</include>
- </includes>
- </fileSet>
- <!-- all jars from jboss-seam module dependencies
- (done this way due needs to have all scopes except test there) -->
- <fileSet>
- <directory>../jar-dependencies</directory>
- <outputDirectory>./lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <dependencySets>
-
- <!-- some extra things Embedded bootstrap, extras etc. -->
- <dependencySet>
- <outputDirectory>.</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
-
<include>org.jboss.seam:jboss-embedded-bootstrap</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- <exclude>.settings/</exclude>
- <exclude>**/.settings/</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.project</exclude>
- <exclude>.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.classpath</exclude>
- </excludes>
- </unpackOptions>
-
<outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Add necessary sources jars -->
- <dependencySet>
- <outputDirectory>lib/src</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.seam:*:*:sources</include>
- </includes>
- <excludes>
- <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
- <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude>
- </excludes>
-
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Add jboss-seam jars into lib folder -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.seam:jboss-seam:ejb</include>
- <include>org.jboss.seam:jboss-seam-debug:jar</include>
- <include>org.jboss.seam:jboss-seam-ui:jar</include>
- <include>org.jboss.seam:jboss-seam-excel:jar</include>
- <include>org.jboss.seam:jboss-seam-pdf:jar</include>
- <include>org.jboss.seam:jboss-seam-mail:jar</include>
- <include>org.jboss.seam:jboss-seam-rss:jar</include>
- <include>org.jboss.seam:jboss-seam-resteasy:jar</include>
- <include>org.jboss.seam:jboss-seam-wicket:jar</include>
- <include>org.jboss.seam:jboss-seam-remoting:jar</include>
- <include>org.jboss.seam:jboss-seam-flex:jar</include>
- <include>org.jboss.seam:jboss-seam-ioc:jar</include>
- <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include>
- </includes>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Seam jul -->
- <dependencySet>
- <outputDirectory>lib/interop</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.seam:jboss-seam-jul:jar</include>
- </includes>
- <excludes>
- <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude>
- </excludes>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Seam jul sources -->
- <dependencySet>
- <outputDirectory>lib/interop/src</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.seam:jboss-seam-jul:jar:sources</include>
- </includes>
-
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Seam gen -->
- <dependencySet>
- <outputDirectory>lib/gen</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <useStrictFiltering>true</useStrictFiltering>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <includes>
- <include>org.jboss.seam:jboss-seam-gen:jar</include>
- <include>org.hibernate:hibernate-tools:jar</include>
- <include>org.beanshell:bsh:jar</include>
- <include>org.hibernate:jtidy:jar</include>
- <include>freemarker:freemarker:jar</include>
- <include>org.eclipse.core:runtime:jar</include>
- <include>org.eclipse.equinox:common:jar</include>
- <include>org.eclipse:text:jar</include>
- <include>org.richfaces.samples:darkX:jar</include>
- <include>org.richfaces.samples:laguna:jar</include>
- <include>org.richfaces.samples:glassX:jar</include>
- <include>org.apache.ant:ant:jar</include>
- <include>org.apache.ant:ant-launcher:jar</include>
- <include>org.apache.ant:ant-nodeps:jar</include>
- </includes>
- <excludes>
- <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude>
- </excludes>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>lib/gen/src</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.seam:jboss-seam-gen:*:sources</include>
- </includes>
-
<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>./seam-gen</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>**/.gitignore</exclude>
- </excludes>
- </unpackOptions>
- <includes>
- <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>lib/test</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.seam.embedded:hibernate-all:*</include>
- <include>org.jboss.seam.embedded:jboss-embedded-all:*</include>
- <include>org.jboss.seam.embedded:thirdparty-all:*</include>
- </includes>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Pull in docbook artifacts -->
- <dependencySet>
- <outputDirectory>doc/reference/</outputDirectory>
- <unpack>true</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.jboss.seam:seam-reference-guide</include>
- </includes>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/</exclude>
- </excludes>
- </unpackOptions>
-
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <!-- Add necessary javadoc jars -->
- <dependencySet>
- <outputDirectory>doc/api</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/</exclude>
- </excludes>
- </unpackOptions>
- <includes>
- <include>org.jboss.seam:jboss-seam:*:javadoc</include>
- </includes>
-
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>doc/ui/apidocs</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/</exclude>
- </excludes>
- </unpackOptions>
- <includes>
- <include>org.jboss.seam:jboss-seam-ui:*:javadoc</include>
- </includes>
-
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
-
- </dependencySets>
-</assembly>
Copied:
branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml (from
rev 14236,
branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml)
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml
(rev 0)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml
2011-10-28 15:33:26 UTC (rev 14237)
@@ -0,0 +1,287 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2
http://maven.apache.org/xsd/assembly-2.2.xsd";>
+
+ <id>distribution</id>
+ <formats>
+<!-- <format>dir</format> -->
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+
+ <!-- Add distribution files -->
+ <fileSets>
+
+ <!-- All module sources defined in dependencies except examples -->
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>src</outputDirectory>
+ <excludes>
+ <exclude>examples/</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Examples only -->
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>examples/</include>
+ </includes>
+ <excludes>
+ <exclude>examples/wiki/</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Distribution related files -->
+ <fileSet>
+ <directory>src/main/assembly</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ <include>copyright.txt</include>
+ <include>changelog.txt</include>
+ <include>seam21migration.txt</include>
+ <include>seam2migration.txt</include>
+ <include>clustering-howto.txt</include>
+ <include>seam</include>
+ <include>seam.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../extras</directory>
+ <outputDirectory>extras</outputDirectory>
+ <includes>
+ <include>mail-ra.rar</include>
+ <include>jsUnit/**</include>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-seam/target</directory>
+ <outputDirectory>lib/interop</outputDirectory>
+ <includes>
+ <include>jboss-seam-wls-compatible.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-seam/target</directory>
+ <outputDirectory>lib/interop/src</outputDirectory>
+ <includes>
+ <include>jboss-seam-wls-compatible-sources.jar</include>
+ </includes>
+ </fileSet>
+ <!-- all jars from jboss-seam module dependencies
+ (done this way due needs to have all scopes except test there) -->
+ <fileSet>
+ <directory>../jar-dependencies</directory>
+ <outputDirectory>./lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+
+ <!-- some extra things Embedded bootstrap, extras etc. -->
+ <dependencySet>
+ <outputDirectory>.</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+
<include>org.jboss.seam:jboss-embedded-bootstrap</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ <exclude>.settings/</exclude>
+ <exclude>**/.settings/</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.project</exclude>
+ <exclude>.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ </excludes>
+ </unpackOptions>
+
<outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add necessary sources jars -->
+ <dependencySet>
+ <outputDirectory>lib/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:*:*:sources</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
+ <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude>
+ </excludes>
+
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add jboss-seam jars into lib folder -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam:ejb</include>
+ <include>org.jboss.seam:jboss-seam-debug:jar</include>
+ <include>org.jboss.seam:jboss-seam-ui:jar</include>
+ <include>org.jboss.seam:jboss-seam-excel:jar</include>
+ <include>org.jboss.seam:jboss-seam-pdf:jar</include>
+ <include>org.jboss.seam:jboss-seam-mail:jar</include>
+ <include>org.jboss.seam:jboss-seam-rss:jar</include>
+ <include>org.jboss.seam:jboss-seam-resteasy:jar</include>
+ <include>org.jboss.seam:jboss-seam-wicket:jar</include>
+ <include>org.jboss.seam:jboss-seam-remoting:jar</include>
+ <include>org.jboss.seam:jboss-seam-flex:jar</include>
+ <include>org.jboss.seam:jboss-seam-ioc:jar</include>
+ <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam jul -->
+ <dependencySet>
+ <outputDirectory>lib/interop</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-jul:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude>
+ </excludes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam jul sources -->
+ <dependencySet>
+ <outputDirectory>lib/interop/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-jul:jar:sources</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam gen -->
+ <dependencySet>
+ <outputDirectory>lib/gen</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:jar</include>
+ <include>org.hibernate:hibernate-tools:jar</include>
+ <include>org.beanshell:bsh:jar</include>
+ <include>org.hibernate:jtidy:jar</include>
+ <include>freemarker:freemarker:jar</include>
+ <include>org.eclipse.core:runtime:jar</include>
+ <include>org.eclipse.equinox:common:jar</include>
+ <include>org.eclipse:text:jar</include>
+ <include>org.richfaces.samples:darkX:jar</include>
+ <include>org.richfaces.samples:laguna:jar</include>
+ <include>org.richfaces.samples:glassX:jar</include>
+ <include>org.apache.ant:ant:jar</include>
+ <include>org.apache.ant:ant-launcher:jar</include>
+ <include>org.apache.ant:ant-nodeps:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude>
+ </excludes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/gen/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:*:sources</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>./seam-gen</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/test</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.embedded:hibernate-all:*</include>
+ <include>org.jboss.seam.embedded:jboss-embedded-all:*</include>
+ <include>org.jboss.seam.embedded:thirdparty-all:*</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Pull in docbook artifacts -->
+ <dependencySet>
+ <outputDirectory>doc/reference/</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:seam-reference-guide</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add necessary javadoc jars -->
+ <dependencySet>
+ <outputDirectory>doc/api</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam:*:javadoc</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>doc/ui/apidocs</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-ui:*:javadoc</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ </dependencySets>
+</assembly>
Copied:
branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml (from
rev 14236,
branches/community/Seam_2_3/distribution/src/main/assembly/assembly.xml)
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml
(rev 0)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml
2011-10-28 15:33:26 UTC (rev 14237)
@@ -0,0 +1,287 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2
http://maven.apache.org/xsd/assembly-2.2.xsd";>
+
+ <id>distribution-jsf2</id>
+ <formats>
+<!-- <format>dir</format> -->
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+
+ <!-- Add distribution files -->
+ <fileSets>
+
+ <!-- All module sources defined in dependencies except examples -->
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>src</outputDirectory>
+ <excludes>
+ <exclude>examples/</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Examples only -->
+ <fileSet>
+ <directory>target/dependency</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>examples/</include>
+ </includes>
+ <excludes>
+ <exclude>examples/wiki/</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Distribution related files -->
+ <fileSet>
+ <directory>src/main/assembly</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ <include>copyright.txt</include>
+ <include>changelog.txt</include>
+ <include>seam21migration.txt</include>
+ <include>seam2migration.txt</include>
+ <include>clustering-howto.txt</include>
+ <include>seam</include>
+ <include>seam.bat</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../extras</directory>
+ <outputDirectory>extras</outputDirectory>
+ <includes>
+ <include>mail-ra.rar</include>
+ <include>jsUnit/**</include>
+ <include>readme.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-seam/target</directory>
+ <outputDirectory>lib/interop</outputDirectory>
+ <includes>
+ <include>jboss-seam-wls-compatible.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../jboss-seam/target</directory>
+ <outputDirectory>lib/interop/src</outputDirectory>
+ <includes>
+ <include>jboss-seam-wls-compatible-sources.jar</include>
+ </includes>
+ </fileSet>
+ <!-- all jars from jboss-seam module dependencies
+ (done this way due needs to have all scopes except test there) -->
+ <fileSet>
+ <directory>../jar-dependencies</directory>
+ <outputDirectory>./lib</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+
+ <!-- some extra things Embedded bootstrap, extras etc. -->
+ <dependencySet>
+ <outputDirectory>.</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+
<include>org.jboss.seam:jboss-embedded-bootstrap</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ <exclude>.settings/</exclude>
+ <exclude>**/.settings/</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.project</exclude>
+ <exclude>.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
+ </excludes>
+ </unpackOptions>
+
<outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add necessary sources jars -->
+ <dependencySet>
+ <outputDirectory>lib/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:*:*:sources</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
+ <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude>
+ </excludes>
+
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add jboss-seam jars into lib folder -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam:ejb</include>
+ <include>org.jboss.seam:jboss-seam-debug-jsf2:jar</include>
+ <include>org.jboss.seam:jboss-seam-ui-jsf2:jar</include>
+ <include>org.jboss.seam:jboss-seam-excel:jar</include>
+ <include>org.jboss.seam:jboss-seam-pdf:jar</include>
+ <include>org.jboss.seam:jboss-seam-mail:jar</include>
+ <include>org.jboss.seam:jboss-seam-rss:jar</include>
+ <include>org.jboss.seam:jboss-seam-resteasy:jar</include>
+ <include>org.jboss.seam:jboss-seam-wicket:jar</include>
+ <include>org.jboss.seam:jboss-seam-remoting:jar</include>
+ <include>org.jboss.seam:jboss-seam-flex:jar</include>
+ <include>org.jboss.seam:jboss-seam-ioc:jar</include>
+ <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam jul -->
+ <dependencySet>
+ <outputDirectory>lib/interop</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-jul:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude>
+ </excludes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam jul sources -->
+ <dependencySet>
+ <outputDirectory>lib/interop/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-jul:jar:sources</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Seam gen -->
+ <dependencySet>
+ <outputDirectory>lib/gen</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:jar</include>
+ <include>org.hibernate:hibernate-tools:jar</include>
+ <include>org.beanshell:bsh:jar</include>
+ <include>org.hibernate:jtidy:jar</include>
+ <include>freemarker:freemarker:jar</include>
+ <include>org.eclipse.core:runtime:jar</include>
+ <include>org.eclipse.equinox:common:jar</include>
+ <include>org.eclipse:text:jar</include>
+ <include>org.richfaces.samples:darkX:jar</include>
+ <include>org.richfaces.samples:laguna:jar</include>
+ <include>org.richfaces.samples:glassX:jar</include>
+ <include>org.apache.ant:ant:jar</include>
+ <include>org.apache.ant:ant-launcher:jar</include>
+ <include>org.apache.ant:ant-nodeps:jar</include>
+ </includes>
+ <excludes>
+ <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude>
+ </excludes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/gen/src</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:*:sources</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>./seam-gen</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/.gitignore</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib/test</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.embedded:hibernate-all:*</include>
+ <include>org.jboss.seam.embedded:jboss-embedded-all:*</include>
+ <include>org.jboss.seam.embedded:thirdparty-all:*</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Pull in docbook artifacts -->
+ <dependencySet>
+ <outputDirectory>doc/reference/</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam:seam-reference-guide</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <!-- Add necessary javadoc jars -->
+ <dependencySet>
+ <outputDirectory>doc/api</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam:*:javadoc</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>doc/ui/apidocs</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ <includes>
+ <include>org.jboss.seam:jboss-seam-ui:*:javadoc</include>
+ </includes>
+
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+
+ </dependencySets>
+</assembly>
Modified:
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java
===================================================================
---
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java
2011-10-19 21:34:20 UTC (rev 14236)
+++
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java
2011-10-28 15:33:26 UTC (rev 14237)
@@ -13,13 +13,13 @@
* completely initialized).
*/
public class StateWriterControl {
- final static String STATEWRITER_CLASS_NAME =
"com.sun.facelets.StateWriter";
+ final static String STATEWRITER_CLASS_NAME =
"com.sun.faces.facelets.StateWriter";
static Class getStateWriter() {
try {
return Class.forName(STATEWRITER_CLASS_NAME);
} catch (Exception e) {
- throw new RuntimeException("Could not load class
com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not load class
com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -30,7 +30,7 @@
constructor.setAccessible(true);
constructor.newInstance(writer, 1024);
} catch (Exception e) {
- throw new RuntimeException("Could not initilise
com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not initilise
com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -42,7 +42,7 @@
Writer w = (Writer) meth.invoke(null);
return writer.cloneWithWriter(w);
} catch (Exception e) {
- throw new RuntimeException("Could not create clone of
com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not create clone of
com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -56,7 +56,7 @@
instMeth.setAccessible(true);
return (Boolean) instMeth.invoke(o);
} catch (Exception e) {
- throw new RuntimeException("Could not call isStateWritten on
com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not call isStateWritten on
com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -70,7 +70,7 @@
instMeth.setAccessible(true);
return (String) instMeth.invoke(o);
} catch (Exception e) {
- throw new RuntimeException("Could not call getAndResetBuffer on
com.sun.facelets.StateWriter using reflection", e);
+ throw new RuntimeException("Could not call getAndResetBuffer on
com.sun.faces.facelets.StateWriter using reflection", e);
}
}
@@ -84,7 +84,7 @@
instMeth.setAccessible(true);
instMeth.invoke(o);
} catch (Exception e) {
- throw new RuntimeException("Could not call release on
com.sun.facelets.StateWriter using reflection",e);
+ throw new RuntimeException("Could not call release on
com.sun.faces.facelets.StateWriter using reflection",e);
}
}
Modified:
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java
===================================================================
---
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java
2011-10-19 21:34:20 UTC (rev 14236)
+++
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java
2011-10-28 15:33:26 UTC (rev 14237)
@@ -33,14 +33,20 @@
public String[] getSession()
{
- String[] names =
org.jboss.seam.contexts.Contexts.getSessionContext().getNames();
+ String[] names={};
+ if(org.jboss.seam.contexts.Contexts.isSessionContextActive()) {
+ names =
org.jboss.seam.contexts.Contexts.getSessionContext().getNames();
+ }
Arrays.sort(names);
return names;
}
public String[] getConversation()
{
- String[] names =
org.jboss.seam.contexts.Contexts.getConversationContext().getNames();
+ String[] names = {};
+ if ( org.jboss.seam.contexts.Contexts.isConversationContextActive()) {
+ names =
org.jboss.seam.contexts.Contexts.getConversationContext().getNames();
+ }
Arrays.sort(names);
return names;
}
@@ -61,7 +67,17 @@
public Exception getException()
{
- return (Exception)
org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException");
+ Exception e=null;
+ if(org.jboss.seam.contexts.Contexts.isConversationContextActive())
+ {
+
if(org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException")==null)
{
+ return null;
+ }
+ else {
+
e=(Exception)org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException");
+ }
+ }
+ return e;
}
public List<Exception> getExceptionCauses()
Modified:
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java
===================================================================
---
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java
2011-10-19 21:34:20 UTC (rev 14236)
+++
branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java
2011-10-28 15:33:26 UTC (rev 14237)
@@ -11,6 +11,7 @@
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
+import javax.faces.view.facelets.ResourceResolver;
import javax.servlet.http.HttpServletResponse;
import org.jboss.seam.contexts.FacesLifecycle;
@@ -42,7 +43,16 @@
{
FacesContext facesContext = FacesContext.getCurrentInstance();
URL url =
SeamDebugPhaseListener.class.getClassLoader().getResource("META-INF/debug.xhtml");
- Facelet f = new DefaultFaceletFactory( new SAXCompiler(), new
DefaultResourceResolver() ).getFacelet(url);
+
+ ResourceResolver resroler=new ResourceResolver(){
+ @Override
+ public URL resolveUrl(String path)
+ {
+ return
SeamDebugPhaseListener.class.getClassLoader().getResource(path);
+ }
+ };
+
+ Facelet f = new DefaultFaceletFactory( new
SAXCompiler(),resroler).getFacelet(url);
UIViewRoot viewRoot = facesContext.getViewRoot();
f.apply(facesContext, viewRoot);
HttpServletResponse response = (HttpServletResponse)
facesContext.getExternalContext().getResponse();
Modified:
branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java
===================================================================
---
branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java
2011-10-19 21:34:20 UTC (rev 14236)
+++
branches/community/Seam_2_3/jboss-seam-mail/src/main/java/org/jboss/seam/mail/ui/context/MailFacesContextImpl.java
2011-10-28 15:33:26 UTC (rev 14237)
@@ -1,5 +1,6 @@
package org.jboss.seam.mail.ui.context;
+import javax.el.ELContext;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -33,6 +34,13 @@
}
@Override
+ public ELContext getELContext()
+ {
+
+ return getDelegate().getELContext();
+
+ }
+ @Override
public ResponseWriter getResponseWriter()
{
return responseWriter;
Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-10-19
21:34:20 UTC (rev 14236)
+++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2011-10-28
15:33:26 UTC (rev 14237)
@@ -128,12 +128,30 @@
</exclusion>
</exclusions>
</dependency>
+
+ <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>
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
