You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by sd...@apache.org on 2017/04/19 21:59:02 UTC
[1/9] struts-examples git commit: changed indentation (tabs to spaces)
Repository: struts-examples
Updated Branches:
refs/heads/master 6d98cba65 -> 18affab89
changed indentation (tabs to spaces)
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/141802c3
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/141802c3
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/141802c3
Branch: refs/heads/master
Commit: 141802c3884bf53c92c802ddd35ef6ae25250f74
Parents: 6d98cba
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 22:26:07 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 22:26:07 2017 +0200
----------------------------------------------------------------------
.../helloworld/action/HelloWorldAction.java | 87 ++++++++++----------
.../helloworld/model/MessageStore.java | 35 ++++----
2 files changed, 58 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/141802c3/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
----------------------------------------------------------------------
diff --git a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
index 2a777be..8a37129 100644
--- a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
+++ b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
@@ -14,49 +14,46 @@ import org.apache.struts.using_tags.helloworld.model.MessageStore;
*/
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;
-
- private static int helloCount = 0;
-
- public int getHelloCount() {
- return helloCount;
- }
-
- public void setHelloCount(int helloCount) {
- HelloWorldAction.helloCount = helloCount;
- }
-
- /*
- * Creates the MessageStore model object,
- * increase helloCount by 1 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() ;
-
- helloCount++;
-
- 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;
+
+ private static int helloCount = 0;
+
+ public int getHelloCount() {
+ return helloCount;
+ }
+
+ public void setHelloCount(int helloCount) {
+ HelloWorldAction.helloCount = helloCount;
+ }
+
+ /*
+ * Creates the MessageStore model object,
+ * increase helloCount by 1 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() ;
+
+ helloCount++;
+
+ return SUCCESS;
+ }
+
+ public MessageStore getMessageStore() {
+ return messageStore;
+ }
+
+ public void setMessageStore(MessageStore messageStore) {
+ this.messageStore = messageStore;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/141802c3/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java
----------------------------------------------------------------------
diff --git a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java
index 8870513..b14f766 100644
--- a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java
+++ b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java
@@ -6,26 +6,23 @@ package org.apache.struts.using_tags.helloworld.model;
*
*/
public class MessageStore {
-
- private String message;
-
- public MessageStore() {
-
- setMessage("Hello Struts User");
- }
+
+ private String message;
+
+ public MessageStore() {
+ setMessage("Hello Struts User");
+ }
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String toString() {
-
- return message + " (from toString)";
-
- }
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public String toString() {
+ return message + " (from toString)";
+ }
}
[3/9] struts-examples git commit: changed formatting for struts.xml
Posted by sd...@apache.org.
changed formatting for struts.xml
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/03e6bd81
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/03e6bd81
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/03e6bd81
Branch: refs/heads/master
Commit: 03e6bd8164e8482b476a718204ff026a9147307b
Parents: bfea188
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 22:41:09 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 22:41:09 2017 +0200
----------------------------------------------------------------------
using-tags/src/main/resources/struts.xml | 33 ++++++++++++---------------
1 file changed, 14 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/03e6bd81/using-tags/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/using-tags/src/main/resources/struts.xml b/using-tags/src/main/resources/struts.xml
index be7c92c..8711da3 100644
--- a/using-tags/src/main/resources/struts.xml
+++ b/using-tags/src/main/resources/struts.xml
@@ -1,27 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
- "http://struts.apache.org/dtds/struts-2.5.dtd">
-
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
+ <constant name="struts.devMode" value="true" />
- <constant name="struts.devMode" value="true" />
-
- <package name="basicstruts2" extends="struts-default">
-
+ <package name="basicstruts2" extends="struts-default">
<!-- If no class attribute is specified the framework will assume success and
render the result index.jsp -->
<!-- If no name value for the result node is specified the success value is the default -->
- <action name="index">
- <result>/index.jsp</result>
- </action>
-
- <!-- If the URL is hello.action the call the execute method of class HelloWorldAction.
- If the result returned by the execute method is success render the HelloWorld.jsp -->
- <action name="hello" class="org.apache.struts.using_tags.helloworld.action.HelloWorldAction" method="execute">
- <result name="success">/HelloWorld.jsp</result>
- </action>
-
- </package>
+ <action name="index">
+ <result>/index.jsp</result>
+ </action>
-</struts>
\ No newline at end of file
+ <!-- If the URL is hello.action the call the execute method of class HelloWorldAction.
+ If the result returned by the execute method is success render the HelloWorld.jsp -->
+ <action name="hello" class="org.apache.struts.using_tags.helloworld.action.HelloWorldAction" method="execute">
+ <result name="success">/HelloWorld.jsp</result>
+ </action>
+ </package>
+</struts>
[6/9] struts-examples git commit: removed unnecessary setter
Posted by sd...@apache.org.
removed unnecessary setter
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/f4fb7dfb
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/f4fb7dfb
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/f4fb7dfb
Branch: refs/heads/master
Commit: f4fb7dfb95496d152f8f23f8029a7ba85e07cc1e
Parents: 1010c52
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 22:59:24 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 22:59:24 2017 +0200
----------------------------------------------------------------------
.../struts/using_tags/helloworld/model/MessageStore.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/f4fb7dfb/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java
----------------------------------------------------------------------
diff --git a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java
index b14f766..6871281 100644
--- a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java
+++ b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/model/MessageStore.java
@@ -10,17 +10,13 @@ public class MessageStore {
private String message;
public MessageStore() {
- setMessage("Hello Struts User");
+ message = "Hello Struts User";
}
public String getMessage() {
return message;
}
- public void setMessage(String message) {
- this.message = message;
- }
-
public String toString() {
return message + " (from toString)";
}
[4/9] struts-examples git commit: fixed javadoc object type name
Posted by sd...@apache.org.
fixed javadoc object type name
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/7e2b1caa
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/7e2b1caa
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/7e2b1caa
Branch: refs/heads/master
Commit: 7e2b1caac5c44811407d9d4c23800566c9e22241
Parents: 03e6bd8
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 22:51:23 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 22:51:23 2017 +0200
----------------------------------------------------------------------
.../struts/using_tags/helloworld/action/HelloWorldAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7e2b1caa/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
----------------------------------------------------------------------
diff --git a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
index 8a37129..c4d320f 100644
--- a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
+++ b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
@@ -7,7 +7,7 @@ import org.apache.struts.using_tags.helloworld.model.MessageStore;
/**
* Acts as a Struts 2 controller that responds
* to a user action by setting the value
- * of the Message model class, and returns a String
+ * of the MessageStore model class, and returns a String
* result.
* @author Bruce Phillips
*
[7/9] struts-examples git commit: changed encoding to UTF-8
Posted by sd...@apache.org.
changed encoding to UTF-8
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/404319bf
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/404319bf
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/404319bf
Branch: refs/heads/master
Commit: 404319bf2ba114eea3a7aacc1d98252f73f2da17
Parents: f4fb7df
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 23:22:31 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 23:22:31 2017 +0200
----------------------------------------------------------------------
using-tags/src/main/webapp/HelloWorld.jsp | 4 ++--
using-tags/src/main/webapp/index.jsp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/404319bf/using-tags/src/main/webapp/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/using-tags/src/main/webapp/HelloWorld.jsp b/using-tags/src/main/webapp/HelloWorld.jsp
index 7f39cf6..f05ae12 100644
--- a/using-tags/src/main/webapp/HelloWorld.jsp
+++ b/using-tags/src/main/webapp/HelloWorld.jsp
@@ -1,9 +1,9 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ 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">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Hello World!</title>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/404319bf/using-tags/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/using-tags/src/main/webapp/index.jsp b/using-tags/src/main/webapp/index.jsp
index 114b534..9967f3c 100644
--- a/using-tags/src/main/webapp/index.jsp
+++ b/using-tags/src/main/webapp/index.jsp
@@ -1,9 +1,9 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ 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">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Basic Struts 2 Application - Welcome</title>
</head>
<body>
[5/9] struts-examples git commit: removed unnecessary setter
Posted by sd...@apache.org.
removed unnecessary setter
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/1010c524
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/1010c524
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/1010c524
Branch: refs/heads/master
Commit: 1010c52435587c9470880db15267062c98362eb1
Parents: 7e2b1ca
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 22:55:29 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 22:55:29 2017 +0200
----------------------------------------------------------------------
.../struts/using_tags/helloworld/action/HelloWorldAction.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1010c524/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
----------------------------------------------------------------------
diff --git a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
index c4d320f..835dc56 100644
--- a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
+++ b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
@@ -52,8 +52,4 @@ public class HelloWorldAction extends ActionSupport {
return messageStore;
}
- public void setMessageStore(MessageStore messageStore) {
- this.messageStore = messageStore;
- }
-
}
[2/9] struts-examples git commit: tried adding some form of
indentation to jsps
Posted by sd...@apache.org.
tried adding some form of indentation to jsps
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/bfea188e
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/bfea188e
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/bfea188e
Branch: refs/heads/master
Commit: bfea188e35d816b90994786f475c6164506a7f40
Parents: 141802c
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 22:36:38 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 22:36:38 2017 +0200
----------------------------------------------------------------------
using-tags/src/main/webapp/HelloWorld.jsp | 23 +++++++-------
using-tags/src/main/webapp/index.jsp | 44 +++++++++++---------------
2 files changed, 30 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bfea188e/using-tags/src/main/webapp/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/using-tags/src/main/webapp/HelloWorld.jsp b/using-tags/src/main/webapp/HelloWorld.jsp
index 108810c..7f39cf6 100644
--- a/using-tags/src/main/webapp/HelloWorld.jsp
+++ b/using-tags/src/main/webapp/HelloWorld.jsp
@@ -1,15 +1,14 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
<%@ 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>
-<p>I've said hello <s:property value="helloCount" /> times!</p>
-<p><s:property value="messageStore" /></p>
-</body>
-</html>
\ No newline at end of file
+ <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>
+ <p>I've said hello <s:property value="helloCount" /> times!</p>
+ <p><s:property value="messageStore" /></p>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/bfea188e/using-tags/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/using-tags/src/main/webapp/index.jsp b/using-tags/src/main/webapp/index.jsp
index f9bcea2..114b534 100644
--- a/using-tags/src/main/webapp/index.jsp
+++ b/using-tags/src/main/webapp/index.jsp
@@ -1,28 +1,22 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
<%@ 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>
-<s:url action="hello" var="helloLink">
- <s:param name="userName">Bruce Phillips</s:param>
-</s:url>
-<p><a href="${helloLink}">Hello Bruce Phillips</a></p>
-
-<p>Get your own personal hello by filling out and submitting this form.</p>
-
-<s:form action="hello">
-
- <s:textfield name="userName" label="Your name" />
-
- <s:submit value="Submit" />
-
-</s:form>
-</body>
-</html>
\ No newline at end of file
+ <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>
+ <s:url action="hello" var="helloLink">
+ <s:param name="userName">Bruce Phillips</s:param>
+ </s:url>
+ <p><a href="${helloLink}">Hello Bruce Phillips</a></p>
+ <p>Get your own personal hello by filling out and submitting this form.</p>
+ <s:form action="hello">
+ <s:textfield name="userName" label="Your name" />
+ <s:submit value="Submit" />
+ </s:form>
+ </body>
+</html>
[8/9] struts-examples git commit: changed doctype to html5
Posted by sd...@apache.org.
changed doctype to html5
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/72c31f2b
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/72c31f2b
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/72c31f2b
Branch: refs/heads/master
Commit: 72c31f2b1fa72213d2ee827338c7eca2e5039f69
Parents: 404319b
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 23:29:14 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 23:29:14 2017 +0200
----------------------------------------------------------------------
using-tags/src/main/webapp/HelloWorld.jsp | 2 +-
using-tags/src/main/webapp/index.jsp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/72c31f2b/using-tags/src/main/webapp/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/using-tags/src/main/webapp/HelloWorld.jsp b/using-tags/src/main/webapp/HelloWorld.jsp
index f05ae12..e6006f3 100644
--- a/using-tags/src/main/webapp/HelloWorld.jsp
+++ b/using-tags/src/main/webapp/HelloWorld.jsp
@@ -1,6 +1,6 @@
<%@ 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">
+<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/72c31f2b/using-tags/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/using-tags/src/main/webapp/index.jsp b/using-tags/src/main/webapp/index.jsp
index 9967f3c..6c6fa80 100644
--- a/using-tags/src/main/webapp/index.jsp
+++ b/using-tags/src/main/webapp/index.jsp
@@ -1,6 +1,6 @@
<%@ 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">
+<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
[9/9] struts-examples git commit: changed deprecated artifactId to
project.artifactId
Posted by sd...@apache.org.
changed deprecated artifactId to project.artifactId
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/18affab8
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/18affab8
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/18affab8
Branch: refs/heads/master
Commit: 18affab89c9bfad8c7c0cecdbb313142cc4394cb
Parents: 72c31f2
Author: Stefaan Dutry <st...@gmail.com>
Authored: Wed Apr 19 23:51:31 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Wed Apr 19 23:51:31 2017 +0200
----------------------------------------------------------------------
using-tags/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/18affab8/using-tags/pom.xml
----------------------------------------------------------------------
diff --git a/using-tags/pom.xml b/using-tags/pom.xml
index b649c44..0414941 100644
--- a/using-tags/pom.xml
+++ b/using-tags/pom.xml
@@ -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>