Skip to content
This repository has been archived by the owner on Nov 10, 2017. It is now read-only.

Commit

Permalink
fixed conflicted name of testComponent
Browse files Browse the repository at this point in the history
  • Loading branch information
mareknovotny committed Feb 19, 2013
1 parent 84cd00c commit c9e2a93
Showing 1 changed file with 5 additions and 5 deletions.
Expand Up @@ -56,9 +56,9 @@ public static Archive<?> createDeployment()
"<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='#{redirecttestComponent.begin}' value='Begin' />" +
"<h:commandButton id='throw' action='#{redirecttestComponent.throwTestException}' value='Throw' />" +
"<h:commandButton id='throwAjax' action='#{redirecttestComponent.throwTestException}' value='Throw Ajax'>" +
"<f:ajax/>" +
"</h:commandButton>" +
"</h:form>" +
Expand All @@ -71,7 +71,7 @@ public static Archive<?> createDeployment()
" 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='#{redirecttestComponent.state}'/>" +
"</h:body>" +
"</html>"), "error.xhtml")
.addAsWebInfResource(new StringAsset(
Expand All @@ -91,7 +91,7 @@ public static class TestException extends Exception
}

@Scope(ScopeType.CONVERSATION)
@Name("testComponent")
@Name("redirecttestComponent")
public static class TestComponent implements Serializable
{
private static final long serialVersionUID = 1L;
Expand Down

0 comments on commit c9e2a93

Please sign in to comment.