jspwiki git commit: New README.md

2016-09-16 Thread dvittor 
Repository: jspwiki
Updated Branches:
  refs/heads/develop dc45a6626 -> 970feaef5


New README.md


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/970feaef
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/970feaef
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/970feaef

Branch: refs/heads/develop
Commit: 970feaef5e2dc85b1e42a38d5e0cfb4eaae7bdf7
Parents: dc45a66
Author: David Vittor 
Authored: Fri Sep 16 21:01:53 2016 +1000
Committer: David Vittor 
Committed: Fri Sep 16 21:01:53 2016 +1000

--
 README.md | 130 +
 1 file changed, 130 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/970feaef/README.md
--
diff --git a/README.md b/README.md
new file mode 100644
index 000..9e603c4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,130 @@
+# Apache JSPWiki 2.10 - Documentation
+
+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.  
+
+The license file can be found in LICENSE.
+
+
+## What is JSPWiki?
+
+JSPWiki is a simple (well, not any more) WikiWiki clone, written in Java
+and JSP.  A WikiWiki is a web site which allows anyone to participate
+in its development.  JSPWiki supports all the traditional wiki features,
+as well as very detailed access control and security integration using JAAS. 
+
+* For more information see https://jspwiki-wiki.apache.org/
+
+## Pre-requirements
+
+Okay, so you wanna Wiki?  You'll need the following things:
+
+REQUIRED:
+
+* A JSP engine that supports Servlet API 2.5.  We recommend Tomcat from
+  http://tomcat.apache.org/ for a really easy installation.
+  Tomcat 6.x or later is supported.
+
+* Some previous administration experience...  If you've ever installed
+  Apache or any other web server, you should be pretty well off.
+
+* And of course, a server to run the JSP engine on.
+
+* JDK 1.6+
+
+
+OPTIONAL:
+
+* JavaMail package from java.sun.com, if you want to use log4j mailing
+  capabilities.  You'll also need the Java Activation Framework.
+
+## Really simple installation
+
+This section is meant for you, if you just want to have a really quick
+install without much worries.  If you want to have a more complicated
+installation (with more power as to how to do things), 
+check out the "Install" section below.
+
+Since JSPWiki 2.1.153, JSPWiki comes with a really simple installation
+engine.  Just do the following:
+
+1) Install Tomcat from http://tomcat.apache.org/ (or any other servlet
+   container)
+
+2) Rename the JSPWiki.war file from the download and rename it based on
+   your desired URL (if you want it different from /JSPWiki).  For example,
+   if you want your URL to be http://.../wiki, rename it to wiki.war.
+   This name will be referred to as  below.
+   Place this WAR in your $TOMCAT_HOME/webapps folder and then start Tomcat.
+
+3) Point your browser at http:Install.jsp
+
+4) Answer a couple of simple questions
+
+5) Restart your container
+
+6) Point your browser to http:
+
+That's it!
+
+
+## Advanced Installation
+
+In the $TOMCAT_HOME/lib folder (or equivalent based on your servlet container),
+place a jspwiki-custom.properties file, which can contain any overrides to the 
+default ini/jspwiki.properties file in the JSPWiki JAR.  For any values not 
+placed in jspwiki-custom.properties file JSPWiki will rely on the default file.
+Review the default file to look for values you may wish to override in the 
custom
+file.  Some common values to override in your custom file include 
+jspwiki.baseURL, jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
+jspwiki.fileSystemProvider.pageDir, 
jspwiki.basicAttachmentProvider.storageDir, 
+and log4j.appender.FileLog.File.  The comments in the default file will 
suggest 
+appropriate values to override them with. 
+
+The custom file can also be placed in the WEB-INF/ folder of the WAR, but 
storing
+this file in TOMCAT_HOME/lib allows

jspwiki git commit: New README.md

2016-09-16 Thread dvittor 
Repository: jspwiki
Updated Branches:
  refs/heads/JSPWIKI-877 dc45a6626 -> 970feaef5


New README.md


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/970feaef
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/970feaef
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/970feaef

Branch: refs/heads/JSPWIKI-877
Commit: 970feaef5e2dc85b1e42a38d5e0cfb4eaae7bdf7
Parents: dc45a66
Author: David Vittor 
Authored: Fri Sep 16 21:01:53 2016 +1000
Committer: David Vittor 
Committed: Fri Sep 16 21:01:53 2016 +1000

