Repository: struts-examples Updated Branches: refs/heads/master a66c0865e -> 42de17f4d Refactor basic struts example - log4j2 setup - artifact name - jetty plugin Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/42de17f4 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/42de17f4 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/42de17f4 Branch: refs/heads/master Commit: 42de17f4d653cccaf880136ac60cf6383228f227 Parents: a66c086 Author: Johannes Geppert Authored: Fri Jun 12 16:40:41 2015 +0200 Committer: Johannes Geppert Committed: Fri Jun 12 16:40:41 2015 +0200 ---------------------------------------------------------------------- basic-struts/README.txt | 18 ++ basic-struts/pom.xml | 39 ++++ basic-struts/src/main/resources/log4j2.xml | 16 ++ basic-struts/src/main/resources/struts.xml | 16 ++ basic-struts/src/main/webapp/WEB-INF/web.xml | 19 ++ basic-struts/src/main/webapp/index.jsp | 11 ++ basic_struts/README.txt | 16 -- basic_struts/pom.xml | 20 -- basic_struts/src/main/resources/log4j.dtd | 227 ---------------------- basic_struts/src/main/resources/log4j.xml | 28 --- basic_struts/src/main/resources/struts.xml | 18 -- basic_struts/src/main/webapp/WEB-INF/web.xml | 19 -- basic_struts/src/main/webapp/index.jsp | 12 -- 13 files changed, 119 insertions(+), 340 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic-struts/README.txt ---------------------------------------------------------------------- diff --git a/basic-struts/README.txt b/basic-struts/README.txt new file mode 100644 index 0000000..58bee4e --- /dev/null +++ b/basic-struts/README.txt @@ -0,0 +1,18 @@ +This is the example project referred to in the +Struts 2 documentation, Ready, Set, Go tutorial. +See: http://struts.apache.org. + +To build the application's war file run mvn clean package +from the project's root folder. + +The war file is created in the target sub-folder. + +Copy the war file to your Servlet container (e.g. Tomcat) and +then startup the Servlet container. + +Or run mvn jetty:run + +In a web browser go to: http://localhost:8080/basic-struts/index.action. + +You should see a web page with Welcome to Struts 2! + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic-struts/pom.xml ---------------------------------------------------------------------- diff --git a/basic-struts/pom.xml b/basic-struts/pom.xml new file mode 100644 index 0000000..9ed1c09 --- /dev/null +++ b/basic-struts/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + struts.apache.org + struts2examples + 1.0.0 + + basic-struts + Basic Struts2 Example + Basic Struts 2 example application + + war + + + basic-struts + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.16.v20140903 + + + /${artifactId} + + CTRL+C + 8999 + 10 + + src/main/webapp/WEB-INF/web.xml + + + + + + + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic-struts/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/basic-struts/src/main/resources/log4j2.xml b/basic-struts/src/main/resources/log4j2.xml new file mode 100644 index 0000000..d7c09f9 --- /dev/null +++ b/basic-struts/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic-struts/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/basic-struts/src/main/resources/struts.xml b/basic-struts/src/main/resources/struts.xml new file mode 100644 index 0000000..174500f --- /dev/null +++ b/basic-struts/src/main/resources/struts.xml @@ -0,0 +1,16 @@ + + + + + + + + + + /index.jsp + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic-struts/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/basic-struts/src/main/webapp/WEB-INF/web.xml b/basic-struts/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..51648d3 --- /dev/null +++ b/basic-struts/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,19 @@ + + +Basic Struts2 + + index + + + + + struts2 + org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter + + + + struts2 + /* + + + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic-struts/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/basic-struts/src/main/webapp/index.jsp b/basic-struts/src/main/webapp/index.jsp new file mode 100644 index 0000000..21f25d6 --- /dev/null +++ b/basic-struts/src/main/webapp/index.jsp @@ -0,0 +1,11 @@ + +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + + + Basic Struts 2 Application - Welcome + + + +

Welcome To Struts 2!

+ http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic_struts/README.txt ---------------------------------------------------------------------- diff --git a/basic_struts/README.txt b/basic_struts/README.txt deleted file mode 100644 index de52173..0000000 --- a/basic_struts/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -This is the example project referred to in the -Struts 2 documentation, Ready, Set, Go tutorial. -See: http://struts.apache.org. - -To build the application's war file run mvn clean package -from the project's root folder. - -The war file is created in the target sub-folder. - -Copy the war file to your Servlet container (e.g. Tomcat) and -then startup the Servlet container. - -In a web browser go to: http://localhost:8080/basic_struts/index.action. - -You should see a web page with Welcome to Struts 2! - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic_struts/pom.xml ---------------------------------------------------------------------- diff --git a/basic_struts/pom.xml b/basic_struts/pom.xml deleted file mode 100644 index 389471e..0000000 --- a/basic_struts/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - struts.apache.org - struts2examples - 1.0.0 - - basic_struts - basic_struts - Basic Struts 2 example application - - war - - - basic_struts - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic_struts/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/basic_struts/src/main/resources/log4j.dtd b/basic_struts/src/main/resources/log4j.dtd deleted file mode 100644 index 1aabd96..0000000 --- a/basic_struts/src/main/resources/log4j.dtd +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic_struts/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/basic_struts/src/main/resources/log4j.xml b/basic_struts/src/main/resources/log4j.xml deleted file mode 100644 index 2100cb2..0000000 --- a/basic_struts/src/main/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic_struts/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/basic_struts/src/main/resources/struts.xml b/basic_struts/src/main/resources/struts.xml deleted file mode 100644 index d39b922..0000000 --- a/basic_struts/src/main/resources/struts.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - /index.jsp - - - - - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic_struts/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/basic_struts/src/main/webapp/WEB-INF/web.xml b/basic_struts/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 2c2cd4f..0000000 --- a/basic_struts/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,19 +0,0 @@ - - -Basic Struts2 - - index.jsp - - - - - struts2 - org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter - - - - struts2 - /* - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/42de17f4/basic_struts/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/basic_struts/src/main/webapp/index.jsp b/basic_struts/src/main/webapp/index.jsp deleted file mode 100644 index 84329be..0000000 --- a/basic_struts/src/main/webapp/index.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Basic Struts 2 Application - Welcome - - -

Welcome To Struts 2!

- - \ No newline at end of file