Seam SVN: r15240 - branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-10-09 10:34:38 -0400 (Tue, 09 Oct 2012)
New Revision: 15240
Modified:
branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/ConverterGenerator.java
branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/ValidatorGenerator.java
branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/XMLGenerator.java
Log:
fixed some resource leaks in seam-cdk-helper
Modified: branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/ConverterGenerator.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/ConverterGenerator.java 2012-10-09 14:06:30 UTC (rev 15239)
+++ branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/ConverterGenerator.java 2012-10-09 14:34:38 UTC (rev 15240)
@@ -40,20 +40,30 @@
}
}
- private boolean fileIsConverterSource(File file) throws FileNotFoundException
- {
- if (file.getName().endsWith(".java"))
- {
- Scanner scanner = new Scanner(file);
- String find = scanner.findWithinHorizon("@FacesConverter", 0);
- if (find != null)
- {
- log.info("Identified " + file.getName() + " as Converter source code");
- return true;
- }
- }
- return false;
- }
+ private boolean fileIsConverterSource(File file)
+ throws FileNotFoundException
+ {
+
+ if (file.getName().endsWith(".java"))
+ {
+ Scanner scanner = new Scanner(file);
+ String find = scanner.findWithinHorizon("@FacesConverter", 0);
+ try
+ {
+ if (find != null)
+ {
+ log.info("Identified " + file.getName()
+ + " as Converter source code");
+ return true;
+ }
+ }
+ finally
+ {
+ scanner.close();
+ }
+ }
+ return false;
+ }
public void generateConverters() throws Exception
{
@@ -87,10 +97,17 @@
{
Scanner scanner = new Scanner(f);
String find = scanner.findWithinHorizon(classFromSource, 0);
- if (find != null)
+ try
{
- return f;
+ if (find != null)
+ {
+ return f;
+ }
}
+ finally
+ {
+ scanner.close();
+ }
}
}
return null;
Modified: branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/ValidatorGenerator.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/ValidatorGenerator.java 2012-10-09 14:06:30 UTC (rev 15239)
+++ branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/ValidatorGenerator.java 2012-10-09 14:34:38 UTC (rev 15240)
@@ -49,11 +49,18 @@
{
Scanner scanner = new Scanner(file);
String find = scanner.findWithinHorizon("<validator>", 0);
- if (find != null)
+ try
{
- log.info("Identified " + file.getName() + " as Validator XML");
- return true;
+ if (find != null)
+ {
+ log.info("Identified " + file.getName() + " as Validator XML");
+ return true;
+ }
}
+ finally
+ {
+ scanner.close();
+ }
}
return false;
}
Modified: branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/XMLGenerator.java
===================================================================
--- branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/XMLGenerator.java 2012-10-09 14:06:30 UTC (rev 15239)
+++ branches/enterprise/WFK-2_1/seam-cdk-helper/src/main/java/org/jboss/seam/maven/helper/XMLGenerator.java 2012-10-09 14:34:38 UTC (rev 15240)
@@ -126,7 +126,7 @@
log.info("Updating " + outXML);
FileOutputStream fos = new FileOutputStream(outXML);
fos.write(content.getBytes());
-
+ fos.close();
}
public void updateFile(File outXML, List<Element> tags) throws Exception
11 years, 7 months
Seam SVN: r15239 - in branches/community/Seam_2_3/examples/dvdstore: dvdstore-web and 1 other directory.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-09 10:06:30 -0400 (Tue, 09 Oct 2012)
New Revision: 15239
Modified:
branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml
branches/community/Seam_2_3/examples/dvdstore/dvdstore-web/pom.xml
Log:
dvdstore cleanup
Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml 2012-10-09 14:01:50 UTC (rev 15238)
+++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml 2012-10-09 14:06:30 UTC (rev 15239)
@@ -129,7 +129,6 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.15.0-GA</version>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/dvdstore/dvdstore-web/pom.xml 2012-10-09 14:01:50 UTC (rev 15238)
+++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-web/pom.xml 2012-10-09 14:06:30 UTC (rev 15239)
@@ -80,6 +80,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
11 years, 7 months
Seam SVN: r15238 - in branches/community/Seam_2_3/examples/drools: drools-tests/src/test/java/org/jboss/seam/example/numberguess/test and 4 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-09 10:01:50 -0400 (Tue, 09 Oct 2012)
New Revision: 15238
Added:
branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/lose.xhtml
branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/numberGuess.xhtml
branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/win.xhtml
Removed:
branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/lose.jsp
branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/numberGuess.jsp
branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/win.jsp
Modified:
branches/community/Seam_2_3/examples/drools/drools-ear/src/main/application/pageflow.jpdl.xml
branches/community/Seam_2_3/examples/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java
branches/community/Seam_2_3/examples/drools/drools-tests/src/test/resources-integration/web.xml
branches/community/Seam_2_3/examples/drools/drools-web/pom.xml
branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/WEB-INF/web.xml
Log:
upgrade drools example to facelets
Modified: branches/community/Seam_2_3/examples/drools/drools-ear/src/main/application/pageflow.jpdl.xml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-ear/src/main/application/pageflow.jpdl.xml 2012-10-09 11:23:17 UTC (rev 15237)
+++ branches/community/Seam_2_3/examples/drools/drools-ear/src/main/application/pageflow.jpdl.xml 2012-10-09 14:01:50 UTC (rev 15238)
@@ -11,7 +11,7 @@
"http://jboss.org/schema/seam/pageflow http://jboss.org/schema/seam/pageflow-2.3.xsd"
name="numberGuess">
- <start-page name="displayGuess" view-id="/numberGuess.jsp">
+ <start-page name="displayGuess" view-id="/numberGuess.xhtml">
<redirect/>
<transition name="guess" to="drools"/>
</start-page>
@@ -34,12 +34,12 @@
</decision>
- <page name="win" view-id="/win.jsp">
+ <page name="win" view-id="/win.xhtml">
<end-conversation />
<redirect/>
</page>
- <page name="lose" view-id="/lose.jsp">
+ <page name="lose" view-id="/lose.xhtml">
<end-conversation />
<redirect/>
</page>
Modified: branches/community/Seam_2_3/examples/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java 2012-10-09 11:23:17 UTC (rev 15237)
+++ branches/community/Seam_2_3/examples/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java 2012-10-09 14:01:50 UTC (rev 15238)
@@ -46,7 +46,7 @@
@Test
public void testNumberGuessWin() throws Exception
{
- String id = new NonFacesRequest("/numberGuess.jsp")
+ String id = new NonFacesRequest("/numberGuess.xhtml")
{
@Override
@@ -64,7 +64,7 @@
}.run();
- String id2 = new FacesRequest("/numberGuess.jsp", id)
+ String id2 = new FacesRequest("/numberGuess.xhtml", id)
{
@Override
@@ -83,14 +83,14 @@
@Override
protected void afterRequest() {
assert !isRenderResponseBegun();
- assert getViewId().equals("/numberGuess.jsp");
+ assert getViewId().equals("/numberGuess.xhtml");
}
}.run();
assert id2.equals(id);
- new NonFacesRequest("/numberGuess.jsp", id)
+ new NonFacesRequest("/numberGuess.xhtml", id)
{
@Override
@@ -108,7 +108,7 @@
}.run();
- id2 = new FacesRequest("/numberGuess.jsp", id)
+ id2 = new FacesRequest("/numberGuess.xhtml", id)
{
@Override
@@ -132,14 +132,14 @@
protected void afterRequest()
{
assert !isRenderResponseBegun();
- assert getViewId().equals("/win.jsp");
+ assert getViewId().equals("/win.xhtml");
}
}.run();
assert id2.equals(id);
- new NonFacesRequest("/win.jsp", id)
+ new NonFacesRequest("/win.xhtml", id)
{
@Override
protected void renderResponse() throws Exception {
@@ -159,7 +159,7 @@
@Test
public void testNumberGuessLose() throws Exception
{
- String id = new NonFacesRequest("/numberGuess.jsp")
+ String id = new NonFacesRequest("/numberGuess.xhtml")
{
@Override
@@ -180,7 +180,7 @@
final int count = i;
- new FacesRequest("/numberGuess.jsp", id)
+ new FacesRequest("/numberGuess.xhtml", id)
{
@Override
@@ -202,12 +202,12 @@
protected void afterRequest()
{
assert !isRenderResponseBegun();
- assert getViewId().equals("/numberGuess.jsp");
+ assert getViewId().equals("/numberGuess.xhtml");
}
}.run();
- new NonFacesRequest("/numberGuess.jsp", id)
+ new NonFacesRequest("/numberGuess.xhtml", id)
{
@Override
@@ -227,7 +227,7 @@
}
- new FacesRequest("/numberGuess.jsp", id)
+ new FacesRequest("/numberGuess.xhtml", id)
{
@Override
@@ -249,12 +249,12 @@
protected void afterRequest()
{
assert !isRenderResponseBegun();
- assert getViewId().equals("/lose.jsp");
+ assert getViewId().equals("/lose.xhtml");
}
}.run();
- new NonFacesRequest("/lose.jsp", id)
+ new NonFacesRequest("/lose.xhtml", id)
{
@Override
Modified: branches/community/Seam_2_3/examples/drools/drools-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-tests/src/test/resources-integration/web.xml 2012-10-09 11:23:17 UTC (rev 15237)
+++ branches/community/Seam_2_3/examples/drools/drools-tests/src/test/resources-integration/web.xml 2012-10-09 14:01:50 UTC (rev 15238)
@@ -9,9 +9,4 @@
<listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
</listener>
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.jsp</param-value>
- </context-param>
-
</web-app>
Modified: branches/community/Seam_2_3/examples/drools/drools-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-web/pom.xml 2012-10-09 11:23:17 UTC (rev 15237)
+++ branches/community/Seam_2_3/examples/drools/drools-web/pom.xml 2012-10-09 14:01:50 UTC (rev 15238)
@@ -40,6 +40,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/WEB-INF/web.xml 2012-10-09 11:23:17 UTC (rev 15237)
+++ branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/WEB-INF/web.xml 2012-10-09 14:01:50 UTC (rev 15238)
@@ -40,7 +40,7 @@
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.jsp</param-value>
+ <param-value>.xhtml</param-value>
</context-param>
</web-app>
Deleted: branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/lose.jsp
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/lose.jsp 2012-10-09 11:23:17 UTC (rev 15237)
+++ branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/lose.jsp 2012-10-09 14:01:50 UTC (rev 15238)
@@ -1,15 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-<head>
-<title>You lose.</title>
-</head>
-<body>
-<h1>You lose.</h1>
-<f:view>
- We recommend the
- <a href="http://mathworld.wolfram.com/Bisection.html">bisection algorithm</a>.
- Would you like to <a href="numberGuess.seam">play again</a>?
- </f:view>
-</body>
-</html>
Added: branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/lose.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/lose.xhtml (rev 0)
+++ branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/lose.xhtml 2012-10-09 14:01:50 UTC (rev 15238)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<h:html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.org/schema/seam/taglib">
+<h:head>
+<title>You lose.</title>
+</h:head>
+<h:body>
+<h1>You lose.</h1>
+ We recommend the
+ <a href="http://mathworld.wolfram.com/Bisection.html">bisection algorithm</a>.
+ Would you like to <a href="numberGuess.seam">play again</a>
+</h:body>
+</h:html>
Deleted: branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/numberGuess.jsp
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/numberGuess.jsp 2012-10-09 11:23:17 UTC (rev 15237)
+++ branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/numberGuess.jsp 2012-10-09 14:01:50 UTC (rev 15238)
@@ -1,29 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-<head>
-<title>Guess a number...</title>
-</head>
-<body>
-<h1>Guess a number...</h1>
-<f:view>
- <h:form id="NumberGuessMain">
- <h:outputText value="Higher!" rendered="#{randomNumber>guess.value}" />
- <h:outputText value="Lower!" rendered="#{randomNumber<guess.value}" />
- <br />
- I'm thinking of a number between <h:outputText id="Smallest" value="#{game.smallest}" /> and
- <h:outputText id="Biggest" value="#{game.biggest}" />.
- <br />
- Your guess:
- <h:inputText value="#{guess.value}" id="inputGuess" required="true">
- <f:validateLongRange
- maximum="#{game.biggest}"
- minimum="#{game.smallest}"/>
- </h:inputText>
- <h:commandButton id="GuessButton" type="submit" value="Guess" action="guess" />
- <br/>
- <h:message for="guess" style="color: red"/>
- </h:form>
-</f:view>
-</body>
-</html>
Added: branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/numberGuess.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/numberGuess.xhtml (rev 0)
+++ branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/numberGuess.xhtml 2012-10-09 14:01:50 UTC (rev 15238)
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<h:html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.org/schema/seam/taglib">
+<h:head>
+<title>Guess a number...</title>
+</h:head>
+<h:body>
+<h1>Guess a number...</h1>
+ <h:form id="NumberGuessMain">
+ <h:outputText value="Higher!" rendered="#{randomNumber gt guess.value}" />
+ <h:outputText value="Lower!" rendered="#{randomNumber lt guess.value}" />
+ <br />
+ I'm thinking of a number between <h:outputText id="Smallest" value="#{game.smallest}" /> and
+ <h:outputText id="Biggest" value="#{game.biggest}" />.
+ <br />
+ Your guess:
+ <h:inputText value="#{guess.value}" id="inputGuess" required="true">
+ <f:validateLongRange
+ maximum="#{game.biggest}"
+ minimum="#{game.smallest}"/>
+ </h:inputText>
+ <h:commandButton id="GuessButton" type="submit" value="Guess" action="guess">
+ <!-- Workaround for JBSEAM-4976 -->
+ <s:conversationId/>
+ </h:commandButton>
+ <br/>
+ <h:message for="inputGuess" style="color: red"/>
+ </h:form>
+</h:body>
+</h:html>
Deleted: branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/win.jsp
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/win.jsp 2012-10-09 11:23:17 UTC (rev 15237)
+++ branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/win.jsp 2012-10-09 14:01:50 UTC (rev 15238)
@@ -1,15 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-<head>
-<title>You won!</title>
-</head>
-<body>
-<h1>You won!</h1>
-<f:view>
- Yes, the answer was <h:outputText value="#{randomNumber}" />.
- It took you <h:outputText value="#{game.guessCount}" /> guesses.
- Would you like to <a href="numberGuess.seam">play again</a>?
- </f:view>
-</body>
-</html>
Added: branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/win.xhtml
===================================================================
--- branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/win.xhtml (rev 0)
+++ branches/community/Seam_2_3/examples/drools/drools-web/src/main/webapp/win.xhtml 2012-10-09 14:01:50 UTC (rev 15238)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<h:html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.org/schema/seam/taglib">
+<h:head>
+<title>You won!</title>
+</h:head>
+<h:body>
+<h1>You won!</h1>
+ Yes, the answer was <h:outputText value="#{randomNumber}" />.
+ It took you <h:outputText value="#{game.guessCount}" /> guesses.
+ Would you like to <a href="numberGuess.seam">play again</a>?
+</h:body>
+</h:html>
11 years, 7 months
Seam SVN: r15237 - in branches/community/Seam_2_3/examples/booking: booking-web and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-09 07:23:17 -0400 (Tue, 09 Oct 2012)
New Revision: 15237
Modified:
branches/community/Seam_2_3/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
branches/community/Seam_2_3/examples/booking/booking-web/pom.xml
branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html
branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html
branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/introExp.html
branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/loginExp.html
branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/mainExp.html
branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/registerExp.html
branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html
Log:
booking example cleanup
Modified: branches/community/Seam_2_3/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-10-09 11:23:17 UTC (rev 15237)
@@ -8,7 +8,6 @@
import org.jboss.arquillian.container.test.api.OverProtocol;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.Component;
-import org.jboss.seam.annotations.In;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.core.Manager;
import org.jboss.seam.example.booking.User;
Modified: branches/community/Seam_2_3/examples/booking/booking-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/pom.xml 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-web/pom.xml 2012-10-09 11:23:17 UTC (rev 15237)
@@ -28,23 +28,17 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -72,6 +66,16 @@
<groupId>org.richfaces.core</groupId>
<artifactId>richfaces-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html 2012-10-09 11:23:17 UTC (rev 15237)
@@ -16,7 +16,7 @@
<img src="../img/header_line.gif" />
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
<p>
@@ -151,7 +151,7 @@
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
</div>
Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html 2012-10-09 11:23:17 UTC (rev 15237)
@@ -16,7 +16,7 @@
<img src="../img/header_line.gif" />
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
<p>
@@ -94,7 +94,7 @@
</code>
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
</div>
Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/introExp.html
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/introExp.html 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/introExp.html 2012-10-09 11:23:17 UTC (rev 15237)
@@ -17,7 +17,7 @@
<center>
<form>
- <input type="button" value="Close Window" onclick="window.close()"></input>
+ <div><input type="button" value="Close Window" onclick="window.close()"></input></div>
</form>
</center>
@@ -58,7 +58,7 @@
<center>
<form>
- <input type="button" value="Close Window" onclick="window.close()" />
+ <div><input type="button" value="Close Window" onclick="window.close()" /></div>
</form>
</center>
Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/loginExp.html
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/loginExp.html 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/loginExp.html 2012-10-09 11:23:17 UTC (rev 15237)
@@ -16,7 +16,7 @@
<img src="../img/header_line.gif" />
<center>
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
</center>
<p>
@@ -30,12 +30,12 @@
<code class="block">
<div>
- <h:outputLabel for="username">Login Name</h:outputLabel>
- <h:inputText id="username" value="#{identity.username}" />
+ <h:outputLabel for="username">Login Name</h:outputLabel>
+ <h:inputText id="username" value="#{identity.username}" />
</div>
<div>
- <h:outputLabel for="password">Password</h:outputLabel>
- <h:inputSecret id="password" value="#{identity.password}" />
+ <h:outputLabel for="password">Password</h:outputLabel>
+ <h:inputSecret id="password" value="#{identity.password}" />
</div>
... ...
@@ -151,7 +151,7 @@
</p>
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
</div>
Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/mainExp.html
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/mainExp.html 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/mainExp.html 2012-10-09 11:23:17 UTC (rev 15237)
@@ -16,7 +16,7 @@
<img src="../img/header_line.gif" />
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
<p>
@@ -204,7 +204,7 @@
</code>
<center>
<form>
- <input type="button" value="Close Window" onclick="window.close()"></input>
+ <div><input type="button" value="Close Window" onclick="window.close()"></input></div>
</form>
</center>
</div>
Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/registerExp.html
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/registerExp.html 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/registerExp.html 2012-10-09 11:23:17 UTC (rev 15237)
@@ -16,7 +16,7 @@
<img src="img/header_line.gif" />
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
<p>
@@ -30,7 +30,7 @@
<s:validateAll>
<div class="entry">
<div class="label">
- <h:outputLabel for="username">Username:</h:outputLabel>
+ <h:outputLabel for="username">Username:</h:outputLabel>
</div>
<div class="input">
<h:inputText id="username" value="#{user.username}"/><br/>
@@ -39,11 +39,11 @@
</div>
<div class="entry">
<div class="label">
- <h:outputLabel for="name">Real Name:</h:outputLabel>
+ <h:outputLabel for="name">Real Name:</h:outputLabel>
</div>
<div class="input">
<h:inputText id="name" value="#{user.name}" /><br/>
- <span class="errors"><h:message for="name" /></span>
+ <span class="errors"><h:message for="name" /></span>
</div>
</div>
</s:validateAll>
@@ -219,7 +219,7 @@
</p>
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
</div>
Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html
===================================================================
--- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html 2012-10-09 11:02:47 UTC (rev 15236)
+++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html 2012-10-09 11:23:17 UTC (rev 15237)
@@ -17,7 +17,7 @@
<center>
<form>
- <input type="button" value="Close Window" onclick="window.close()"/>
+ <div><input type="button" value="Close Window" onclick="window.close()"/></div>
</form>
</center>
@@ -78,7 +78,7 @@
</p>
<form>
- <input type="button" value="Close Window" onclick="window.close()" />
+ <div><input type="button" value="Close Window" onclick="window.close()" /></div>
</form>
</div>
11 years, 7 months
Seam SVN: r15236 - branches/community/Seam_2_3/examples/wicket/wicket-web.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-09 07:02:47 -0400 (Tue, 09 Oct 2012)
New Revision: 15236
Modified:
branches/community/Seam_2_3/examples/wicket/wicket-web/pom.xml
Log:
wicket example cleanup
Modified: branches/community/Seam_2_3/examples/wicket/wicket-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/wicket/wicket-web/pom.xml 2012-10-09 10:52:23 UTC (rev 15235)
+++ branches/community/Seam_2_3/examples/wicket/wicket-web/pom.xml 2012-10-09 11:02:47 UTC (rev 15236)
@@ -44,6 +44,11 @@
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
11 years, 7 months
Seam SVN: r15235 - branches/community/Seam_2_3/examples/ui/ui-web.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-09 06:52:23 -0400 (Tue, 09 Oct 2012)
New Revision: 15235
Modified:
branches/community/Seam_2_3/examples/ui/ui-web/pom.xml
Log:
ui example cleanup
Modified: branches/community/Seam_2_3/examples/ui/ui-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/ui/ui-web/pom.xml 2012-10-09 10:23:53 UTC (rev 15234)
+++ branches/community/Seam_2_3/examples/ui/ui-web/pom.xml 2012-10-09 10:52:23 UTC (rev 15235)
@@ -55,6 +55,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<scope>provided</scope>
11 years, 7 months
Seam SVN: r15234 - in branches/community/Seam_2_3/examples/todo/todo-web: src/main/webapp/WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-09 06:23:53 -0400 (Tue, 09 Oct 2012)
New Revision: 15234
Modified:
branches/community/Seam_2_3/examples/todo/todo-web/pom.xml
branches/community/Seam_2_3/examples/todo/todo-web/src/main/webapp/WEB-INF/web.xml
Log:
todo example cleanup
Modified: branches/community/Seam_2_3/examples/todo/todo-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/todo/todo-web/pom.xml 2012-10-09 10:14:56 UTC (rev 15233)
+++ branches/community/Seam_2_3/examples/todo/todo-web/pom.xml 2012-10-09 10:23:53 UTC (rev 15234)
@@ -26,10 +26,6 @@
<scope>provided</scope>
<exclusions>
<exclusion>
- <artifactId>jboss-seam</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
- <exclusion>
<artifactId>hibernate-ehcache</artifactId>
<groupId>org.hibernate</groupId>
</exclusion>
@@ -45,18 +41,30 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ui</artifactId>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
- <exclusion>
- <artifactId>jboss-seam</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples/todo/todo-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/examples/todo/todo-web/src/main/webapp/WEB-INF/web.xml 2012-10-09 10:14:56 UTC (rev 15233)
+++ branches/community/Seam_2_3/examples/todo/todo-web/src/main/webapp/WEB-INF/web.xml 2012-10-09 10:23:53 UTC (rev 15234)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5"
+<web-app version="3.0"
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_2_5.xsd">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<listener>
<listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
11 years, 7 months
Seam SVN: r15233 - in branches/community/Seam_2_3/examples/tasks: tasks-tests/src/test/java/org/jboss/seam/example/tasks/test and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-09 06:14:56 -0400 (Tue, 09 Oct 2012)
New Revision: 15233
Modified:
branches/community/Seam_2_3/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java
branches/community/Seam_2_3/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java
branches/community/Seam_2_3/examples/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java
branches/community/Seam_2_3/examples/tasks/tasks-web/pom.xml
Log:
tasks example cleanup
Modified: branches/community/Seam_2_3/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java
===================================================================
--- branches/community/Seam_2_3/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-10-09 10:08:04 UTC (rev 15232)
+++ branches/community/Seam_2_3/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-10-09 10:14:56 UTC (rev 15233)
@@ -46,7 +46,7 @@
@Entity
@XmlRootElement
@Table(uniqueConstraints = @UniqueConstraint(columnNames = { "NAME", "OWNER_USERNAME" }))
-@NamedQuery(name = "categoryByNameAndUser", query = "select category from Category category where category.owner.username like :username and category.name like :category")
+@NamedQuery(name = "categoryByNameAndUser", query = "select c from Category c where c.owner.username like :username and c.name like :category")
public class Category
{
private Long id;
Modified: branches/community/Seam_2_3/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java
===================================================================
--- branches/community/Seam_2_3/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-10-09 10:08:04 UTC (rev 15232)
+++ branches/community/Seam_2_3/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-10-09 10:14:56 UTC (rev 15233)
@@ -37,7 +37,7 @@
*/
@Entity
@XmlRootElement
-@NamedQuery(name="taskByNameAndCategory", query="select task from Task task where task.name like :task and task.category.id = :category")
+@NamedQuery(name="taskByNameAndCategory", query="select t from Task t where t.name like :task and t.category.id = :category")
public class Task
{
private Long id;
Modified: branches/community/Seam_2_3/examples/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java
===================================================================
--- branches/community/Seam_2_3/examples/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java 2012-10-09 10:08:04 UTC (rev 15232)
+++ branches/community/Seam_2_3/examples/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java 2012-10-09 10:14:56 UTC (rev 15233)
@@ -6,7 +6,6 @@
import org.jboss.shrinkwrap.api.spec.WebArchive;
import java.io.File;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
public class Deployments {
public static EnterpriseArchive tasksDeployment() {
Modified: branches/community/Seam_2_3/examples/tasks/tasks-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/tasks/tasks-web/pom.xml 2012-10-09 10:08:04 UTC (rev 15232)
+++ branches/community/Seam_2_3/examples/tasks/tasks-web/pom.xml 2012-10-09 10:14:56 UTC (rev 15233)
@@ -55,6 +55,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
11 years, 7 months
Seam SVN: r15232 - in branches/community/Seam_2_3/examples/spring/spring-web: src/main/java/org/jboss/seam/example/spring and 1 other directory.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-10-09 06:08:04 -0400 (Tue, 09 Oct 2012)
New Revision: 15232
Modified:
branches/community/Seam_2_3/examples/spring/spring-web/pom.xml
branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/BookingListAction.java
branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/HibernateTestService.java
branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/RegisterAction.java
Log:
spring example cleanup
Modified: branches/community/Seam_2_3/examples/spring/spring-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples/spring/spring-web/pom.xml 2012-10-09 10:00:25 UTC (rev 15231)
+++ branches/community/Seam_2_3/examples/spring/spring-web/pom.xml 2012-10-09 10:08:04 UTC (rev 15232)
@@ -79,6 +79,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/BookingListAction.java
===================================================================
--- branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/BookingListAction.java 2012-10-09 10:00:25 UTC (rev 15231)
+++ branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/BookingListAction.java 2012-10-09 10:08:04 UTC (rev 15232)
@@ -30,7 +30,6 @@
@In
private User user;
- @SuppressWarnings("unused")
@DataModel
private List<Booking> bookings;
@DataModelSelection
Modified: branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/HibernateTestService.java
===================================================================
--- branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/HibernateTestService.java 2012-10-09 10:00:25 UTC (rev 15231)
+++ branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/HibernateTestService.java 2012-10-09 10:08:04 UTC (rev 15232)
@@ -3,10 +3,8 @@
*/
package org.jboss.seam.example.spring;
-import java.sql.SQLException;
import java.util.List;
-import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.springframework.transaction.TransactionStatus;
Modified: branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/RegisterAction.java
===================================================================
--- branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/RegisterAction.java 2012-10-09 10:00:25 UTC (rev 15231)
+++ branches/community/Seam_2_3/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/RegisterAction.java 2012-10-09 10:08:04 UTC (rev 15232)
@@ -21,7 +21,6 @@
@In("#{hibernateTestService}")
private HibernateTestService hibernateTestService;
- @SuppressWarnings("unused")
@In("hotelSearch")
private HotelSearchingAction hotelSearchingAction;
11 years, 7 months
Seam SVN: r15231 - branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/util.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-10-09 06:00:25 -0400 (Tue, 09 Oct 2012)
New Revision: 15231
Modified:
branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/util/ProxyFactory.java
Log:
JBPAPP-10130 updated ProxyFactory with javassist patch
Modified: branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/util/ProxyFactory.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/util/ProxyFactory.java 2012-10-09 09:55:00 UTC (rev 15230)
+++ branches/enterprise/JBPAPP_5_0/src/main/org/jboss/seam/util/ProxyFactory.java 2012-10-09 10:00:25 UTC (rev 15231)
@@ -858,6 +858,9 @@
code.addGetstatic(thisClassName, HOLDER, HOLDER_TYPE);
code.addAstore(arrayVar);
code.addAload(arrayVar);
+
+ callFind2Methods(code, meth.getName(), delegatorName, origIndex, desc, arrayVar);
+ /*
code.addIconst(origIndex);
code.addOpcode(Opcode.AALOAD);
code.addOpcode(Opcode.IFNONNULL);
@@ -868,7 +871,7 @@
callFindMethod(code, "findMethod", arrayVar, delIndex, delegatorName, desc);
int pc2 = code.currentPc();
- code.write16bit(pc, pc2 - pc + 1);
+ code.write16bit(pc, pc2 - pc + 1);*/
code.addAload(0);
code.addGetfield(thisClassName, HANDLER, HANDLER_TYPE);
code.addAload(0);
@@ -891,10 +894,10 @@
CodeAttribute ca = code.toCodeAttribute();
forwarder.setCodeAttribute(ca);
- StackMapTable.Writer writer = new StackMapTable.Writer(32);
+ /*StackMapTable.Writer writer = new StackMapTable.Writer(32);
writer.appendFrame(pc2, new int[] { StackMapTable.OBJECT },
new int[] { cp.addClassInfo(HOLDER_TYPE) });
- ca.setAttribute(writer.toStackMapTable(cp));
+ ca.setAttribute(writer.toStackMapTable(cp));*/
return forwarder;
}
@@ -993,6 +996,27 @@
}
}
+ private static void callFind2Methods(Bytecode code, String superMethod, String thisMethod,
+ int index, String desc, int arrayVar)
+ {
+ String findClass = RuntimeSupport.class.getName();
+ String findDesc = "(Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;[Ljava/lang/reflect/Method;)V";
+ code.addAload(0);
+ code.addLdc(superMethod);
+ if (thisMethod == null)
+ {
+ code.addOpcode(Opcode.ACONST_NULL);
+ }
+ else
+ {
+ code.addLdc(thisMethod);
+ }
+ code.addIconst(index);
+ code.addLdc(desc);
+ code.addAload(arrayVar);
+ code.addInvokestatic(findClass, "find2Methods", findDesc);
+ }
+
private static int makeWrapper(Bytecode code, Class type, int regno) {
int index = FactoryHelper.typeIndex(type);
String wrapper = FactoryHelper.wrapperTypes[index];
11 years, 7 months