Author: marrs
Date: Fri Jan 20 20:56:27 2012
New Revision: 802983
Log:
Publishing merge to ace site by marrs
Added:
websites/production/ace/content/apache.html
- copied unchanged from r802982,
websites/staging/ace/trunk/content/apache.html
Modified:
websites/production/ace/ (props changed)
websites/production/ace/content/dev-doc.html
websites/production/ace/content/downloads.html
websites/production/ace/content/get-involved.html
websites/production/ace/content/index.html
websites/production/ace/content/news.html
websites/production/ace/content/on-the-web.html
websites/production/ace/content/sitemap.html
websites/production/ace/content/user-doc.html
websites/production/ace/content/wiki.html
Propchange: websites/production/ace/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 20 20:56:27 2012
@@ -1 +1 @@
-/websites/staging/ace/trunk:801772-802978
+/websites/staging/ace/trunk:801772-802982
Modified: websites/production/ace/content/dev-doc.html
==============================================================================
--- websites/production/ace/content/dev-doc.html (original)
+++ websites/production/ace/content/dev-doc.html Fri Jan 20 20:56:27 2012
@@ -28,7 +28,7 @@
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -76,7 +76,8 @@
</form>
</div>
<div class="clear"></div>
- <div id="content" class="grid_16"><div
class="section-content"><p>Placeholder page.</p></div></div>
+ <div id="content" class="grid_16"><div class="section-content"><h1
id="developer_documentation">Developer Documentation</h1>
+<p>Placeholder page.</p></div></div>
<div class="clear"></div>
</div>
Modified: websites/production/ace/content/downloads.html
==============================================================================
--- websites/production/ace/content/downloads.html (original)
+++ websites/production/ace/content/downloads.html Fri Jan 20 20:56:27 2012
@@ -28,7 +28,7 @@
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -76,7 +76,8 @@
</form>
</div>
<div class="clear"></div>
- <div id="content" class="grid_16"><div
class="section-content"><p>Placeholder page.</p></div></div>
+ <div id="content" class="grid_16"><div class="section-content"><h1
id="downloads">Downloads</h1>
+<p>Placeholder page.</p></div></div>
<div class="clear"></div>
</div>
Modified: websites/production/ace/content/get-involved.html
==============================================================================
--- websites/production/ace/content/get-involved.html (original)
+++ websites/production/ace/content/get-involved.html Fri Jan 20 20:56:27 2012
@@ -28,7 +28,7 @@
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -76,7 +76,8 @@
</form>
</div>
<div class="clear"></div>
- <div id="content" class="grid_16"><div
class="section-content"><p>Placeholder page.</p></div></div>
+ <div id="content" class="grid_16"><div class="section-content"><h1
id="get_involved">Get Involved</h1>
+<p>When you want to get involved in Apache ACE, probably the first thing to do
is to subscribe to the <a href="/get-involved/mailing-lists.html">mailing
lists</a>. You can learn how to check out the <a
href="/get-involved/source-code.html">source code</a>, compile it yourself and
maybe fix a bug or add a feature, both of which you can report in our <a
href="/get-involved/issue-tracking.html">issue tracker</a>. Finally, we would
like to <a href="/get-involved/project-team.html">introduce ourselves</a>
here.</p></div></div>
<div class="clear"></div>
</div>
Modified: websites/production/ace/content/index.html
==============================================================================
--- websites/production/ace/content/index.html (original)
+++ websites/production/ace/content/index.html Fri Jan 20 20:56:27 2012
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html lang="en">
<head>
- <title></title>
+ <title>Apache ACE</title>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta property="og:image"
content="http://www.apache.org/images/asf_logo.gif"; />
@@ -22,13 +22,13 @@
<div id="header" class="grid_8">
<img src="http://www.apache.org/images/feather-small.gif"; alt="The
Apache Software Foundation">
<h1>The Apache Software Foundation</h1>
- <h2></h2>
+ <h2>Apache ACE</h2>
</div>
<div id="nav" class="grid_8">
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -77,12 +77,11 @@
</div>
<div class="clear"></div>
<div id="content" class="grid_16"><div class="section-content"><h1
id="welcome_to_apache_ace">Welcome to Apache ACE</h1>
-<p>This is the new website for Apache ACE, or rather, a stub for it as we are
still setting up the new Apache CMS for it.</p>
-<p>Please see the following resources for further help:</p>
-<ul>
-<li><a
href="http://www.apache.org/dev/cmsref.html";>http://www.apache.org/dev/cmsref.html</a></li>
-<li><a
href="http://wiki.apache.org/general/ApacheCms2010";>http://wiki.apache.org/general/ApacheCms2010</a></li>
-</ul></div></div>
+<p>Apache ACE is a software distribution framework that allows you to
centrally manage and distribute software components, configuration data and
other artifacts to target systems. It is built using OSGi and can be deployed
in different topologies. The target systems are usually also OSGi based, but
don't have to be.</p>
+<h1 id="background">Background</h1>
+<p>When assembling software out of reusable components, the task of deploying
software onto an ever increasing number of targets is not trivial to solve.
This becomes even harder when these targets require different components based
on who's using them.</p>
+<p>Apache ACE allows you to group those components and assign them to a
managed set of targets. This allows you to distribute updates and new
components easily, while keeping a full history of what was installed where
during what period. It also helps you setup an automated development,
QA/testing, staging and production environment.</p>
+<p>If you want to learn more about how to use Apache ACE, go to the <a
href="/user-doc.html">User Documentation</a> and start with <a
href="/user-doc/introduction.html">A brief introduction</a>. If you are
interested in <a href="/get-involved.html">becoming involved</a>, check out our
<a href="#TODO">Mailing Lists</a> and finally, to gain a deeper understanding
of the software, read the available <a href="/dev-doc.html">Developer
Documentation</a> which explains how to build the software and the overall <a
href="/dev-doc/software-architecture.html">Software
Architecture</a>.</p></div></div>
<div class="clear"></div>
</div>
Modified: websites/production/ace/content/news.html
==============================================================================
--- websites/production/ace/content/news.html (original)
+++ websites/production/ace/content/news.html Fri Jan 20 20:56:27 2012
@@ -28,7 +28,7 @@
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -76,7 +76,11 @@
</form>
</div>
<div class="clear"></div>
- <div id="content" class="grid_16"><div
class="section-content"><p>Placeholder page.</p></div></div>
+ <div id="content" class="grid_16"><div class="section-content"><h1
id="news">News</h1>
+<ul>
+<li>Apache ACE graduated as a TLP!</li>
+<li>Apache ACE version 0.8.1-incubator released! <a href="#TODO">Get it
here</a>.</li>
+</ul></div></div>
<div class="clear"></div>
</div>
Modified: websites/production/ace/content/on-the-web.html
==============================================================================
--- websites/production/ace/content/on-the-web.html (original)
+++ websites/production/ace/content/on-the-web.html Fri Jan 20 20:56:27 2012
@@ -28,7 +28,7 @@
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -76,7 +76,8 @@
</form>
</div>
<div class="clear"></div>
- <div id="content" class="grid_16"><div
class="section-content"><p>Placeholder page.</p></div></div>
+ <div id="content" class="grid_16"><div class="section-content"><h1
id="on_the_web">On the web</h1>
+<p>Placeholder page.</p></div></div>
<div class="clear"></div>
</div>
Modified: websites/production/ace/content/sitemap.html
==============================================================================
--- websites/production/ace/content/sitemap.html (original)
+++ websites/production/ace/content/sitemap.html Fri Jan 20 20:56:27 2012
@@ -28,7 +28,7 @@
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -77,10 +77,11 @@
</div>
<div class="clear"></div>
<div id="content" class="grid_16"><div class="section-content"><ul>
+<li><a href="/apache.html">Apache</a></li>
<li><a href="/dev-doc.html">Developer Documentation</a></li>
<li><a href="/downloads.html">Downloads</a></li>
<li><a href="/get-involved.html">Get Involved</a></li>
-<li><a href="/index.html" /></li>
+<li><a href="/index.html">Apache ACE</a></li>
<li><a href="/news.html">News</a></li>
<li><a href="/on-the-web.html">On the web</a></li>
<li><a href="/user-doc.html">User Documentation</a></li>
Modified: websites/production/ace/content/user-doc.html
==============================================================================
--- websites/production/ace/content/user-doc.html (original)
+++ websites/production/ace/content/user-doc.html Fri Jan 20 20:56:27 2012
@@ -28,7 +28,7 @@
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -76,7 +76,8 @@
</form>
</div>
<div class="clear"></div>
- <div id="content" class="grid_16"><div
class="section-content"><p>Placeholder page.</p></div></div>
+ <div id="content" class="grid_16"><div class="section-content"><h1
id="user_documentation">User Documentation</h1>
+<p>Placeholder page.</p></div></div>
<div class="clear"></div>
</div>
Modified: websites/production/ace/content/wiki.html
==============================================================================
--- websites/production/ace/content/wiki.html (original)
+++ websites/production/ace/content/wiki.html Fri Jan 20 20:56:27 2012
@@ -28,7 +28,7 @@
<ul>
<li><a href="/index.html">Home</a><ul>
<li><a href="/news.html">News</a></li>
-<li><a href="/ontheweb.html">On the web</a></li>
+<li><a href="/on-the-web.html">On the web</a></li>
</ul>
</li>
<li><a href="/downloads.html">Downloads</a></li>
@@ -76,7 +76,8 @@
</form>
</div>
<div class="clear"></div>
- <div id="content" class="grid_16"><div class="section-content"><p>Apache
ACE uses Confluence as its wiki. You can take a look by following <a
href="https://cwiki.apache.org/confluence/display/ACE/Index";>this
link</a></p></div></div>
+ <div id="content" class="grid_16"><div class="section-content"><h1
id="wiki">Wiki</h1>
+<p>Apache ACE uses Confluence as its wiki. You can take a look by following <a
href="https://cwiki.apache.org/confluence/display/ACE/Index";>this link</a>. The
wiki is used for collaborating on documents. This includes <a
href="/wiki/drafts.html">design documentation</a> and <a
href="/wiki/board-reports.html">board reports</a>.</p></div></div>
<div class="clear"></div>
</div>
![http://www.apache.org/images/asf_logo.gif"](http://www.apache.org/images/asf_logo.gif"){kind=link}
![http://www.apache.org/images/feather-small.gif"](http://www.apache.org/images/feather-small.gif"){kind=link}