You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2022/12/23 13:03:24 UTC
[myfaces] branch main updated (75c7ec3bc -> 50186684e)
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
from 75c7ec3bc Adopt to Temurin
new 6f514bb20 fix: checkstyle and rat errors from jenkins build and enable checkstyle and rat for myfaces ci on github
new 50186684e fix: checkstyle and rat errors from jenkins build, change version back to snapshot, update tomcat version, workaround for serializer.jar' error message from tomcat jar scanner
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/myfaces-ci.yml | 2 +-
api/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bundle/pom.xml | 2 +-
impl/pom.xml | 4 +-
integration-tests/ajax/pom.xml | 2 +-
.../core/integrationtests/ajax/basic/TestBean.java | 12 +-
.../ajax/test1Protocol/DeferredScriptMockup.java | 3 +-
.../ajax/test1Protocol/JSF21Simulation.java | 96 ++++++---
.../ajax/test1Protocol/ResponseMockup.java | 232 +++++++++++++++------
.../ajax/test1Protocol/ResponseMockup22.java | 3 +-
.../ajax/test1Protocol/ViewData.java | 3 +-
.../ajax/test1Protocol/jsfxmlnodes/Attribute.java | 9 +-
.../ajax/test1Protocol/jsfxmlnodes/Attributes.java | 15 +-
.../ajax/test1Protocol/jsfxmlnodes/Change.java | 3 +-
.../ajax/test1Protocol/jsfxmlnodes/Changes.java | 15 +-
.../ajax/test1Protocol/jsfxmlnodes/Delete.java | 15 +-
.../test1Protocol/jsfxmlnodes/ErrorResponse.java | 9 +-
.../ajax/test1Protocol/jsfxmlnodes/Eval.java | 6 +-
.../ajax/test1Protocol/jsfxmlnodes/Insert.java | 16 +-
.../ajax/test1Protocol/jsfxmlnodes/Insert2.java | 23 +-
.../test1Protocol/jsfxmlnodes/PartialResponse.java | 12 +-
.../ajax/test1Protocol/jsfxmlnodes/Update.java | 9 +-
.../responseWriter/MockupResponseWriter.java | 78 ++++---
.../responseWriter/PartialResponseWriterImpl.java | 209 +++++++++++++------
.../PartialResponseWriterMockup.java | 81 ++++---
.../responses/TableResponseMockups.java | 57 +++--
.../integrationtests/ajax/IntegrationTest.java | 93 ++++++---
.../autoLookupExpressionFactoryWithoutJSP/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 ++
.../automaticExtensionlessMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 ++
integration-tests/exactMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTestBean.java | 2 -
.../core/integrationtests/IntegrationTest.java | 18 ++
integration-tests/faceletToXhtmlMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 ++
.../faceletToXhtmlMappingDisabled/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 ++
integration-tests/pom.xml | 19 +-
integration-tests/protectedViews/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 ++
parent/pom.xml | 8 +-
test/pom.xml | 2 +-
44 files changed, 822 insertions(+), 342 deletions(-)
[myfaces] 02/02: fix: checkstyle and rat errors from jenkins build, change version back to snapshot, update tomcat version, workaround for serializer.jar' error message from tomcat jar scanner
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
commit 50186684e6379d7387abb32db4b7b2de214e596d
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Fri Dec 23 13:30:33 2022 +0100
fix: checkstyle and rat errors from jenkins build, change version back to snapshot, update tomcat version, workaround for serializer.jar' error message from tomcat jar scanner
---
api/pom.xml | 2 +-
assembly/pom.xml | 2 +-
bundle/pom.xml | 2 +-
impl/pom.xml | 4 +-
integration-tests/ajax/pom.xml | 2 +-
.../integrationtests/ajax/IntegrationTest.java | 93 ++++++++++++++++------
.../autoLookupExpressionFactoryWithoutJSP/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
.../automaticExtensionlessMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
integration-tests/exactMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
integration-tests/faceletToXhtmlMapping/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
.../faceletToXhtmlMappingDisabled/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
integration-tests/pom.xml | 11 ++-
integration-tests/protectedViews/pom.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 18 +++++
parent/pom.xml | 8 +-
test/pom.xml | 2 +-
21 files changed, 196 insertions(+), 50 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 298f4653e..7785148c7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 43ce371e7..d5a9e1da6 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 2bbbdd677..0910801a8 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/impl/pom.xml b/impl/pom.xml
index 9db6874a9..fe79dc34a 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -1027,7 +1027,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
- <version>10.0.0-M9</version>
+ <version>10.0.27</version>
<scope>test</scope>
</dependency>
diff --git a/integration-tests/ajax/pom.xml b/integration-tests/ajax/pom.xml
index 23ed559d1..70c1097ac 100644
--- a/integration-tests/ajax/pom.xml
+++ b/integration-tests/ajax/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java b/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
index 55c5c51ae..33239f1d5 100644
--- a/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
+++ b/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
@@ -50,7 +50,8 @@ import static org.junit.Assert.assertTrue;
@RunWith(Arquillian.class)
@RunAsClient
-public class IntegrationTest {
+public class IntegrationTest
+{
public static final String IB_1 = "insert before succeeded should display before test1";
public static final String IB_2 = "insert2 before succeeded should display before test1";
@@ -59,7 +60,26 @@ public class IntegrationTest {
public static final String IEL = "update succeeded 1";
@Deployment(testable = false)
- public static WebArchive createDeployment() {
+ public static WebArchive createDeployment()
+ {
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "ajax.war")
.importFrom(new File("target/ajax.war"))
.as(WebArchive.class);
@@ -80,18 +100,23 @@ public class IntegrationTest {
@After
- public void after() {
+ public void after()
+ {
webDriver.manage().deleteAllCookies();
}
@Before
- public void before() {
+ public void before()
+ {
}
- public void resetServerValues() {
- waitAjax().withTimeout(10, TimeUnit.SECONDS).until(new Function<WebDriver, Object>() {
+ public void resetServerValues()
+ {
+ waitAjax().withTimeout(10, TimeUnit.SECONDS).until(new Function<WebDriver, Object>()
+ {
- public Object apply(WebDriver webDriver) {
+ public Object apply(WebDriver webDriver)
+ {
return webDriver.findElement(By.id("_reset_all")).isDisplayed();
}
});
@@ -99,7 +124,8 @@ public class IntegrationTest {
}
@Test
- public void testAjaxPresent() {
+ public void testAjaxPresent()
+ {
webDriver.get(contextPath + "index.jsf");
resetServerValues();
@@ -117,21 +143,24 @@ public class IntegrationTest {
* and the response handling
*/
@Test
- public void testProtocol() {
+ public void testProtocol()
+ {
webDriver.get(contextPath + "test1-protocol.jsf");
resetServerValues();
//simple eval
trigger("cmd_eval", webDriver -> webDriver.getPageSource().contains("eval test succeeded"));
//simple update insert with embedded js
- trigger("cmd_update_insert", webDriver -> {
+ trigger("cmd_update_insert", webDriver ->
+ {
String pageSource = webDriver.getPageSource();
return pageSource.contains("embedded script at update succeed") &&
pageSource.contains("embedded script at insert succeed");
});
//update, insert with the correct order
- trigger("cmd_update_insert2", webDriver -> {
+ trigger("cmd_update_insert2", webDriver ->
+ {
String pageSource = webDriver.getPageSource();
return updateInsertElementsPresent(pageSource) &&
correctInsertUpdatePos(pageSource);
@@ -163,7 +192,8 @@ public class IntegrationTest {
* third test, body replacement
*/
@Test
- public void testViewBody() {
+ public void testViewBody()
+ {
webDriver.get(contextPath + "test2-viewbody.jsf");
resetServerValues();
trigger("cmd_body1", webDriver ->
@@ -177,7 +207,8 @@ public class IntegrationTest {
* third test, testing the chain function
*/
@Test
- public void testChain() {
+ public void testChain()
+ {
webDriver.get(contextPath + "test3-chain.jsf");
resetServerValues();
webDriver.findElement(new ByIdOrName("chaincall")).click();
@@ -190,24 +221,28 @@ public class IntegrationTest {
@Test
- public void testBasicTable() {
+ public void testBasicTable()
+ {
webDriver.get(contextPath + "test4-tablebasic.jsf");
resetServerValues();
- trigger("replace_head", webDriver -> {
+ trigger("replace_head", webDriver ->
+ {
final WebElement testTable = webDriver.findElement(new By.ById("testTable"));
return testTable.getText().contains("column1 in line1 replaced") &&
testTable.getText().contains("script evaled0");
});
- trigger("replace_body", webDriver -> {
+ trigger("replace_body", webDriver ->
+ {
final WebElement tableSegment = webDriver.findElement(new By.ById("body_row1_col1"));
return tableSegment.getText().contains("column1 in line1 replaced") &&
tableSegment.getText().contains("script evaled");
});
- trigger("insert_row_head", webDriver -> {
+ trigger("insert_row_head", webDriver ->
+ {
final WebElement headRow0 = webDriver.findElement(new By.ById("head_row1_0"));
final WebElement headRow1 = webDriver.findElement(new By.ById("head_row1"));
@@ -217,7 +252,8 @@ public class IntegrationTest {
});
- trigger("insert_row_body", webDriver -> {
+ trigger("insert_row_body", webDriver ->
+ {
final WebElement bodyRowCol1 = webDriver.findElement(new By.ById("body_row1_col1"));
final WebElement bodyRowCol2 = webDriver.findElement(new By.ById("body_row1_col2"));
final WebElement bodyRowCol0 = webDriver.findElement(new By.ById("body_row1_3_col1"));
@@ -231,7 +267,8 @@ public class IntegrationTest {
bodyRowCol2.getText().contains("colum2 in line1 replaced");
});
- trigger("insert_column_head", webDriver -> {
+ trigger("insert_column_head", webDriver ->
+ {
final WebElement headCol0 = webDriver.findElement(new By.ById("head_col1_1_4"));
final WebElement headCol1 = webDriver.findElement(new By.ById("head_col1_1_5"));
final WebElement headCol2 = webDriver.findElement(new By.ById("head_col1"));
@@ -251,7 +288,8 @@ public class IntegrationTest {
});
- trigger("insert_column_body", webDriver -> {
+ trigger("insert_column_body", webDriver ->
+ {
final WebElement bodyCol0 = webDriver.findElement(new By.ById("body_row1_col1_1_8"));
final WebElement bodyCol1 = webDriver.findElement(new By.ById("body_row1_col1_1_9"));
final WebElement bodyCol2 = webDriver.findElement(new By.ById("body_row1_col1"));
@@ -270,7 +308,8 @@ public class IntegrationTest {
});
- trigger("insert_body", webDriver -> {
+ trigger("insert_body", webDriver ->
+ {
return webDriver.getPageSource().contains("<tbody>") &&
webDriver.getPageSource().contains("second body added");
});
@@ -278,7 +317,8 @@ public class IntegrationTest {
}
@Test
- public void testViewRootBodyReplacement() {
+ public void testViewRootBodyReplacement()
+ {
webDriver.get(contextPath + "test5-viewbody-full-response.jsf");
resetServerValues();
trigger("cmd_body1", webDriver1 -> webDriver1.getPageSource().contains("Test for body change done") &&
@@ -291,7 +331,8 @@ public class IntegrationTest {
* @param id the trigger element id
* @param condition a condition resolver which should return true if the condition is met
*/
- void trigger(String id, Function<WebDriver, Object> condition) {
+ void trigger(String id, Function<WebDriver, Object> condition)
+ {
webDriver.findElement(new ByIdOrName(id)).click();
waitAjax()
.withTimeout(10, TimeUnit.SECONDS)
@@ -300,7 +341,8 @@ public class IntegrationTest {
//some page state condition helpers
- private boolean updateInsertElementsPresent(String pageSource) {
+ private boolean updateInsertElementsPresent(String pageSource)
+ {
return pageSource.contains(IB_1) &&
pageSource.contains(IB_2) &&
pageSource.contains(IA_2) &&
@@ -309,7 +351,8 @@ public class IntegrationTest {
}
- private boolean correctInsertUpdatePos(String pageSource) {
+ private boolean correctInsertUpdatePos(String pageSource)
+ {
return pageSource.indexOf(IB_1) < pageSource.indexOf(IB_2) &&
pageSource.indexOf(IB_2) < pageSource.indexOf(IEL) &&
pageSource.indexOf(IEL) < pageSource.indexOf(IA_2) &&
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/pom.xml b/integration-tests/autoLookupExpressionFactoryWithoutJSP/pom.xml
index 29ac3567c..bfc77428f 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/pom.xml
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index b2321c373..0d40a8bce 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -42,6 +42,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "exactMapping.war")
.importFrom(new File("target/autoLookupExpressionFactoryWithoutJSP.war"))
.as(WebArchive.class);
diff --git a/integration-tests/automaticExtensionlessMapping/pom.xml b/integration-tests/automaticExtensionlessMapping/pom.xml
index aec1ebbc5..be43038d2 100644
--- a/integration-tests/automaticExtensionlessMapping/pom.xml
+++ b/integration-tests/automaticExtensionlessMapping/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 483915662..73ee3300e 100644
--- a/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -42,6 +42,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "automaticExtensionlessMapping.war")
.importFrom(new File("target/automaticExtensionlessMapping.war"))
.as(WebArchive.class);
diff --git a/integration-tests/exactMapping/pom.xml b/integration-tests/exactMapping/pom.xml
index df9ac698c..bbaf64bb7 100644
--- a/integration-tests/exactMapping/pom.xml
+++ b/integration-tests/exactMapping/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index dff135f6c..4f4a529e3 100644
--- a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -45,6 +45,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "exactMapping.war")
.importFrom(new File("target/exactMapping.war"))
.as(WebArchive.class);
diff --git a/integration-tests/faceletToXhtmlMapping/pom.xml b/integration-tests/faceletToXhtmlMapping/pom.xml
index 055e16d7f..1af92c373 100644
--- a/integration-tests/faceletToXhtmlMapping/pom.xml
+++ b/integration-tests/faceletToXhtmlMapping/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 3c87770d0..a3d8caefa 100644
--- a/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -42,6 +42,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "faceletToXhtmlMapping.war")
.importFrom(new File("target/faceletToXhtmlMapping.war"))
.as(WebArchive.class);
diff --git a/integration-tests/faceletToXhtmlMappingDisabled/pom.xml b/integration-tests/faceletToXhtmlMappingDisabled/pom.xml
index c932fb5b9..f0a3ecee0 100644
--- a/integration-tests/faceletToXhtmlMappingDisabled/pom.xml
+++ b/integration-tests/faceletToXhtmlMappingDisabled/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index e87de9c19..e2d7f8334 100644
--- a/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -42,6 +42,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "faceletToXhtmlMappingDisabled.war")
.importFrom(new File("target/faceletToXhtmlMappingDisabled.war"))
.as(WebArchive.class);
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 8d0a58598..22f168053 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -28,7 +28,7 @@
<artifactId>myfaces-integration-tests</artifactId>
<name>Apache MyFaces Core 4.0 - Integration Tests</name>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
@@ -45,7 +45,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M7</version>
<configuration>
<trimStackTrace>false</trimStackTrace>
<systemPropertyVariables>
@@ -119,7 +118,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>10.0.8</version>
+ <version>10.0.27</version>
<scope>provided</scope>
</dependency>
@@ -217,19 +216,19 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>10.0.8</version>
+ <version>10.0.27</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
- <version>10.0.8</version>
+ <version>10.0.27</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
- <version>10.0.8</version>
+ <version>10.0.27</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/integration-tests/protectedViews/pom.xml b/integration-tests/protectedViews/pom.xml
index c0756a5dd..3b444501d 100644
--- a/integration-tests/protectedViews/pom.xml
+++ b/integration-tests/protectedViews/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 6c763be1d..fcf18a6e3 100644
--- a/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -45,6 +45,24 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
+ // Fix for 'Failed to scan serializer.jar' error message
+ String key = "tomcat.util.scan.StandardJarScanFilter.jarsToSkip";
+ String value = "bootstrap.jar,commons-daemon.jar,tomcat-juli.jar,annotations-api.jar,el-api.jar,jsp-api.jar," +
+ "servlet-api.jar,websocket-api.jar,jaspic-api.jar,catalina.jar,catalina-ant.jar,catalina-ha.jar," +
+ "catalina-storeconfig.jar,catalina-tribes.jar,jasper.jar,jasper-el.jar,ecj-*.jar,tomcat-api.jar," +
+ "tomcat-util.jar,tomcat-util-scan.jar,tomcat-coyote.jar,tomcat-dbcp.jar,tomcat-jni.jar," +
+ "tomcat-websocket.jar,tomcat-i18n-en.jar,tomcat-i18n-es.jar,tomcat-i18n-fr.jar,tomcat-i18n-ja.jar," +
+ "tomcat-juli-adapters.jar,catalina-jmx-remote.jar,catalina-ws.jar,tomcat-jdbc.jar,tools.jar," +
+ "commons-beanutils*.jar,commons-codec*.jar,commons-collections*.jar,commons-dbcp*.jar," +
+ "commons-digester*.jar,commons-fileupload*.jar,commons-httpclient*.jar,commons-io*.jar," +
+ "commons-lang*.jar,commons-logging*.jar,commons-math*.jar,commons-pool*.jar,jstl.jar," +
+ "taglibs-standard-spec-*.jar,geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,ant.jar,ant-junit*.jar," +
+ "aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,jmx-tools.jar,jta*.jar,log4j*.jar," +
+ "mail*.jar,slf4j*.jar,xercesImpl.jar,xmlParserAPIs.jar,xml-apis.jar,junit.jar,junit-*.jar," +
+ "ant-launcher.jar,cobertura-*.jar,asm-*.jar,dom4j-*.jar,icu4j-*.jar,jaxen-*.jar,jdom-*.jar," +
+ "jetty-*.jar,oro-*.jar,servlet-api-*.jar,tagsoup-*.jar,xmlParserAPIs-*.jar,xom-*.jar,serializer.jar";
+ System.setProperty(key, value);
+
return ShrinkWrap.create(ZipImporter.class, "protectedViews.war")
.importFrom(new File("target/protectedViews.war"))
.as(WebArchive.class);
diff --git a/parent/pom.xml b/parent/pom.xml
index 45ef34364..6db337670 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,7 +34,7 @@
This project is the home of the MyFaces implementation of the JavaServer Faces 2.3 specification, and
consists of an API module (jakarta.faces.* classes) and an implementation module (org.apache.myfaces.* classes).
</description>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<url>https://myfaces.apache.org/#/core40</url>
<issueManagement>
@@ -206,7 +206,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M7</version>
</plugin>
<plugin>
@@ -520,8 +520,4 @@
<siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
<siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>
</properties>
-
- <scm>
- <tag>myfaces-core-module-4.0.0-RC3</tag>
- </scm>
</project>
diff --git a/test/pom.xml b/test/pom.xml
index e833c5184..2423f5e43 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-core-project</artifactId>
- <version>4.0.0-RC3</version>
+ <version>4.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
[myfaces] 01/02: fix: checkstyle and rat errors from jenkins build and enable checkstyle and rat for myfaces ci on github
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bommel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
commit 6f514bb2091036d80b2d88e0b9b4f4b93890fd4a
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Thu Dec 22 20:39:06 2022 +0100
fix: checkstyle and rat errors from jenkins build and enable checkstyle and rat for myfaces ci on github
---
.github/workflows/myfaces-ci.yml | 2 +-
.../core/integrationtests/ajax/basic/TestBean.java | 12 +-
.../ajax/test1Protocol/DeferredScriptMockup.java | 3 +-
.../ajax/test1Protocol/JSF21Simulation.java | 96 ++++++---
.../ajax/test1Protocol/ResponseMockup.java | 232 +++++++++++++++------
.../ajax/test1Protocol/ResponseMockup22.java | 3 +-
.../ajax/test1Protocol/ViewData.java | 3 +-
.../ajax/test1Protocol/jsfxmlnodes/Attribute.java | 9 +-
.../ajax/test1Protocol/jsfxmlnodes/Attributes.java | 15 +-
.../ajax/test1Protocol/jsfxmlnodes/Change.java | 3 +-
.../ajax/test1Protocol/jsfxmlnodes/Changes.java | 15 +-
.../ajax/test1Protocol/jsfxmlnodes/Delete.java | 15 +-
.../test1Protocol/jsfxmlnodes/ErrorResponse.java | 9 +-
.../ajax/test1Protocol/jsfxmlnodes/Eval.java | 6 +-
.../ajax/test1Protocol/jsfxmlnodes/Insert.java | 16 +-
.../ajax/test1Protocol/jsfxmlnodes/Insert2.java | 23 +-
.../test1Protocol/jsfxmlnodes/PartialResponse.java | 12 +-
.../ajax/test1Protocol/jsfxmlnodes/Update.java | 9 +-
.../responseWriter/MockupResponseWriter.java | 78 ++++---
.../responseWriter/PartialResponseWriterImpl.java | 209 +++++++++++++------
.../PartialResponseWriterMockup.java | 81 ++++---
.../responses/TableResponseMockups.java | 57 +++--
.../core/integrationtests/IntegrationTestBean.java | 2 -
integration-tests/pom.xml | 8 +-
24 files changed, 626 insertions(+), 292 deletions(-)
diff --git a/.github/workflows/myfaces-ci.yml b/.github/workflows/myfaces-ci.yml
index cb91a615e..eac92f1c1 100644
--- a/.github/workflows/myfaces-ci.yml
+++ b/.github/workflows/myfaces-ci.yml
@@ -70,7 +70,7 @@ jobs:
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: |
- if ! mvn -B -V clean verify -Dformats=XML -f pom.xml; then
+ if ! mvn -B -V clean verify checkstyle:check apache-rat:check -Dformats=XML -f pom.xml; then
find . \( -path '*/target/surefire-reports/*.xml' -o -path '*/target/failsafe-reports/*.xml' -o -path '*/target/rat.txt' -o -path '*/target/checkstyle-result.xml' -o -path '*/target/dependency-check-report.xml' \) | zip -q reports.zip -@
exit 1
fi
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/basic/TestBean.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/basic/TestBean.java
index 75937d95e..d022accce 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/basic/TestBean.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/basic/TestBean.java
@@ -27,18 +27,22 @@ import static jakarta.faces.annotation.FacesConfig.Version.JSF_2_3;
@Named
@RequestScoped
@FacesConfig(version = JSF_2_3)
-public class TestBean {
+public class TestBean
+{
private String sayHello = "hello world from bean";
- public String getSayHello() {
+ public String getSayHello()
+ {
return sayHello;
}
- public void setSayHello(String sayHello) {
+ public void setSayHello(String sayHello)
+ {
this.sayHello = sayHello;
}
- public void doAction() {
+ public void doAction()
+ {
sayHello = "Action Performed";
}
}
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/DeferredScriptMockup.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/DeferredScriptMockup.java
index a6099d841..c8833ca1b 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/DeferredScriptMockup.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/DeferredScriptMockup.java
@@ -33,7 +33,8 @@ import java.io.IOException;
public class DeferredScriptMockup
{
- public String testScriptMockup() throws IOException {
+ public String testScriptMockup() throws IOException
+ {
PartialResponseWriterImpl writer = new PartialResponseWriterImpl();
writer.startDocument();
writer.startUpdate(PartialResponseWriterImpl.RENDER_ALL_MARKER);
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/JSF21Simulation.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/JSF21Simulation.java
index 95a3faa75..026b35389 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/JSF21Simulation.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/JSF21Simulation.java
@@ -34,64 +34,88 @@ import java.io.PrintWriter;
* @author Werner Punz (latest modification by $Author$)
* @version $Revision$ $Date$
*/
-public class JSF21Simulation extends HttpServlet {
+public class JSF21Simulation extends HttpServlet
+{
- static int TIMEOUT_REQS = 0;
- static int QUEUESIZE_REQS = 0;
+ static int timeoutReqs = 0;
+ static int queuesizeReqs = 0;
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
process(request, response);
}
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
process(request, response);
}
- private void process(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ private void process(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
+ {
response.setContentType("text/xml;charset=UTF-8");
PrintWriter out = response.getWriter();
- try {
- org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.PartialResponse root = new PartialResponse();
- if (request.getParameter("op") != null && request.getParameter("op").equals("timeout")) {
+ try
+ {
+ org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.PartialResponse root
+ = new PartialResponse();
+ if (request.getParameter("op") != null && request.getParameter("op").equals("timeout"))
+ {
renderTimeout(out, root);
- } else if (request.getParameter("op") != null && request.getParameter("op").equals("cleardelay")) {
- TIMEOUT_REQS = 0;
+ }
+ else if (request.getParameter("op") != null && request.getParameter("op").equals("cleardelay"))
+ {
+ timeoutReqs = 0;
Changes changes = new Changes(root);
- changes.addChild(new Update(changes, "delayoutput", "<div id='delayoutput'>Number of requests so far " + TIMEOUT_REQS + " </div>"));
+ changes.addChild(new Update(changes, "delayoutput",
+ "<div id='delayoutput'>Number of requests so far " + timeoutReqs + " </div>"));
root.addElement(changes);
out.println(root.toString());
out.flush();
- } else if (request.getParameter("op") != null && request.getParameter("op").equals("delay")) {
- TIMEOUT_REQS++;
+ }
+ else if (request.getParameter("op") != null && request.getParameter("op").equals("delay"))
+ {
+ timeoutReqs++;
Changes changes = new Changes(root);
- changes.addChild(new Update(changes, "delayoutput", "<div id='delayoutput'>Number of requests so far " + TIMEOUT_REQS + " </div>"));
+ changes.addChild(new Update(changes, "delayoutput",
+ "<div id='delayoutput'>Number of requests so far " + timeoutReqs + " </div>"));
root.addElement(changes);
out.println(root.toString());
out.flush();
- } else if (request.getParameter("op") != null && request.getParameter("op").equals("queuesize")) {
- QUEUESIZE_REQS++;
+ }
+ else if (request.getParameter("op") != null && request.getParameter("op").equals("queuesize"))
+ {
+ queuesizeReqs++;
Changes changes = new Changes(root);
- changes.addChild(new Update(changes, "queuesizeoutput", "<div id='queuesizeoutput'>Number of requests so far " + QUEUESIZE_REQS + " </div>"));
+ changes.addChild(new Update(changes, "queuesizeoutput",
+ "<div id='queuesizeoutput'>Number of requests so far " + queuesizeReqs + " </div>"));
root.addElement(changes);
sleep(300);
out.println(root.toString());
out.flush();
- } else if (request.getParameter("op") != null && request.getParameter("op").equals("pps")) {
- QUEUESIZE_REQS++;
+ }
+ else if (request.getParameter("op") != null && request.getParameter("op").equals("pps"))
+ {
+ queuesizeReqs++;
Changes changes = new Changes(root);
- boolean validPPS = request.getParameter("ppsControl") != null && request.getParameter("queuesizecontrol") == null;
+ boolean validPPS = request.getParameter("ppsControl") != null
+ && request.getParameter("queuesizecontrol") == null;
String validPPSString = (validPPS)? "is a valid partial page submit" : "is a full post submit";
- changes.addChild(new Update(changes, "ppsoutput", "<div id='ppsoutput'>" + validPPSString + " </div>"));
+ changes.addChild(new Update(changes, "ppsoutput",
+ "<div id='ppsoutput'>" + validPPSString + " </div>"));
root.addElement(changes);
out.println(root.toString());
out.flush();
- } else if (request.getParameter("op") != null && request.getParameter("op").equals("pps2")) {
- QUEUESIZE_REQS++;
+ }
+ else if (request.getParameter("op") != null && request.getParameter("op").equals("pps2"))
+ {
+ queuesizeReqs++;
Changes changes = new Changes(root);
- boolean validPPS = request.getParameter("ppsControl3") != null && request.getParameter("queuesizecontrol") == null;
+ boolean validPPS = request.getParameter("ppsControl3") != null
+ && request.getParameter("queuesizecontrol") == null;
String validPPSString = (validPPS)? "is a valid partial page submit" : "is a full post submit";
- changes.addChild(new Update(changes, "ppsoutput2", "<div id='ppsoutput2'>" + validPPSString + " </div>"));
+ changes.addChild(new Update(changes, "ppsoutput2",
+ "<div id='ppsoutput2'>" + validPPSString + " </div>"));
root.addElement(changes);
out.println(root.toString());
out.flush();
@@ -100,26 +124,34 @@ public class JSF21Simulation extends HttpServlet {
- } finally {
+ }
+ finally
+ {
out.close();
}
}
- private void renderTimeout(PrintWriter out, PartialResponse root) {
+ private void renderTimeout(PrintWriter out, PartialResponse root)
+ {
sleep(3000);
- root.addElement(new ErrorResponse(root, "This error should be displayed only if you run the long running request", "NoTrigger"));
+ root.addElement(new ErrorResponse(root,
+ "This error should be displayed only if you run the long running request", "NoTrigger"));
out.println(root.toString());
out.flush();
}
- private void sleep(int len) {
- try {
+ private void sleep(int len)
+ {
+ try
+ {
Thread.sleep(len);
- } catch (InterruptedException e) {
+ }
+ catch (InterruptedException e)
+ {
e.printStackTrace();
}
}
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
index 545b166ac..060af12c4 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
@@ -18,15 +18,28 @@
*/
package org.apache.myfaces.core.integrationtests.ajax.test1Protocol;
-import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.*;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Attribute;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Attributes;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Changes;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Delete;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.ErrorResponse;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Eval;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Insert;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Insert2;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.PartialResponse;
+import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes.Update;
import org.apache.myfaces.core.integrationtests.ajax.test1Protocol.responses.TableResponseMockups;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintWriter;
/**
@@ -39,7 +52,8 @@ import java.io.*;
* In the end some tests will use this servlet some tests will fall back into jsf
* with our javascript codebase as implementation
*/
-public class ResponseMockup extends HttpServlet {
+public class ResponseMockup extends HttpServlet
+{
public static final String VIEW_DATA = "_viewData_";
public static final String RESET_STATE = "reset_counters";
@@ -67,10 +81,10 @@ public class ResponseMockup extends HttpServlet {
public static final String TABLE_INSERT_BODY = "table_insert_body";
- private static String DEFAULT_RESPONSE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+ private static final String DEFAULT_RESPONSE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
"<partial-response><changes><update id=\"out1\"><![CDATA[<span id=\"out1\">2</span>]]></update><update id" +
"=\"jakarta.faces.ViewState\"><![CDATA[j_id1:j_id3]]></update></changes></partial-response>";
- private static String EMPTY_RESPONSE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+ private static final String EMPTY_RESPONSE = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
"<partial-response><changes></changes></partial-response>";
@@ -83,14 +97,16 @@ public class ResponseMockup extends HttpServlet {
* @throws java.io.IOException if an I/O error occurs
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException
+ {
//we simulate viewscoped here
String origin = request.getParameter("origin");
origin = (origin != null) ? origin : "";
ViewData viewData = (ViewData) request.getSession().getAttribute(VIEW_DATA + origin);
- if (viewData == null) {
+ if (viewData == null)
+ {
viewData = resetViewData(request, origin);
}
@@ -109,88 +125,142 @@ public class ResponseMockup extends HttpServlet {
* attributeChange
*
*/
- try {
+ try
+ {
- if (op == null || op.isEmpty()) {
+ if (op == null || op.isEmpty())
+ {
defaultResponse(out);
- } else if (op.trim().equalsIgnoreCase(RESET_STATE)) {
+ }
+ else if (op.trim().equalsIgnoreCase(RESET_STATE))
+ {
resetInternalState(request, origin, out);
- } else if (op.trim().toLowerCase().equals(EVAL_1)) {
+ }
+ else if (op.trim().toLowerCase().equals(EVAL_1))
+ {
embeddedJavascript1(out, root);
- } else if (op.trim().toLowerCase().equals(UPDATEINSERT_1)) {
+ }
+ else if (op.trim().toLowerCase().equals(UPDATEINSERT_1))
+ {
updateInsert1(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(UPDATEINSERT_2)) {
+ }
+ else if (op.trim().toLowerCase().equals(UPDATEINSERT_2))
+ {
updateInsert2(out, root);
- } else if (op.trim().toLowerCase().equals(DELETE_1)) {
+ }
+ else if (op.trim().toLowerCase().equals(DELETE_1))
+ {
delete1(out, root);
- } else if (op.trim().toLowerCase().equals(VIEWSTATE)) {
+ }
+ else if (op.trim().toLowerCase().equals(VIEWSTATE))
+ {
viewstateHandling(out, root);
- } else if (op.trim().toLowerCase().equals(ATTRIBUTES)) {
+ }
+ else if (op.trim().toLowerCase().equals(ATTRIBUTES))
+ {
attributeHandling(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(ERRORS_TAG)) {
+ }
+ else if (op.trim().toLowerCase().equals(ERRORS_TAG))
+ {
errors(out, root);
- } else if (op.trim().equals(ILLEGAL_RESPONSE)) {
+ }
+ else if (op.trim().equals(ILLEGAL_RESPONSE))
+ {
illegalResponse(out);
- } else if (op.trim().toLowerCase().equals(VIEW_BODY_REPLACE)) {
+ }
+ else if (op.trim().toLowerCase().equals(VIEW_BODY_REPLACE))
+ {
//we omit our xml builder for now
viewBodyWithFullHTMLResponse(out, root);
- } else if (op.trim().toLowerCase().equals(VIEW_BODY_REPLACE_2)) {
+ }
+ else if (op.trim().toLowerCase().equals(VIEW_BODY_REPLACE_2))
+ {
viewBodyWithOnlyBodyData(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(VIEW_ROOT_REPLACEMENT_1)) {
+ }
+ else if (op.trim().toLowerCase().equals(VIEW_ROOT_REPLACEMENT_1))
+ {
viewRootReplacement1(out, root);
//TODO check if still used?
- } else if (op.trim().toLowerCase().equals("serversideresponsewriter")) {
+ }
+ else if (op.trim().toLowerCase().equals("serversideresponsewriter"))
+ {
DeferredScriptMockup scriptMockup = new DeferredScriptMockup();
Changes changes = new Changes(root);
changes.addChild(new Eval(changes, "alert('the output is on the server console');"));
root.addElement(changes);
out.println(root.toString());
// table tests
- } else if (op.trim().toLowerCase().equals(ILLEGAL_RESPONSE_2)) {
+ }
+ else if (op.trim().toLowerCase().equals(ILLEGAL_RESPONSE_2))
+ {
illegalResponse2(out);
- } else if (op.trim().toLowerCase().equals(TABLE_REPLACE_HEAD)) {
+ }
+ else if (op.trim().toLowerCase().equals(TABLE_REPLACE_HEAD))
+ {
TableResponseMockups.tableReplaceHead(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(TABLE_REPLACE_BODY)) {
+ }
+ else if (op.trim().toLowerCase().equals(TABLE_REPLACE_BODY))
+ {
TableResponseMockups.tableReplaceBody(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(TABLE_INSERT_ROW_HEAD)) {
+ }
+ else if (op.trim().toLowerCase().equals(TABLE_INSERT_ROW_HEAD))
+ {
TableResponseMockups.tableInsertRowHead(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(TABLE_INSERT_ROW_BODY)) {
+ }
+ else if (op.trim().toLowerCase().equals(TABLE_INSERT_ROW_BODY))
+ {
TableResponseMockups.tableInsertRowBody(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(TABLE_INSERT_COLUMN_HEAD)) {
+ }
+ else if (op.trim().toLowerCase().equals(TABLE_INSERT_COLUMN_HEAD))
+ {
TableResponseMockups.tableInsetColumnHead(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(TABLE_INSERT_COLUMN_BODY)) {
+ }
+ else if (op.trim().toLowerCase().equals(TABLE_INSERT_COLUMN_BODY))
+ {
TableResponseMockups.tableInsertColumnBody(viewData, out, root);
- } else if (op.trim().toLowerCase().equals(TABLE_INSERT_FOOTER)) {
+ }
+ else if (op.trim().toLowerCase().equals(TABLE_INSERT_FOOTER))
+ {
TableResponseMockups.tableInsertFooter(out, root);
- } else if (op.trim().toLowerCase().equals(TABLE_INSERT_BODY)) {
+ }
+ else if (op.trim().toLowerCase().equals(TABLE_INSERT_BODY))
+ {
TableResponseMockups.tableInsertBody(out, root);
- } else if (op.trim().toLowerCase().equals(EXECUTE_NONE)) {
+ }
+ else if (op.trim().toLowerCase().equals(EXECUTE_NONE))
+ {
TableResponseMockups.execteNone(request, out, root);
}
- } finally {
+ }
+ finally
+ {
out.close();
}
}
- private void illegalResponse2(PrintWriter out) {
+ private void illegalResponse2(PrintWriter out)
+ {
out.println("blablabl this is an illegal reponse, you should see an error");
}
- private void viewRootReplacement1(PrintWriter out, PartialResponse root) throws IOException {
+ private void viewRootReplacement1(PrintWriter out, PartialResponse root) throws IOException
+ {
//TODO fix this properly, still references the absolute file position
- File fIn = new File("/Users/werpu/development/workspace/TestRI20/TestRI20/src/main/webapp/34beta.html.html");
+ File fIn = new File("src/main/webapp/34beta.html.html");
FileReader fRead = new FileReader(fIn);
BufferedReader reader = new BufferedReader(fRead);
String line = null;
StringBuilder replacement = new StringBuilder();
- do {
+ do
+ {
line = reader.readLine();
- if (line != null) {
+ if (line != null)
+ {
replacement.append(line);
replacement.append("\n");
}
@@ -201,14 +271,16 @@ public class ResponseMockup extends HttpServlet {
out.println(root.toString());
}
- private void viewBodyWithOnlyBodyData(ViewData viewData, PrintWriter out, PartialResponse root) {
+ private void viewBodyWithOnlyBodyData(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
//we omit our xml builder for now
StringBuilder replacement = new StringBuilder();
replacement.append("<body class=\"tundra\"> ");
replacement.append(" <div id=\"myfaces.logging\"><div id = \"centerDiv\">\n");
replacement.append(" <h1>Selenium Test for body change done</h1>\n");
- for (int cnt = 0; cnt < 20; cnt++) {
+ for (int cnt = 0; cnt < 20; cnt++)
+ {
replacement.append(" <div id = \"testResults" + cnt + "\"></div>\n");
}
replacement.append(" <h3>Body replacement test successful</h3>\n");
@@ -221,7 +293,8 @@ public class ResponseMockup extends HttpServlet {
out.println(root.toString());
}
- private void viewBodyWithFullHTMLResponse(PrintWriter out, PartialResponse root) {
+ private void viewBodyWithFullHTMLResponse(PrintWriter out, PartialResponse root)
+ {
StringBuilder replacement = new StringBuilder();
replacement.append("<html xmlns=\"http://www.w3.org/1999/xhtml\">" +
@@ -254,76 +327,106 @@ public class ResponseMockup extends HttpServlet {
out.println(root.toString());
}
- private void illegalResponse(PrintWriter out) {
+ private void illegalResponse(PrintWriter out)
+ {
out.println(">>>> xxxx >YYYY-!->>>");
}
- private void errors(PrintWriter out, PartialResponse root) {
+ private void errors(PrintWriter out, PartialResponse root)
+ {
root.addElement(new ErrorResponse(root, "Error1", "Error1 Text"));
root.addElement(new ErrorResponse(root, "Error2", "Error2 Text"));
out.println(root.toString());
}
- private void attributeHandling(ViewData viewData, PrintWriter out, PartialResponse root) {
+ private void attributeHandling(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
Attributes attr = new Attributes(changes, "attributeChange");
- attr.addAttribute(new Attribute("style", "color:rgb(" + ((viewData.red += 10) % 255) + ",100,100);"));
+ viewData.red += 10;
+ attr.addAttribute(new Attribute("style",
+ "color:rgb(" + ((viewData.red) % 255) + ",100,100);"));
attr.addAttribute(new Attribute("style", "border:1px solid black"));
- attr.addAttribute(new Attribute("onclick", "document.getElementById('evalarea4').innerHTML = 'attributes onclick succeeded';"));
+ attr.addAttribute(new Attribute("onclick",
+ "document.getElementById('evalarea4').innerHTML = 'attributes onclick succeeded';"));
changes.addChild(attr);
root.addElement(changes);
out.println(root.toString());
}
- private void viewstateHandling(PrintWriter out, PartialResponse root) {
+ private void viewstateHandling(PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
changes.addChild(new Update(changes, "jakarta.faces.ViewState", "hello world"));
root.addElement(changes);
out.println(root.toString());
}
- private void delete1(PrintWriter out, PartialResponse root) {
+ private void delete1(PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
changes.addChild(new Delete(changes, "deleteable"));
root.addElement(changes);
out.println(root.toString());
}
- private void updateInsert2(PrintWriter out, PartialResponse root) {
+ private void updateInsert2(PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
- changes.addChild(new Update(changes, "changesArea", "<div id='changesArea'>update succeeded 1</div><script type='text/javascript'>document.getElementById('evalarea2').innerHTML='embedded script at update succeed';</script>"));
- changes.addChild(new Insert2(changes, "inserted1", "<div id='insertbefore'>insert2 before succeeded " +
- "should display before test1</div><script type='text/javascript'>document.getElementById('evalarea3').innerHTML='embedded script at insert succeed';</script>", "changesArea", null));
+ changes.addChild(new Update(changes, "changesArea",
+ "<div id='changesArea'>update succeeded 1</div><script type='text/javascript'>" +
+ "document.getElementById('evalarea2').innerHTML='embedded script at update succeed';" +
+ "</script>"));
+ changes.addChild(new Insert2(changes, "inserted1",
+ "<div id='insertbefore'>insert2 before succeeded " +
+ "should display before test1</div><script type='text/javascript'>" +
+ "document.getElementById('evalarea3').innerHTML='embedded script at insert succeed';" +
+ "</script>", "changesArea", null));
changes.addChild(new Insert2(changes, "inserted2", "<div id='insertafter'>insert2 after succeeded " +
"should display after test1</div>", null, "changesArea"));
root.addElement(changes);
out.println(root.toString());
}
- private void updateInsert1(ViewData viewData, PrintWriter out, PartialResponse root) {
+ private void updateInsert1(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
- changes.addChild(new Update(changes, "changesArea", "<div id='changesArea'>update succeeded " + (viewData.cnt++) + "</div><script type='text/javascript'>document.getElementById('evalarea2').innerHTML='embedded script at update succeed';</script>"));
- changes.addChild(new Insert(changes, "inserted1", "<div id='insertbefore'>insert before succeeded should display before test1</div><script type='text/javascript'>document.getElementById('evalarea3').innerHTML='embedded script at insert succeed';</script>", "changesArea", null));
- changes.addChild(new Insert(changes, "inserted2", "<div id='insertafter'>insert after succeeded should display after test1</div>", null, "changesArea"));
+ changes.addChild(new Update(changes, "changesArea",
+ "<div id='changesArea'>update succeeded " + (viewData.cnt++) + "</div>" +
+ "<script type='text/javascript'>" +
+ "document.getElementById('evalarea2').innerHTML='embedded script at update succeed';" +
+ "</script>"));
+ changes.addChild(new Insert(changes, "inserted1",
+ "<div id='insertbefore'>insert before succeeded should display before test1</div>" +
+ "<script type='text/javascript'>" +
+ "document.getElementById('evalarea3').innerHTML='embedded script at insert succeed';</script>",
+ "changesArea", null));
+ changes.addChild(new Insert(changes, "inserted2",
+ "<div id='insertafter'>insert after succeeded should display after test1</div>",
+ null, "changesArea"));
root.addElement(changes);
out.println(root.toString());
}
- private void embeddedJavascript1(PrintWriter out, PartialResponse root) {
+ private void embeddedJavascript1(PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
- changes.addChild(new Eval(changes, "document.getElementById('evalarea1').innerHTML = 'eval test succeeded';"));
+ changes.addChild(new Eval(changes,
+ "document.getElementById('evalarea1').innerHTML = 'eval test succeeded';"));
root.addElement(changes);
out.println(root.toString());
}
- private void resetInternalState(HttpServletRequest request, String origin, PrintWriter out) {
+ private void resetInternalState(HttpServletRequest request, String origin, PrintWriter out)
+ {
resetViewData(request, origin);
out.println(EMPTY_RESPONSE);
}
- private void defaultResponse(PrintWriter out) {
+ private void defaultResponse(PrintWriter out)
+ {
out.println(DEFAULT_RESPONSE);
}
@@ -337,7 +440,8 @@ public class ResponseMockup extends HttpServlet {
*/
@Override
protected void doPost(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException
+ {
processRequest(request, response);
}
@@ -347,12 +451,14 @@ public class ResponseMockup extends HttpServlet {
* @return a String containing servlet description
*/
@Override
- public String getServletInfo() {
+ public String getServletInfo()
+ {
return "Short description";
}// </editor-fold>
- private ViewData resetViewData(HttpServletRequest request, String origin) {
+ private ViewData resetViewData(HttpServletRequest request, String origin)
+ {
ViewData viewData;
viewData = new ViewData();
request.getSession().setAttribute(VIEW_DATA + origin, viewData);
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
index 71f526b1c..bc04ccab0 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
@@ -61,7 +61,8 @@ public class ResponseMockup22 extends ResponseMockup
root.addElement(changes);
out.println(root.toString());
- } else
+ }
+ else
{
super.processRequest(request, response);
}
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ViewData.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ViewData.java
index bb1f37ee9..4fec8e068 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ViewData.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ViewData.java
@@ -21,7 +21,8 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol;
/**
* a helper model class storing the testing data
*/
-public class ViewData {
+public class ViewData
+{
public int cnt = 0;
public int elemCnt = 0;
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Attribute.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Attribute.java
index 5d1299b35..afe734908 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Attribute.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Attribute.java
@@ -25,16 +25,19 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.1 $ $Date: 2009/04/16 15:45:19 $
*/
-public class Attribute {
+public class Attribute
+{
String name = "";
String value = "";
- public Attribute(String name, String value) {
+ public Attribute(String name, String value)
+ {
this.name = name;
this.value = value;
}
- public String toString() {
+ public String toString()
+ {
StringBuilder retVal = new StringBuilder();
retVal.append("<attribute name='");
retVal.append(name);
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Attributes.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Attributes.java
index 7c2e23edf..5a8f643e6 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Attributes.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Attributes.java
@@ -25,25 +25,30 @@ import java.util.List;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.1 $ $Date: 2009/04/16 15:45:19 $
*/
-public class Attributes implements Change {
+public class Attributes implements Change
+{
String id = "";
List<Attribute> attributes = new LinkedList<Attribute>();
- public Attributes(Changes parent, String id) {
+ public Attributes(Changes parent, String id)
+ {
this.id = id;
}
- public void addAttribute(Attribute attr) {
+ public void addAttribute(Attribute attr)
+ {
attributes.add(attr);
}
- public String toString() {
+ public String toString()
+ {
StringBuilder retVal = new StringBuilder();
retVal.append("<attributes id='");
retVal.append(id);
retVal.append("'>");
- for (Attribute attribute : attributes) {
+ for (Attribute attribute : attributes)
+ {
retVal.append(attribute.toString());
}
retVal.append("</attributes>");
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Change.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Change.java
index 719a9e7b6..3aa0ddddf 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Change.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Change.java
@@ -27,7 +27,8 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes;
* changes
*
*/
-public interface Change {
+public interface Change
+{
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Changes.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Changes.java
index 23ddd82f7..2f3bff001 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Changes.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Changes.java
@@ -27,23 +27,28 @@ import java.util.List;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.1 $ $Date: 2009/04/16 15:45:19 $
*/
-public class Changes {
+public class Changes
+{
PartialResponse parent;
List<Change> childs = new LinkedList<Change>();
- public Changes(PartialResponse parent) {
+ public Changes(PartialResponse parent)
+ {
this.parent = parent;
}
- public void addChild(Change child) {
+ public void addChild(Change child)
+ {
childs.add(child);
}
- public String toString() {
+ public String toString()
+ {
StringBuilder retVal = new StringBuilder();
retVal.append("<changes>");
- for (Change child : childs) {
+ for (Change child : childs)
+ {
retVal.append(child.toString());
}
retVal.append("</changes>");
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Delete.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Delete.java
index 306d03f63..8307f299d 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Delete.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Delete.java
@@ -25,29 +25,34 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.1 $ $Date: 2009/04/16 15:45:19 $
*/
-public class Delete implements Change {
+public class Delete implements Change
+{
private String id = "";
- public Delete(Changes parent, String id) {
+ public Delete(Changes parent, String id)
+ {
this.id = id;
}
/**
* @return the id
*/
- public String getId() {
+ public String getId()
+ {
return id;
}
/**
* @param id the id to set
*/
- public void setId(String id) {
+ public void setId(String id)
+ {
this.id = id;
}
- public String toString() {
+ public String toString()
+ {
StringBuilder retVal = new StringBuilder();
retVal.append("<delete id='");
retVal.append(id);
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/ErrorResponse.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/ErrorResponse.java
index 3a461fb36..65082abfc 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/ErrorResponse.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/ErrorResponse.java
@@ -25,17 +25,20 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.1 $ $Date: 2009/04/17 10:27:53 $
*/
-public class ErrorResponse {
+public class ErrorResponse
+{
String errorMessage = "";
String errorName = "";
- public ErrorResponse(PartialResponse parent, String errorMessage, String errorName) {
+ public ErrorResponse(PartialResponse parent, String errorMessage, String errorName)
+ {
this.errorMessage = errorMessage;
this.errorName = errorName;
}
- public String toString() {
+ public String toString()
+ {
StringBuilder retVal = new StringBuilder();
retVal.append("<error>");
retVal.append("<error-name>");
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Eval.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Eval.java
index bcc16124b..572fdb550 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Eval.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Eval.java
@@ -30,11 +30,13 @@ public class Eval implements Change
String javascriptText = "";
- public Eval(Changes parent, String javascript) {
+ public Eval(Changes parent, String javascript)
+ {
javascriptText = javascript;
}
- public String toString() {
+ public String toString()
+ {
StringBuilder retVal = new StringBuilder();
retVal.append("<eval><![CDATA[");
retVal.append(javascriptText);
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Insert.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Insert.java
index fe529a6cd..a3a56e0d3 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Insert.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Insert.java
@@ -24,14 +24,16 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.2 $ $Date: 2009/04/17 10:53:30 $
*/
-public class Insert implements Change {
+public class Insert implements Change
+{
String id = "";
String before = "";
String after = "";
String data = "";
- public Insert(Changes parent, String id, String data, String before, String after) {
+ public Insert(Changes parent, String id, String data, String before, String after)
+ {
super();
this.id = id;
this.before = before;
@@ -40,17 +42,21 @@ public class Insert implements Change {
}
- public String toString() {
+ public String toString()
+ {
StringBuilder builder = new StringBuilder();
builder.append("<insert id='");
builder.append(id);
builder.append("' ");
- if (before != null && !before.trim().equals("")) {
+ if (before != null && !before.trim().equals(""))
+ {
builder.append(" before='");
builder.append(before);
builder.append("' >");
- } else {
+ }
+ else
+ {
builder.append(" after='");
builder.append(after);
builder.append("' >");
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Insert2.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Insert2.java
index c752c074c..6700665ec 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Insert2.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Insert2.java
@@ -31,14 +31,16 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.2 $ $Date: 2009/04/17 10:53:30 $
*/
-public class Insert2 implements Change {
+public class Insert2 implements Change
+{
String id = "";
String before = "";
String after = "";
String data = "";
- public Insert2(Changes parent, String id, String data, String before, String after) {
+ public Insert2(Changes parent, String id, String data, String before, String after)
+ {
super();
this.id = id;
this.before = before;
@@ -47,15 +49,19 @@ public class Insert2 implements Change {
}
- public String toString() {
+ public String toString()
+ {
StringBuilder builder = new StringBuilder();
builder.append("<insert>");
- if (before != null && !before.trim().equals("")) {
+ if (before != null && !before.trim().equals(""))
+ {
builder.append("<before id='");
builder.append(before);
builder.append("'>");
- } else {
+ }
+ else
+ {
builder.append("<after id='");
builder.append(after);
builder.append("' >");
@@ -63,9 +69,12 @@ public class Insert2 implements Change {
builder.append("<![CDATA[");
builder.append(data);
builder.append("]]>");
- if (before != null && !before.trim().equals("")) {
+ if (before != null && !before.trim().equals(""))
+ {
builder.append("</before>");
- } else {
+ }
+ else
+ {
builder.append("</after>");
}
builder.append("</insert>");
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/PartialResponse.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/PartialResponse.java
index ff1a155d5..c29ef3d02 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/PartialResponse.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/PartialResponse.java
@@ -27,21 +27,25 @@ import java.util.List;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.2 $ $Date: 2009/04/17 10:27:53 $
*/
-public class PartialResponse {
+public class PartialResponse
+{
List<Object> elements = new LinkedList<Object>();
- public void addElement(Object element) {
+ public void addElement(Object element)
+ {
elements.add(element);
}
- public String toString() {
+ public String toString()
+ {
StringBuilder retVal = new StringBuilder();
retVal.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
retVal.append("<partial-response>");
- for (Object element : elements) {
+ for (Object element : elements)
+ {
retVal.append(element.toString());
}
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Update.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Update.java
index d2a4d8f05..1fa7a3df5 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Update.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/jsfxmlnodes/Update.java
@@ -25,16 +25,19 @@ package org.apache.myfaces.core.integrationtests.ajax.test1Protocol.jsfxmlnodes;
* @author Werner Punz(latest modification by $Author: werpu $)
* @version $Revision: 1.2 $ $Date: 2009/04/17 10:53:30 $
*/
-public class Update implements Change{
+public class Update implements Change
+{
String id = "";
String data = "";
- public Update(Changes parent, String id, String data) {
+ public Update(Changes parent, String id, String data)
+ {
this.id = id;
this.data = data;
}
- public String toString() {
+ public String toString()
+ {
StringBuilder builder = new StringBuilder();
builder.append("<update id='");
builder.append(id);
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/MockupResponseWriter.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/MockupResponseWriter.java
index 3746f7de0..657b54803 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/MockupResponseWriter.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/MockupResponseWriter.java
@@ -28,43 +28,50 @@ import java.io.Writer;
*
* @author werpu
*/
-public class MockupResponseWriter extends ResponseWriter {
+public class MockupResponseWriter extends ResponseWriter
+{
StringBuilder target = new StringBuilder();
boolean _openTag = false;
@Override
- public String getContentType() {
+ public String getContentType()
+ {
return "text/xml";
}
@Override
- public String getCharacterEncoding() {
+ public String getCharacterEncoding()
+ {
return "utf-8";
}
@Override
- public void flush() throws IOException {
+ public void flush() throws IOException
+ {
}
@Override
- public void startDocument() throws IOException {
+ public void startDocument() throws IOException
+ {
target.append("<html><head></head><body>\n");
}
@Override
- public void endDocument() throws IOException {
+ public void endDocument() throws IOException
+ {
target.append("</body></html>");
}
@Override
- public void startElement(String arg0, UIComponent arg1) throws IOException {
- if (_openTag) {
+ public void startElement(String arg0, UIComponent arg1) throws IOException
+ {
+ if (_openTag)
+ {
target.append(">");
-
}
target.append("<");
@@ -76,10 +83,14 @@ public class MockupResponseWriter extends ResponseWriter {
/*for testing purposes this is not 100% correct we have to use the nesting depth
to check for
but it is ok for testing*/
- public void endElement(String arg0) throws IOException {
- if(_openTag) {
+ public void endElement(String arg0) throws IOException
+ {
+ if(_openTag)
+ {
target.append("/>");
- } else {
+ }
+ else
+ {
target.append("</");
target.append(arg0);
target.append("/>");
@@ -87,8 +98,10 @@ public class MockupResponseWriter extends ResponseWriter {
}
@Override
- public void writeAttribute(String arg0, Object arg1, String arg2) throws IOException {
- if(arg1 instanceof String) {
+ public void writeAttribute(String arg0, Object arg1, String arg2) throws IOException
+ {
+ if(arg1 instanceof String)
+ {
target.append(" ");
target.append(arg0);
target.append("=");
@@ -96,7 +109,9 @@ public class MockupResponseWriter extends ResponseWriter {
target.append(arg1);
target.append("'");
target.append(" ");
- } else {
+ }
+ else
+ {
target.append(" ");
target.append(arg0);
target.append("=");
@@ -106,13 +121,16 @@ public class MockupResponseWriter extends ResponseWriter {
}
@Override
- public void writeURIAttribute(String arg0, Object arg1, String arg2) throws IOException {
+ public void writeURIAttribute(String arg0, Object arg1, String arg2) throws IOException
+ {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void writeComment(Object arg0) throws IOException {
- if(_openTag) {
+ public void writeComment(Object arg0) throws IOException
+ {
+ if(_openTag)
+ {
_openTag = false;
target.append(">");
}
@@ -122,8 +140,10 @@ public class MockupResponseWriter extends ResponseWriter {
}
@Override
- public void writeText(Object arg0, String arg1) throws IOException {
- if(_openTag) {
+ public void writeText(Object arg0, String arg1) throws IOException
+ {
+ if(_openTag)
+ {
_openTag = false;
target.append(">");
}
@@ -133,8 +153,10 @@ public class MockupResponseWriter extends ResponseWriter {
}
@Override
- public void writeText(char[] arg0, int arg1, int arg2) throws IOException {
- if(_openTag) {
+ public void writeText(char[] arg0, int arg1, int arg2) throws IOException
+ {
+ if(_openTag)
+ {
_openTag = false;
target.append(">");
}
@@ -143,20 +165,24 @@ public class MockupResponseWriter extends ResponseWriter {
}
@Override
- public ResponseWriter cloneWithWriter(Writer arg0) {
+ public ResponseWriter cloneWithWriter(Writer arg0)
+ {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void write(char[] cbuf, int off, int len) throws IOException {
+ public void write(char[] cbuf, int off, int len) throws IOException
+ {
target.append(cbuf);
}
@Override
- public void close() throws IOException {
+ public void close() throws IOException
+ {
}
- public StringBuilder getTarget() {
+ public StringBuilder getTarget()
+ {
return target;
}
}
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/PartialResponseWriterImpl.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/PartialResponseWriterImpl.java
index 3f4188b36..222c88045 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/PartialResponseWriterImpl.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/PartialResponseWriterImpl.java
@@ -1,17 +1,23 @@
/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+
+
package org.apache.myfaces.core.integrationtests.ajax.test1Protocol.responseWriter;
import jakarta.faces.component.UIComponent;
@@ -60,45 +66,55 @@ public class PartialResponseWriterImpl extends PartialResponseWriterMockup
ScriptHandler _scriptEntry = null;
boolean _deferEval = false;
- public PartialResponseWriterImpl() {
+ public PartialResponseWriterImpl()
+ {
super();
}
@Override
- public void startError(String errorName) throws IOException {
+ public void startError(String errorName) throws IOException
+ {
super.startError(errorName);
_deferEval = true;
}
@Override
- public void startExtension(Map<String, String> attributes) throws IOException {
+ public void startExtension(Map<String, String> attributes) throws IOException
+ {
super.startExtension(attributes);
_deferEval = true;
}
@Override
- public void startInsertAfter(String targetId) throws IOException {
+ public void startInsertAfter(String targetId) throws IOException
+ {
super.startInsertAfter(targetId);
_deferEval = true;
}
@Override
- public void startInsertBefore(String targetId) throws IOException {
+ public void startInsertBefore(String targetId) throws IOException
+ {
super.startInsertBefore(targetId);
_deferEval = true;
}
@Override
- public void startUpdate(String targetId) throws IOException {
+ public void startUpdate(String targetId) throws IOException
+ {
super.startUpdate(targetId);
_deferEval = true;
}
- public void startEval() throws IOException {
- if (!_deferEval) {
+ public void startEval() throws IOException
+ {
+ if (!_deferEval)
+ {
super.startEval();
writeEvals();
- } else {
+ }
+ else
+ {
//we are already in an insert update or delete
//lets open a deferrence element
_scriptEntry = new ScriptHandler();
@@ -106,24 +122,29 @@ public class PartialResponseWriterImpl extends PartialResponseWriterMockup
}
}
- public void endEval() throws IOException {
- if (_scriptEntry != null) {
+ public void endEval() throws IOException
+ {
+ if (_scriptEntry != null)
+ {
_evals.append(_scriptEntry.toString());
_scriptEntry = null;
}
- if (!_deferEval) {
+ if (!_deferEval)
+ {
super.endEval();
}
}
- public void endInsert() throws IOException {
+ public void endInsert() throws IOException
+ {
super.endInsert();
flushEvals();
}
- public void endUpdate() throws IOException {
+ public void endUpdate() throws IOException
+ {
super.endUpdate();
flushEvals();
}
@@ -136,8 +157,10 @@ public class PartialResponseWriterImpl extends PartialResponseWriterMockup
* eval section
* @throws java.io.IOException
*/
- private void flushEvals() throws IOException {
- if (_evals.length() == 0) {
+ private void flushEvals() throws IOException
+ {
+ if (_evals.length() == 0)
+ {
return;
}
super.startEval();
@@ -145,71 +168,96 @@ public class PartialResponseWriterImpl extends PartialResponseWriterMockup
super.endEval();
}
- public void startElement(String name, UIComponent component) throws IOException {
+ public void startElement(String name, UIComponent component) throws IOException
+ {
//it is either <script type="text/javascript>" or <script>
- if (isScript(name)) {
+ if (isScript(name))
+ {
_scriptEntry = new ScriptHandler();
_scriptEntry.setComponent(component);
- } else {
+ }
+ else
+ {
super.startElement(name, component);
}
}
- public void write(String str) throws IOException {
+ public void write(String str) throws IOException
+ {
- if (_scriptEntry != null) {
+ if (_scriptEntry != null)
+ {
_scriptEntry.append(str);
- } else {
+ }
+ else
+ {
super.write(str);
}
}
- public void endElement(String name) throws IOException {
+ public void endElement(String name) throws IOException
+ {
//We can probably replace this with a simple scriptBuffer check!
- if (isScript(name) && _scriptEntry != null) {
+ if (isScript(name) && _scriptEntry != null)
+ {
_evals.append(_scriptEntry.toString());
_scriptEntry = null;
- } else {
+ }
+ else
+ {
super.endElement(name);
}
}
- public void writeAttribute(String name, Object value, String property) throws IOException {
- if (_scriptEntry != null && isType(name)) {
+ public void writeAttribute(String name, Object value, String property) throws IOException
+ {
+ if (_scriptEntry != null && isType(name))
+ {
_scriptEntry.setScriptType(value.toString());
return;
- } else if (_scriptEntry != null && isSource(name)) {
+ }
+ else if (_scriptEntry != null && isSource(name))
+ {
_scriptEntry.setSource(value.toString());
return;
- } else if (_scriptEntry != null && isDefer(name)) {
+ }
+ else if (_scriptEntry != null && isDefer(name))
+ {
_scriptEntry.setDefer(value.toString());
return;
- } else if (_scriptEntry != null && isCharset(name)) {
+ }
+ else if (_scriptEntry != null && isCharset(name))
+ {
_scriptEntry.setCharSet(value.toString());
return;
-
- } else if (_scriptEntry != null) {
+ }
+ else if (_scriptEntry != null)
+ {
//condition reached which we cannot eval, which means usually
//a script tag outside of what we can process in javascript
startElement(HTML.SCRIPT_ELEM, _scriptEntry.getComponent());
- if (_scriptEntry.getScriptType() != null) {
+ if (_scriptEntry.getScriptType() != null)
+ {
writeAttribute(HTML.TYPE_ATTR, _scriptEntry.getScriptType(), null);
_scriptEntry.setScriptType(null);
}
- if (_scriptEntry.getSource() != null) {
+ if (_scriptEntry.getSource() != null)
+ {
writeAttribute(HTML.SRC_ATTR, _scriptEntry.getSource(), null);
_scriptEntry.setSource(null);
}
- if (_scriptEntry.getDefer() != null) {
+ if (_scriptEntry.getDefer() != null)
+ {
writeAttribute("defer", _scriptEntry.getDefer(), null);
_scriptEntry.setSource(null);
}
- if (_scriptEntry.getCharSet() != null) {
+ if (_scriptEntry.getCharSet() != null)
+ {
writeAttribute(HTML.CHARSET_ATTR, _scriptEntry.getCharSet(), null);
_scriptEntry.setSource(null);
}
@@ -221,51 +269,61 @@ public class PartialResponseWriterImpl extends PartialResponseWriterMockup
super.writeAttribute(name, value, property);
}
- private boolean isDefer(String theType) {
+ private boolean isDefer(String theType)
+ {
return theType.equalsIgnoreCase("defer");
}
- private boolean isCharset(String theType) {
+ private boolean isCharset(String theType)
+ {
return theType.equalsIgnoreCase(HTML.CHARSET_ATTR);
}
- private boolean isSource(String theType) {
+ private boolean isSource(String theType)
+ {
return theType.equalsIgnoreCase(HTML.SRC_ATTR);
}
- private boolean isType(String theType) {
+ private boolean isType(String theType)
+ {
return theType.equalsIgnoreCase(HTML.TYPE_ATTR);
}
- private boolean isScript(String name) {
+ private boolean isScript(String name)
+ {
return name.equalsIgnoreCase(HTML.SCRIPT_ELEM);
}
/**
* @return the _evals
*/
- public String getEvals() {
+ public String getEvals()
+ {
return _evals.toString();
}
/**
* @param evals the _evals to set
*/
- public void setEvals(String evals) {
+ public void setEvals(String evals)
+ {
this._evals = new StringBuilder(evals);
}
- private void writeEvals() throws IOException {
+ private void writeEvals() throws IOException
+ {
super.write(_evals.toString());
_evals = new StringBuilder();
}
- public String toString() {
+ public String toString()
+ {
return super.getTarget().toString();
}
- private class ScriptHandler {
+ private class ScriptHandler
+ {
private String _scriptType = HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT;
private String _source = null;
@@ -274,13 +332,16 @@ public class PartialResponseWriterImpl extends PartialResponseWriterMockup
StringBuilder _content = new StringBuilder();
private UIComponent _component = null;
- public void append(String content) {
+ public void append(String content)
+ {
_content.append(content);
}
- public String toString() {
+ public String toString()
+ {
StringBuilder retVal = new StringBuilder(128);
- if (getSource() != null) {
+ if (getSource() != null)
+ {
//TODO replace this with a utils method in one of our utils sections
retVal.append("myfaces._impl._util._Utils.loadScript('");
retVal.append(getSource());
@@ -301,70 +362,80 @@ public class PartialResponseWriterImpl extends PartialResponseWriterMockup
/**
* @return the _scriptType
*/
- public String getScriptType() {
+ public String getScriptType()
+ {
return _scriptType;
}
/**
* @param scriptType the _scriptType to set
*/
- public void setScriptType(String scriptType) {
+ public void setScriptType(String scriptType)
+ {
this._scriptType = scriptType;
}
/**
* @return the _source
*/
- public String getSource() {
+ public String getSource()
+ {
return _source;
}
/**
* @param source the _source to set
*/
- public void setSource(String source) {
+ public void setSource(String source)
+ {
this._source = source;
}
/**
* @return the _component
*/
- public UIComponent getComponent() {
+ public UIComponent getComponent()
+ {
return _component;
}
/**
* @param component the _component to set
*/
- public void setComponent(UIComponent component) {
+ public void setComponent(UIComponent component)
+ {
this._component = component;
}
/**
* @return the _charSet
*/
- public String getCharSet() {
+ public String getCharSet()
+ {
return _charSet;
}
/**
* @param charSet the _charSet to set
*/
- public void setCharSet(String charSet) {
+ public void setCharSet(String charSet)
+ {
this._charSet = charSet;
}
/**
* @return the _defer
*/
- public String getDefer() {
+ public String getDefer()
+ {
return _defer;
}
/**
* @param defer the _defer to set
*/
- public void setDefer(String defer) {
+ public void setDefer(String defer)
+ {
this._defer = defer;
}
}
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/PartialResponseWriterMockup.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/PartialResponseWriterMockup.java
index 23c94b969..81fcd2341 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/PartialResponseWriterMockup.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/PartialResponseWriterMockup.java
@@ -26,14 +26,16 @@ import java.util.Map;
*
* @author werpu
*/
-public class PartialResponseWriterMockup extends MockupResponseWriter {
+public class PartialResponseWriterMockup extends MockupResponseWriter
+{
public static final String RENDER_ALL_MARKER = "jakarta.faces.ViewRoot";
public static final String VIEW_STATE_MARKER = "jakarta.faces.ViewState";
private boolean hasChanges;
private String insertType;
- public void delete(String targetId) throws IOException {
+ public void delete(String targetId) throws IOException
+ {
startChanges();
super.startElement("delete", null);
@@ -45,8 +47,10 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
* {@inheritDoc}
*/
@Override
- public void endDocument() throws IOException {
- if (hasChanges) {
+ public void endDocument() throws IOException
+ {
+ if (hasChanges)
+ {
// Close the <insert> element, if any.
endInsert();
@@ -59,7 +63,8 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
super.endElement("partial-response");
}
- public void endError() throws IOException {
+ public void endError() throws IOException
+ {
// Close open <error-message> element.
endCDATA();
@@ -67,19 +72,23 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
super.endElement("error");
}
- public void endEval() throws IOException {
+ public void endEval() throws IOException
+ {
// Close open <eval> element.
endCDATA();
super.endElement("eval");
}
- public void endExtension() throws IOException {
+ public void endExtension() throws IOException
+ {
super.endElement("extension");
}
- public void endInsert() throws IOException {
- if (insertType == null) {
+ public void endInsert() throws IOException
+ {
+ if (insertType == null)
+ {
// No insert started; ignore.
return;
@@ -94,12 +103,14 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
insertType = null;
}
- public void endUpdate() throws IOException {
+ public void endUpdate() throws IOException
+ {
endCDATA();
super.endElement("update");
}
- public void redirect(String url) throws IOException {
+ public void redirect(String url) throws IOException
+ {
super.startElement("redirect", null);
super.writeAttribute("url", url, null);
super.endElement("redirect");
@@ -109,13 +120,15 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
* {@inheritDoc}
*/
@Override
- public void startDocument() throws IOException {
+ public void startDocument() throws IOException
+ {
super.write("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
super.startElement("partial-response", null);
}
- public void startError(String errorName) throws IOException {
+ public void startError(String errorName) throws IOException
+ {
super.startElement("error", null);
super.startElement("error-name", null);
@@ -128,7 +141,8 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
// Leave open; caller will write message.
}
- public void startEval() throws IOException {
+ public void startEval() throws IOException
+ {
startChanges();
super.startElement("eval", null);
@@ -137,7 +151,8 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
// Leave open; caller will write statements.
}
- public void startExtension(Map<String, String> attributes) throws IOException {
+ public void startExtension(Map<String, String> attributes) throws IOException
+ {
Iterator<String> attrNames;
startChanges();
@@ -149,7 +164,8 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
attrNames = attributes.keySet().iterator();
- while (attrNames.hasNext()) {
+ while (attrNames.hasNext())
+ {
String attrName = attrNames.next();
super.writeAttribute(attrName, attributes.get(attrName), null);
@@ -158,15 +174,18 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
// Leave open; caller will write extension elements.
}
- public void startInsertAfter(String targetId) throws IOException {
+ public void startInsertAfter(String targetId) throws IOException
+ {
startInsertCommon("after", targetId);
}
- public void startInsertBefore(String targetId) throws IOException {
+ public void startInsertBefore(String targetId) throws IOException
+ {
startInsertCommon("before", targetId);
}
- public void startUpdate(String targetId) throws IOException {
+ public void startUpdate(String targetId) throws IOException
+ {
startChanges();
super.startElement("update", null);
@@ -176,7 +195,8 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
// Leave open; caller will write content.
}
- public void updateAttributes(String targetId, Map<String, String> attributes) throws IOException {
+ public void updateAttributes(String targetId, Map<String, String> attributes) throws IOException
+ {
Iterator<String> attrNames;
startChanges();
@@ -186,7 +206,8 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
attrNames = attributes.keySet().iterator();
- while (attrNames.hasNext()) {
+ while (attrNames.hasNext())
+ {
String attrName = attrNames.next();
super.startElement("attribute", null);
@@ -198,16 +219,20 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
super.endElement("attributes");
}
- private void startChanges() throws IOException {
- if (!hasChanges) {
+ private void startChanges() throws IOException
+ {
+ if (!hasChanges)
+ {
super.startElement("changes", null);
hasChanges = true;
}
}
- private void startInsertCommon(String type, String targetId) throws IOException {
- if (insertType != null) {
+ private void startInsertCommon(String type, String targetId) throws IOException
+ {
+ if (insertType != null)
+ {
// An insert has already been started; ignore.
return;
@@ -229,11 +254,13 @@ public class PartialResponseWriterMockup extends MockupResponseWriter {
* These methods are needed since we can't be sure that the data written by the caller will not
* contain reserved characters.
*/
- public void endCDATA() throws IOException {
+ public void endCDATA() throws IOException
+ {
super.write("]]>");
}
- public void startCDATA() throws IOException {
+ public void startCDATA() throws IOException
+ {
super.write("<![CDATA[");
}
}
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responses/TableResponseMockups.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responses/TableResponseMockups.java
index 6e5e2443e..f2389dbf7 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responses/TableResponseMockups.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responses/TableResponseMockups.java
@@ -30,10 +30,12 @@ import java.io.PrintWriter;
/**
* A helper class to encapsule the table responses
*/
-public class TableResponseMockups {
+public class TableResponseMockups
+{
- public static void execteNone(HttpServletRequest request, PrintWriter out, PartialResponse root) {
+ public static void execteNone(HttpServletRequest request, PrintWriter out, PartialResponse root)
+ {
boolean execute = request.getParameter("jakarta.faces.partial.execute") != null;
boolean render = request.getParameter("jakarta.faces.partial.render") != null;
@@ -45,7 +47,8 @@ public class TableResponseMockups {
out.println(root.toString());
}
- public static void tableInsertBody(PrintWriter out, PartialResponse root) {
+ public static void tableInsertBody(PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
changes.addChild(new Insert2(changes, "body_row1_col1",
"<tbody><tr><td colspan='2'>second body added</td></tr></tbody>",
@@ -55,7 +58,8 @@ public class TableResponseMockups {
out.println(root.toString());
}
- public static void tableInsertFooter(PrintWriter out, PartialResponse root) {
+ public static void tableInsertFooter(PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
changes.addChild(new Insert2(changes, "body_row1_col1", "<tfooter>footer inserted</tfooter>",
null,
@@ -64,17 +68,18 @@ public class TableResponseMockups {
out.println(root.toString());
}
- public static void tableInsertColumnBody(ViewData viewData, PrintWriter out, PartialResponse root) {
+ public static void tableInsertColumnBody(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
- changes.addChild(new Insert2(changes, "body_row1_col1", "<td id='body_row1_col1_1_" + (viewData.elemCnt++) +
- "'>inserted " +
- "before" + viewData.elemCnt + "</td>" + "<td id='body_row1_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
+ changes.addChild(new Insert2(changes, "body_row1_col1", "<td id='body_row1_col1_1_" +
+ (viewData.elemCnt++) + "'>inserted " + "before" + viewData.elemCnt + "</td>" +
+ "<td id='body_row1_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
"before " + viewData.elemCnt + "</td>",
"body_row1_col1",
null));
- changes.addChild(new Insert2(changes, "body_row1_col1", "<td id='body_row1_col1_1_" + (viewData.elemCnt++) +
- "'>inserted " +
- "after" + viewData.elemCnt + "</td>" + "<td id='body_row1_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
+ changes.addChild(new Insert2(changes, "body_row1_col1", "<td id='body_row1_col1_1_" +
+ (viewData.elemCnt++) + "'>inserted " + "after" + viewData.elemCnt +
+ "</td>" + "<td id='body_row1_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
"after" + viewData.elemCnt + "</td>",
null,
"body_row1_col2"));
@@ -83,15 +88,20 @@ public class TableResponseMockups {
out.println(root.toString());
}
- public static void tableInsetColumnHead(ViewData viewData, PrintWriter out, PartialResponse root) {
+ public static void tableInsetColumnHead(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
- changes.addChild(new Insert2(changes, "head_col1", "<td id='head_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
- "before" + viewData.elemCnt + "</td>" + "<td id='head_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
+ changes.addChild(new Insert2(changes,
+ "head_col1", "<td id='head_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
+ "before" + viewData.elemCnt + "</td>" +
+ "<td id='head_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
"before " + viewData.elemCnt + "</td>",
"head_col1",
null));
- changes.addChild(new Insert2(changes, "head_col1", "<td id='head_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
- "after" + viewData.elemCnt + "</td>" + "<td id='head_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
+ changes.addChild(new Insert2(changes,
+ "head_col1", "<td id='head_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
+ "after" + viewData.elemCnt + "</td>" +
+ "<td id='head_col1_1_" + (viewData.elemCnt++) + "'>inserted " +
"after" + viewData.elemCnt + "</td>",
null,
"head_col2"));
@@ -100,7 +110,8 @@ public class TableResponseMockups {
out.println(root.toString());
}
- public static void tableInsertRowBody(ViewData viewData, PrintWriter out, PartialResponse root) {
+ public static void tableInsertRowBody(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
changes.addChild(new Insert2(changes, "body_row1", " <tr class='insert_before' id=\"body_row1_" +
(viewData.elemCnt++) +
@@ -128,9 +139,11 @@ public class TableResponseMockups {
out.println(root.toString());
}
- public static void tableInsertRowHead(ViewData viewData, PrintWriter out, PartialResponse root) {
+ public static void tableInsertRowHead(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
- changes.addChild(new Insert2(changes, "head_row1", " <tr class='insert_before' id=\"head_row1_" + (viewData.elemCnt++) + "\">\n" +
+ changes.addChild(new Insert2(changes, "head_row1",
+ " <tr class='insert_before' id=\"head_row1_" + (viewData.elemCnt++) + "\">\n" +
" <td id=\"head_col1_" + viewData.elemCnt + "\">column1 in line1 inserted " +
"before</td>\n" +
" <td id=\"head_col2_" + viewData.elemCnt + "\">colum2 in line2 inserted before</td>\n" +
@@ -153,7 +166,8 @@ public class TableResponseMockups {
out.println(root.toString());
}
- public static void tableReplaceBody(ViewData viewData, PrintWriter out, PartialResponse root) {
+ public static void tableReplaceBody(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
changes.addChild(new Update(changes, "tbody1", "<tbody id=\"tbody1\">" +
"<tr id=\"body_row1\">" +
@@ -170,7 +184,8 @@ public class TableResponseMockups {
out.println(root.toString());
}
- public static void tableReplaceHead(ViewData viewData, PrintWriter out, PartialResponse root) {
+ public static void tableReplaceHead(ViewData viewData, PrintWriter out, PartialResponse root)
+ {
Changes changes = new Changes(root);
changes.addChild(new Update(changes, "head1", "<thead id=\"head1\">" +
"<tr id=\"head_row1\">" +
diff --git a/integration-tests/exactMapping/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java b/integration-tests/exactMapping/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
index f70f1b6d6..3effb8516 100644
--- a/integration-tests/exactMapping/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
+++ b/integration-tests/exactMapping/src/main/java/org/apache/myfaces/core/integrationtests/IntegrationTestBean.java
@@ -22,8 +22,6 @@ import static jakarta.faces.annotation.FacesConfig.Version.JSF_2_3;
import jakarta.enterprise.context.RequestScoped;
import jakarta.faces.annotation.FacesConfig;
-import jakarta.faces.context.FacesContext;
-import jakarta.inject.Inject;
import jakarta.inject.Named;
@FacesConfig(version = JSF_2_3)
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 52ffc5e56..8d0a58598 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -17,9 +17,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-project</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-integration-tests</artifactId>
<name>Apache MyFaces Core 4.0 - Integration Tests</name>
<version>4.0.0-RC3</version>