[1/3] git commit: Moves JSPs under /WEB-INF to promote good practises

2014-04-14 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/develop 90eb79ad8 -> 54c9efc51


Moves JSPs under /WEB-INF to promote good practises


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/13a3b92a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/13a3b92a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/13a3b92a

Branch: refs/heads/develop
Commit: 13a3b92ae7acede82421f30a00e0737357b7b7dd
Parents: 90eb79a
Author: Lukasz Lenart 
Authored: Mon Apr 14 22:36:27 2014 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 14 22:36:27 2014 +0200

--
 .../src/main/resources/example.xml  |  6 ++---
 .../main/webapp/WEB-INF/example/HelloWorld.jsp  | 28 
 .../src/main/webapp/WEB-INF/example/Login.jsp   | 15 +++
 .../src/main/webapp/WEB-INF/example/Menu.jsp|  3 +++
 .../src/main/webapp/WEB-INF/example/Missing.jsp | 11 
 .../main/webapp/WEB-INF/example/Register.jsp|  3 +++
 .../src/main/webapp/WEB-INF/example/Welcome.jsp | 18 +
 .../src/main/webapp/example/HelloWorld.jsp  | 28 
 .../src/main/webapp/example/Login.jsp   | 15 ---
 .../src/main/webapp/example/Menu.jsp|  3 ---
 .../src/main/webapp/example/Missing.jsp | 11 
 .../src/main/webapp/example/Register.jsp|  3 ---
 .../src/main/webapp/example/Welcome.jsp | 18 -
 .../src/main/resources/struts.xml   |  4 +--
 .../src/main/webapp/WEB-INF/jsp/helloWorld.jsp  | 16 +++
 .../src/main/webapp/WEB-INF/jsp/index.jsp   | 20 ++
 .../src/main/webapp/jsp/helloWorld.jsp  | 16 ---
 .../src/main/webapp/jsp/index.jsp   | 20 --
 18 files changed, 119 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
--
diff --git 
a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
 
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
index 442f5ee..7de329f 100644
--- 
a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
+++ 
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/resources/example.xml
@@ -12,16 +12,16 @@
 
 
 
-/example/HelloWorld.jsp
+/WEB-INF/example/HelloWorld.jsp
 
 
 
-/example/Login.jsp
+/WEB-INF/example/Login.jsp
 Menu
 
 
 
-/example/{1}.jsp
+/WEB-INF/example/{1}.jsp
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
--
diff --git 
a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
 
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
new file mode 100644
index 000..938c761
--- /dev/null
+++ 
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/HelloWorld.jsp
@@ -0,0 +1,28 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+
+
+
+
+
+
+
+Languages
+
+
+
+en
+
+English
+
+
+
+es
+
+Espanol
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Login.jsp
--
diff --git 
a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Login.jsp
 
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Login.jsp
new file mode 100644
index 000..6438080
--- /dev/null
+++ 
b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/example/Login.jsp
@@ -0,0 +1,15 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+
+Sign On
+
+
+
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/struts/blob/13a3b92a/archetypes/struts2-archetype-blank/src/main/resources/arc

[2/3] git commit: Moves JSPs under /WEB-INF to promote good practises

2014-04-14 Thread lukaszlenart 
Moves JSPs under /WEB-INF to promote good practises


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0b510cab
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0b510cab
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0b510cab

Branch: refs/heads/develop
Commit: 0b510cab890de57c4c164d85e8bb8bfc13d27ec1
Parents: 13a3b92
Author: Lukasz Lenart 
Authored: Mon Apr 14 22:38:44 2014 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 14 22:38:44 2014 +0200

--
 .../src/main/webapp/WEB-INF/jsp/helloWorld.jsp  | 32 -
 .../src/main/webapp/WEB-INF/jsp/index.jsp   | 38 ++--
 2 files changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/0b510cab/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
--
diff --git 
a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
 
b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
index 41176a2..6d4a091 100644
--- 
a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
+++ 
b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/helloWorld.jsp
@@ -1,16 +1,16 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-   
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-
-   Hello World
-   
-
-
-   Hello , today is 
-
-
-
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+   
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+   Hello World
+   
+
+
+   Hello , today is 
+
+
+

http://git-wip-us.apache.org/repos/asf/struts/blob/0b510cab/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
--
diff --git 
a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
 
