Seam SVN: r15522 - branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:46:19 -0400 (Mon, 03 Jun 2013)
New Revision: 15522
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/ResourceRequestEnvironment.java
Log:
bz961295, JBSEAM-5095
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/ResourceRequestEnvironment.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/ResourceRequestEnvironment.java 2013-06-03 13:21:44 UTC (rev 15521)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/ResourceRequestEnvironment.java 2013-06-03 13:46:19 UTC (rev 15522)
@@ -206,7 +206,7 @@
protected EnhancedMockHttpServletRequest createRequest()
{
- return new EnhancedMockHttpServletRequest();
+ return new EnhancedMockHttpServletRequest(environment.seamTest.servletContex);
}
protected EnhancedMockHttpServletResponse createResponse()
11 years, 6 months
Seam SVN: r15521 - branches/enterprise/WFK-2_1/distribution/src/main/assembly.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:21:44 -0400 (Mon, 03 Jun 2013)
New Revision: 15521
Modified:
branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
Log:
added required library for richfaces - guava - into distribution
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2013-06-03 13:21:36 UTC (rev 15520)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2013-06-03 13:21:44 UTC (rev 15521)
@@ -123,7 +123,6 @@
<!-- Add Richfaces for Seam-gen -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.richfaces.core:richfaces-core-api</include>
<include>org.richfaces.core:richfaces-core-impl</include>
@@ -131,6 +130,7 @@
<include>org.richfaces.ui:richfaces-components-ui</include>
<include>net.sourceforge.cssparser:cssparser</include>
<include>org.w3c.css:sac</include>
+ <include>com.google.guava:guava</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
11 years, 6 months
Seam SVN: r15520 - branches/enterprise/WFK-2_1/distribution/src/main/assembly.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:21:36 -0400 (Mon, 03 Jun 2013)
New Revision: 15520
Modified:
branches/enterprise/WFK-2_1/distribution/src/main/assembly/changelog.txt
branches/enterprise/WFK-2_1/distribution/src/main/assembly/readme.txt
Log:
updated release notes and readme for 2.3.1.CR1 and 2.3.1.Final-redhat-2
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/changelog.txt
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/changelog.txt 2013-06-03 13:21:27 UTC (rev 15519)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/changelog.txt 2013-06-03 13:21:36 UTC (rev 15520)
@@ -1,6 +1,78 @@
JBoss Seam Changelog
====================
+Release Notes - Seam 2 - Version 2.3.1.CR1
+
+** Bug
+ * [JBSEAM-4529] - org.jboss.seam.framework.Query --- count query generation fails if the query contains a JOIN FETCH operation written in uppercase
+ * [JBSEAM-4701] - Cookie path being set to empty string via getRequestContextPath forming invalid cookies in IE
+ * [JBSEAM-4811] - Problem sending an email with multiple recipients and attachments in <ui:repeat>.
+ * [JBSEAM-4848] - jboss-seam-ui.jar is not backward compatible
+ * [JBSEAM-4925] - Some broken links in Seam 2.3 reference guide
+ * [JBSEAM-4947] - <s:decorate /> tag breaks JSF2 f:ajax functionality
+ * [JBSEAM-4976] - Conversation id not restored from page context
+ * [JBSEAM-5001] - Deadlock between SFSB EJB lock and Component.getInstanceFromFactory factoryLock calling factory from the same component
+ * [JBSEAM-5020] - Binding component does not restore conversation
+ * [JBSEAM-5044] - s:decorate javax.faces.FacesException: Cannot add the same component twice on Mojarra 2.1.11
+ * [JBSEAM-5045] - Ajax error not calling ExceptionFilter
+ * [JBSEAM-5047] - Transaction lookup fails on Tomcat
+ * [JBSEAM-5048] - blog example atom feed not working
+ * [JBSEAM-5052] - s:selectItems noSelectionLabel causes errors without using ui:debug
+ * [JBSEAM-5054] - Seam UI taglib tag Decorate has got wrong default value for enclose attribute
+ * [JBSEAM-5055] - only a single attachment is attached to a mail
+ * [JBSEAM-5057] - Move all Seam UI faces-config properties from xml into annotation fields/methods
+ * [JBSEAM-5058] - s:validateEquality required attribute is false by default (should be true)
+ * [JBSEAM-5061] - FacesManager.interpolateAndRedirect throws NoSuchElementException on http-Parameter without value
+ * [JBSEAM-5063] - Debug page broken
+ * [JBSEAM-5064] - s:link conversation propagation none broken
+ * [JBSEAM-5065] - page context broken on Mojarra 2.1.16
+ * [JBSEAM-5066] - Incorrect Redirection
+ * [JBSEAM-5067] - ConcurrentModificationException in ServerConversationContext.flush()
+ * [JBSEAM-5068] - seam-gen explode target touches .dodeploy forcing a restart, preventing hot-deployment
+ * [JBSEAM-5070] - seam-gen identity-management creating a new user fails with org.hibernate.exception.ConstraintViolationException: Duplicate entry '1' for key 1
+ * [JBSEAM-5071] - seam-gen identity-management user and role manager "edit" link doesn't open the selected entity
+ * [JBSEAM-5073] - Programmatic redirect always add conversation id
+ * [JBSEAM-5074] - Excel example SeamTest failure UnsupportedOperationException in ExternalContext.getRequestCharacterEncoding
+ * [JBSEAM-5077] - ui example, s:resource s:download error 404
+ * [JBSEAM-5080] - Seam2.3 NPE in Interpolator.interpolate if pages.xml exception http-error no message set
+ * [JBSEAM-5081] - Upgrade Hibernate Search version to latest final 4.2.0.Final
+ * [JBSEAM-5082] - seam-gen generated JUnitSeamTest deployment should use org.jboss.seam.mock.MockSeamListener instead of the SeamListener
+ * [JBSEAM-5083] - SeamViewHandler adds conversation id even if conversation is not long running
+ * [JBSEAM-5084] - seam-gen dependency management with ivy is not updated
+ * [JBSEAM-5085] - Pages rewrite doesn't rewrite s:link params
+ * [JBSEAM-5086] - localization settings via component.xml doesn't work
+ * [JBSEAM-5087] - seam-gen EAR explode target touches .dodeploy forcing a restart, preventing hot-deployment
+ * [JBSEAM-5090] - Seam Text documentation falsely claims that forward slash creates italics
+ * [JBSEAM-5091] - SeamInterceptor doesn't work on EJB @Schedule methods
+ * [JBSEAM-5093] - Seam produces malformed partial response on ViewExpiredException with Ajax
+ * [JBSEAM-5097] - s:link and s:button don't work correctly when using taskInstance param
+ * [JBSEAM-5098] - SeamApplication missing JSF 2.0 methods
+ * [JBSEAM-5100] - Example Remoting Progressbar: progressbar is not changing
+ * [JBSEAM-5102] - Seam examples use unencrypted client-side view state
+ * [JBSEAM-5103] - Conversation after @End method process does not release ConversationEntry lock
+ * [JBSEAM-5104] - SoapRequestHandler doesn't create SOAP header if not exists
+ * [JBSEAM-5105] - Disable default bean validation in seam-gen generated application to use Seam validation by default
+ * [JBSEAM-5106] - Default Seam-gen generated jdbc driver is not set to h2 if it is not provided the path to driver
+ * [JBSEAM-5107] - seam-gen EAR projects tests (form and action tests) fails with "org.jboss.seam.InstantiationException: Could not instantiate Seam component"
+ * [JBSEAM-5108] - seam-gen command generate fails in generating of UI from templates
+
+
+** Enhancement
+ * [JBSEAM-4958] - Improve the Seam UI javadoc
+ * [JBSEAM-5049] - Unify artifactIds and finalName in WAR examples for better JBDS experience
+ * [JBSEAM-5089] - Update jboss-as-maven plugin to use newer compatible version with latest AS 7/8 releases
+
+
+** Feature Request
+ * [JBSEAM-3033] - make s:graphicImage cachable
+ * [JBSEAM-5034] - Allow for seam-gen run arquillian testsuite on generated project structure
+ * [JBSEAM-5062] - Seam example ant scripts should be pure ant scripts
+
+
+** Patch
+ * [JBSEAM-5051] - messageList on place off messageManager - seam-reference-2.3.0.Final
+
+
Release Notes - Seam 2 - Version 2.3.0.Final
** Bug
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/readme.txt
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/readme.txt 2013-06-03 13:21:27 UTC (rev 15519)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/readme.txt 2013-06-03 13:21:36 UTC (rev 15520)
@@ -1,7 +1,7 @@
JBoss Seam - Contextual Component framework for Java EE
=========================================================
-version 2.3.0.Final-redhat-1, October 2012
+version 2.3.1.Final-redhat-2, May 2013
This software is distributed under the terms of the FSF Lesser Gnu
Public License (see lgpl.txt).
@@ -9,7 +9,7 @@
Get Up And Running Quick
------------------------
-1. Install JBoss EAP 6.0.x
+1. Install JBoss EAP 6.1.x
2. Start JBoss AS by typing "bin/standalone.sh" in the JBoss AS home directory
11 years, 6 months
Seam SVN: r15519 - in branches/enterprise/WFK-2_1: jboss-seam-gen and 2 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:21:27 -0400 (Mon, 03 Jun 2013)
New Revision: 15519
Modified:
branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml
branches/enterprise/WFK-2_1/jboss-seam-gen/src/main/assembly/assembly.xml
Log:
JBSEAM-5108 refactored seam-gen required runtime libraries
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2013-06-03 13:21:16 UTC (rev 15518)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2013-06-03 13:21:27 UTC (rev 15519)
@@ -91,9 +91,6 @@
<includes>
<include>org.jboss.seam:*:*:sources</include>
</includes>
- <excludes>
- <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude>
- </excludes>
<outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping>
</dependencySet>
@@ -112,6 +109,7 @@
<include>org.jboss.seam:jboss-seam-resteasy:jar</include>
<include>org.jboss.seam:jboss-seam-remoting:jar</include>
<include>org.jboss.seam:jboss-seam-ioc:jar</include>
+ <include>org.jboss.seam:jboss-seam-gen:jar</include>
</includes>
<excludes>
<exclude>*:*:ejb:sources</exclude>
@@ -137,36 +135,7 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${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.hibernate:hibernate-core:jar:4.0.0.Final</include>
- <include>commons-collections:commons-collections:jar</include>
- <include>commons-logging:commons-logging:jar</include>
- <include>org.beanshell:bsh:jar</include>
- <include>org.hibernate:jtidy:jar</include>
- <include>freemarker:freemarker:jar</include>
- <include>org.eclipse.jdt:core:jar</include>
- <include>org.eclipse.core:runtime:jar</include>
- <include>org.eclipse.equinox:common:jar</include>
- <include>org.eclipse:text: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/test</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
@@ -179,15 +148,6 @@
</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>
Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam 2013-06-03 13:21:16 UTC (rev 15518)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam 2013-06-03 13:21:27 UTC (rev 15519)
@@ -55,7 +55,7 @@
SEAM_HOME_WINPATH=`cygpath -aw "$SEAM_HOME"`
SEAM_GEN_DIR_WINPATH=`cygpath -aw "$SEAM_GEN_DIR"`
WORKING_DIR_WINPATH=`cygpath -aw "$WORKING_DIR"`
- "$JAVA_HOME/bin/java" -cp "$JAVA_HOME_WINPATH\lib\tools.jar;$SEAM_HOME_WINPATH\lib\gen\ant-launcher.jar;$SEAM_HOME_WINPATH\lib\gen\ant-nodeps.jar;$SEAM_HOME_WINPATH\lib\gen\ant.jar" -Dant.home="$SEAM_HOME_WINPATH\lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR_WINPATH\build.xml" -Dworking.dir="$WORKING_DIR_WINPATH" "$@"
+ "$JAVA_HOME/bin/java" -cp "$JAVA_HOME_WINPATH\lib\tools.jar;$SEAM_HOME_WINPATH\seam-gen\lib\ant-launcher.jar;$SEAM_HOME_WINPATH\seam-gen\lib\ant-nodeps.jar;$SEAM_HOME_WINPATH\seam-gen\lib\ant.jar" -Dant.home="$SEAM_HOME_WINPATH\lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR_WINPATH\build.xml" -Dworking.dir="$WORKING_DIR_WINPATH" "$@"
else
- "$JAVA_HOME/bin/java" -cp "$JAVA_HOME/lib/tools.jar:$SEAM_HOME/lib/gen/ant-launcher.jar:$SEAM_HOME/lib/gen/ant-nodeps.jar:$SEAM_HOME/lib/gen/ant.jar" -Dant.home="$SEAM_HOME/lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR/build.xml" -Dworking.dir="$WORKING_DIR" "$@"
+ "$JAVA_HOME/bin/java" -cp "$JAVA_HOME/lib/tools.jar:$SEAM_HOME/seam-gen/lib/ant-launcher.jar:$SEAM_HOME/seam-gen/lib/ant-nodeps.jar:$SEAM_HOME/seam-gen/lib/ant.jar" -Dant.home="$SEAM_HOME/lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR/build.xml" -Dworking.dir="$WORKING_DIR" "$@"
fi
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2013-06-03 13:21:16 UTC (rev 15518)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2013-06-03 13:21:27 UTC (rev 15519)
@@ -37,7 +37,7 @@
<import file="${seam.dir}/build/common.build.xml"/>
<target name="init">
- <path id="seam-gen.lib.path" path="${seam.dir}/lib/gen/jboss-seam-gen.jar"/>
+ <path id="seam-gen.lib.path" path="${seam.dir}/lib/jboss-seam-gen.jar"/>
<taskdef name="normalizeProjectName"
classname="org.jboss.seam.tool.NormalizeProjectNameTask"
@@ -1466,34 +1466,6 @@
<echo message="Type '${seam.cmd} restart' and go to http://localhost:8080/${project.name}/${masterPage.name}.seam"/>
</target>
- <target name="init"]]></replacevalue>
- </replace>
-
- <!-- uncomment richfaces dependencies if not using icefaces -->
- <replace dir="${project.home}">
- <include name="ivy.xml" unless="icefaces.property"/>
- <replacetoken><![CDATA[ [if richfaces] ->]]></replacetoken>
- <replacevalue><![CDATA[ [if richfaces] -->]]></replacevalue>
- </replace>
- <replace dir="${project.home}">
- <include name="ivy.xml" unless="icefaces.property"/>
- <replacetoken><![CDATA[<!- [/endif richfaces] ]]></replacetoken>
- <replacevalue><![CDATA[<!-- [/endif richfaces] ]]></replacevalue>
- </replace>
-
- <!-- uncomment icefaces dependencies if using icefaces -->
- <replace dir="${project.home}">
- <include name="ivy.xml" if="icefaces.property"/>
- <replacetoken><![CDATA[ [if icefaces] ->]]></replacetoken>
- <replacevalue><![CDATA[ [if icefaces] -->]]></replacevalue>
- </replace>
- <replace dir="${project.home}">
- <include name="ivy.xml" if="icefaces.property"/>
- <replacetoken><![CDATA[<!- [/endif icefaces] ]]></replacetoken>
- <replacevalue><![CDATA[<!-- [/endif icefaces] ]]></replacevalue>
- </replace>
- </target>
-
<!-- Do not remove generate-entities, netbeans depends on it -->
<target name="generate-entities" depends="generate"/>
<target name="generate" depends="validate-project,generate-model,generate-ui"
@@ -1503,37 +1475,34 @@
<target name="init-generate">
<path id="htools.classpath">
<pathelement path="${seam.dir}/lib/ant.jar"/>
- <pathelement path="${seam.dir}/lib/gen/hibernate-tools.jar"/>
- <pathelement path="${seam.dir}/lib/gen/freemarker.jar"/>
- <pathelement path="${seam.dir}/lib/jboss-seam.jar"/>
- <pathelement path="${seam.dir}/lib/gen/runtime.jar"/>
- <pathelement path="${seam.dir}/lib/gen/common.jar"/>
- <pathelement path="${seam.dir}/lib/gen/text.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/hibernate-core.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/hibernate-entitymanager.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/hibernate-tools.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/freemarker.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/runtime.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/common.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/commons-collections.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/commons-logging.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/core.jar"/>
+ <pathelement path="${seam.dir}/seam-gen/lib/text.jar"/>
<pathelement path="${seam.dir}/lib/dom4j.jar"/>
<pathelement path="${seam.dir}/lib/persistence-api.jar"/>
- <pathelement path="${seam.dir}/lib/gen/hibernate-core.jar"/>
<pathelement path="${seam.dir}/lib/hibernate-commons-annotations.jar"/>
<pathelement path="${seam.dir}/lib/hibernate-annotations.jar"/>
- <pathelement path="${seam.dir}/lib/hibernate-entitymanager.jar"/>
<pathelement path="${seam.dir}/lib/hibernate-validator.jar"/>
<pathelement path="${seam.dir}/lib/jboss-logging.jar"/>
<pathelement path="${seam.dir}/lib/jboss-transaction-api_1.1_spec.jar"/>
<pathelement path="${seam.dir}/lib/hibernate-jpa-2.0-api.jar"/>
- <pathelement path="${seam.dir}/lib/gen/core.jar"/>
<pathelement path="${seam.dir}/lib/slf4j-api.jar"/>
- <pathelement path="${seam.dir}/lib/slf4j-log4j12.jar"/>
<pathelement path="${seam.dir}/lib/log4j.jar"/>
- <pathelement path="${seam.dir}/lib/gen/commons-collections.jar"/>
- <pathelement path="${seam.dir}/lib/gen/commons-logging.jar"/>
<pathelement path="${seam.dir}/lib/javassist.jar"/>
- <pathelement path="${seam.dir}/lib/cglib-nodep.jar"/>
<pathelement path="${seam.dir}/lib/asm.jar"/>
- <pathelement path="${seam.dir}/lib/core.jar"/>
<pathelement path="${seam.dir}/lib/jboss-common-core.jar"/>
<pathelement path="${seam.dir}/lib/concurrent.jar"/>
<pathelement path="${driver.jar}"/>
<pathelement path="${driver.license.jar}"/>
- <pathelement path="${seam.dir}/lib/gen/jboss-seam-gen.jar"/>
+ <pathelement path="${seam.dir}/lib/jboss-seam.jar"/>
+ <pathelement path="${seam.dir}/lib/jboss-seam-gen.jar"/>
</path>
<taskdef name="hibernate" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="htools.classpath"/>
</target>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml 2013-06-03 13:21:16 UTC (rev 15518)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml 2013-06-03 13:21:27 UTC (rev 15519)
@@ -65,6 +65,11 @@
</plugin>
</plugins>
</build>
+
+ <properties>
+ <hibernateversion>4.0.0.Final</hibernateversion>
+ </properties>
+
<dependencies>
<!-- version runtime dependencies are managed only here instead in parent -->
@@ -73,32 +78,35 @@
<artifactId>hibernate-tools</artifactId>
<version>4.0.0-CR1</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- </exclusion>
-
- </exclusions>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernateversion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernateversion}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.8</version>
@@ -191,9 +199,6 @@
<scope>runtime</scope>
</dependency>
</dependencies>
-
- <modules>
- </modules>
<profiles>
<profile>
@@ -213,4 +218,13 @@
</profile>
</profiles>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml</groupId>
+ <artifactId>classmate</artifactId>
+ <version>0.5.4-redhat-1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/src/main/assembly/assembly.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/src/main/assembly/assembly.xml 2013-06-03 13:21:16 UTC (rev 15518)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/src/main/assembly/assembly.xml 2013-06-03 13:21:27 UTC (rev 15519)
@@ -20,5 +20,31 @@
</excludes>
</fileSet>
</fileSets>
-
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useStrictFiltering>true</useStrictFiltering>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <includes>
+ <include>org.hibernate:hibernate-tools:jar</include>
+ <include>org.hibernate:hibernate-core:jar</include>
+ <include>org.hibernate:hibernate-entitymanager:jar</include>
+ <include>commons-collections:commons-collections:jar</include>
+ <include>commons-logging:commons-logging:jar</include>
+ <include>org.hibernate:jtidy:jar</include>
+ <include>freemarker:freemarker:jar</include>
+ <include>org.eclipse.jdt:core:jar</include>
+ <include>org.eclipse.core:runtime:jar</include>
+ <include>org.eclipse.equinox:common:jar</include>
+ <include>org.eclipse:text:jar</include>
+ <include>antlr:antlr:jar</include>
+ <include>org.apache.ant:ant:jar</include>
+ <include>org.apache.ant:ant-nodeps:jar</include>
+ <include>org.apache.ant:ant-launcher:jar</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
+ </outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
11 years, 6 months
Seam SVN: r15518 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:21:16 -0400 (Mon, 03 Jun 2013)
New Revision: 15518
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/README
Log:
bz916998 removed ivy command from seam-gen as unsupported
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/README
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/README 2013-06-03 13:21:10 UTC (rev 15517)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/README 2013-06-03 13:21:16 UTC (rev 15518)
@@ -149,12 +149,4 @@
Example: seam add-identity-management
- add-ivy
- Alters an existing project to use Ivy to manage the dependencies. The
- command adds Ivy configuration files and a corresponding Ant build file.
- The Ant tasks invoke Ivy to download the dependency sets required to
- build, test and deploy the application. The step of downloading the
- dependencies is kept separate from the build life cycle.
- Example: seam add-ivy
-
11 years, 6 months
Seam SVN: r15517 - branches/enterprise/WFK-2_1/examples/seambay/seambay-web/src/main/webapp/WEB-INF.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:21:10 -0400 (Mon, 03 Jun 2013)
New Revision: 15517
Modified:
branches/enterprise/WFK-2_1/examples/seambay/seambay-web/src/main/webapp/WEB-INF/web.xml
Log:
JBSEAM-5102 changed from client to server JSF state saving method
Modified: branches/enterprise/WFK-2_1/examples/seambay/seambay-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/enterprise/WFK-2_1/examples/seambay/seambay-web/src/main/webapp/WEB-INF/web.xml 2013-06-03 13:21:01 UTC (rev 15516)
+++ branches/enterprise/WFK-2_1/examples/seambay/seambay-web/src/main/webapp/WEB-INF/web.xml 2013-06-03 13:21:10 UTC (rev 15517)
@@ -43,7 +43,7 @@
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>client</param-value>
+ <param-value>server</param-value>
</context-param>
<!-- URL Rewrite Filter -->
11 years, 6 months
Seam SVN: r15516 - in branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam: core and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:21:01 -0400 (Mon, 03 Jun 2013)
New Revision: 15516
Added:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/intercept/AroundTimeout.java
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/BijectionInterceptor.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/Interceptor.java
Log:
JBSEAM-5091 Add AroundTimeout annotation to work properly with EJB Timeout method
Added: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/intercept/AroundTimeout.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/intercept/AroundTimeout.java (rev 0)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/annotations/intercept/AroundTimeout.java 2013-06-03 13:21:01 UTC (rev 15516)
@@ -0,0 +1,18 @@
+package org.jboss.seam.annotations.intercept;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Synonym for javax.interceptors.AroundTimeout.
+ *
+ * @author tremes
+ */
+@Target(METHOD)
+@Retention(RUNTIME)
+@Documented
+public @interface AroundTimeout {}
\ No newline at end of file
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/BijectionInterceptor.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/BijectionInterceptor.java 2013-06-03 13:20:49 UTC (rev 15515)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/BijectionInterceptor.java 2013-06-03 13:21:01 UTC (rev 15516)
@@ -6,6 +6,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.CyclicDependencyException;
import org.jboss.seam.annotations.intercept.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundTimeout;
import org.jboss.seam.annotations.intercept.Interceptor;
import org.jboss.seam.intercept.AbstractInterceptor;
import org.jboss.seam.intercept.InvocationContext;
@@ -38,6 +39,7 @@
}
@AroundInvoke
+ @AroundTimeout
public Object aroundInvoke(InvocationContext invocation) throws Exception
{
Component component = getComponent();
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/Interceptor.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/Interceptor.java 2013-06-03 13:20:49 UTC (rev 15515)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/intercept/Interceptor.java 2013-06-03 13:21:01 UTC (rev 15516)
@@ -11,10 +11,9 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
-import javax.interceptor.AroundTimeout;
-
import org.jboss.seam.Component;
import org.jboss.seam.annotations.intercept.AroundInvoke;
+import org.jboss.seam.annotations.intercept.AroundTimeout;
import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.annotations.intercept.PostActivate;
import org.jboss.seam.annotations.intercept.PostConstruct;
11 years, 6 months
Seam SVN: r15515 - branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/webservice.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:20:49 -0400 (Mon, 03 Jun 2013)
New Revision: 15515
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/webservice/SOAPRequestHandler.java
Log:
JBSEAM-5104 added correct SOAP handling by adding missing header
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/webservice/SOAPRequestHandler.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/webservice/SOAPRequestHandler.java 2013-06-03 13:20:40 UTC (rev 15514)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/webservice/SOAPRequestHandler.java 2013-06-03 13:20:49 UTC (rev 15515)
@@ -106,20 +106,16 @@
SOAPMessageContext smc = (SOAPMessageContext) messageContext;
SOAPHeader header = smc.getMessage().getSOAPHeader();
- if (header != null)
+ if (header == null)
{
- SOAPElement element = header.addChildElement(CIDQN);
- element.addTextNode(conversationId);
- smc.getMessage().saveChanges();
- }
- else
- {
SOAPEnvelope envelope = smc.getMessage().getSOAPPart().getEnvelope();
- header = envelope.addHeader();
- SOAPElement element = header.addChildElement(CIDQN);
- element.addTextNode(conversationId);
- smc.getMessage().saveChanges();
+ header = envelope.addHeader();
}
+
+ SOAPElement element = header.addChildElement(CIDQN);
+ element.addTextNode(conversationId);
+ smc.getMessage().saveChanges();
+
}
Manager.instance().endRequest( new ServletRequestSessionMap(request) );
11 years, 6 months
Seam SVN: r15514 - branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:20:40 -0400 (Mon, 03 Jun 2013)
New Revision: 15514
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/Manager.java
Log:
JBSEAM-5103 unlocking conversation in @End annotated method
Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/Manager.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/Manager.java 2013-06-03 13:20:28 UTC (rev 15513)
+++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/core/Manager.java 2013-06-03 13:20:40 UTC (rev 15514)
@@ -726,6 +726,7 @@
endNestedConversations( getCurrentConversationId() );
storeConversationToViewRootIfNecessary();
}
+ unlockConversation();
}
/**
11 years, 6 months
Seam SVN: r15513 - in branches/enterprise/WFK-2_1: jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2013-06-03 09:20:28 -0400 (Mon, 03 Jun 2013)
New Revision: 15513
Modified:
branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp/graphicImage.xhtml
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java
branches/enterprise/WFK-2_1/seam-reference-guide/src/docbook/en-US/Controls.xml
Log:
JBSEAM-3033 added cacheble s:graphicImage
Modified: branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp/graphicImage.xhtml
===================================================================
--- branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp/graphicImage.xhtml 2013-06-03 13:20:12 UTC (rev 15512)
+++ branches/enterprise/WFK-2_1/examples/ui/ui-web/src/main/webapp/graphicImage.xhtml 2013-06-03 13:20:28 UTC (rev 15513)
@@ -11,7 +11,7 @@
<p>Outputs an image</p>
<h:panelGrid>
<s:fragment>
- <s:graphicImage value="#{person.picture.data}">
+ <s:graphicImage value="#{person.picture.data}" cache="true" cacheKey="id-0.5">
<s:transformImageSize factor="0.5" />
</s:graphicImage>
<h:outputText value="No image found (upload one)" rendered="#{person.picture.contentType eq null}" />
Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2013-06-03 13:20:12 UTC (rev 15512)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2013-06-03 13:20:28 UTC (rev 15513)
@@ -6,6 +6,7 @@
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import org.jboss.seam.cache.CacheProvider;
import org.jboss.seam.ui.graphicImage.GraphicImageStore.ImageWrapper;
import org.jboss.seam.ui.util.HTML;
import org.jboss.seam.ui.util.cdk.RendererBase;
@@ -31,26 +32,46 @@
protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException
{
UIGraphicImage graphicImage = (UIGraphicImage) component;
-
+
+ CacheProvider cacheProvider = CacheProvider.instance();
+
String key = graphicImage.getFileName();
String extension = null;
+ ImageWrapper wrapper = null;
+
Image image = Image.instance();
- image.setInput(graphicImage.getValue());
-
- // Do transforms
-
- for (UIComponent cmp : graphicImage.getChildren())
+
+ if (graphicImage.isInvalidate())
+ cacheProvider.remove(graphicImage.getCacheKey());
+
+ if (graphicImage.isCache() && cacheProvider.get(graphicImage.getCacheKey()) != null)
{
- if (cmp instanceof ImageTransform)
+ wrapper = (ImageWrapper) cacheProvider.get(graphicImage.getCacheKey());
+ }
+ else
+ {
+
+ image.setInput(graphicImage.getValue());
+
+ // Do transforms
+
+ for (UIComponent cmp : graphicImage.getChildren())
{
- ImageTransform imageTransform = (ImageTransform) cmp;
- imageTransform.applyTransform(image);
+ if (cmp instanceof ImageTransform)
+ {
+ ImageTransform imageTransform = (ImageTransform) cmp;
+ imageTransform.applyTransform(image);
+ }
}
+
+ wrapper = new ImageWrapper(image.getImage(), image.getContentType());
+
+ if(graphicImage.isCache())
+ cacheProvider.put(graphicImage.getCacheKey(), wrapper);
}
- key = GraphicImageStore.instance().put(new ImageWrapper(image.getImage(), image.getContentType()),
- key);
+ key = GraphicImageStore.instance().put(wrapper, key);
extension = image.getContentType().getExtension();
writer.startElement(HTML.IMG_ELEM, graphicImage);
@@ -58,9 +79,8 @@
{
writer.writeAttribute(HTML.ID_ATTR, graphicImage.getClientId(context), HTML.ID_ATTR);
}
-
- String url = context.getExternalContext().getRequestContextPath()
- + GraphicImageResource.GRAPHIC_IMAGE_RESOURCE_PATH + "/" + key + extension;
+
+ String url = context.getExternalContext().getRequestContextPath() + GraphicImageResource.GRAPHIC_IMAGE_RESOURCE_PATH + "/" + key + extension;
writer.writeAttribute(HTML.SRC_ATTR, url, HTML.SRC_ATTR);
HTML.renderHTMLAttributes(writer, component, HTML.IMG_PASSTHROUGH_ATTRIBUTES);
writer.endElement(HTML.IMG_ELEM);
Modified: branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2013-06-03 13:20:12 UTC (rev 15512)
+++ branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2013-06-03 13:20:28 UTC (rev 15513)
@@ -31,4 +31,13 @@
@Attribute
public abstract Object getValue();
+
+ @Attribute(description = @Description("True if this image should be cached"))
+ public abstract boolean isCache();
+
+ @Attribute(description = @Description("Unique string for a cached image"))
+ public abstract String getCacheKey();
+
+ @Attribute(description = @Description("if property resolves to true, current cached key will be removed"))
+ public abstract boolean isInvalidate();
}
Modified: branches/enterprise/WFK-2_1/seam-reference-guide/src/docbook/en-US/Controls.xml
===================================================================
--- branches/enterprise/WFK-2_1/seam-reference-guide/src/docbook/en-US/Controls.xml 2013-06-03 13:20:12 UTC (rev 15512)
+++ branches/enterprise/WFK-2_1/seam-reference-guide/src/docbook/en-US/Controls.xml 2013-06-03 13:20:28 UTC (rev 15513)
@@ -1346,6 +1346,21 @@
should be unique
</para>
</listitem>
+ <listitem>
+ <para>
+ <literal>cache</literal> — specify if this image should be cached. Boolean value.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>invalidate</literal> — specify if this image cache should be invalidated. Boolean value.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>cacheKey</literal> — specify unique string for a cached image.
+ </para>
+ </listitem>
</itemizedlist>
<para><emphasis>Transformations</emphasis></para>
11 years, 6 months