Skip to content

minor changes to helloworld example as preparation to documentation updates #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 6 commits into from
Apr 17, 2017
Merged

minor changes to helloworld example as preparation to documentation updates #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06c4ded
changed tabs to spaces
sdutry Apr 17, 2017
47ad79f
removed unnecessary setter
sdutry Apr 17, 2017
3e31be7
removed unnecessary throws statement
sdutry Apr 17, 2017
a7c5f30
changed deprecated ${artifactId} to ${project.artifactId}
sdutry Apr 17, 2017
8d53015
removed unnecessary setter
sdutry Apr 17, 2017
6d98cba
updated jsps: UTF-8, html5, indentation
sdutry Apr 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helloworld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<version>8.1.16.v20140903</version>
<configuration>
<webApp>
<contextPath>/${artifactId}</contextPath>
<contextPath>/${project.artifactId}</contextPath>
</webApp>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
Expand Down
54 changes: 24 additions & 30 deletions helloworld/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,29 @@
*/
public class HelloWorldAction extends ActionSupport {

private static final long serialVersionUID = 1L;

/**
* The model class that stores the message
* to display in the view.
*/
private MessageStore messageStore;

/*
* Creates the MessageStore model object and
* returns success. The MessageStore model
* object will be available to the view.
* (non-Javadoc)
* @see com.opensymphony.xwork2.ActionSupport#execute()
*/
public String execute() throws Exception {

messageStore = new MessageStore() ;
return SUCCESS;
}

public MessageStore getMessageStore() {
return messageStore;
}

public void setMessageStore(MessageStore messageStore) {
this.messageStore = messageStore;
}


private static final long serialVersionUID = 1L;

/**
* The model class that stores the message
* to display in the view.
*/
private MessageStore messageStore;

/*
* Creates the MessageStore model object and
* returns success. The MessageStore model
* object will be available to the view.
* (non-Javadoc)
* @see com.opensymphony.xwork2.ActionSupport#execute()
*/
public String execute() {
messageStore = new MessageStore() ;

return SUCCESS;
}

public MessageStore getMessageStore() {
return messageStore;
}

}
23 changes: 9 additions & 14 deletions helloworld/src/main/java/org/apache/struts/helloworld/model/MessageStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,15 @@
*
*/
public class MessageStore {

private String message;

public MessageStore() {

setMessage("Hello Struts User");
}

private String message;

public MessageStore() {
message = "Hello Struts User";
}

public String getMessage() {
return message;
}

public void setMessage(String message) {
this.message = message;
}
public String getMessage() {
return message;
}

}
21 changes: 10 additions & 11 deletions helloworld/src/main/webapp/HelloWorld.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Hello World!</title>
</head>
<body>
<h2><s:property value="messageStore.message" /></h2>
</body>
</html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Hello World!</title>
</head>
<body>
<h2><s:property value="messageStore.message" /></h2>
</body>
</html>
23 changes: 11 additions & 12 deletions helloworld/src/main/webapp/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Basic Struts 2 Application - Welcome</title>
</head>
<body>
<h1>Welcome To Struts 2!</h1>
<p><a href="<s:url action='hello'/>">Hello World</a></p>
</body>
</html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Basic Struts 2 Application - Welcome</title>
</head>
<body>
<h1>Welcome To Struts 2!</h1>
<p><a href="<s:url action='hello'/>">Hello World</a></p>
</body>
</html>