February 2013 - seam-commits - Jboss List Archives

Seam SVN: r15424 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse.

by seam-commits＠lists.jboss.org

Author: vdedik Date: 2013-02-26 07:45:30 -0500 (Tue, 26 Feb 2013) New Revision: 15424 Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath Log: bz 912630 - solr-commons-csv.jar removed from .classpath project file Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2013-02-26 10:39:12 UTC (rev 15423) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2013-02-26 12:45:30 UTC (rev 15424) @@ -115,7 +115,6 @@ <classpathentry kind="lib" path="lib/snakeyaml.jar"/> <classpathentry kind="lib" path="lib/snappy-java.jar"/> <classpathentry kind="lib" path="lib/solr-analysis-extras.jar"/> - <classpathentry kind="lib" path="lib/solr-commons-csv.jar"/> <classpathentry kind="lib" path="lib/solr-core.jar"/> <classpathentry kind="lib" path="lib/solr-solrj.jar"/> <classpathentry kind="lib" path="lib/stax2-api.jar"/>

11 years, 10 months

1
0
0 / 0

Seam SVN: r15423 - in branches/enterprise/WFK-2_1/examples: seamspace and 1 other directory.

by seam-commits＠lists.jboss.org

Author: vdedik Date: 2013-02-26 05:39:12 -0500 (Tue, 26 Feb 2013) New Revision: 15423 Modified: branches/enterprise/WFK-2_1/examples/booking/build.xml branches/enterprise/WFK-2_1/examples/seamspace/build.xml Log: bz 874487 - fail when build directory with ant libraries not found Modified: branches/enterprise/WFK-2_1/examples/booking/build.xml =================================================================== (Binary files differ) Modified: branches/enterprise/WFK-2_1/examples/seamspace/build.xml =================================================================== (Binary files differ)

11 years, 10 months

1
0
0 / 0

Seam SVN: r15422 - branches/enterprise/WFK-2_1/bom.

by seam-commits＠lists.jboss.org

Author: vdedik Date: 2013-02-26 04:55:26 -0500 (Tue, 26 Feb 2013) New Revision: 15422 Modified: branches/enterprise/WFK-2_1/bom/pom.xml Log: dom4j and javassist updated due to bz 874487 Modified: branches/enterprise/WFK-2_1/bom/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/bom/pom.xml 2013-02-21 16:01:59 UTC (rev 15421) +++ branches/enterprise/WFK-2_1/bom/pom.xml 2013-02-26 09:55:26 UTC (rev 15422) @@ -350,7 +350,7 @@ <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.15.0.GA-redhat-1</version> + <version>3.15.0-GA-redhat-2</version> </dependency> <dependency> @@ -725,7 +725,7 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1-redhat-1</version> + <version>1.6.1-redhat-3</version> <exclusions> <exclusion> <groupId>xml-apis</groupId>

11 years, 10 months

1
0
0 / 0

Seam SVN: r15421 - branches/enterprise/WFK-2_1/jboss-seam.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-02-21 11:01:59 -0500 (Thu, 21 Feb 2013) New Revision: 15421 Modified: branches/enterprise/WFK-2_1/jboss-seam/pom.xml Log: added exclusion for jackson-core-asl into jboss-seam Modified: branches/enterprise/WFK-2_1/jboss-seam/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam/pom.xml 2013-02-21 16:01:52 UTC (rev 15420) +++ branches/enterprise/WFK-2_1/jboss-seam/pom.xml 2013-02-21 16:01:59 UTC (rev 15421) @@ -141,12 +141,16 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-search-orm</artifactId> <optional>true</optional> - <exclusions> - <exclusion> - <artifactId>jackson-mapper-asl</artifactId> - <groupId>org.codehaus.jackson</groupId> - </exclusion> - </exclusions> + <exclusions> + <exclusion> + <artifactId>jackson-mapper-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-core-asl</artifactId> + <groupId>org.codehaus.jackson</groupId> + </exclusion> + </exclusions> </dependency> <dependency>

11 years, 10 months

