Author: wsmoak
Date: Tue Sep 5 20:24:53 2006
New Revision: 440591
URL: http://svn.apache.org/viewvc?view=rev&rev=440591
Log:
Added svn:eol-style native property to .java files.
WW-1432
Modified:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/Action.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/MessageAware.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/Messages.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/ResultNames.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/Validatable.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/servlet/ParameterAware.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/ActionContext.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/Interceptor.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/RequestContext.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/RequestContextAware.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/Result.java
(props changed)
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/ValueStack.java
(props changed)
struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
(contents, props changed)
struts/struts2/trunk/apps/blank/src/main/java/example/Login.java
(contents, props changed)
struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
(contents, props changed)
struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
(contents, props changed)
struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java
(contents, props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
(props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java
(props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
(props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
(props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
(props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java
(contents, props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java
(contents, props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java
(contents, props changed)
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsException.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherListener.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/MessagesImpl.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/ResultAdapter.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
(contents, props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesResult.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSupport.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java
(props changed)
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java
(props changed)
struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/MessagesTest.java
(props changed)
struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java
(props changed)
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
(props changed)
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
(props changed)
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
(props changed)
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java
(props changed)
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
(props changed)
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
(props changed)
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java
(props changed)
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java
(props changed)
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
(props changed)
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/Action.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/MessageAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/Messages.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/ResultNames.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/Validatable.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/servlet/ParameterAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/ActionContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/Interceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/RequestContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/RequestContextAware.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/Result.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/api/src/main/java/org/apache/struts2/spi/ValueStack.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
(original)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
Tue Sep 5 20:24:53 2006
@@ -1,9 +1,9 @@
-package example;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- * Base Action class for the Tutorial package.
- */
-public class ExampleSupport extends ActionSupport {
-}
+package example;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * Base Action class for the Tutorial package.
+ */
+public class ExampleSupport extends ActionSupport {
+}
Propchange:
struts/struts2/trunk/apps/blank/src/main/java/example/ExampleSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/apps/blank/src/main/java/example/Login.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/java/example/Login.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/java/example/Login.java (original)
+++ struts/struts2/trunk/apps/blank/src/main/java/example/Login.java Tue Sep 5
20:24:53 2006
@@ -1,38 +1,38 @@
-package example;
-
-public class Login extends ExampleSupport {
-
- public String execute() throws Exception {
-
- if (isInvalid(getUsername())) return INPUT;
-
- if (isInvalid(getPassword())) return INPUT;
-
- return SUCCESS;
- }
-
- private boolean isInvalid(String value) {
- return (value == null || value.length() == 0);
- }
-
- private String username;
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- private String password;
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
+package example;
+
+public class Login extends ExampleSupport {
+
+ public String execute() throws Exception {
+
+ if (isInvalid(getUsername())) return INPUT;
+
+ if (isInvalid(getPassword())) return INPUT;
+
+ return SUCCESS;
+ }
+
+ private boolean isInvalid(String value) {
+ return (value == null || value.length() == 0);
+ }
+
+ private String username;
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ private String password;
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
}
Propchange: struts/struts2/trunk/apps/blank/src/main/java/example/Login.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java Tue
Sep 5 20:24:53 2006
@@ -1,75 +1,75 @@
-package example;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-
-import java.util.Map;
-import java.util.List;
-
-public class ConfigTest extends XWorkTestCase {
-
- protected void assertSuccess(String result) throws Exception {
- assertTrue("Expected a success result!",
- ActionSupport.SUCCESS.equals(result));
- }
-
- protected void assertInput(String result) throws Exception {
- assertTrue("Expected an input result!",
- ActionSupport.INPUT.equals(result));
- }
-
- protected Map assertFieldErrors(ActionSupport action) throws Exception {
- assertTrue(action.hasFieldErrors());
- return action.getFieldErrors();
- }
-
- protected void assertFieldError(Map field_errors, String field_name,
String error_message) {
-
- List errors = (List) field_errors.get(field_name);
- assertNotNull("Expected errors for " + field_name, errors);
- assertTrue("Expected errors for " + field_name, errors.size()>0);
- // TODO: Should be a loop
- assertEquals(error_message,errors.get(0));
-
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- XmlConfigurationProvider c = new
XmlConfigurationProvider("struts.xml");
- configurationManager.addConfigurationProvider(c);
- configurationManager.reload();
- }
-
- protected ActionConfig assertClass(String namespace, String action_name,
String class_name) {
- RuntimeConfiguration configuration =
configurationManager.getConfiguration().getRuntimeConfiguration();
- ActionConfig config = configuration.getActionConfig(namespace,
action_name);
- assertNotNull("Mssing action", config);
- assertTrue("Wrong class name: [" + config.getClassName() + "]",
- class_name.equals(config.getClassName()));
- return config;
- }
-
- protected ActionConfig assertClass(String action_name, String class_name) {
- return assertClass("", action_name, class_name);
- }
-
- protected void assertResult(ActionConfig config, String result_name,
String result_value) {
- Map results = config.getResults();
- ResultConfig result = (ResultConfig) results.get(result_name);
- Map params = result.getParams();
- String value = (String) params.get("actionName");
- if (value == null)
- value = (String) params.get("location");
- assertTrue("Wrong result value: [" + value + "]",
- result_value.equals(value));
- }
-
- public void testConfig() throws Exception {
- assertNotNull(configurationManager);
- }
-
-}
+package example;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.XWorkTestCase;
+import com.opensymphony.xwork2.config.RuntimeConfiguration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.ResultConfig;
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+
+import java.util.Map;
+import java.util.List;
+
+public class ConfigTest extends XWorkTestCase {
+
+ protected void assertSuccess(String result) throws Exception {
+ assertTrue("Expected a success result!",
+ ActionSupport.SUCCESS.equals(result));
+ }
+
+ protected void assertInput(String result) throws Exception {
+ assertTrue("Expected an input result!",
+ ActionSupport.INPUT.equals(result));
+ }
+
+ protected Map assertFieldErrors(ActionSupport action) throws Exception {
+ assertTrue(action.hasFieldErrors());
+ return action.getFieldErrors();
+ }
+
+ protected void assertFieldError(Map field_errors, String field_name,
String error_message) {
+
+ List errors = (List) field_errors.get(field_name);
+ assertNotNull("Expected errors for " + field_name, errors);
+ assertTrue("Expected errors for " + field_name, errors.size()>0);
+ // TODO: Should be a loop
+ assertEquals(error_message,errors.get(0));
+
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ XmlConfigurationProvider c = new
XmlConfigurationProvider("struts.xml");
+ configurationManager.addConfigurationProvider(c);
+ configurationManager.reload();
+ }
+
+ protected ActionConfig assertClass(String namespace, String action_name,
String class_name) {
+ RuntimeConfiguration configuration =
configurationManager.getConfiguration().getRuntimeConfiguration();
+ ActionConfig config = configuration.getActionConfig(namespace,
action_name);
+ assertNotNull("Mssing action", config);
+ assertTrue("Wrong class name: [" + config.getClassName() + "]",
+ class_name.equals(config.getClassName()));
+ return config;
+ }
+
+ protected ActionConfig assertClass(String action_name, String class_name) {
+ return assertClass("", action_name, class_name);
+ }
+
+ protected void assertResult(ActionConfig config, String result_name,
String result_value) {
+ Map results = config.getResults();
+ ResultConfig result = (ResultConfig) results.get(result_name);
+ Map params = result.getParams();
+ String value = (String) params.get("actionName");
+ if (value == null)
+ value = (String) params.get("location");
+ assertTrue("Wrong result value: [" + value + "]",
+ result_value.equals(value));
+ }
+
+ public void testConfig() throws Exception {
+ assertNotNull(configurationManager);
+ }
+
+}
Propchange:
struts/struts2/trunk/apps/blank/src/test/java/example/ConfigTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
Tue Sep 5 20:24:53 2006
@@ -1,16 +1,16 @@
-package example;
-
-import com.opensymphony.xwork2.ActionSupport;
-import junit.framework.TestCase;
-
-public class HelloWorldTest extends TestCase {
-
- public void testHelloWorld() throws Exception {
- HelloWorld hello_world = new HelloWorld();
- String result = hello_world.execute();
- assertTrue("Expected a success result!",
- ActionSupport.SUCCESS.equals(result));
- assertTrue("Expected the default message!",
-
hello_world.getText(HelloWorld.MESSAGE).equals(hello_world.getMessage()));
- }
-}
+package example;
+
+import com.opensymphony.xwork2.ActionSupport;
+import junit.framework.TestCase;
+
+public class HelloWorldTest extends TestCase {
+
+ public void testHelloWorld() throws Exception {
+ HelloWorld hello_world = new HelloWorld();
+ String result = hello_world.execute();
+ assertTrue("Expected a success result!",
+ ActionSupport.SUCCESS.equals(result));
+ assertTrue("Expected the default message!",
+
hello_world.getText(HelloWorld.MESSAGE).equals(hello_world.getMessage()));
+ }
+}
Propchange:
struts/struts2/trunk/apps/blank/src/test/java/example/HelloWorldTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
--- struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java
(original)
+++ struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java Tue
Sep 5 20:24:53 2006
@@ -1,36 +1,36 @@
-package example;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-
-import java.util.Map;
-import java.util.Collection;
-import java.util.List;
-
-public class LoginTest extends ConfigTest {
-
- public void FIXME_testLoginConfig() throws Exception {
- ActionConfig config = assertClass("example", "Login!input",
"example.Login");
- assertResult(config, ActionSupport.SUCCESS, "Menu");
- assertResult(config, ActionSupport.INPUT, "/example/Login.jsp");
- }
-
- public void testLoginSubmit() throws Exception {
- Login login = new Login();
- login.setUsername("username");
- login.setPassword("password");
- String result = login.execute();
- assertSuccess(result);
- }
-
- // Needs access to an envinronment that includes validators
- public void FIXME_testLoginSubmitInput() throws Exception {
- Login login = new Login();
- String result = login.execute();
- assertInput(result);
- Map errors = assertFieldErrors(login);
- assertFieldError(errors,"username","Username is required.");
- assertFieldError(errors,"password","Password is required.");
- }
-
-}
+package example;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+
+import java.util.Map;
+import java.util.Collection;
+import java.util.List;
+
+public class LoginTest extends ConfigTest {
+
+ public void FIXME_testLoginConfig() throws Exception {
+ ActionConfig config = assertClass("example", "Login!input",
"example.Login");
+ assertResult(config, ActionSupport.SUCCESS, "Menu");
+ assertResult(config, ActionSupport.INPUT, "/example/Login.jsp");
+ }
+
+ public void testLoginSubmit() throws Exception {
+ Login login = new Login();
+ login.setUsername("username");
+ login.setPassword("password");
+ String result = login.execute();
+ assertSuccess(result);
+ }
+
+ // Needs access to an envinronment that includes validators
+ public void FIXME_testLoginSubmitInput() throws Exception {
+ Login login = new Login();
+ String result = login.execute();
+ assertInput(result);
+ Map errors = assertFieldErrors(login);
+ assertFieldError(errors,"username","Username is required.");
+ assertFieldError(errors,"password","Password is required.");
+ }
+
+}
Propchange: struts/struts2/trunk/apps/blank/src/test/java/example/LoginTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/GetCategory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Toggle.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java
Tue Sep 5 20:24:53 2006
@@ -1,23 +1,23 @@
-package org.apache.struts2.showcase.tutorial;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-public class HelloName extends ActionSupport {
-
- public String execute() throws Exception {
- if (getName() == null || getName().length() == 0)
- return ERROR;
- else
- return SUCCESS;
- }
-
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
+package org.apache.struts2.showcase.tutorial;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+public class HelloName extends ActionSupport {
+
+ public String execute() throws Exception {
+ if (getName() == null || getName().length() == 0)
+ return ERROR;
+ else
+ return SUCCESS;
+ }
+
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
}
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java
Tue Sep 5 20:24:53 2006
@@ -1,29 +1,29 @@
-package org.apache.struts2.showcase.tutorial;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.interceptor.ParameterAware;
-
-import java.util.Map;
-
-public class HelloName2 extends ActionSupport implements ParameterAware {
-
- public static String NAME = "name";
-
- public String execute() {
- String[] name = (String[]) parameters.get(NAME);
- if (name == null || name[0] == null || name[0].length() == 0)
- return ERROR;
- else
- return SUCCESS;
- }
-
- Map parameters;
-
- public Map getParameters() {
- return parameters;
- }
-
- public void setParameters(Map parameters) {
- this.parameters = parameters;
- }
-}
+package org.apache.struts2.showcase.tutorial;
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.ParameterAware;
+
+import java.util.Map;
+
+public class HelloName2 extends ActionSupport implements ParameterAware {
+
+ public static String NAME = "name";
+
+ public String execute() {
+ String[] name = (String[]) parameters.get(NAME);
+ if (name == null || name[0] == null || name[0].length() == 0)
+ return ERROR;
+ else
+ return SUCCESS;
+ }
+
+ Map parameters;
+
+ public Map getParameters() {
+ return parameters;
+ }
+
+ public void setParameters(Map parameters) {
+ this.parameters = parameters;
+ }
+}
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloName2.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java
Tue Sep 5 20:24:53 2006
@@ -1,23 +1,23 @@
-package org.apache.struts2.showcase.tutorial;
-
-import com.opensymphony.xwork2.Action;
-
-import java.text.DateFormat;
-import java.util.Date;
-
-public class HelloWorld implements Action {
-
- public String execute() {
- message = "Hello, World!\n";
- message += "The time is:\n";
- message += DateFormat.getDateInstance().format(new Date());
- return SUCCESS;
- }
-
- private String message;
-
- public String getMessage() {
- return message;
- }
-
+package org.apache.struts2.showcase.tutorial;
+
+import com.opensymphony.xwork2.Action;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+public class HelloWorld implements Action {
+
+ public String execute() {
+ message = "Hello, World!\n";
+ message += "The time is:\n";
+ message += DateFormat.getDateInstance().format(new Date());
+ return SUCCESS;
+ }
+
+ private String message;
+
+ public String getMessage() {
+ return message;
+ }
+
}
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/SubmitApplication.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Debug.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXMLConfigurationProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/MessagesImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/ResultAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java?view=diff&rev=440591&r1=440590&r2=440591
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
Tue Sep 5 20:24:53 2006
@@ -1,76 +1,76 @@
-/*
- * $Id: PlainTextResult.java 394468 2006-04-16 12:16:03Z tmjee $
- *
- * Copyright 2006 The Apache Software Foundation.
- *
- * 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
- *
- * 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.
- */
-package org.apache.struts2.jsf;
-
-import java.io.IOException;
-
-import javax.faces.FacesException;
-import javax.faces.application.Application;
-import javax.faces.application.ViewHandler;
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseId;
-
-/**
- * Performs the JSF render lifecycle phase.
- *
- */
-public class FacesRender extends FacesSupport {
-
- /**
- * Executes the render phase, borrowed from MyFaces
- *
- * @param facesContext
- * The faces context
- * @throws FacesException
- * If anything goes wrong
- */
- public void render(FacesContext facesContext) throws FacesException {
- // if the response is complete we should not be invoking the phase
- // listeners
- if (isResponseComplete(facesContext, "render", true)) {
- return;
- }
- if (log.isTraceEnabled())
- log.trace("entering renderResponse");
-
- informPhaseListenersBefore(facesContext, PhaseId.RENDER_RESPONSE);
- try {
- // also possible that one of the listeners completed the response
- if (isResponseComplete(facesContext, "render", true)) {
- return;
- }
- Application application = facesContext.getApplication();
- ViewHandler viewHandler = application.getViewHandler();
- try {
- viewHandler
- .renderView(facesContext, facesContext.getViewRoot());
- } catch (IOException e) {
- throw new FacesException(e.getMessage(), e);
- }
- } finally {
- informPhaseListenersAfter(facesContext, PhaseId.RENDER_RESPONSE);
- }
- if (log.isTraceEnabled()) {
- // Note: DebugUtils Logger must also be in trace level
- // DebugUtils.traceView("View after rendering");
- }
-
- if (log.isTraceEnabled())
- log.trace("exiting renderResponse");
- }
-}
+/*
+ * $Id: PlainTextResult.java 394468 2006-04-16 12:16:03Z tmjee $
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * 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
+ *
+ * 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.
+ */
+package org.apache.struts2.jsf;
+
+import java.io.IOException;
+
+import javax.faces.FacesException;
+import javax.faces.application.Application;
+import javax.faces.application.ViewHandler;
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+
+/**
+ * Performs the JSF render lifecycle phase.
+ *
+ */
+public class FacesRender extends FacesSupport {
+
+ /**
+ * Executes the render phase, borrowed from MyFaces
+ *
+ * @param facesContext
+ * The faces context
+ * @throws FacesException
+ * If anything goes wrong
+ */
+ public void render(FacesContext facesContext) throws FacesException {
+ // if the response is complete we should not be invoking the phase
+ // listeners
+ if (isResponseComplete(facesContext, "render", true)) {
+ return;
+ }
+ if (log.isTraceEnabled())
+ log.trace("entering renderResponse");
+
+ informPhaseListenersBefore(facesContext, PhaseId.RENDER_RESPONSE);
+ try {
+ // also possible that one of the listeners completed the response
+ if (isResponseComplete(facesContext, "render", true)) {
+ return;
+ }
+ Application application = facesContext.getApplication();
+ ViewHandler viewHandler = application.getViewHandler();
+ try {
+ viewHandler
+ .renderView(facesContext, facesContext.getViewRoot());
+ } catch (IOException e) {
+ throw new FacesException(e.getMessage(), e);
+ }
+ } finally {
+ informPhaseListenersAfter(facesContext, PhaseId.RENDER_RESPONSE);
+ }
+ if (log.isTraceEnabled()) {
+ // Note: DebugUtils Logger must also be in trace level
+ // DebugUtils.traceView("View after rendering");
+ }
+
+ if (log.isTraceEnabled())
+ log.trace("exiting renderResponse");
+ }
+}
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesRender.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/FacesSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/MessagesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/impl/RequestContextTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
------------------------------------------------------------------------------
svn:eol-style = native
