You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/03/27 19:38:15 UTC
git commit: [#7277] Removed more "incubating" references and changed
Allura homepage URL
Repository: allura
Updated Branches:
refs/heads/master b82eb5ee3 -> d51b81fd1
[#7277] Removed more "incubating" references and changed Allura homepage URL
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d51b81fd
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d51b81fd
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d51b81fd
Branch: refs/heads/master
Commit: d51b81fd160fc2db47aecab0bcfc098469ad7da5
Parents: b82eb5e
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Thu Mar 27 17:01:04 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Mar 27 18:38:00 2014 +0000
----------------------------------------------------------------------
Allura/NOTICE | 2 +-
Allura/allura/templates/jinja_master/theme_macros.html | 2 +-
Allura/docs/_templates/layout.html | 4 ++--
Allura/docs/contributing.rst | 2 +-
Allura/docs/online.rst | 2 +-
Allura/setup.py | 2 +-
CONTRIBUTING | 6 +++---
DISCLAIMER | 8 --------
ForgeDiscussion/NOTICE | 2 +-
ForgeGit/NOTICE | 2 +-
ForgeImporters/forgeimporters/base.py | 2 +-
ForgeImporters/forgeimporters/tests/test_base.py | 2 +-
ForgeLink/NOTICE | 2 +-
ForgeSVN/NOTICE | 2 +-
ForgeTracker/NOTICE | 2 +-
ForgeWiki/NOTICE | 2 +-
INSTALL.markdown | 4 ++--
NOTICE | 2 +-
NoWarnings/NOTICE | 2 +-
README.markdown | 8 ++++----
scripts/asf-release.sh | 6 +++---
vagrant/manifests/ubuntu-1204-server-amd64.pp | 2 +-
22 files changed, 30 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/Allura/NOTICE
----------------------------------------------------------------------
diff --git a/Allura/NOTICE b/Allura/NOTICE
index 3938e2b..69af9fe 100644
--- a/Allura/NOTICE
+++ b/Allura/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index 17702dd..6033fe8 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -36,7 +36,7 @@
{%- macro footer(year, path_to_static='') %}
<footer id="site-footer">
<nav>
- <p>This project is powered by <a href="https://forge-allura.apache.org/p/allura/">Apache Allura</a>.</p>
+ <p>This project is powered by <a href="https://allura.apache.org/">Apache Allura</a>.</p>
<p>
Copyright © 2014 The Apache Software Foundation, Licensed under the
<a style="color: #069;" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/Allura/docs/_templates/layout.html
----------------------------------------------------------------------
diff --git a/Allura/docs/_templates/layout.html b/Allura/docs/_templates/layout.html
index 5079c7d..42f079b 100644
--- a/Allura/docs/_templates/layout.html
+++ b/Allura/docs/_templates/layout.html
@@ -18,6 +18,6 @@
-#}
{% extends "!layout.html" %}
{% block rootrellink %}
- <li><a href="https://forge-allura.apache.org/p/allura/">Allura Home</a> »</li>
+ <li><a href="https://allura.apache.org/">Allura Home</a> »</li>
{{ super() }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/Allura/docs/contributing.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/contributing.rst b/Allura/docs/contributing.rst
index ac956eb..5dd83df 100644
--- a/Allura/docs/contributing.rst
+++ b/Allura/docs/contributing.rst
@@ -25,7 +25,7 @@ Getting Help
------------
Along the way, you will no doubt have questions that aren't addressed here.
For help, you can get in touch with other Allura developers on the developer
-mailing list (allura-dev@incubator.apache.org) or in the #allura channel on
+mailing list (dev@allura.apache.org) or in the #allura channel on
the Freenode IRC network.
Installing Allura
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/Allura/docs/online.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/online.rst b/Allura/docs/online.rst
index 632d1c9..8f6518b 100644
--- a/Allura/docs/online.rst
+++ b/Allura/docs/online.rst
@@ -24,7 +24,7 @@ Generated API docs, useful for browsing through the code, viewing inheritance, e
Our project page, including tickets, discussion forums, etc.:
-* https://forge-allura.apache.org/p/allura/
+* https://allura.apache.org/
Much of the current forge was inspired by Roundup
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/Allura/setup.py
----------------------------------------------------------------------
diff --git a/Allura/setup.py b/Allura/setup.py
index f3a1a20..1671283 100644
--- a/Allura/setup.py
+++ b/Allura/setup.py
@@ -37,7 +37,7 @@ setup(
description='Base distribution of the Allura development platform',
long_description=PROJECT_DESCRIPTION,
author='Allura Team',
- url='https://forge-allura.apache.org/p/allura/',
+ url='https://allura.apache.org/',
keywords='allura forge turbogears pylons jinja2 mongodb',
license='Apache License, http://www.apache.org/licenses/LICENSE-2.0',
platforms=[
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/CONTRIBUTING
----------------------------------------------------------------------
diff --git a/CONTRIBUTING b/CONTRIBUTING
index e52c1f1..0c70739 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -25,7 +25,7 @@ number of individual projects.
SourceForge.net is running an instance of Allura (aka New Forge, or
Forge 2.0); and Allura itself is a project managed there:
- <https://forge-allura.apache.org/p/allura/>
+ <https://allura.apache.org/>
The source for Allura is available there from a Git repo under the
Apache License, Version 2.0.
@@ -81,7 +81,7 @@ possible or applicable:
The code is self-hosted in a public git repository. Get it by cloning:
- git clone https://git-wip-us.apache.org/repos/asf/incubator-allura.git allura
+ git clone https://git-wip-us.apache.org/repos/asf/allura.git allura
- CONTRIBUTING CODE
@@ -125,7 +125,7 @@ discussion where we talk about new features, submitted patches, bugs,
direction, and deployment. You can join in the discussion on the
mailing list:
- <http://mail-archives.apache.org/mod_mbox/incubator-allura-dev/>
+ <http://mail-archives.apache.org/mod_mbox/allura-dev/>
- ASKING QUESTIONS
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 95a84f1..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Allura is an effort undergoing incubation at The Apache
-Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-Incubation is required of all newly accepted projects until a further
-review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other
-successful ASF projects. While incubation status is not necessarily a
-reflection of the completeness or stability of the code, it does
-indicate that the project has yet to be fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/ForgeDiscussion/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/NOTICE b/ForgeDiscussion/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeDiscussion/NOTICE
+++ b/ForgeDiscussion/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/ForgeGit/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeGit/NOTICE b/ForgeGit/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeGit/NOTICE
+++ b/ForgeGit/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/ForgeImporters/forgeimporters/base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 996edb5..ae19156 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -169,7 +169,7 @@ class ProjectExtractor(object):
def urlopen(url, retries=3, codes=(408,), **kw):
req = urllib2.Request(url, **kw)
req.add_header(
- 'User-Agent', 'Allura Data Importer (https://forge-allura.apache.org/p/allura/)')
+ 'User-Agent', 'Allura Data Importer (https://allura.apache.org/)')
return h.urlopen(req, retries=retries, codes=codes)
def get_page(self, page_name_or_url, parser=None, **kw):
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/ForgeImporters/forgeimporters/tests/test_base.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/test_base.py b/ForgeImporters/forgeimporters/tests/test_base.py
index b2556a6..22844a0 100644
--- a/ForgeImporters/forgeimporters/tests/test_base.py
+++ b/ForgeImporters/forgeimporters/tests/test_base.py
@@ -40,7 +40,7 @@ class TestProjectExtractor(TestCase):
Request.assert_called_once_with('myurl', data='foo')
req = Request.return_value
req.add_header.assert_called_once_with(
- 'User-Agent', 'Allura Data Importer (https://forge-allura.apache.org/p/allura/)')
+ 'User-Agent', 'Allura Data Importer (https://allura.apache.org/)')
urlopen.assert_called_once_with(req, retries=3, codes=(408,))
self.assertEqual(r, urlopen.return_value)
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/ForgeLink/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeLink/NOTICE b/ForgeLink/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeLink/NOTICE
+++ b/ForgeLink/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/ForgeSVN/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeSVN/NOTICE b/ForgeSVN/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeSVN/NOTICE
+++ b/ForgeSVN/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/ForgeTracker/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeTracker/NOTICE b/ForgeTracker/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeTracker/NOTICE
+++ b/ForgeTracker/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/ForgeWiki/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeWiki/NOTICE b/ForgeWiki/NOTICE
index 3938e2b..69af9fe 100644
--- a/ForgeWiki/NOTICE
+++ b/ForgeWiki/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/INSTALL.markdown
----------------------------------------------------------------------
diff --git a/INSTALL.markdown b/INSTALL.markdown
index da90e4e..e890203 100644
--- a/INSTALL.markdown
+++ b/INSTALL.markdown
@@ -72,7 +72,7 @@ Now we can get down to actually getting the Allura code and dependencies downloa
(env-allura)~$ mkdir src
(env-allura)~$ cd src
- (env-allura)~/src$ git clone https://git-wip-us.apache.org/repos/asf/incubator-allura.git allura
+ (env-allura)~/src$ git clone https://git-wip-us.apache.org/repos/asf/allura.git allura
If you already reading this file from an Allura release or checkout, you're ready to continue.
@@ -156,7 +156,7 @@ register a new project in your own forge, visit /p/add_project
* Read more documentation: <http://allura.sourceforge.net/docs/>
* Including how to enable extra features: <http://allura.sourceforge.net/docs/installation.html>
-* Ask questions and discuss Allura on the <http://mail-archives.apache.org/mod_mbox/incubator-allura-dev/>
+* Ask questions and discuss Allura on the <http://mail-archives.apache.org/mod_mbox/allura-dev/>
* Run the test suite (slow): `$ ALLURA_VALIDATION=none ./run_tests`
* File bug reports at <https://sourceforge.net/p/allura/tickets/new/> (login required)
* Contribute code according to this guide: <https://forge-allura.apache.org/p/allura/wiki/Contributing%20Code/>
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 3938e2b..69af9fe 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/NoWarnings/NOTICE
----------------------------------------------------------------------
diff --git a/NoWarnings/NOTICE b/NoWarnings/NOTICE
index 3938e2b..69af9fe 100644
--- a/NoWarnings/NOTICE
+++ b/NoWarnings/NOTICE
@@ -1,4 +1,4 @@
-Apache Allura (incubating)
+Apache Allura
Copyright 2012-2014 The Apache Software Foundation
This product includes software developed at
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 796edc7..5daeb0c 100644
--- a/README.markdown
+++ b/README.markdown
@@ -17,13 +17,13 @@
under the License.
-->
-Apache Allura (incubating)
-==========================
+Apache Allura
+=============
Allura is an open source implementation of a software "forge", a web site that manages source code repositories, bug reports, discussions, mailing lists, wiki pages, blogs and more for any number of individual projects.
To install Allura, see INSTALL.markdown
-Website: <https://forge-allura.apache.org/p/allura/>
+Website: <https://allura.apache.org/>
-To find more documentation, ask a question, file a bug, or contribute a patch, see the links on our website. If you're not sure where to start, join the mailing list and ask.
\ No newline at end of file
+To find more documentation, ask a question, file a bug, or contribute a patch, see the links on our website. If you're not sure where to start, join the mailing list and ask.
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/scripts/asf-release.sh
----------------------------------------------------------------------
diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh
index b33c47d..8e9581b 100755
--- a/scripts/asf-release.sh
+++ b/scripts/asf-release.sh
@@ -84,7 +84,7 @@ Hello,
This is a call for a vote on Apache Allura $VERSION.
Source tarball, signature and checksums are available at:
- https://dist.apache.org/repos/dist/dev/incubator/allura/
+ https://dist.apache.org/repos/dist/dev/allura/
Checksums:
MD5: $MD5_CHECKSUM
@@ -92,7 +92,7 @@ Checksums:
SHA512: $SHA512_CHECKSUM
The KEYS file can be found at:
- http://www.apache.org/dist/incubator/allura/KEYS
+ http://www.apache.org/dist/allura/KEYS
The release has been signed with key ($KEY):
http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x$FINGERPRINT
@@ -100,7 +100,7 @@ The release has been signed with key ($KEY):
Source corresponding to this release can be found at:
Commit: $COMMIT_SHA
Tag: asf_release_$VERSION
- Browse: https://git-wip-us.apache.org/repos/asf?p=incubator-allura.git;a=shortlog;h=refs/tags/asf_release_$VERSION
+ Browse: https://git-wip-us.apache.org/repos/asf?p=allura.git;a=shortlog;h=refs/tags/asf_release_$VERSION
The RAT report is available at:
$RAT_LOG_PASTEBIN_URL
http://git-wip-us.apache.org/repos/asf/allura/blob/d51b81fd/vagrant/manifests/ubuntu-1204-server-amd64.pp
----------------------------------------------------------------------
diff --git a/vagrant/manifests/ubuntu-1204-server-amd64.pp b/vagrant/manifests/ubuntu-1204-server-amd64.pp
index b93456e..11fd2d0 100644
--- a/vagrant/manifests/ubuntu-1204-server-amd64.pp
+++ b/vagrant/manifests/ubuntu-1204-server-amd64.pp
@@ -78,7 +78,7 @@ file { "/var/log/allura":
# clone Allura source from git
exec { "clone repo":
- command => "/usr/bin/git clone https://git-wip-us.apache.org/repos/asf/incubator-allura.git allura",
+ command => "/usr/bin/git clone https://git-wip-us.apache.org/repos/asf/allura.git allura",
cwd => "/vagrant",
creates => "/vagrant/allura",
user => "vagrant",