1
0
0 / 0

Seam SVN: r15420 - branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-02-21 11:01:52 -0500 (Thu, 21 Feb 2013) New Revision: 15420 Added: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandler.java Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandlerFactory.java Log: replaced dependency on JSF-IMPL in ExceptionHandlerFactory Added: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandler.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandler.java (rev 0) +++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandler.java 2013-02-21 16:01:52 UTC (rev 15420) @@ -0,0 +1,38 @@ +package org.jboss.seam.jsf; + +import javax.faces.FacesException; +import javax.faces.context.ExceptionHandler; +import javax.faces.context.ExceptionHandlerWrapper; + +public class SeamExceptionHandler extends ExceptionHandlerWrapper +{ + + private ExceptionHandler wrapped; + + /** + * Construct a new ajax exception handler around the given wrapped exception handler. + * @param wrapped The wrapped exception handler. + */ + public SeamExceptionHandler(ExceptionHandler wrapped) + { + this.wrapped = wrapped; + } + + // Actions -------------------------------------------------------------------------------------------------------- + + /** + * Handle the ajax exception by default ExceptionHandler + * + */ + @Override + public void handle() throws FacesException { + wrapped.handle(); + } + + @Override + public ExceptionHandler getWrapped() { + return wrapped; + } + +} + Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandlerFactory.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandlerFactory.java 2013-02-21 12:52:09 UTC (rev 15419) +++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamExceptionHandlerFactory.java 2013-02-21 16:01:52 UTC (rev 15420) @@ -2,16 +2,7 @@ import javax.faces.context.ExceptionHandler; import javax.faces.context.ExceptionHandlerFactory; -import javax.faces.context.FacesContext; -import org.jboss.seam.web.ExceptionFilter; - -import com.sun.faces.application.ApplicationAssociate; -import com.sun.faces.context.AjaxExceptionHandlerImpl; -import com.sun.faces.context.ExceptionHandlerImpl; - - - /** * Factory not to be used AjaxExceptionHandlerImpl class and * always be an exception to be thrown by capturad ExceptionFilter @@ -19,31 +10,32 @@ * @see AjaxExceptionHandlerImpl * @see ExceptionFilter * @author Tiago Peruzzo + * @author Marek Novotny - mnovotny(a)redhat.com * + * */ -public class SeamExceptionHandlerFactory extends ExceptionHandlerFactory { +public class SeamExceptionHandlerFactory extends ExceptionHandlerFactory +{ - private ApplicationAssociate associate; + private ExceptionHandlerFactory wrapped; + + public SeamExceptionHandlerFactory(ExceptionHandlerFactory parent) + { + this.wrapped = parent; + } - @Override - public ExceptionHandler getExceptionHandler() { - FacesContext fc = FacesContext.getCurrentInstance(); - ApplicationAssociate associate = getAssociate(fc); - return new ExceptionHandlerImpl(((associate != null) ? associate.isErrorPagePresent() : Boolean.TRUE)); - } - - - // --------------------------------------------------------- Private Methods - - private ApplicationAssociate getAssociate(FacesContext ctx) { - if (associate == null) { - associate = ApplicationAssociate.getCurrentInstance(); - if (associate == null) { - associate = ApplicationAssociate.getInstance(ctx.getExternalContext()); - } - } - return associate; - } + public ExceptionHandler getExceptionHandler() + { + return new SeamExceptionHandler(wrapped.getExceptionHandler()); + } + /** + * Returns the wrapped factory. + */ + @Override + public ExceptionHandlerFactory getWrapped() { + return wrapped; + } + }

11 years, 10 months

1
0
0 / 0

Seam SVN: r15419 - in branches/enterprise/WFK-2_1/examples: blog/blog-web/src/main/webapp/WEB-INF and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-02-21 07:52:09 -0500 (Thu, 21 Feb 2013) New Revision: 15419 Modified: branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/pages.xml branches/enterprise/WFK-2_1/examples/pom.xml Log: bz878006 rolled back previously removed exception handling due Hibernate search 4.2.0 update Modified: branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/pages.xml 2013-02-21 12:51:55 UTC (rev 15418) +++ branches/enterprise/WFK-2_1/examples/blog/blog-web/src/main/webapp/WEB-INF/pages.xml 2013-02-21 12:52:09 UTC (rev 15419) @@ -58,4 +58,9 @@ <action execute="#{blog.hitCount.hit}"/> </page> + <exception class="org.hibernate.search.errors.EmptyQueryException"> + <redirect view-id="/search.xhtml"> + <message severity="warn">Given query is too simple. Try again.</message> + </redirect> + </exception> </pages> Modified: branches/enterprise/WFK-2_1/examples/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/pom.xml 2013-02-21 12:51:55 UTC (rev 15418) +++ branches/enterprise/WFK-2_1/examples/pom.xml 2013-02-21 12:52:09 UTC (rev 15419) @@ -43,8 +43,6 @@ </organization> <properties> -  -  <tests.excludedGroups>slow</tests.excludedGroups> @@ -184,7 +182,7 @@ <plugin> <groupId>org.jboss.as.plugins</groupId> <artifactId>jboss-as-maven-plugin</artifactId> - <version>${version.jbossas7}</version> + <version>7.3.Final</version> <executions> <execution> <phase></phase> @@ -285,32 +283,6 @@ <version>2.0.1</version> </dependency> -  </dependencies> </dependencyManagement>

11 years, 10 months

1
0
0 / 0

Seam SVN: r15418 - branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-02-21 07:51:55 -0500 (Thu, 21 Feb 2013) New Revision: 15418 Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java Log: JBSEAM-5045 Ajax error should call ExceptionFilter too Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java 2013-02-21 09:37:31 UTC (rev 15417) +++ branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/mock/MockExternalContext.java 2013-02-21 12:51:55 UTC (rev 15418) @@ -8,7 +8,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.Writer; import java.net.MalformedURLException; import java.net.URL; import java.security.Principal; @@ -22,18 +21,17 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import java.util.logging.Level; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import javax.faces.context.PartialResponseWriter; -import javax.faces.context.ResponseWriter; import javax.servlet.ServletContext; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.dom4j.Document; +import org.dom4j.DocumentFactory; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; import org.jboss.seam.util.EnumerationIterator; @@ -56,7 +54,7 @@ public MockExternalContext() { - this.context = new MockServletContext(); + this.context = new MockServletContext(); this.request = new MockHttpServletRequest(new MockHttpSession(context)); this.response = new MockHttpServletResponse(); } @@ -546,17 +544,12 @@ this.response.setCharacterEncoding("UTF-8"); this.response.addHeader("Cache-Control", "no-cache"); this.response.setStatus(HttpServletResponse.SC_OK); - - FacesContext facesContext = FacesContext.getCurrentInstance(); - PartialResponseWriter pwriter = facesContext.getPartialViewContext().getPartialResponseWriter(); - - if (pwriter == null) - { - pwriter = createPartialResponseWriter(); - } - pwriter.startDocument(); - pwriter.redirect(url); - pwriter.endDocument(); + + final Document body = DocumentFactory.getInstance().createDocument("UTF-8"); + body.addElement("partial-response").addElement("redirect").addAttribute("url", url); + + this.response.getWriter().format(body.asXML()); + this.response.getWriter().flush(); } else { @@ -566,38 +559,6 @@ FacesContext.getCurrentInstance().responseComplete(); } - private PartialResponseWriter createPartialResponseWriter() - { - FacesContext facesCtx = FacesContext.getCurrentInstance(); - ExternalContext externalCtx = facesCtx.getExternalContext(); - String encoding = externalCtx.getRequestCharacterEncoding(); - externalCtx.setResponseCharacterEncoding(encoding); - ResponseWriter responseWriter = null; - Writer outputWriter = null; - try - { - outputWriter = externalCtx.getResponseOutputWriter(); - } - catch (IOException ioe) - { - log.error("couldn't get ResponseOutputWriter for Partial Ajax request", ioe); - } - - if (outputWriter != null) - { - responseWriter = facesCtx.getRenderKit().createResponseWriter(outputWriter, "text/xml", encoding); - } - if (responseWriter instanceof PartialResponseWriter) - { - return (PartialResponseWriter) responseWriter; - } - else - { - return new PartialResponseWriter(responseWriter); - } - - } - @Override public void setRequest(Object myrequest) {

11 years, 10 months

1
0
0 / 0

Seam SVN: r15417 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-02-21 04:37:31 -0500 (Thu, 21 Feb 2013) New Revision: 15417 Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java Log: fixed duplicated seam components in test Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java =================================================================== --- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java 2013-02-20 12:53:19 UTC (rev 15416) +++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/ExceptionRedirectTest.java 2013-02-21 09:37:31 UTC (rev 15417) @@ -56,9 +56,9 @@ "<h:head></h:head>" + "<h:body>" + "<h:form id='form'>" + - "<h:commandButton id='begin' action='#{testComponent.begin}' value='Begin' />" + - "<h:commandButton id='throw' action='#{testComponent.throwTestException}' value='Throw' />" + - "<h:commandButton id='throwAjax' action='#{testComponent.throwTestException}' value='Throw Ajax'>" + + "<h:commandButton id='begin' action='#{testComponent1.begin}' value='Begin' />" + + "<h:commandButton id='throw' action='#{testComponent1.throwTestException}' value='Throw' />" + + "<h:commandButton id='throwAjax' action='#{testComponent1.throwTestException}' value='Throw Ajax'>" + "<f:ajax/>" + "</h:commandButton>" + "</h:form>" + @@ -71,7 +71,7 @@ " xmlns:ui=\"http://java.sun.com/jsf/facelets\">" + "<h:head></h:head>" + "<h:body>" + - " Exception handled, state: <h:outputText value='#{testComponent.state}'/>" + + " Exception handled, state: <h:outputText value='#{testComponent1.state}'/>" + "</h:body>" + "</html>"), "error.xhtml") .addAsWebInfResource(new StringAsset( @@ -91,7 +91,7 @@ } @Scope(ScopeType.CONVERSATION) - @Name("testComponent") + @Name("testComponent1") public static class TestComponent implements Serializable { private static final long serialVersionUID = 1L;

11 years, 10 months

1
0
0 / 0

Seam SVN: r15416 - branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-02-20 07:53:19 -0500 (Wed, 20 Feb 2013) New Revision: 15416 Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath Log: bz912630 removed nonexisting xml-api.jar from .classpath Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2013-02-19 16:27:33 UTC (rev 15415) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2013-02-20 12:53:19 UTC (rev 15416) @@ -123,7 +123,6 @@ <classpathentry kind="lib" path="lib/validation-api.jar"/> <classpathentry kind="lib" path="lib/woodstox-core-asl.jar"/> <classpathentry kind="lib" path="lib/xercesImpl.jar"/> - <classpathentry kind="lib" path="lib/xml-apis.jar"/> <classpathentry kind="lib" path="lib/test/aether-api-1.8.jar"/> <classpathentry kind="lib" path="lib/test/aether-connector-wagon-1.8.jar"/> <classpathentry kind="lib" path="lib/test/aether-impl-1.8.jar"/>

11 years, 10 months

1
0
0 / 0

Seam SVN: r15415 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/WEB-INF.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2013-02-19 11:27:33 -0500 (Tue, 19 Feb 2013) New Revision: 15415 Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/WEB-INF/real-web.xml Log: added workaround into real-web.xml for org.jboss.seam.test.integration.i8ln.RealLocaleTest Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/WEB-INF/real-web.xml =================================================================== --- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/WEB-INF/real-web.xml 2013-02-19 16:27:26 UTC (rev 15414) +++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/resources/WEB-INF/real-web.xml 2013-02-19 16:27:33 UTC (rev 15415) @@ -3,6 +3,10 @@ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> <listener> <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>

11 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits February 2013