b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
index 71d4e1f..683fdcc 100644
--- 
a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
+++ 
b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -1,20 +1,20 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-   
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
-
-   Index
-   
-
-
-   
-   
-   
-   
-   
-
-
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+   
+<%@taglib prefix="s" uri="/struts-tags" %>
+
+http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+   Index
+   
+
+
+   
+   
+   
+   
+   
+
+

\ No newline at end of file

[3/3] git commit: Merge branch 'feature/move-jsps-under-webinf' into develop

2014-04-14 Thread lukaszlenart 
Merge branch 'feature/move-jsps-under-webinf' into develop


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/54c9efc5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/54c9efc5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/54c9efc5

Branch: refs/heads/develop
Commit: 54c9efc51b30bbd2f529ffa4c74cd96965b8a6d0
Parents: 90eb79a 0b510ca
Author: Lukasz Lenart 
Authored: Mon Apr 14 22:39:29 2014 +0200
Committer: Lukasz Lenart 
Committed: Mon Apr 14 22:39:29 2014 +0200

--
 .../src/main/resources/example.xml  |  6 ++---
 .../main/webapp/WEB-INF/example/HelloWorld.jsp  | 28 
 .../src/main/webapp/WEB-INF/example/Login.jsp   | 15 +++
 .../src/main/webapp/WEB-INF/example/Menu.jsp|  3 +++
 .../src/main/webapp/WEB-INF/example/Missing.jsp | 11 
 .../main/webapp/WEB-INF/example/Register.jsp|  3 +++
 .../src/main/webapp/WEB-INF/example/Welcome.jsp | 18 +
 .../src/main/webapp/example/HelloWorld.jsp  | 28 
 .../src/main/webapp/example/Login.jsp   | 15 ---
 .../src/main/webapp/example/Menu.jsp|  3 ---
 .../src/main/webapp/example/Missing.jsp | 11 
 .../src/main/webapp/example/Register.jsp|  3 ---
 .../src/main/webapp/example/Welcome.jsp | 18 -
 .../src/main/resources/struts.xml   |  4 +--
 .../src/main/webapp/WEB-INF/jsp/helloWorld.jsp  | 16 +++
 .../src/main/webapp/WEB-INF/jsp/index.jsp   | 20 ++
 .../src/main/webapp/jsp/helloWorld.jsp  | 16 ---
 .../src/main/webapp/jsp/index.jsp   | 20 --
 18 files changed, 119 insertions(+), 119 deletions(-)
--

[CONF] Confluence Changes in the last 24 hours

2014-04-14 Thread Anonymous (Confluence) 
















  Confluence Changes in the last 24 hours  




 Apache ActiveMQ 

Pages

 Page: ActiveMQ 5.9.1 Release created by Daniel Kulp [07:26 PM] 
 Page: Download edited by Daniel Kulp [07:25 PM] (View Changes) 
 Home page: Index edited by Daniel Kulp [07:25 PM] (View Changes) 


 Apache Airavata 

Pages

 Page: Quality Assurance created by Eroma [06:26 PM] 


 Apache Camel 

Pages

 Page: CXF Example edited by Gregor Zurowski [08:44 PM] (View Changes) 
 Page: HTTP4 edited by willem jiang [09:27 AM] (View Changes) 
 Page: Jetty edited by willem jiang [08:46 AM] (View Changes) 


 Apache Cloudstack 

Pages

 Page: GPU and vGPU support for CloudStack Guest VMs edited by Sanjay Tripathi [01:39 PM] (View Changes) 
 Page: Zone wide primary storage for Hyper-V created by Devdeep Singh [09:42 AM] 
 Page: Hyper-V support features in 4.4 edited by Devdeep Singh [10:52 AM] (View Changes) 
 Page: Storage motion for Hyper-V edited by Devdeep Singh [09:32 AM] (View Changes) 


 Apache Curator 

Pages

 Page: Third Party Articles edited by Jordan Zimmerman [07:46 PM] (View Changes) 


 Apache CXF 

Pages

 Page: Download edited by Daniel Kulp [02:06 PM] (View Changes) 
 Page: CXF 2.6.14 Release Notes created by Daniel Kulp [02:01 PM] 
 Page: CXF 2.7.11 Release Notes created by Daniel Kulp [01:59 PM] 
 Home page: Index edited by Daniel Kulp [01:56 PM] (View Changes) 


 DataFu 

Pages

 Page: Contributing to Apache DataFu edited by Matthew Hayes [08:43 PM] (View Changes) 


 Apache Fle