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 <jo...@apache.org> Authored: Fri Jun 12 16:40:41 2015 +0200 Committer: Johannes Geppert <jo...@apache.org> 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 @@ +<?xml version="1.0"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>struts.apache.org</groupId> + <artifactId>struts2examples</artifactId> + <version>1.0.0</version> + </parent> + <artifactId>basic-struts</artifactId> + <name>Basic Struts2 Example</name> + <description>Basic Struts 2 example application</description> + + <packaging>war</packaging> + + <build> + <finalName>basic-struts</finalName> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>8.1.16.v20140903</version> + <configuration> + <webApp> + <contextPath>/${artifactId}</contextPath> + </webApp> + <stopKey>CTRL+C</stopKey> + <stopPort>8999</stopPort> + <scanIntervalSeconds>10</scanIntervalSeconds> + <scanTargets> + <scanTarget>src/main/webapp/WEB-INF/web.xml</scanTarget> + </scanTargets> + </configuration> + </plugin> + </plugins> + </build> + +</project> 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration> + <Appenders> + <Console name="STDOUT" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="com.opensymphony.xwork2" level="info"/> + <Logger name="org.apache.struts2" level="info"/> + <Logger name="org.apache.struts2.edit" level="debug"/> + <Root level="warn"> + <AppenderRef ref="STDOUT"/> + </Root> + </Loggers> +</Configuration> \ 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.0.dtd";> + +<struts> + + <constant name="struts.devMode" value="true" /> + + <package name="basic-struts2" extends="struts-default"> + <action name="index"> + <result>/index.jsp</result> + </action> + </package> + +</struts> \ 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<display-name>Basic Struts2</display-name> + <welcome-file-list> + <welcome-file>index</welcome-file> + </welcome-file-list> + + + <filter> + <filter-name>struts2</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>struts2</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + +</web-app> 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 @@ +<!DOCTYPE html> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<html> +<head> + <meta charset="UTF-8"> + <title>Basic Struts 2 Application - Welcome</title> +</head> + +<body> +<h1>Welcome To Struts 2!</h1> +</body> 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 @@ -<?xml version="1.0"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>struts.apache.org</groupId> - <artifactId>struts2examples</artifactId> - <version>1.0.0</version> - </parent> - <artifactId>basic_struts</artifactId> - <name>basic_struts</name> - <description>Basic Struts 2 example application</description> - - <packaging>war</packaging> - - <build> - <finalName>basic_struts</finalName> - </build> - -</project> 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 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- - 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 - - 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. ---> - -<!-- Authors: Chris Taylor, Ceki Gulcu. --> - -<!-- Version: 1.2 --> - -<!-- A configuration element consists of optional renderer -elements,appender elements, categories and an optional root -element. --> - -<!ELEMENT log4j:configuration (renderer*, appender*,plugin*, (category|logger)*,root?, - (categoryFactory|loggerFactory)?)> - -<!-- The "threshold" attribute takes a level value below which --> -<!-- all logging statements are disabled. --> - -<!-- Setting the "debug" enable the printing of internal log4j logging --> -<!-- statements. --> - -<!-- By default, debug attribute is "null", meaning that we not do touch --> -<!-- internal log4j logging settings. The "null" value for the threshold --> -<!-- attribute can be misleading. The threshold field of a repository --> -<!-- cannot be set to null. The "null" value for the threshold attribute --> -<!-- simply means don't touch the threshold field, the threshold field --> -<!-- keeps its old value. --> - -<!ATTLIST log4j:configuration - xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; - threshold (all|trace|debug|info|warn|error|fatal|off|null) "null" - debug (true|false|null) "null" - reset (true|false) "false" -> - -<!-- renderer elements allow the user to customize the conversion of --> -<!-- message objects to String. --> - -<!ELEMENT renderer EMPTY> -<!ATTLIST renderer - renderedClass CDATA #REQUIRED - renderingClass CDATA #REQUIRED -> - -<!-- Appenders must have a name and a class. --> -<!-- Appenders may contain an error handler, a layout, optional parameters --> -<!-- and filters. They may also reference (or include) other appenders. --> -<!ELEMENT appender (errorHandler?, param*, - rollingPolicy?, triggeringPolicy?, connectionSource?, - layout?, filter*, appender-ref*)> -<!ATTLIST appender - name CDATA #REQUIRED - class CDATA #REQUIRED -> - -<!ELEMENT layout (param*)> -<!ATTLIST layout - class CDATA #REQUIRED -> - -<!ELEMENT filter (param*)> -<!ATTLIST filter - class CDATA #REQUIRED -> - -<!-- ErrorHandlers can be of any class. They can admit any number of --> -<!-- parameters. --> - -<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)> -<!ATTLIST errorHandler - class CDATA #REQUIRED -> - -<!ELEMENT root-ref EMPTY> - -<!ELEMENT logger-ref EMPTY> -<!ATTLIST logger-ref - ref CDATA #REQUIRED -> - -<!ELEMENT param EMPTY> -<!ATTLIST param - name CDATA #REQUIRED - value CDATA #REQUIRED -> - - -<!-- The priority class is org.apache.log4j.Level by default --> -<!ELEMENT priority (param*)> -<!ATTLIST priority - class CDATA #IMPLIED - value CDATA #REQUIRED -> - -<!-- The level class is org.apache.log4j.Level by default --> -<!ELEMENT level (param*)> -<!ATTLIST level - class CDATA #IMPLIED - value CDATA #REQUIRED -> - - -<!-- If no level element is specified, then the configurator MUST not --> -<!-- touch the level of the named category. --> -<!ELEMENT category (param*,(priority|level)?,appender-ref*)> -<!ATTLIST category - class CDATA #IMPLIED - name CDATA #REQUIRED - additivity (true|false) "true" -> - -<!-- If no level element is specified, then the configurator MUST not --> -<!-- touch the level of the named logger. --> -<!ELEMENT logger (level?,appender-ref*)> -<!ATTLIST logger - name CDATA #REQUIRED - additivity (true|false) "true" -> - - -<!ELEMENT categoryFactory (param*)> -<!ATTLIST categoryFactory - class CDATA #REQUIRED> - -<!ELEMENT loggerFactory (param*)> -<!ATTLIST loggerFactory - class CDATA #REQUIRED> - -<!ELEMENT appender-ref EMPTY> -<!ATTLIST appender-ref - ref CDATA #REQUIRED -> - -<!-- plugins must have a name and class and can have optional parameters --> -<!ELEMENT plugin (param*, connectionSource?)> -<!ATTLIST plugin - name CDATA #REQUIRED - class CDATA #REQUIRED -> - -<!ELEMENT connectionSource (dataSource?, param*)> -<!ATTLIST connectionSource - class CDATA #REQUIRED -> - -<!ELEMENT dataSource (param*)> -<!ATTLIST dataSource - class CDATA #REQUIRED -> - -<!ELEMENT triggeringPolicy ((param|filter)*)> -<!ATTLIST triggeringPolicy - name CDATA #IMPLIED - class CDATA #REQUIRED -> - -<!ELEMENT rollingPolicy (param*)> -<!ATTLIST rollingPolicy - name CDATA #IMPLIED - class CDATA #REQUIRED -> - - -<!-- If no priority element is specified, then the configurator MUST not --> -<!-- touch the priority of root. --> -<!-- The root category always exists and cannot be subclassed. --> -<!ELEMENT root (param*, (priority|level)?, appender-ref*)> - - -<!-- ==================================================================== --> -<!-- A logging event --> -<!-- ==================================================================== --> -<!ELEMENT log4j:eventSet (log4j:event*)> -<!ATTLIST log4j:eventSet - xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; - version (1.1|1.2) "1.2" - includesLocationInfo (true|false) "true" -> - - - -<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?, - log4j:locationInfo?, log4j:properties?) > - -<!-- The timestamp format is application dependent. --> -<!ATTLIST log4j:event - logger CDATA #REQUIRED - level CDATA #REQUIRED - thread CDATA #REQUIRED - timestamp CDATA #REQUIRED - time CDATA #IMPLIED -> - -<!ELEMENT log4j:message (#PCDATA)> -<!ELEMENT log4j:NDC (#PCDATA)> - -<!ELEMENT log4j:throwable (#PCDATA)> - -<!ELEMENT log4j:locationInfo EMPTY> -<!ATTLIST log4j:locationInfo - class CDATA #REQUIRED - method CDATA #REQUIRED - file CDATA #REQUIRED - line CDATA #REQUIRED -> - -<!ELEMENT log4j:properties (log4j:data*)> - -<!ELEMENT log4j:data EMPTY> -<!ATTLIST log4j:data - name CDATA #REQUIRED - value CDATA #REQUIRED -> 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 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE log4j:configuration PUBLIC "-//log4j/log4j Configuration//EN" "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> - - <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender"> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p %c.%M:%L - %m%n"/> - </layout> - </appender> - - <!-- specify the logging level for loggers from other libraries --> - <logger name="com.opensymphony"> - <level value="DEBUG" /> - </logger> - - <logger name="org.apache.struts2"> - <level value="DEBUG" /> - </logger> - - <!-- for all other loggers log only debug and above log messages --> - <root> - <priority value="INFO"/> - <appender-ref ref="STDOUT" /> - </root> - -</log4j:configuration> - 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" - "http://struts.apache.org/dtds/struts-2.0.dtd";> - -<struts> - - <constant name="struts.devMode" value="true" /> - - <package name="basicstruts2" extends="struts-default"> - - <action name="index"> - <result>/index.jsp</result> - </action> - - </package> - -</struts> \ 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> -<display-name>Basic Struts2</display-name> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - - - <filter> - <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>struts2</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - -</web-app> 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"%> -<!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> -</body> -</html> \ No newline at end of file
