[struts-site] 01/01: Imports the Migration Guide and performs some cleanups

2019-10-01 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch migration-guide
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit 100d75a4aaf2465cd4adb06030cc48f8a3450732
Author: Lukasz Lenart 
AuthorDate: Tue Oct 1 09:28:33 2019 +0200

Imports the Migration Guide and performs some cleanups
---
 pom.xml  |   4 +-
 source/_includes/header.html |   1 +
 source/migration/index.md| 342 +++
 3 files changed, 345 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index caf6162..ff7d4f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,14 +94,14 @@
 -a
 
${project.build.directory}/md/attachments
 -o
-
${project.build.directory}/md/big-picture.md
+
${project.build.directory}/md/migration-guide.md
 -u
 
${confluence.user}:${confluence.password}
 -server
 
https://cwiki.apache.org/confluence
 +gfm
 true
-13850
+13981
 
 
 
diff --git a/source/_includes/header.html b/source/_includes/header.html
index 39e6bdf..ed07383 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -63,6 +63,7 @@
 Security Guide
 Core Developers Guide
 Tag Developers Guide
+Migration Guide
 Maven Archetypes
 Plugins
 Struts 
Core API
diff --git a/source/migration/index.md b/source/migration/index.md
new file mode 100644
index 000..a26450a
--- /dev/null
+++ b/source/migration/index.md
@@ -0,0 +1,342 @@
+---
+layout: default
+title: Migration Guide
+---
+
+# Migration Guide
+
+Getting here from there.
+
+## Version Notes
+
+All Version Notes are available on our 
[Wiki](https://cwiki.apache.org/confluence/display/WW/Migration+Guide)
+
+## Struts 2.3 to Struts 2.5
+
+- [Struts 2.3 to 2.5 migration](struts-2-3-to-2-5-migration)
+
+## Struts 1 to Struts 2
+
+- [Comparing Struts 1 and 2](#PAGE_14048)|How are Struts 1 and Struts 2 alike? 
How are they different?|
+- [Struts 1 Solutions](#PAGE_14240)|Various issues (and hopefully their 
solutions\!) encountered during migrations to Struts 2.|
+- [Migration Strategies](#PAGE_14221)|Steps and overall strategies for 
migrating Struts 1 applications to Struts 2.|
+- [Migration Tools](#PAGE_13954)|Development tools to help aid the migration 
process.|
+
+
+## Tutorials
+
+- [Migrating Applications to Struts 2 
](http://www.infoq.com/news/migrating-struts2) - A three-part series by Ian 
Roughley (Sep 2006)
+
+
+##Comparing Struts 1 and 2## {#PAGE_14048}
+
+| Feature | Struts 1 | Struts 2 |
+|-|--|--|
+| Action classes | Struts 1 requires Action classes to extend an abstract base 
class. A common problem in Struts 1 is programming to abstract classes instead 
of interfaces. | An Struts 2 Action _may_  implement an Action interface, along 
with other interfaces to enable optional and custom services. Struts 2 provides 
a base ActionSupport class to implement commonly used interfaces. Albeit, the 
Action interface is **not** required. Any POJO object with a execute signature 
can be used as an [...]
+| Threading Model | Struts 1 Actions are singletons and must be thread-safe 
since there will only be one instance of a class to handle all requests for 
that Action. The singleton strategy places restrictions on what can be done 
with Struts 1 Actions and requires extra care to develop. Action resources must 
be thread-safe or synchronized. | Struts 2 Action objects are instantiated for 
each request, so there are no thread-safety issues. (In practice, servlet 
containers generate many throw- [...]
+| Servlet Dependency | Struts 1 Actions have dependencies on the servlet API 
since the HttpServletRequest and HttpServletResponse is passed to the execute 
method when an Action is invoked. | Struts 2 Actions are not coupled to a 
container. Most often the servlet contexts are represented as simple Maps, 
allowing Actions to be tested in isolation. Struts 2 Actions can still access 
the original request and response, if required. However, other architectural 
elements reduce or eliminate the  [...]
+| Testability | A major hurdle to testing Struts 1 Actions is that the execute 
method exposes the Servlet API. A third-party extension, Struts TestCase, 
offers a set of mock object for Struts 1. | Struts 2 Actions can

[struts-site] branch migration-guide created (now 100d75a)

2019-10-01 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch migration-guide
in repository https://gitbox.apache.org/repos/asf/struts-site.git.


  at 100d75a  Imports the Migration Guide and performs some cleanups

This branch includes the following new commits:

 new 100d75a  Imports the Migration Guide and performs some cleanups

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.




[struts-site] branch migration-guide updated: Adds table of contents

2019-10-01 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch migration-guide
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/migration-guide by this push:
 new b7e7298  Adds table of contents
b7e7298 is described below

commit b7e7298f94602097496ed1b5fb831a18e7d50ac1
Author: Lukasz Lenart 
AuthorDate: Tue Oct 1 09:39:30 2019 +0200

Adds table of contents
---
 source/migration/index.md | 35 ---
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/source/migration/index.md b/source/migration/index.md
index a26450a..3080cc5 100644
--- a/source/migration/index.md
+++ b/source/migration/index.md
@@ -4,9 +4,13 @@ title: Migration Guide
 ---
 
 # Migration Guide
+{:.no_toc}
 
 Getting here from there.
 
+* Will be replaced with the ToC, excluding a header
+{:toc}
+
 ## Version Notes
 
 All Version Notes are available on our 
[Wiki](https://cwiki.apache.org/confluence/display/WW/Migration+Guide)
@@ -27,8 +31,7 @@ All Version Notes are available on our 
[Wiki](https://cwiki.apache.org/confluenc
 
 - [Migrating Applications to Struts 2 
](http://www.infoq.com/news/migrating-struts2) - A three-part series by Ian 
Roughley (Sep 2006)
 
-
-##Comparing Struts 1 and 2## {#PAGE_14048}
+## Comparing Struts 1 and 2
 
 | Feature | Struts 1 | Struts 2 |
 |-|--|--|
@@ -48,31 +51,9 @@ All Version Notes are available on our 
[Wiki](https://cwiki.apache.org/confluenc
 
 **(i) See Also**
 
-
-> 
-
-> 
-
-> + Matt Raible wrote (mid 2005) an interesting whitepaper where he compared 
various web frameworks. You can view the PDF here:
- > 
-
-> 
-
->   + 
[https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf](https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf)
-
-> 
-
->   + 
[http://www.virtuas.com/files/osl-jwf-01.pdf](http://www.virtuas.com/files/osl-jwf-01.pdf)
-
-> 
-
-> 
-
-> 
-
-> 
-
-Next:
+> Matt Raible wrote (mid 2005) an interesting whitepaper where he compared 
various web frameworks. You can view the PDF here:
+> - 
[https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf](https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf)
+> - 
[http://www.virtuas.com/files/osl-jwf-01.pdf](http://www.virtuas.com/files/osl-jwf-01.pdf)
 
 ##Key Changes From WebWork 2## {#PAGE_26950}
 



[struts-site] branch asf-staging updated: Updates stage by Jenkins

2019-10-01 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-staging by this push:
 new bb51510  Updates stage by Jenkins
bb51510 is described below

commit bb51510b588b531f98b084c77131dcb36aaa8966
Author: jenkins 
AuthorDate: Tue Oct 1 07:40:04 2019 +

Updates stage by Jenkins
---
 content/migration/index.html | 65 +---
 1 file changed, 13 insertions(+), 52 deletions(-)

diff --git a/content/migration/index.html b/content/migration/index.html
index 64eabba..81c7dbc 100644
--- a/content/migration/index.html
+++ b/content/migration/index.html
@@ -128,10 +128,18 @@
   
 https://github.com/apache/struts-site/edit/master/source/migration/index.md";
 title="Edit this page on GitHub">Edit on GitHub
 
-Migration Guide
+Migration Guide
 
 Getting here from there.
 
+
+  Version 
Notes
+  Struts 2.3 to Struts 2.5
+  Struts 1 to Struts 2
+  Tutorials
+  Comparing Struts 1 and 2
+
+
 Version Notes
 
 All Version Notes are available on our https://cwiki.apache.org/confluence/display/WW/Migration+Guide";>Wiki
@@ -193,7 +201,7 @@
   http://www.infoq.com/news/migrating-struts2";>Migrating 
Applications to Struts 2  - A three-part series by Ian Roughley (Sep 
2006)
 
 
-##Comparing Struts 1 and 2## {#PAGE_14048}
+Comparing Struts 1 and 2
 
 
   
@@ -275,58 +283,11 @@
 (i) See Also
 
 
-
-
-
-
-
-
-
-
-  
-Matt Raible wrote (mid 2005) an interesting whitepaper where he 
compared various web frameworks. You can view the PDF here:
-  
-
-
-
-
-
-
-
-
-  
-https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf";>https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf
-  
-
-
-
-
+  Matt Raible wrote (mid 2005) an interesting whitepaper where he compared 
various web frameworks. You can view the PDF here:
+- https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf";>https://equinox.dev.java.net/framework-comparison/WebFrameworks.pdf
+- http://www.virtuas.com/files/osl-jwf-01.pdf";>http://www.virtuas.com/files/osl-jwf-01.pdf
 
 
-
-  
-http://www.virtuas.com/files/osl-jwf-01.pdf";>http://www.virtuas.com/files/osl-jwf-01.pdf
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Next:
-
 ##Key Changes From WebWork 2## {#PAGE_26950}
 
 The upgrade path from WebWork 2 to Struts 2 is smooth glide. Here’s the 
roadmap.