Skip to content

Commit

Permalink
Replacing svn info with git info
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/shiro/site/trunk@1735353 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
bdemers committed Mar 17, 2016
1 parent 688270d commit fb3e82a
Show file tree
Hide file tree
Showing 13 changed files with 99 additions and 48 deletions.
2 changes: 1 addition & 1 deletion 2012/01/24/apache-shiro-120-released.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h3><a name="ApacheShiro1.2.0Released%21-Backwardsincompatibleorpotentialbreakin
<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>

Expand Down
2 changes: 1 addition & 1 deletion authorization.html
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ <h4><a name="Authorization-Configuration"></a>Configuration</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 applications, you can look into our <a href="spring.html" title="Spring">Spring Integration</a> documentation.</p>

Expand Down
16 changes: 7 additions & 9 deletions developer-resources.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,27 @@ <h2><a name="DeveloperResources-WritingDocumentation"></a>Writing Documentation<

<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>
18 changes: 10 additions & 8 deletions download.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h3>Releases</h3>
<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>
Expand All @@ -56,7 +56,7 @@ <h3>Releases</h3>
<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>
Expand Down Expand Up @@ -635,13 +635,14 @@ <h3><a name="latestSource"></a>1.2.4 Source Code Distribution</h3>
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>
Expand Down Expand Up @@ -824,13 +825,14 @@ <h4><a name="1.1.0Source"></a>1.1.0 Source Code Distribution</h4>
<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>
Loading

0 comments on commit fb3e82a

Please sign in to comment.