svn commit: r1735353 - in /shiro/site: publish/ publish/2012/01/24/ trunk/ trunk/2012/01/24/

[bdemers]

Author: bdemers
Date: Thu Mar 17 00:45:20 2016
New Revision: 1735353

URL: http://svn.apache.org/viewvc?rev=1735353&view=rev
Log:
Replacing svn info with git info

Modified:
    shiro/site/publish/2012/01/24/apache-shiro-120-released.html
    shiro/site/publish/authorization.html
    shiro/site/publish/developer-resources.html
    shiro/site/publish/download.html
    shiro/site/publish/how-to-contribute.html
    shiro/site/publish/java-annotations.html
    shiro/site/publish/java-authorization-guide.html
    shiro/site/publish/news.html
    shiro/site/publish/performing-a-release.html
    shiro/site/publish/session-management.html
    shiro/site/publish/tags.html
    shiro/site/publish/tutorial.html
    shiro/site/publish/version-2-brainstorming.html
    shiro/site/trunk/   (props changed)
    shiro/site/trunk/2012/01/24/apache-shiro-120-released.html
    shiro/site/trunk/authorization.html
    shiro/site/trunk/developer-resources.html
    shiro/site/trunk/download.html
    shiro/site/trunk/how-to-contribute.html
    shiro/site/trunk/java-annotations.html
    shiro/site/trunk/java-authorization-guide.html
    shiro/site/trunk/news.html
    shiro/site/trunk/performing-a-release.html
    shiro/site/trunk/session-management.html
    shiro/site/trunk/tags.html
    shiro/site/trunk/tutorial.html
    shiro/site/trunk/version-2-brainstorming.html

Modified: shiro/site/publish/2012/01/24/apache-shiro-120-released.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/2012/01/24/apache-shiro-120-released.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/2012/01/24/apache-shiro-120-released.html (original)
+++ shiro/site/publish/2012/01/24/apache-shiro-120-released.html Thu Mar 17 
00:45:20 2016
@@ -91,7 +91,7 @@
 <p><font color="#222222">There are only a few small cases where breakage could 
occur - please&#160;</font><font color="#222222">view the release notes to 
ensure you mitigate any potential breaking&#160;</font><font 
color="#222222">change - particularly if you are using the 
SecureRandomNumberGenerator</font><br clear="none">
 <font color="#222222">or Shiro's Block Cipher Services (AES, 
Blowfish):</font></p>
 
-<p><a class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.0/RELEASE-NOTES";>https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.0/RELEASE-NOTES</a></p>
+<p><a class="external-link" 
href="https://raw.githubusercontent.com/apache/shiro/shiro-root-1.2.0/RELEASE-NOTES";>https://raw.githubusercontent.com/apache/shiro/shiro-root-1.2.0/RELEASE-NOTES</a></p>
 
 <h3><a name="ApacheShiro1.2.0Released%21-ResolvedIssues"></a>Resolved 
Issues</h3>
 