--
 README.md | 130 +
 1 file changed, 130 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/970feaef/README.md
--
diff --git a/README.md b/README.md
new file mode 100644
index 000..9e603c4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,130 @@
+# Apache JSPWiki 2.10 - Documentation
+
+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.  
+
+The license file can be found in LICENSE.
+
+
+## What is JSPWiki?
+
+JSPWiki is a simple (well, not any more) WikiWiki clone, written in Java
+and JSP.  A WikiWiki is a web site which allows anyone to participate
+in its development.  JSPWiki supports all the traditional wiki features,
+as well as very detailed access control and security integration using JAAS. 
+
+* For more information see https://jspwiki-wiki.apache.org/
+
+## Pre-requirements
+
+Okay, so you wanna Wiki?  You'll need the following things:
+
+REQUIRED:
+
+* A JSP engine that supports Servlet API 2.5.  We recommend Tomcat from
+  http://tomcat.apache.org/ for a really easy installation.
+  Tomcat 6.x or later is supported.
+
+* Some previous administration experience...  If you've ever installed
+  Apache or any other web server, you should be pretty well off.
+
+* And of course, a server to run the JSP engine on.
+
+* JDK 1.6+
+
+
+OPTIONAL:
+
+* JavaMail package from java.sun.com, if you want to use log4j mailing
+  capabilities.  You'll also need the Java Activation Framework.
+
+## Really simple installation
+
+This section is meant for you, if you just want to have a really quick
+install without much worries.  If you want to have a more complicated
+installation (with more power as to how to do things), 
+check out the "Install" section below.
+
+Since JSPWiki 2.1.153, JSPWiki comes with a really simple installation
+engine.  Just do the following:
+
+1) Install Tomcat from http://tomcat.apache.org/ (or any other servlet
+   container)
+
+2) Rename the JSPWiki.war file from the download and rename it based on
+   your desired URL (if you want it different from /JSPWiki).  For example,
+   if you want your URL to be http://.../wiki, rename it to wiki.war.
+   This name will be referred to as  below.
+   Place this WAR in your $TOMCAT_HOME/webapps folder and then start Tomcat.
+
+3) Point your browser at http:Install.jsp
+
+4) Answer a couple of simple questions
+
+5) Restart your container
+
+6) Point your browser to http:
+
+That's it!
+
+
+## Advanced Installation
+
+In the $TOMCAT_HOME/lib folder (or equivalent based on your servlet container),
+place a jspwiki-custom.properties file, which can contain any overrides to the 
+default ini/jspwiki.properties file in the JSPWiki JAR.  For any values not 
+placed in jspwiki-custom.properties file JSPWiki will rely on the default file.
+Review the default file to look for values you may wish to override in the 
custom
+file.  Some common values to override in your custom file include 
+jspwiki.baseURL, jspwiki.xmlUserDatabaseFile, jspwiki.xmlGroupDatabaseFile
+jspwiki.fileSystemProvider.pageDir, 
jspwiki.basicAttachmentProvider.storageDir, 
+and log4j.appender.FileLog.File.  The comments in the default file will 
suggest 
+appropriate values to override them with. 
+
+The custom file can also be placed in the WEB-INF/ folder of the WAR, but 
storing
+this file in TOMCAT_HOME/lib

[jspwiki] Git Push Summary

2016-09-16 Thread dvittor 
Repository: jspwiki
Updated Branches:
  refs/heads/JSPWIKI-877 [created] dc45a6626

jspwiki git commit: ChangeLog test commit into git repo

2016-09-16 Thread dvittor 
Repository: jspwiki
Updated Branches:
  refs/heads/master a625d82d3 -> dc45a6626


ChangeLog test commit into git repo


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

Branch: refs/heads/master
Commit: dc45a66265007873e310bba4785bec0ea3a64fc3
Parents: a625d82
Author: David Vittor 
Authored: Fri Sep 16 20:40:00 2016 +1000
Committer: David Vittor 
Committed: Fri Sep 16 20:40:00 2016 +1000

--
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/dc45a662/ChangeLog
--
diff --git a/ChangeLog b/ChangeLog
index 7504b51..65d175a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-09-16  David Vittor (dvit...@apache.org)
+   * Test commit to our new git repo.
+
 2016-09-16  Harry Metske (mets...@apache.org)
* Test commit to see how our new git repo works.