Modified: shiro/site/publish/authorization.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/authorization.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/authorization.html (original)
+++ shiro/site/publish/authorization.html Thu Mar 17 00:45:20 2016
@@ -401,7 +401,7 @@ customizeMacroTable('TBL1365578679393',
 
 <p>Before you can use Java annotations, you'll need to enable AOP support in 
your application. There are a number of different AOP frameworks so, 
unfortunately, there is no standard way to enable AOP in an application.</p>
 
-<p>For AspectJ, you can review our <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/samples/aspectj/";>AspectJ 
sample application</a>.</p>
+<p>For AspectJ, you can review our <a class="external-link" 
href="https://github.com/apache/shiro/tree/master/samples/aspectj";>AspectJ 
sample application</a>.</p>
 
 <p>For Spring applications, you can look into our <a href="spring.html" 
title="Spring">Spring Integration</a> documentation.</p>
 

Modified: shiro/site/publish/developer-resources.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/developer-resources.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/developer-resources.html (original)
+++ shiro/site/publish/developer-resources.html Thu Mar 17 00:45:20 2016
@@ -73,32 +73,30 @@
 
 <h2><a name="DeveloperResources-SourceCodeRepository"></a>Source Code 
Repository</h2>
 
-<p>We use the Subversion repository located at <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro";>http://svn.apache.org/repos/asf/shiro</a>.
  Committers must use the <tt>https</tt> scheme (not <tt>http</tt>).</p>
+<p>We use a Git repository located at <a class="external-link" 
href="git://git.apache.org/shiro.git">git://git.apache.org/shiro.git</a>.</p>
 
-<p>Active development is done in the <tt>trunk</tt> subdirectory.  The 
<tt>branches</tt> and <tt>tags</tt> peer subdirectories exist based on the <a 
class="external-link" href="http://apr.apache.org/versioning.html";>Apache APR 
Versioning Scheme</a> and are generally created/maintained by the dev team 
using the <a class="external-link" 
href="http://maven.apache.org/plugins/maven-release-plugin/";>Maven Release 
Plugin</a>.</p>
+<p>Active development is done in the <tt>master</tt> branch, and maintenance 
typically on the <tt>1.2.x</tt> branch.</p>
 
-<h3><a name="DeveloperResources-BuildingfromSubversion"></a>Building from 
Subversion</h3>
+<h3><a name="DeveloperResources-BuildingfromGit"></a>Building from Git</h3>
 
-<p>For Shiro cutting-edge development, you can check-out the code from 
Subversion and build it using <a class="external-link" 
href="http://maven.apache.org";>Maven</a> 2.2+:</p>
+<p>For Shiro cutting-edge development, you can clone the code from Git and 
build it using <a class="external-link" 
href="http://maven.apache.org";>Maven</a> 2.2+:</p>
 
 <ol><li>Check out the code:
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-java">
-mkdir shiro
-cd shiro
-svn co https:<span class="code-comment">//svn.apache.org/repos/asf/shiro/trunk 
trunk</span>
+git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
 </pre>
 </div></div></li><li>Build the project using <a class="external-link" 
href="http://maven.apache.org";>Maven</a> 2.2+:
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-java">
-cd trunk
+cd shiro
 mvn install
 </pre>
 </div></div>
 <p>The resulting artifacts will be in your local M2 Repo under the 
org.apache.shiro group.</p></li></ol>
 
 
-<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col 
span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" 
valign="top"><img align="middle" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif"; 
width="16" height="16" alt="" border="0"></td><td colspan="1" 
rowspan="1"><b>Cutting-edge development</b><br clear="none">When building from 
<tt>trunk</tt> or any branches, use the generated artifacts at your own risk!  
Current and previous stable releases will always be available via the <a 
href="download.html" title="Download">Download</a> page.</td></tr></table></div>
+<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col 
span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" 
valign="top"><img align="middle" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif"; 
width="16" height="16" alt="" border="0"></td><td colspan="1" 
rowspan="1"><b>Cutting-edge development</b><br clear="none">When building from 
<tt>master</tt> or any branches, use the generated artifacts at your own risk!  
Current and previous stable releases will always be available via the <a 
href="download.html" title="Download">Download</a> page.</td></tr></table></div>
 
         </div>
 

Modified: shiro/site/publish/download.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/download.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/download.html (original)
+++ shiro/site/publish/download.html Thu Mar 17 00:45:20 2016
@@ -112,7 +112,7 @@
             <ul>
                 <li><a href="#latestBinary">1.2.4. Binary Distribution</a></li>
                 <li><a href="#latestSource">1.2.4 Source Code 
Distribution</a></li>
-                <li><a href="#latestSvn">1.2.4 SVN Source repository</a></li>
+                <li><a href="#latestGit">1.2.4 Git Source repository</a></li>
             </ul>
         </li>
         <li><a href="#previous">Previous Releases</a>
@@ -121,7 +121,7 @@
                 <ul>
                     <li><a href="#1.1.0Binary">1.1.0 Binary 
Distribution</a></li>
                     <li><a href="#1.1.0Source">1.1.0 Source Code 
Distribution</a></li>
-                    <li><a href="#1.1.0Svn">1.1.0 SVN Source 
repository</a></li>
+                    <li><a href="#1.1.0Git">1.1.0 Git Source 
repository</a></li>
                 </ul>
             </ul>
         </li>
@@ -700,13 +700,14 @@ customizeMacroTable('TBL1365578679386',
             
href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.4/shiro-root-1.2.4-source-release.zip.sha1";>sha1</a>)
 </p>
 
-<h3><a name="latestSvn"></a>1.2.4 SVN Source repository</h3>
+<h3><a name="latestGit"></a>1.2.4 Git Source repository</h3>
 
-<p>The source can be checked out anonymously from SVN with this command:</p>
+<p>The source can be cloned anonymously from Git with this command:</p>
 <div class="code panel" style="border-width: 1px;">
     <div class="codeContent panelContent">
 <pre class="code-java">
-svn checkout http:<span 
class="code-comment">//svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.4</span>
+git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
+git checkout shiro-root-1.2.4 -b shiro-root-1.2.4
 </pre>
     </div>
 </div>
@@ -889,13 +890,14 @@ customizeMacroTable('TBL1365578679388',
     <a class="external-link" 
href="http://archive.apache.org/dist/shiro/1.1.0/shiro-root-1.1.0-source-release.zip.sha1";>sha1</a>)
 </p>
 
-<h4><a name="1.1.0Svn"></a>1.1.0 SVN Source repository</h4>
+<h4><a name="1.1.0Git"></a>1.1.0 Git Source repository</h4>
 
-<p>The source can be checked out anonymously from SVN with this command:</p>
+<p>The source can be cloned anonymously from Git with this command:</p>
 <div class="code panel" style="border-width: 1px;">
     <div class="codeContent panelContent">
 <pre class="code-java">
-svn checkout http:<span 
class="code-comment">//svn.apache.org/repos/asf/shiro/tags/shiro-root-1.1.0</span>
+git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
+git checkout shiro-root-1.1.0 -b shiro-root-1.1.0
 </pre>
     </div>
 </div>

Modified: shiro/site/publish/how-to-contribute.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/how-to-contribute.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/how-to-contribute.html (original)
+++ shiro/site/publish/how-to-contribute.html Thu Mar 17 00:45:20 2016
@@ -65,7 +65,7 @@
 
             <h1><a 
name="HowtoContribute-ContributingtoApacheShiro"></a>Contributing to Apache 
Shiro</h1>
 
-<ul><li><a href="#HowtoContribute-introduction">Introduction</a></li><li><a 
href="#HowtoContribute-help">Help Wanted Here</a></li><li><a 
href="#HowtoContribute-procedure">Procedure for reporting bugs and issues and 
enhancement suggestions</a></li><li><a href="#HowtoContribute-svn">SVN 
Usage</a></li><li><a href="#HowtoContribute-committer">SVN 
Committers</a></li><li><a href="#HowtoContribute-issues">Procedure for Raising 
Development Issues</a></li><li><a href="#HowtoContribute-patches">How to 
prepare and contribute patches</a></li><li><a 
href="#HowtoContribute-revert">How to revert changes in SVN</a></li><li><a 
href="#HowtoContribute-tips">Contribution Notes and Tips</a></li></ul>
+<ul><li><a href="#HowtoContribute-introduction">Introduction</a></li><li><a 
href="#HowtoContribute-help">Help Wanted Here</a></li><li><a 
href="#HowtoContribute-procedure">Procedure for reporting bugs and issues and 
enhancement suggestions</a></li><li><a href="#HowtoContribute-git">Git 
Usage</a></li><li><a href="#HowtoContribute-committer">Git 
Committers</a></li><li><a href="#HowtoContribute-issues">Procedure for Raising 
Development Issues</a></li><li><a href="#HowtoContribute-patches">How to 
prepare and contribute patches</a></li><li><a 
href="#HowtoContribute-revert">How to revert changes in Git</a></li><li><a 
href="#HowtoContribute-tips">Contribution Notes and Tips</a></li></ul>
 
 
 <p><a name="HowtoContribute-introductions"></a></p>
@@ -98,15 +98,15 @@
 
 <p>When creating a new issue, please provide a concise Summary Title and a 
short Description. Add further information as Comments and include links to the 
mail archives. The normal procedure is to discuss the issue on the mailing list 
and then add relevant notes to the issue tracker, otherwise it becomes 
cluttered.</p>
 
-<p><a name="HowtoContribute-svn"></a></p>
-<h2><a name="HowtoContribute-SVNUsage"></a>SVN Usage</h2>
+<p><a name="HowtoContribute-git"></a></p>
+<h2><a name="HowtoContribute-GitUsage"></a>Git Usage</h2>
 
-<p>An overview of how to use Subversion (SVN) to participate in Shiro 
development. Do not be afraid - you cannot accidently destroy the actual code 
repository, because you are working with a local copy as an anonymous user. 
Therefore, you do not have the system permissions to change anything. You can 
only update your local repository and compare your revisions with the real 
repository. The <a href="download.html" title="Download">Download Shiro</a> 
page explains how to check-out the code base and build your local copy.</p>
+<p>An overview of how to use Git to participate in Shiro development. Do not 
be afraid - you cannot accidentally destroy the actual code repository, because 
you are working with a local copy as an anonymous user. Therefore, you do not 
have the system permissions to change anything. You can only update your local 
repository and compare your revisions with the real repository. The <a 
href="download.html" title="Download">Download Shiro</a> page explains how to 
check-out the code base and build your local copy.</p>
 
 <p><a name="HowtoContribute-committer"></a></p>
-<h2><a name="HowtoContribute-SVNCommitters"></a>SVN Committers</h2>
+<h2><a name="HowtoContribute-GitCommitters"></a>Git Committers</h2>
 
-<p>After a developer has consistently provided contributions (code, 
documentation and discussion) and demonstrated committment, then the rest of 
the dev community may vote to grant this developer commit access to the 
Subversion repository. See the <a class="external-link" 
href="http://www.apache.org/dev/";>ASF developers resources</a> especially the 
<a class="external-link" 
href="http://www.apache.org/dev/version-control.html";>Source code 
repositories</a>.</p>
+<p>After a developer has consistently provided contributions (code, 
documentation and discussion) and demonstrated committment, then the rest of 
the dev community may vote to grant this developer commit access to the Git 
repository. See the <a class="external-link" 
href="http://www.apache.org/dev/";>ASF developers resources</a> especially the 
<a class="external-link" 
href="http://www.apache.org/dev/version-control.html";>Source code 
repositories</a>.</p>
 
 <p><a name="HowtoContribute-issues"></a></p>
 <h2><a 
name="HowtoContribute-ProcedureforRaisingDevelopmentIssues"></a>Procedure for 
Raising Development Issues</h2>
@@ -124,22 +124,73 @@
 <p>Perhaps you do not get any answer on your first reply, so just post it 
again until you get one. (But please not every hour - allow a few days for the 
list to deal with it.) Bear in mind that other countries will have holidays at 
different times to your country and that they are in different time zones. You 
might also consider rewriting your initial posting.  It may have not been clear 
to the readers on the mailing list.</p>
 
 <p><a name="HowtoContribute-patches"></a></p>
-<h2><a name="HowtoContribute-Howtoprepareandcontributepatches"></a>How to 
prepare and contribute patches</h2>
+<h2><a 
name="HowtoContribute-Howtoprepareandcontributepatches"></a>Contributing as a 
Non-Committer</h2>
 
-<p>If you use the current development version of Shiro via Subversion, then do 
'svn update; svn status' to see what files that you have changed. Do 'svn diff 
&gt; mypatch.txt' to make a patch which includes every change. To make a patch 
for a specific file, do svn diff <tt>src/documentation/content/xdocs/faq.xml 
&gt; faq.xml.diff</tt>. It is better to prepare the patch from the 
<tt>$SHIRO_HOME</tt> directory so that it contains a definite path to the 
document. However, be careful that the patch does not contain other 
work-in-progress.</p>
+<p>If you're a committer on an Apache project, it means that you can commit 
directly to the project's repository. For instance, with Apache Shiro 
committers are allowed to directly push commits into the git repository.</p>
 
-<p>For more information about working with SVN, see <a class="external-link" 
href="http://svnbook.red-bean.com/"; rel="nofollow">Version Control with 
Subversion</a> - the opensource SVN book.</p>
+<p>Non-committers, however, have to submit patches for review. Apache Shiro 
accepts GitHub pull requests. If you are new to Git and GitHub, check these two 
links:</p>
 
-<p>If you use a downloaded released version of Shiro (or don't use SVN), then 
use the 'diff' command of your operating system: <tt>diff -u faq.xml.orig 
faq.xml &gt; mypatch.txt</tt> (better to do that from <tt>$SHIRO_HOME</tt> 
directory). If you want to use the most recent version of the documentation 
then grab its source file directly from the <a href="download.html" 
title="Download">SVN server</a> (and tell us which Revision number you 
used).</p>
+<ul>
+    <li><a class="external-link" 
href="https://try.github.io/levels/1/challenges/1";>GitHub 15 minutes 
tutorial</a></li>
+    <li><a class="external-link" 
href="https://help.github.com/articles/creating-a-pull-request/";>Creating Pull 
Requests</a></li>
+</ul>
 
-<div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col 
span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" 
valign="top"><img align="middle" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif"; 
width="16" height="16" alt="" border="0"></td><td colspan="1" 
rowspan="1"><b>Note</b><br clear="none">Please send all contributions via our 
<a class="external-link" 
href="https://issues.apache.org/jira/browse/SHIRO";>issue tracker</a>. and 
specify the Forrest version or svn version of the 
source.</td></tr></table></div>
+<p>Apache Shiro has a read-only mirror on GitHub that is kept in sync with the 
canonical Git repo maintained by the Apache Software Foundation. Submitting 
GitHub pull requests is the easiest way to get your contribution upstream. For 
detailed instructions see the link below:</p>
+<a href="https://github.com/apache/shiro/blob/master/CONTRIBUTING.md";>GitHub 
Contribution Guidelines</a>
 
-<p>It is always a good idea to check the <a class="external-link" 
href="https://issues.apache.org/jira/browse/SHIRO";>Shiro issue tracker</a> 
before diving in.</p>
+<h3><a name="HowtoContribute-submitThroughJIRA">Submitting a patch through 
JIRA</a></h3>
 
-<p><a name="HowtoContribute-revert"></a></p>
-<h2><a name="HowtoContribute-HowtorevertchangesinSVN"></a>How to revert 
changes in SVN</h2>
+<p>While we encourage you to submit your contribution through GitHub pull 
requests, you can also attach a patch in a JIRA ticket. For the purpose of 
these instructions, we'll assume that you already have a system with Git and 
have found a bug to fix or have a feature that you'd like to submit, and you're 
willing to contribute that code or documentation under the Apache License 
2.0.</p>
 
-<p>Check out <a class="external-link" 
href="http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2"; 
rel="nofollow">http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2</a>
 for instructions on how to revert (roll back) changes to svn.</p>
+<p>Further, if you're fixing a bug we'll assume that you've either filed a bug 
report (where you will attach your patch) or are submitting a fix for a known 
bug. If you find a bug and would like to fix it, that's awesome! Please be sure 
to file the bug too, though.</p>
+
+<p>If you want to add a feature, you should bring it up for discussion on the 
d...@shiro.apache.org mailing list before implementing it. This ensures that it 
meshes with the plans that other contributors have for Apache Shiro, and that 
you're not doing redundant work. Other developers may also have ideas for the 
feature or suggestions that will help you land the feature without having to 
re-do the work. More information about our mailing lists can be found here.</p>
+
+<p>In short, communication is a vital part of making a contribution to an 
Apache project.</p>
+
+<h3><a name="HowtoContribute-gettingStartedGit">Getting Started</a></h3>
+
+<p>First, lets make sure that you've added your name and email to your 
`~/.gitconfig`:</p>
+
+<pre>
+$ git config --global user.name "Your Name"
+$ git config --global user.email y...@domain.com
+</pre>
+You'll grab the Shiro source with git:
+
+<pre>
+$ git clone https://git-wip-us.apache.org/repos/asf/shiro.git
+</pre>
+
+<p>If you already have the source, make sure you're working with the most 
recent version. Do a `git pull` if you cloned the source more than a few hours 
ago. (Apache Shiro development can move pretty fast!)</p>
+
+<pre>
+$ git checkout -b mybranch
+</pre>
+
+<p>This does two things: One, it creates the branch mybranch and two, it 
changes your working branch to mybranch. Running `git branch` will show you 
which branch you're working on, with an asterisk next to the active branch, 
like so:</p>
+
+<pre>
+[user@localhost shiro]$ git branch
+master
+* mybranch
+</pre>
+
+<p>Make whatever changes you're going to make, be sure to use git add to stage 
the changes, and then you're going to commit the changes to your working 
branch:</p>
+
+<pre>
+git commit -m "Insert a meaningful summary of changes here."
+</pre>
+
+<p>Finally, you can create a patch and attach it to the JIRA issue that you 
created for the bug you are fixing.</p>
+
+<pre>
+git format-patch master --stdout > ~/patch-name.patch
+</pre>
+
+<h3><a name="HowtoContribute-review">Review</a></h3>
+
+<p>Once you've submitted your pull request, you should receive a response 
within a few days. If you receive no response within a week, please ping the 
shiro-dev mailing list (d...@shiro.apache.org).</p>
 
 <p><a name="HowtoContribute-tips"></a></p>
 <h2><a name="HowtoContribute-ContributionNotesandTips"></a>Contribution Notes 
and Tips</h2>
@@ -147,7 +198,7 @@
 <p>This is a collection of tips for contributing to the project in a manner 
that is productive for all parties.</p>
 
 <ul><li>See general ASF <a class="external-link" 
href="http://www.apache.org/dev/contrib-email-tips.html";>Tips for email 
contributors</a></li><li>There is no such thing as a dumb question.  Always 
check the <a href="mailing-lists.html" title="Mailing Lists">archives</a> to 
see if someone else asked it first and maybe already received an 
answer.</li><li>Every contribution is worthwhile. Even if the code isn't 
perfect.  Even if the documentation has typos.  Even if you got it wrong the 
first time around. Any contribution is a start of something special.  Through 
your continued effort and the help of the community, your contribution will 
evolve and get ever closer to "perfect".</li><li>Use sensible and concise email 
subject headings. Search engines, and humans trying to browse a voluminous 
list, will respond favourably to a descriptive title.</li><li>Start new threads 
with new Subject for new topics, rather than reusing the previous Subject 
line.</li><li>Keep each topic focused. If som
 e new topic arises then start a new discussion. This leaves the original topic 
to continue uncluttered.<br clear="none">
-Whenever you decide to start a new topic, then start with a fresh new email 
message window. Do not use the "Reply to" button, because threaded mail-readers 
get confused (they utilise the In-reply-to header). If so, then your new topic 
will get lost in the previous thread and go unanswered.</li><li>Prepend your 
email subject line with a marker when that is appropriate, e.g. [Proposal], 
[RT] (Random Thought which quickly blossom into research topics <img 
align="middle" class="emoticon" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif"; 
height="20" width="20" alt="" border="0">, [STATUS] (development status of a 
certain facility).</li><li>Remember that most people are participating in 
development on a volunteer basis and in their "spare time". These enthusiasts 
will attempt to respond to issues. It may take a little while to get your 
answers.</li><li>Research your topic thoroughly before beginning to discuss a 
new development issue. Search and browse through the
  email archives - your issue may have been discussed before. Do not just 
perceive a problem and then rush out with a question - instead, 
delve.</li><li>Try to at least offer a partial solution and not just a problem 
statement.</li><li>Take the time to clearly explain your issue and write a 
concise email message. Less confusion facilitates fast and complete 
resolution.</li><li>Do not bother to send an email reply that simply says 
"thanks". When the issue is resolved, that is the finish - end of thread. 
Reduce clutter.</li><li>You would usually do any development work against the 
trunk of SVN.</li><li>When sending a patch, you usually do not need to worry 
about which SVN branch it should be applied to. The maintainers of the 
repository will decide.</li><li>Keep all project-related discussion on the 
mailing list. It is much better to utilise the wider audience, rather than to 
break off into private discussion groups. You never know who else will have the 
answer to your issues, and anyw
 ay other people are interested in the outcome.</li><li>Become familiar with 
the mailing lists. As you browse and search, you will see the way other people 
do things. Follow the leading examples.</li></ul>
+Whenever you decide to start a new topic, then start with a fresh new email 
message window. Do not use the "Reply to" button, because threaded mail-readers 
get confused (they utilise the In-reply-to header). If so, then your new topic 
will get lost in the previous thread and go unanswered.</li><li>Prepend your 
email subject line with a marker when that is appropriate, e.g. [Proposal], 
[RT] (Random Thought which quickly blossom into research topics <img 
align="middle" class="emoticon" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif"; 
height="20" width="20" alt="" border="0">, [STATUS] (development status of a 
certain facility).</li><li>Remember that most people are participating in 
development on a volunteer basis and in their "spare time". These enthusiasts 
will attempt to respond to issues. It may take a little while to get your 
answers.</li><li>Research your topic thoroughly before beginning to discuss a 
new development issue. Search and browse through the
  email archives - your issue may have been discussed before. Do not just 
perceive a problem and then rush out with a question - instead, 
delve.</li><li>Try to at least offer a partial solution and not just a problem 
statement.</li><li>Take the time to clearly explain your issue and write a 
concise email message. Less confusion facilitates fast and complete 
resolution.</li><li>Do not bother to send an email reply that simply says 
"thanks". When the issue is resolved, that is the finish - end of thread. 
Reduce clutter.</li><li>You would usually do any development work against the 
master branch in Git.</li><li>When sending a patch, you usually do not need to 
worry about which Git branch it should be applied to. The maintainers of the 
repository will decide.</li><li>Keep all project-related discussion on the 
mailing list. It is much better to utilise the wider audience, rather than to 
break off into private discussion groups. You never know who else will have the 
answer to your issues, 
 and anyway other people are interested in the outcome.</li><li>Become familiar 
with the mailing lists. As you browse and search, you will see the way other 
people do things. Follow the leading examples.</li></ul>
 
 
         </div>

Modified: shiro/site/publish/java-annotations.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/java-annotations.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/java-annotations.html (original)
+++ shiro/site/publish/java-annotations.html Thu Mar 17 00:45:20 2016
@@ -66,7 +66,7 @@
             <h1><a name="JavaAnnotations-JavaAnnotationSupport"></a>Java 
Annotation Support</h1>
 <p>Before you can use Java annotations, you'll need to enable AOP support in 
your application. There are a number of different AOP frameworks so, 
unfortunately, there is no standard way to enable AOP in an application.</p>
 
-<p>For AspectJ, you can review our <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/samples/aspectj/";>AspectJ 
sample application</a>.</p>
+<p>For AspectJ, you can review our <a class="external-link" 
href="https://github.com/apache/shiro/tree/master/samples/aspectj";>AspectJ 
sample application</a>.</p>
 
 <p>For Spring, you can look into our <a href="spring.html" 
title="Spring">Spring Integration</a> documentation.</p>
 

Modified: shiro/site/publish/java-authorization-guide.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/java-authorization-guide.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/java-authorization-guide.html (original)
+++ shiro/site/publish/java-authorization-guide.html Thu Mar 17 00:45:20 2016
@@ -221,7 +221,7 @@ If (currentUser.isPermitted(printPermiss
 <h4><a name="JavaAuthorizationGuide-EnablingAnnotationSupport"></a>Enabling 
Annotation Support</h4>
 <p>Before you can use Java annotations, you'll need to enable AOP support in 
your application. There are a number of different AOP frameworks so, 
unfortunately, there is no standard way to enable AOP in an application.</p>
 
-<p>For AspectJ, you can review our <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/samples/aspectj/";>AspectJ 
sample application</a>.</p>
+<p>For AspectJ, you can review our <a class="external-link" 
href="https://github.com/apache/shiro/tree/master/samples/aspectj";>AspectJ 
sample application</a>.</p>
 
 <p>For Spring, you can look into our <a href="spring.html" 
title="Spring">Spring Integration</a> documentation.</p>
 

Modified: shiro/site/publish/news.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/news.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/news.html (original)
+++ shiro/site/publish/news.html Thu Mar 17 00:45:20 2016
@@ -250,7 +250,7 @@ The Apache Shiro Team
 <p><font color="#222222">There are only a few small cases where breakage could 
occur - please&#160;</font><font color="#222222">view the release notes to 
ensure you mitigate any potential breaking&#160;</font><font 
color="#222222">change - particularly if you are using the 
SecureRandomNumberGenerator</font><br clear="none">
 <font color="#222222">or Shiro's Block Cipher Services (AES, 
Blowfish):</font></p>
 
-<p><a class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.0/RELEASE-NOTES";>https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.0/RELEASE-NOTES</a></p>
+<p><a class="external-link" 
href="https://raw.githubusercontent.com/apache/shiro/shiro-root-1.2.0/RELEASE-NOTES";>https://raw.githubusercontent.com/apache/shiro/shiro-root-1.2.0/RELEASE-NOTES</a></p>
 
 <h3><a name="ApacheShiro1.2.0Released%21-ResolvedIssues"></a>Resolved 
Issues</h3>
 

Modified: shiro/site/publish/performing-a-release.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/performing-a-release.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/performing-a-release.html (original)
+++ shiro/site/publish/performing-a-release.html Thu Mar 17 00:45:20 2016
@@ -80,8 +80,8 @@
 &gt; mvn release:prepare -DdryRun=<span class="code-keyword">true</span>
 &gt; mvn deploy -Pdocs
 &gt; mvn release:clean
-&gt; mvn release:prepare -Dusername=YOUR_SVN_USERNAME 
-Dpassword=YOUR_SVN_PASSWORD
-&gt; mvn release:perform -Dusername=YOUR_SVN_USERNAME 
-Dpassword=YOUR_SVN_PASSWORD
+&gt; mvn release:prepare -Dusername=YOUR_ASF_USERNAME 
-Dpassword=YOUR_ASF_PASSWORD
+&gt; mvn release:perform -Dusername=YOUR_ASF_USERNAME 
-Dpassword=YOUR_ASF_PASSWORD
 </pre>
 </div></div></li><li>Log in to <a class="external-link" 
href="https://repository.apache.org";>https://repository.apache.org</a>.  
Navigate to "Staging Repositories" (on the left nav panel).  Find the 
repository starting with 'org.apache.shiro' and <tt>close</tt> it.</li><li>Send 
out the VOTE email to the <tt>d...@shiro.apache.org</tt> mailing list.  Here's 
a good template:
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
@@ -93,7 +93,7 @@ The 59 issues solved <span class="code-k
 https:<span 
class="code-comment">//issues.apache.org/jira/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+%3D+SHIRO+AND+fixVersion+%3D+%221.2.0%22+AND+%28status+%21%3D+Open+and+status+%21%3D+%22In+Progress%22%29+ORDER+BY+priority+DESC&amp;runQuery=<span
 class="code-keyword">true</span>&amp;clear=<span 
class="code-keyword">true</span>
 </span>
 The tag to be voted upon:
-&lt;SVN_URL_OF_THE_RELEASE_TAG&gt; (e.g. https:<span 
class="code-comment">//svn.apache.org/repos/asf/shiro/tags/1.2.0)
+&lt;GIT_URL_OF_THE_RELEASE_TAG&gt; (e.g. https:<span 
class="code-comment">//github.com/apache/shiro/tree/1.2.0)
 </span>
 Staging repo <span class="code-keyword">for</span> binaries:
 &lt;URL_OF_THE_CLOSED_REPO_FROM_ABOVE_STEP&gt; (e.g. https:<span 
class="code-comment">//repository.apache.org/content/repositories/orgapacheshiro-92/)
@@ -117,7 +117,7 @@ Vote open <span class="code-keyword">for
 
 <h2><a name="PerformingaRelease-AfteraSuccessfulVote"></a>After a Successful 
Vote</h2>
 
-<ol><li>Update the <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/shiro.doap.rdf";>Shiro DOAP 
file in subversion</a> to include another release information chunk 
(<em>after</em> the other similar chunks):
+<ol><li>Update the <a class="external-link" 
href="https://github.com/apache/shiro/blob/master/shiro.doap.rdf";>Shiro DOAP 
file in git</a> to include another release information chunk (<em>after</em> 
the other similar chunks):
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-xml">
 <span class="code-tag">&lt;release&gt;</span>
@@ -130,7 +130,7 @@ Vote open <span class="code-keyword">for
 </pre>
 </div></div>
 <p><br clear="none" class="atl-forced-newline">
-With the appropriate <tt>RELEASE_DATE</tt> (e.g. 2011-10-01) and 
<tt>VERSION</tt> (e.g. 1.1.0).  Save and commit the file to SVN.
+With the appropriate <tt>RELEASE_DATE</tt> (e.g. 2011-10-01) and 
<tt>VERSION</tt> (e.g. 1.1.0).  Save and commit the file to Git.
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline"></p></li><li>Put the distribution 
on the ASF web servers
        <ol><li>SSH into people.apache.org and &#65279;cd&#160;to to Shiro's 
distribution location:

Modified: shiro/site/publish/session-management.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/session-management.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/session-management.html (original)
+++ shiro/site/publish/session-management.html Thu Mar 17 00:45:20 2016
@@ -288,11 +288,11 @@ securityManager.cacheManager = $cacheMan
 <p><a name="SessionManagement-ehcachesessioncacheconfiguration"></a></p>
 <h5><a name="SessionManagement-EHCacheSessionCacheConfiguration"></a>EHCache 
Session Cache Configuration</h5>
 
-<p>By default, the <tt>EhCacheManager</tt> uses a Shiro-specific <tt><a 
class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/trunk/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml";>ehcache.xml</a></tt>
 file that sets up the Session cache region and the necessary settings to 
ensure Sessions are stored and retrieved properly.</p>
+<p>By default, the <tt>EhCacheManager</tt> uses a Shiro-specific <tt><a 
class="external-link" 
href="https://github.com/apache/shiro/tree/master/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml";>ehcache.xml</a></tt>
 file that sets up the Session cache region and the necessary settings to 
ensure Sessions are stored and retrieved properly.</p>
 
 <p>However, if you wish to change the cache settings, or configure your own 
<tt>ehcache.xml</tt> or EHCache <tt>net.sf.ehcache.CacheManager</tt> instance, 
you will need to configure the cache region to ensure that Sessions are handled 
correctly.</p>
 
-<p>If you look at the default <tt><a class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/trunk/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml";>ehcache.xml</a></tt>
 file, you will see the following <tt>shiro-activeSessionCache</tt> cache 
configuration:</p>
+<p>If you look at the default <tt><a class="external-link" 
href="https://github.com/apache/shiro/tree/master/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml";>ehcache.xml</a></tt>
 file, you will see the following <tt>shiro-activeSessionCache</tt> cache 
configuration:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-xml">

Modified: shiro/site/publish/tags.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/tags.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/tags.html (original)
+++ shiro/site/publish/tags.html Thu Mar 17 00:45:20 2016
@@ -65,7 +65,7 @@
 
             <script type="text/javascript">
 <!--
-window.location = 
"http://svn.apache.org/repos/asf/shiro/trunk/web/src/main/resources/META-INF/shiro.tld";
+window.location = 
"https://github.com/apache/shiro/blob/master/web/src/main/resources/META-INF/shiro.tld";
 //-->
 </script>
 

Modified: shiro/site/publish/tutorial.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/tutorial.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/tutorial.html (original)
+++ shiro/site/publish/tutorial.html Thu Mar 17 00:45:20 2016
@@ -91,7 +91,7 @@
 <p>If you're new to Apache Shiro, this short tutorial will show you how to set 
up an initial and very simple application secured by Apache Shiro.  We'll 
discuss Shiro's core concepts along the way to help familiarize you with 
Shiro's design and API.</p>
 
 <p>If you don't want to actually edit files as you follow this tutorial, you 
can obtain a nearly identical sample application and reference it as you go.  
Choose a location:</p>
-<ul><li>In Apache Shiro's Subversion repository: <a class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/trunk/samples/quickstart/";>https://svn.apache.org/repos/asf/shiro/trunk/samples/quickstart/</a></li><li>In
 Apache Shiro's source distribution's <tt>samples/quickstart</tt> directory.  
The source distribution is available from the <a href="download.html" 
title="Download">Download</a> page.</li></ul>
+<ul><li>In Apache Shiro's Git repository: <a class="external-link" 
href="https://github.com/apache/shiro/tree/master/samples/quickstart";>https://github.com/apache/shiro/tree/master/samples/quickstart</a></li><li>In
 Apache Shiro's source distribution's <tt>samples/quickstart</tt> directory.  
The source distribution is available from the <a href="download.html" 
title="Download">Download</a> page.</li></ul>
 
 <h3><a name="Tutorial-Setup"></a>Setup</h3>
 

Modified: shiro/site/publish/version-2-brainstorming.html
URL: 
http://svn.apache.org/viewvc/shiro/site/publish/version-2-brainstorming.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/publish/version-2-brainstorming.html (original)
+++ shiro/site/publish/version-2-brainstorming.html Thu Mar 17 00:45:20 2016
@@ -171,7 +171,7 @@
 
 <p>Convert this to be a sub-interface of Map with additional per-Realm utility 
methods.</p>
 
-<p>See the <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/core/src/main/java/org/apache/shiro/subject/PrincipalMap.java";>PrincipalMap</a>
 concept for ideas (experimental, not referenced in Shiro 1.x at the 
moment).</p>
+<p>See the <a class="external-link" 
href="https://github.com/apache/shiro/blob/master/core/src/main/java/org/apache/shiro/subject/PrincipalMap.java";>PrincipalMap</a>
 concept for ideas (experimental, not referenced in Shiro 1.x at the 
moment).</p>
 
 <p>Maybe rename this to 'attributes'?  i.e. 
<tt>subject.getAttributes()</tt>?</p>
 

Propchange: shiro/site/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 17 00:45:20 2016
@@ -0,0 +1 @@
+*.iml

Modified: shiro/site/trunk/2012/01/24/apache-shiro-120-released.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/2012/01/24/apache-shiro-120-released.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/2012/01/24/apache-shiro-120-released.html (original)
+++ shiro/site/trunk/2012/01/24/apache-shiro-120-released.html Thu Mar 17 
00:45:20 2016
@@ -26,7 +26,7 @@
 <p><font color="#222222">There are only a few small cases where breakage could 
occur - please&#160;</font><font color="#222222">view the release notes to 
ensure you mitigate any potential breaking&#160;</font><font 
color="#222222">change - particularly if you are using the 
SecureRandomNumberGenerator</font><br clear="none">
 <font color="#222222">or Shiro's Block Cipher Services (AES, 
Blowfish):</font></p>
 
-<p><a class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.0/RELEASE-NOTES";>https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.0/RELEASE-NOTES</a></p>
+<p><a class="external-link" 
href="https://raw.githubusercontent.com/apache/shiro/shiro-root-1.2.0/RELEASE-NOTES";>https://raw.githubusercontent.com/apache/shiro/shiro-root-1.2.0/RELEASE-NOTES</a></p>
 
 <h3><a name="ApacheShiro1.2.0Released%21-ResolvedIssues"></a>Resolved 
Issues</h3>
 

Modified: shiro/site/trunk/authorization.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/authorization.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/authorization.html (original)
+++ shiro/site/trunk/authorization.html Thu Mar 17 00:45:20 2016
@@ -336,7 +336,7 @@ customizeMacroTable('TBL1365578679393',
 
 <p>Before you can use Java annotations, you'll need to enable AOP support in 
your application. There are a number of different AOP frameworks so, 
unfortunately, there is no standard way to enable AOP in an application.</p>
 
-<p>For AspectJ, you can review our <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/samples/aspectj/";>AspectJ 
sample application</a>.</p>
+<p>For AspectJ, you can review our <a class="external-link" 
href="https://github.com/apache/shiro/tree/master/samples/aspectj";>AspectJ 
sample application</a>.</p>
 
 <p>For Spring applications, you can look into our <a href="spring.html" 
title="Spring">Spring Integration</a> documentation.</p>
 

Modified: shiro/site/trunk/developer-resources.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/developer-resources.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/developer-resources.html (original)
+++ shiro/site/trunk/developer-resources.html Thu Mar 17 00:45:20 2016
@@ -8,29 +8,27 @@
 
 <h2><a name="DeveloperResources-SourceCodeRepository"></a>Source Code 
Repository</h2>
 
-<p>We use the Subversion repository located at <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro";>http://svn.apache.org/repos/asf/shiro</a>.
  Committers must use the <tt>https</tt> scheme (not <tt>http</tt>).</p>
+<p>We use a Git repository located at <a class="external-link" 
href="git://git.apache.org/shiro.git">git://git.apache.org/shiro.git</a>.</p>
 
-<p>Active development is done in the <tt>trunk</tt> subdirectory.  The 
<tt>branches</tt> and <tt>tags</tt> peer subdirectories exist based on the <a 
class="external-link" href="http://apr.apache.org/versioning.html";>Apache APR 
Versioning Scheme</a> and are generally created/maintained by the dev team 
using the <a class="external-link" 
href="http://maven.apache.org/plugins/maven-release-plugin/";>Maven Release 
Plugin</a>.</p>
+<p>Active development is done in the <tt>master</tt> branch, and maintenance 
typically on the <tt>1.2.x</tt> branch.</p>
 
-<h3><a name="DeveloperResources-BuildingfromSubversion"></a>Building from 
Subversion</h3>
+<h3><a name="DeveloperResources-BuildingfromGit"></a>Building from Git</h3>
 
-<p>For Shiro cutting-edge development, you can check-out the code from 
Subversion and build it using <a class="external-link" 
href="http://maven.apache.org";>Maven</a> 2.2+:</p>
+<p>For Shiro cutting-edge development, you can clone the code from Git and 
build it using <a class="external-link" 
href="http://maven.apache.org";>Maven</a> 2.2+:</p>
 
 <ol><li>Check out the code:
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-java">
-mkdir shiro
-cd shiro
-svn co https:<span class="code-comment">//svn.apache.org/repos/asf/shiro/trunk 
trunk</span>
+git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
 </pre>
 </div></div></li><li>Build the project using <a class="external-link" 
href="http://maven.apache.org";>Maven</a> 2.2+:
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-java">
-cd trunk
+cd shiro
 mvn install
 </pre>
 </div></div>
 <p>The resulting artifacts will be in your local M2 Repo under the 
org.apache.shiro group.</p></li></ol>
 
 
-<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col 
span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" 
valign="top"><img align="middle" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif"; 
width="16" height="16" alt="" border="0"></td><td colspan="1" 
rowspan="1"><b>Cutting-edge development</b><br clear="none">When building from 
<tt>trunk</tt> or any branches, use the generated artifacts at your own risk!  
Current and previous stable releases will always be available via the <a 
href="download.html" title="Download">Download</a> page.</td></tr></table></div>
\ No newline at end of file
+<div class="panelMacro"><table class="warningMacro"><colgroup span="1"><col 
span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" 
valign="top"><img align="middle" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif"; 
width="16" height="16" alt="" border="0"></td><td colspan="1" 
rowspan="1"><b>Cutting-edge development</b><br clear="none">When building from 
<tt>master</tt> or any branches, use the generated artifacts at your own risk!  
Current and previous stable releases will always be available via the <a 
href="download.html" title="Download">Download</a> page.</td></tr></table></div>
\ No newline at end of file

Modified: shiro/site/trunk/download.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/download.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/download.html (original)
+++ shiro/site/trunk/download.html Thu Mar 17 00:45:20 2016
@@ -47,7 +47,7 @@
             <ul>
                 <li><a href="#latestBinary">1.2.4. Binary Distribution</a></li>
                 <li><a href="#latestSource">1.2.4 Source Code 
Distribution</a></li>
-                <li><a href="#latestSvn">1.2.4 SVN Source repository</a></li>
+                <li><a href="#latestGit">1.2.4 Git Source repository</a></li>
             </ul>
         </li>
         <li><a href="#previous">Previous Releases</a>
@@ -56,7 +56,7 @@
                 <ul>
                     <li><a href="#1.1.0Binary">1.1.0 Binary 
Distribution</a></li>
                     <li><a href="#1.1.0Source">1.1.0 Source Code 
Distribution</a></li>
-                    <li><a href="#1.1.0Svn">1.1.0 SVN Source 
repository</a></li>
+                    <li><a href="#1.1.0Git">1.1.0 Git Source 
repository</a></li>
                 </ul>
             </ul>
         </li>
@@ -635,13 +635,14 @@ customizeMacroTable('TBL1365578679386',
             
href="http://www.apache.org/dyn/closer.cgi/shiro/1.2.4/shiro-root-1.2.4-source-release.zip.sha1";>sha1</a>)
 </p>
 
-<h3><a name="latestSvn"></a>1.2.4 SVN Source repository</h3>
+<h3><a name="latestGit"></a>1.2.4 Git Source repository</h3>
 
-<p>The source can be checked out anonymously from SVN with this command:</p>
+<p>The source can be cloned anonymously from Git with this command:</p>
 <div class="code panel" style="border-width: 1px;">
     <div class="codeContent panelContent">
 <pre class="code-java">
-svn checkout http:<span 
class="code-comment">//svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.4</span>
+git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
+git checkout shiro-root-1.2.4 -b shiro-root-1.2.4
 </pre>
     </div>
 </div>
@@ -824,13 +825,14 @@ customizeMacroTable('TBL1365578679388',
     <a class="external-link" 
href="http://archive.apache.org/dist/shiro/1.1.0/shiro-root-1.1.0-source-release.zip.sha1";>sha1</a>)
 </p>
 
-<h4><a name="1.1.0Svn"></a>1.1.0 SVN Source repository</h4>
+<h4><a name="1.1.0Git"></a>1.1.0 Git Source repository</h4>
 
-<p>The source can be checked out anonymously from SVN with this command:</p>
+<p>The source can be cloned anonymously from Git with this command:</p>
 <div class="code panel" style="border-width: 1px;">
     <div class="codeContent panelContent">
 <pre class="code-java">
-svn checkout http:<span 
class="code-comment">//svn.apache.org/repos/asf/shiro/tags/shiro-root-1.1.0</span>
+git clone https:<span class="code-comment">//github.com/apache/shiro.git</span>
+git checkout shiro-root-1.1.0 -b shiro-root-1.1.0
 </pre>
     </div>
 </div>

Modified: shiro/site/trunk/how-to-contribute.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/how-to-contribute.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/how-to-contribute.html (original)
+++ shiro/site/trunk/how-to-contribute.html Thu Mar 17 00:45:20 2016
@@ -1,6 +1,6 @@
 <h1><a name="HowtoContribute-ContributingtoApacheShiro"></a>Contributing to 
Apache Shiro</h1>
 
-<ul><li><a href="#HowtoContribute-introduction">Introduction</a></li><li><a 
href="#HowtoContribute-help">Help Wanted Here</a></li><li><a 
href="#HowtoContribute-procedure">Procedure for reporting bugs and issues and 
enhancement suggestions</a></li><li><a href="#HowtoContribute-svn">SVN 
Usage</a></li><li><a href="#HowtoContribute-committer">SVN 
Committers</a></li><li><a href="#HowtoContribute-issues">Procedure for Raising 
Development Issues</a></li><li><a href="#HowtoContribute-patches">How to 
prepare and contribute patches</a></li><li><a 
href="#HowtoContribute-revert">How to revert changes in SVN</a></li><li><a 
href="#HowtoContribute-tips">Contribution Notes and Tips</a></li></ul>
+<ul><li><a href="#HowtoContribute-introduction">Introduction</a></li><li><a 
href="#HowtoContribute-help">Help Wanted Here</a></li><li><a 
href="#HowtoContribute-procedure">Procedure for reporting bugs and issues and 
enhancement suggestions</a></li><li><a href="#HowtoContribute-git">Git 
Usage</a></li><li><a href="#HowtoContribute-committer">Git 
Committers</a></li><li><a href="#HowtoContribute-issues">Procedure for Raising 
Development Issues</a></li><li><a href="#HowtoContribute-patches">How to 
prepare and contribute patches</a></li><li><a 
href="#HowtoContribute-revert">How to revert changes in Git</a></li><li><a 
href="#HowtoContribute-tips">Contribution Notes and Tips</a></li></ul>
 
 
 <p><a name="HowtoContribute-introductions"></a></p>
@@ -33,15 +33,15 @@
 
 <p>When creating a new issue, please provide a concise Summary Title and a 
short Description. Add further information as Comments and include links to the 
mail archives. The normal procedure is to discuss the issue on the mailing list 
and then add relevant notes to the issue tracker, otherwise it becomes 
cluttered.</p>
 
-<p><a name="HowtoContribute-svn"></a></p>
-<h2><a name="HowtoContribute-SVNUsage"></a>SVN Usage</h2>
+<p><a name="HowtoContribute-git"></a></p>
+<h2><a name="HowtoContribute-GitUsage"></a>Git Usage</h2>
 
-<p>An overview of how to use Subversion (SVN) to participate in Shiro 
development. Do not be afraid - you cannot accidently destroy the actual code 
repository, because you are working with a local copy as an anonymous user. 
Therefore, you do not have the system permissions to change anything. You can 
only update your local repository and compare your revisions with the real 
repository. The <a href="download.html" title="Download">Download Shiro</a> 
page explains how to check-out the code base and build your local copy.</p>
+<p>An overview of how to use Git to participate in Shiro development. Do not 
be afraid - you cannot accidentally destroy the actual code repository, because 
you are working with a local copy as an anonymous user. Therefore, you do not 
have the system permissions to change anything. You can only update your local 
repository and compare your revisions with the real repository. The <a 
href="download.html" title="Download">Download Shiro</a> page explains how to 
check-out the code base and build your local copy.</p>
 
 <p><a name="HowtoContribute-committer"></a></p>
-<h2><a name="HowtoContribute-SVNCommitters"></a>SVN Committers</h2>
+<h2><a name="HowtoContribute-GitCommitters"></a>Git Committers</h2>
 
-<p>After a developer has consistently provided contributions (code, 
documentation and discussion) and demonstrated committment, then the rest of 
the dev community may vote to grant this developer commit access to the 
Subversion repository. See the <a class="external-link" 
href="http://www.apache.org/dev/";>ASF developers resources</a> especially the 
<a class="external-link" 
href="http://www.apache.org/dev/version-control.html";>Source code 
repositories</a>.</p>
+<p>After a developer has consistently provided contributions (code, 
documentation and discussion) and demonstrated committment, then the rest of 
the dev community may vote to grant this developer commit access to the Git 
repository. See the <a class="external-link" 
href="http://www.apache.org/dev/";>ASF developers resources</a> especially the 
<a class="external-link" 
href="http://www.apache.org/dev/version-control.html";>Source code 
repositories</a>.</p>
 
 <p><a name="HowtoContribute-issues"></a></p>
 <h2><a 
name="HowtoContribute-ProcedureforRaisingDevelopmentIssues"></a>Procedure for 
Raising Development Issues</h2>
@@ -59,22 +59,73 @@
 <p>Perhaps you do not get any answer on your first reply, so just post it 
again until you get one. (But please not every hour - allow a few days for the 
list to deal with it.) Bear in mind that other countries will have holidays at 
different times to your country and that they are in different time zones. You 
might also consider rewriting your initial posting.  It may have not been clear 
to the readers on the mailing list.</p>
 
 <p><a name="HowtoContribute-patches"></a></p>
-<h2><a name="HowtoContribute-Howtoprepareandcontributepatches"></a>How to 
prepare and contribute patches</h2>
+<h2><a 
name="HowtoContribute-Howtoprepareandcontributepatches"></a>Contributing as a 
Non-Committer</h2>
 
-<p>If you use the current development version of Shiro via Subversion, then do 
'svn update; svn status' to see what files that you have changed. Do 'svn diff 
&gt; mypatch.txt' to make a patch which includes every change. To make a patch 
for a specific file, do svn diff <tt>src/documentation/content/xdocs/faq.xml 
&gt; faq.xml.diff</tt>. It is better to prepare the patch from the 
<tt>$SHIRO_HOME</tt> directory so that it contains a definite path to the 
document. However, be careful that the patch does not contain other 
work-in-progress.</p>
+<p>If you're a committer on an Apache project, it means that you can commit 
directly to the project's repository. For instance, with Apache Shiro 
committers are allowed to directly push commits into the git repository.</p>
 
-<p>For more information about working with SVN, see <a class="external-link" 
href="http://svnbook.red-bean.com/"; rel="nofollow">Version Control with 
Subversion</a> - the opensource SVN book.</p>
+<p>Non-committers, however, have to submit patches for review. Apache Shiro 
accepts GitHub pull requests. If you are new to Git and GitHub, check these two 
links:</p>
 
-<p>If you use a downloaded released version of Shiro (or don't use SVN), then 
use the 'diff' command of your operating system: <tt>diff -u faq.xml.orig 
faq.xml &gt; mypatch.txt</tt> (better to do that from <tt>$SHIRO_HOME</tt> 
directory). If you want to use the most recent version of the documentation 
then grab its source file directly from the <a href="download.html" 
title="Download">SVN server</a> (and tell us which Revision number you 
used).</p>
+<ul>
+    <li><a class="external-link" 
href="https://try.github.io/levels/1/challenges/1";>GitHub 15 minutes 
tutorial</a></li>
+    <li><a class="external-link" 
href="https://help.github.com/articles/creating-a-pull-request/";>Creating Pull 
Requests</a></li>
+</ul>
 
-<div class="panelMacro"><table class="noteMacro"><colgroup span="1"><col 
span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" 
valign="top"><img align="middle" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif"; 
width="16" height="16" alt="" border="0"></td><td colspan="1" 
rowspan="1"><b>Note</b><br clear="none">Please send all contributions via our 
<a class="external-link" 
href="https://issues.apache.org/jira/browse/SHIRO";>issue tracker</a>. and 
specify the Forrest version or svn version of the 
source.</td></tr></table></div>
+<p>Apache Shiro has a read-only mirror on GitHub that is kept in sync with the 
canonical Git repo maintained by the Apache Software Foundation. Submitting 
GitHub pull requests is the easiest way to get your contribution upstream. For 
detailed instructions see the link below:</p>
+<a href="https://github.com/apache/shiro/blob/master/CONTRIBUTING.md";>GitHub 
Contribution Guidelines</a>
 
-<p>It is always a good idea to check the <a class="external-link" 
href="https://issues.apache.org/jira/browse/SHIRO";>Shiro issue tracker</a> 
before diving in.</p>
+<h3><a name="HowtoContribute-submitThroughJIRA">Submitting a patch through 
JIRA</a></h3>
 
-<p><a name="HowtoContribute-revert"></a></p>
-<h2><a name="HowtoContribute-HowtorevertchangesinSVN"></a>How to revert 
changes in SVN</h2>
+<p>While we encourage you to submit your contribution through GitHub pull 
requests, you can also attach a patch in a JIRA ticket. For the purpose of 
these instructions, we'll assume that you already have a system with Git and 
have found a bug to fix or have a feature that you'd like to submit, and you're 
willing to contribute that code or documentation under the Apache License 
2.0.</p>
 
-<p>Check out <a class="external-link" 
href="http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2"; 
rel="nofollow">http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2</a>
 for instructions on how to revert (roll back) changes to svn.</p>
+<p>Further, if you're fixing a bug we'll assume that you've either filed a bug 
report (where you will attach your patch) or are submitting a fix for a known 
bug. If you find a bug and would like to fix it, that's awesome! Please be sure 
to file the bug too, though.</p>
+
+<p>If you want to add a feature, you should bring it up for discussion on the 
d...@shiro.apache.org mailing list before implementing it. This ensures that it 
meshes with the plans that other contributors have for Apache Shiro, and that 
you're not doing redundant work. Other developers may also have ideas for the 
feature or suggestions that will help you land the feature without having to 
re-do the work. More information about our mailing lists can be found here.</p>
+
+<p>In short, communication is a vital part of making a contribution to an 
Apache project.</p>
+
+<h3><a name="HowtoContribute-gettingStartedGit">Getting Started</a></h3>
+
+<p>First, lets make sure that you've added your name and email to your 
`~/.gitconfig`:</p>
+
+<pre>
+$ git config --global user.name "Your Name"
+$ git config --global user.email y...@domain.com
+</pre>
+You'll grab the Shiro source with git:
+
+<pre>
+$ git clone https://git-wip-us.apache.org/repos/asf/shiro.git
+</pre>
+
+<p>If you already have the source, make sure you're working with the most 
recent version. Do a `git pull` if you cloned the source more than a few hours 
ago. (Apache Shiro development can move pretty fast!)</p>
+
+<pre>
+$ git checkout -b mybranch
+</pre>
+
+<p>This does two things: One, it creates the branch mybranch and two, it 
changes your working branch to mybranch. Running `git branch` will show you 
which branch you're working on, with an asterisk next to the active branch, 
like so:</p>
+
+<pre>
+[user@localhost shiro]$ git branch
+master
+* mybranch
+</pre>
+
+<p>Make whatever changes you're going to make, be sure to use git add to stage 
the changes, and then you're going to commit the changes to your working 
branch:</p>
+
+<pre>
+git commit -m "Insert a meaningful summary of changes here."
+</pre>
+
+<p>Finally, you can create a patch and attach it to the JIRA issue that you 
created for the bug you are fixing.</p>
+
+<pre>
+git format-patch master --stdout > ~/patch-name.patch
+</pre>
+
+<h3><a name="HowtoContribute-review">Review</a></h3>
+
+<p>Once you've submitted your pull request, you should receive a response 
within a few days. If you receive no response within a week, please ping the 
shiro-dev mailing list (d...@shiro.apache.org).</p>
 
 <p><a name="HowtoContribute-tips"></a></p>
 <h2><a name="HowtoContribute-ContributionNotesandTips"></a>Contribution Notes 
and Tips</h2>
@@ -82,4 +133,4 @@
 <p>This is a collection of tips for contributing to the project in a manner 
that is productive for all parties.</p>
 
 <ul><li>See general ASF <a class="external-link" 
href="http://www.apache.org/dev/contrib-email-tips.html";>Tips for email 
contributors</a></li><li>There is no such thing as a dumb question.  Always 
check the <a href="mailing-lists.html" title="Mailing Lists">archives</a> to 
see if someone else asked it first and maybe already received an 
answer.</li><li>Every contribution is worthwhile. Even if the code isn't 
perfect.  Even if the documentation has typos.  Even if you got it wrong the 
first time around. Any contribution is a start of something special.  Through 
your continued effort and the help of the community, your contribution will 
evolve and get ever closer to "perfect".</li><li>Use sensible and concise email 
subject headings. Search engines, and humans trying to browse a voluminous 
list, will respond favourably to a descriptive title.</li><li>Start new threads 
with new Subject for new topics, rather than reusing the previous Subject 
line.</li><li>Keep each topic focused. If som
 e new topic arises then start a new discussion. This leaves the original topic 
to continue uncluttered.<br clear="none">
-Whenever you decide to start a new topic, then start with a fresh new email 
message window. Do not use the "Reply to" button, because threaded mail-readers 
get confused (they utilise the In-reply-to header). If so, then your new topic 
will get lost in the previous thread and go unanswered.</li><li>Prepend your 
email subject line with a marker when that is appropriate, e.g. [Proposal], 
[RT] (Random Thought which quickly blossom into research topics <img 
align="middle" class="emoticon" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif"; 
height="20" width="20" alt="" border="0">, [STATUS] (development status of a 
certain facility).</li><li>Remember that most people are participating in 
development on a volunteer basis and in their "spare time". These enthusiasts 
will attempt to respond to issues. It may take a little while to get your 
answers.</li><li>Research your topic thoroughly before beginning to discuss a 
new development issue. Search and browse through the
  email archives - your issue may have been discussed before. Do not just 
perceive a problem and then rush out with a question - instead, 
delve.</li><li>Try to at least offer a partial solution and not just a problem 
statement.</li><li>Take the time to clearly explain your issue and write a 
concise email message. Less confusion facilitates fast and complete 
resolution.</li><li>Do not bother to send an email reply that simply says 
"thanks". When the issue is resolved, that is the finish - end of thread. 
Reduce clutter.</li><li>You would usually do any development work against the 
trunk of SVN.</li><li>When sending a patch, you usually do not need to worry 
about which SVN branch it should be applied to. The maintainers of the 
repository will decide.</li><li>Keep all project-related discussion on the 
mailing list. It is much better to utilise the wider audience, rather than to 
break off into private discussion groups. You never know who else will have the 
answer to your issues, and anyw
 ay other people are interested in the outcome.</li><li>Become familiar with 
the mailing lists. As you browse and search, you will see the way other people 
do things. Follow the leading examples.</li></ul>
+Whenever you decide to start a new topic, then start with a fresh new email 
message window. Do not use the "Reply to" button, because threaded mail-readers 
get confused (they utilise the In-reply-to header). If so, then your new topic 
will get lost in the previous thread and go unanswered.</li><li>Prepend your 
email subject line with a marker when that is appropriate, e.g. [Proposal], 
[RT] (Random Thought which quickly blossom into research topics <img 
align="middle" class="emoticon" 
src="https://cwiki.apache.org/confluence/images/icons/emoticons/smile.gif"; 
height="20" width="20" alt="" border="0">, [STATUS] (development status of a 
certain facility).</li><li>Remember that most people are participating in 
development on a volunteer basis and in their "spare time". These enthusiasts 
will attempt to respond to issues. It may take a little while to get your 
answers.</li><li>Research your topic thoroughly before beginning to discuss a 
new development issue. Search and browse through the
  email archives - your issue may have been discussed before. Do not just 
perceive a problem and then rush out with a question - instead, 
delve.</li><li>Try to at least offer a partial solution and not just a problem 
statement.</li><li>Take the time to clearly explain your issue and write a 
concise email message. Less confusion facilitates fast and complete 
resolution.</li><li>Do not bother to send an email reply that simply says 
"thanks". When the issue is resolved, that is the finish - end of thread. 
Reduce clutter.</li><li>You would usually do any development work against the 
master branch in Git.</li><li>When sending a patch, you usually do not need to 
worry about which Git branch it should be applied to. The maintainers of the 
repository will decide.</li><li>Keep all project-related discussion on the 
mailing list. It is much better to utilise the wider audience, rather than to 
break off into private discussion groups. You never know who else will have the 
answer to your issues, 
 and anyway other people are interested in the outcome.</li><li>Become familiar 
with the mailing lists. As you browse and search, you will see the way other 
people do things. Follow the leading examples.</li></ul>

Modified: shiro/site/trunk/java-annotations.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/java-annotations.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/java-annotations.html (original)
+++ shiro/site/trunk/java-annotations.html Thu Mar 17 00:45:20 2016
@@ -1,7 +1,7 @@
 <h1><a name="JavaAnnotations-JavaAnnotationSupport"></a>Java Annotation 
Support</h1>
 <p>Before you can use Java annotations, you'll need to enable AOP support in 
your application. There are a number of different AOP frameworks so, 
unfortunately, there is no standard way to enable AOP in an application.</p>
 
-<p>For AspectJ, you can review our <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/samples/aspectj/";>AspectJ 
sample application</a>.</p>
+<p>For AspectJ, you can review our <a class="external-link" 
href="https://github.com/apache/shiro/tree/master/samples/aspectj";>AspectJ 
sample application</a>.</p>
 
 <p>For Spring, you can look into our <a href="spring.html" 
title="Spring">Spring Integration</a> documentation.</p>
 

Modified: shiro/site/trunk/java-authorization-guide.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/java-authorization-guide.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/java-authorization-guide.html (original)
+++ shiro/site/trunk/java-authorization-guide.html Thu Mar 17 00:45:20 2016
@@ -156,7 +156,7 @@ If (currentUser.isPermitted(printPermiss
 <h4><a name="JavaAuthorizationGuide-EnablingAnnotationSupport"></a>Enabling 
Annotation Support</h4>
 <p>Before you can use Java annotations, you'll need to enable AOP support in 
your application. There are a number of different AOP frameworks so, 
unfortunately, there is no standard way to enable AOP in an application.</p>
 
-<p>For AspectJ, you can review our <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/samples/aspectj/";>AspectJ 
sample application</a>.</p>
+<p>For AspectJ, you can review our <a class="external-link" 
href="https://github.com/apache/shiro/tree/master/samples/aspectj";>AspectJ 
sample application</a>.</p>
 
 <p>For Spring, you can look into our <a href="spring.html" 
title="Spring">Spring Integration</a> documentation.</p>
 

Modified: shiro/site/trunk/news.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/news.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/news.html (original)
+++ shiro/site/trunk/news.html Thu Mar 17 00:45:20 2016
@@ -185,7 +185,7 @@ The Apache Shiro Team
 <p><font color="#222222">There are only a few small cases where breakage could 
occur - please&#160;</font><font color="#222222">view the release notes to 
ensure you mitigate any potential breaking&#160;</font><font 
color="#222222">change - particularly if you are using the 
SecureRandomNumberGenerator</font><br clear="none">
 <font color="#222222">or Shiro's Block Cipher Services (AES, 
Blowfish):</font></p>
 
-<p><a class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.0/RELEASE-NOTES";>https://svn.apache.org/repos/asf/shiro/tags/shiro-root-1.2.0/RELEASE-NOTES</a></p>
+<p><a class="external-link" 
href="https://raw.githubusercontent.com/apache/shiro/shiro-root-1.2.0/RELEASE-NOTES";>https://raw.githubusercontent.com/apache/shiro/shiro-root-1.2.0/RELEASE-NOTES</a></p>
 
 <h3><a name="ApacheShiro1.2.0Released%21-ResolvedIssues"></a>Resolved 
Issues</h3>
 

Modified: shiro/site/trunk/performing-a-release.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/performing-a-release.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/performing-a-release.html (original)
+++ shiro/site/trunk/performing-a-release.html Thu Mar 17 00:45:20 2016
@@ -15,8 +15,8 @@
 &gt; mvn release:prepare -DdryRun=<span class="code-keyword">true</span>
 &gt; mvn deploy -Pdocs
 &gt; mvn release:clean
-&gt; mvn release:prepare -Dusername=YOUR_SVN_USERNAME 
-Dpassword=YOUR_SVN_PASSWORD
-&gt; mvn release:perform -Dusername=YOUR_SVN_USERNAME 
-Dpassword=YOUR_SVN_PASSWORD
+&gt; mvn release:prepare -Dusername=YOUR_ASF_USERNAME 
-Dpassword=YOUR_ASF_PASSWORD
+&gt; mvn release:perform -Dusername=YOUR_ASF_USERNAME 
-Dpassword=YOUR_ASF_PASSWORD
 </pre>
 </div></div></li><li>Log in to <a class="external-link" 
href="https://repository.apache.org";>https://repository.apache.org</a>.  
Navigate to "Staging Repositories" (on the left nav panel).  Find the 
repository starting with 'org.apache.shiro' and <tt>close</tt> it.</li><li>Send 
out the VOTE email to the <tt>d...@shiro.apache.org</tt> mailing list.  Here's 
a good template:
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
@@ -28,7 +28,7 @@ The 59 issues solved <span class="code-k
 https:<span 
class="code-comment">//issues.apache.org/jira/secure/IssueNavigator!executeAdvanced.jspa?jqlQuery=project+%3D+SHIRO+AND+fixVersion+%3D+%221.2.0%22+AND+%28status+%21%3D+Open+and+status+%21%3D+%22In+Progress%22%29+ORDER+BY+priority+DESC&amp;runQuery=<span
 class="code-keyword">true</span>&amp;clear=<span 
class="code-keyword">true</span>
 </span>
 The tag to be voted upon:
-&lt;SVN_URL_OF_THE_RELEASE_TAG&gt; (e.g. https:<span 
class="code-comment">//svn.apache.org/repos/asf/shiro/tags/1.2.0)
+&lt;GIT_URL_OF_THE_RELEASE_TAG&gt; (e.g. https:<span 
class="code-comment">//github.com/apache/shiro/tree/1.2.0)
 </span>
 Staging repo <span class="code-keyword">for</span> binaries:
 &lt;URL_OF_THE_CLOSED_REPO_FROM_ABOVE_STEP&gt; (e.g. https:<span 
class="code-comment">//repository.apache.org/content/repositories/orgapacheshiro-92/)
@@ -52,7 +52,7 @@ Vote open <span class="code-keyword">for
 
 <h2><a name="PerformingaRelease-AfteraSuccessfulVote"></a>After a Successful 
Vote</h2>
 
-<ol><li>Update the <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/shiro.doap.rdf";>Shiro DOAP 
file in subversion</a> to include another release information chunk 
(<em>after</em> the other similar chunks):
+<ol><li>Update the <a class="external-link" 
href="https://github.com/apache/shiro/blob/master/shiro.doap.rdf";>Shiro DOAP 
file in git</a> to include another release information chunk (<em>after</em> 
the other similar chunks):
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-xml">
 <span class="code-tag">&lt;release&gt;</span>
@@ -65,7 +65,7 @@ Vote open <span class="code-keyword">for
 </pre>
 </div></div>
 <p><br clear="none" class="atl-forced-newline">
-With the appropriate <tt>RELEASE_DATE</tt> (e.g. 2011-10-01) and 
<tt>VERSION</tt> (e.g. 1.1.0).  Save and commit the file to SVN.
+With the appropriate <tt>RELEASE_DATE</tt> (e.g. 2011-10-01) and 
<tt>VERSION</tt> (e.g. 1.1.0).  Save and commit the file to Git.
 <br clear="none" class="atl-forced-newline">
 <br clear="none" class="atl-forced-newline"></p></li><li>Put the distribution 
on the ASF web servers
        <ol><li>SSH into people.apache.org and &#65279;cd&#160;to to Shiro's 
distribution location:

Modified: shiro/site/trunk/session-management.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/session-management.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/session-management.html (original)
+++ shiro/site/trunk/session-management.html Thu Mar 17 00:45:20 2016
@@ -223,11 +223,11 @@ securityManager.cacheManager = $cacheMan
 <p><a name="SessionManagement-ehcachesessioncacheconfiguration"></a></p>
 <h5><a name="SessionManagement-EHCacheSessionCacheConfiguration"></a>EHCache 
Session Cache Configuration</h5>
 
-<p>By default, the <tt>EhCacheManager</tt> uses a Shiro-specific <tt><a 
class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/trunk/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml";>ehcache.xml</a></tt>
 file that sets up the Session cache region and the necessary settings to 
ensure Sessions are stored and retrieved properly.</p>
+<p>By default, the <tt>EhCacheManager</tt> uses a Shiro-specific <tt><a 
class="external-link" 
href="https://github.com/apache/shiro/tree/master/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml";>ehcache.xml</a></tt>
 file that sets up the Session cache region and the necessary settings to 
ensure Sessions are stored and retrieved properly.</p>
 
 <p>However, if you wish to change the cache settings, or configure your own 
<tt>ehcache.xml</tt> or EHCache <tt>net.sf.ehcache.CacheManager</tt> instance, 
you will need to configure the cache region to ensure that Sessions are handled 
correctly.</p>
 
-<p>If you look at the default <tt><a class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/trunk/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml";>ehcache.xml</a></tt>
 file, you will see the following <tt>shiro-activeSessionCache</tt> cache 
configuration:</p>
+<p>If you look at the default <tt><a class="external-link" 
href="https://github.com/apache/shiro/tree/master/support/ehcache/src/main/resources/org/apache/shiro/cache/ehcache/ehcache.xml";>ehcache.xml</a></tt>
 file, you will see the following <tt>shiro-activeSessionCache</tt> cache 
configuration:</p>
 
 <div class="code panel" style="border-width: 1px;"><div class="codeContent 
panelContent">
 <pre class="code-xml">

Modified: shiro/site/trunk/tags.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/tags.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/tags.html (original)
+++ shiro/site/trunk/tags.html Thu Mar 17 00:45:20 2016
@@ -1,5 +1,5 @@
 <script type="text/javascript">
 <!--
-window.location = 
"http://svn.apache.org/repos/asf/shiro/trunk/web/src/main/resources/META-INF/shiro.tld";
+window.location = 
"https://github.com/apache/shiro/blob/master/web/src/main/resources/META-INF/shiro.tld";
 //-->
 </script>

Modified: shiro/site/trunk/tutorial.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/tutorial.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/tutorial.html (original)
+++ shiro/site/trunk/tutorial.html Thu Mar 17 00:45:20 2016
@@ -26,7 +26,7 @@
 <p>If you're new to Apache Shiro, this short tutorial will show you how to set 
up an initial and very simple application secured by Apache Shiro.  We'll 
discuss Shiro's core concepts along the way to help familiarize you with 
Shiro's design and API.</p>
 
 <p>If you don't want to actually edit files as you follow this tutorial, you 
can obtain a nearly identical sample application and reference it as you go.  
Choose a location:</p>
-<ul><li>In Apache Shiro's Subversion repository: <a class="external-link" 
href="https://svn.apache.org/repos/asf/shiro/trunk/samples/quickstart/";>https://svn.apache.org/repos/asf/shiro/trunk/samples/quickstart/</a></li><li>In
 Apache Shiro's source distribution's <tt>samples/quickstart</tt> directory.  
The source distribution is available from the <a href="download.html" 
title="Download">Download</a> page.</li></ul>
+<ul><li>In Apache Shiro's Git repository: <a class="external-link" 
href="https://github.com/apache/shiro/tree/master/samples/quickstart";>https://github.com/apache/shiro/tree/master/samples/quickstart</a></li><li>In
 Apache Shiro's source distribution's <tt>samples/quickstart</tt> directory.  
The source distribution is available from the <a href="download.html" 
title="Download">Download</a> page.</li></ul>
 
 <h3><a name="Tutorial-Setup"></a>Setup</h3>
 

Modified: shiro/site/trunk/version-2-brainstorming.html
URL: 
http://svn.apache.org/viewvc/shiro/site/trunk/version-2-brainstorming.html?rev=1735353&r1=1735352&r2=1735353&view=diff
==============================================================================
--- shiro/site/trunk/version-2-brainstorming.html (original)
+++ shiro/site/trunk/version-2-brainstorming.html Thu Mar 17 00:45:20 2016
@@ -106,7 +106,7 @@
 
 <p>Convert this to be a sub-interface of Map with additional per-Realm utility 
methods.</p>
 
-<p>See the <a class="external-link" 
href="http://svn.apache.org/repos/asf/shiro/trunk/core/src/main/java/org/apache/shiro/subject/PrincipalMap.java";>PrincipalMap</a>
 concept for ideas (experimental, not referenced in Shiro 1.x at the 
moment).</p>
+<p>See the <a class="external-link" 
href="https://github.com/apache/shiro/blob/master/core/src/main/java/org/apache/shiro/subject/PrincipalMap.java";>PrincipalMap</a>
 concept for ideas (experimental, not referenced in Shiro 1.x at the 
moment).</p>
 
 <p>Maybe rename this to 'attributes'?  i.e. 
<tt>subject.getAttributes()</tt>?</p>