aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r782139 [5/6] - in /websites/staging/aries/trunk/content: ./ community/ development/ documentation/ documentation/tutorials/ downloads/ downloads/archived-releases/ modules/ modules/samples/ overview/ overview/boardreports/ resources/
Date Wed, 05 Jan 2011 09:01:10 GMT
Modified: websites/staging/aries/trunk/content/modules/jpaproject.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/jpaproject.html (original)
+++ websites/staging/aries/trunk/content/modules/jpaproject.html Wed Jan  5 09:01:09 2011
@@ -17,8 +17,8 @@
 -->
 <html>
   <head>
-    <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/aries/resources/site.css"></link>
-    </script><script src="http://incubator.apache.org/aries/resources/menus.js" language="javascript" type="text/javascript"></script>
+    <link type="text/css" rel="stylesheet" href="http://aries.apache.org/resources/site.css"></link>
+    </script><script src="http://aries.apache.org/resources/menus.js" language="javascript" type="text/javascript"></script>
 	<meta name="keywords" content="..."/>
 	<meta name="description" content="..." />
     <title>
@@ -43,10 +43,10 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="left" class="topbardiv" nowrap="">
-						<a href="http://incubator.apache.org/aries/" title="Apache Aries"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+						<a href="http://aries.apache.org/" title="Apache Aries"> <img border="0" src="http://aries.apache.org/images/Arieslogo_Horizontal.gif"> </a>
 					</td>
 					<td align="right" nowrap="">
-						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache_feather.png"> </a>
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://aries.apache.org/images/apache_feather.png"> </a>
       				</td>
 				</tr>
 			</table>
@@ -67,13 +67,13 @@
                 <!-- Quicklinks -->
 					<DIV style="padding: 5px 5px 0px 25px;">
 						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<!-- <A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> --> 
 						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
 						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
 						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
 						<INPUT name="btnG" type="submit" value="Search"></INPUT>
-						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
-						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="domains" type="hidden" value="aries.apache.org"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="aries.apache.org"></INPUT>
 						</FORM>
 					</DIV>
                 <!-- Quicklinks -->
@@ -100,61 +100,61 @@
 					<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/overview/boardreports.html">Board Reports</a> 
+        <a href="/overview/boardreports.html">Board Reports</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/overview/news.html">News</a> 
+        <a href="/overview/news.html">News</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('documentation')" id="documentationTitle" class="menutitle">Documentation</div>
 <div id="documentation" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/documentation/ariesprogrammingmodel.html">Programming Model</a> 
+        <a href="/documentation/ariesprogrammingmodel.html">Programming Model</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
+        <a href="/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/integrators-guide.html">Integrators Guide</a> 
+        <a href="/documentation/integrators-guide.html">Integrators Guide</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/articles.html">Articles</a> 
+        <a href="/documentation/articles.html">Articles</a> 
     </div>
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/slides/">Slides</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/slides/">Slides</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/tutorials.html">Tutorials</a> 
+        <a href="/documentation/tutorials.html">Tutorials</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('downloads')" id="downloadsTitle" class="menutitle">Downloads</div>
 <div id="downloads" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/downloads/currentrelease.html">Current Release</a> 
+        <a href="/downloads/currentrelease.html">Current Release</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/testresults.html">Compliance Tests</a> 
+        <a href="/downloads/testresults.html">Compliance Tests</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/releasenotes.html">Release Notes</a> 
+        <a href="/downloads/releasenotes.html">Release Notes</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/archived-releases.html">Archived Releases</a> 
+        <a href="/downloads/archived-releases.html">Archived Releases</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('community')" id="communityTitle" class="menutitle">Community</div>
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/community/overview.html">Community</a> 
+        <a href="/community/overview.html">Community</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/gettinginvolved.html">Getting Involved</a> 
+        <a href="/community/gettinginvolved.html">Getting Involved</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/people.html">Who we are</a> 
+        <a href="/community/people.html">Who we are</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/mailinglists.html">Mailing lists</a> 
+        <a href="/community/mailinglists.html">Mailing lists</a> 
     </div>
     <div class="menuitem">
         <a href="http://blogs.apache.org/aries/">Aries Group Blog</a> 
@@ -163,58 +163,58 @@
 <div onclick="SwitchMenu('development')" id="developmentTitle" class="menutitle">Development</div>
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/">Source Control</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
     </div>
     <div class="menuitem">
         <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/buildingaries.html">Building Aries </a> 
+        <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/moduledependencies.html">Module Dependencies</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/releasingaries.html">Releasing Aries </a> 
+        <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/compliancetesting.html">OSGi Compliance Tests </a> 
+        <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
         <a href="http://hudson.zones.apache.org/hudson/">Build System</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maintainingthewebpages.html">Web Site Maintenance </a> 
+        <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
 </div>
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
 <div id="modules" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/modules/samples.html">Samples</a> 
+        <a href="/modules/samples.html">Samples</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/blueprint.html">Blueprint</a> 
+        <a href="/modules/blueprint.html">Blueprint</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jndiproject.html">JNDI</a> 
+        <a href="/modules/jndiproject.html">JNDI</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jpaproject.html">JPA</a> 
+        <a href="/modules/jpaproject.html">JPA</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/applications.html">Applications</a> 
+        <a href="/modules/applications.html">Applications</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/transactionsproject.html">Transactions</a> 
+        <a href="/modules/transactionsproject.html">Transactions</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
+        <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/spi-fly.html">SPI Fly</a> 
+        <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('sponsorship')" id="sponsorshipTitle" class="menutitle">Sponsorship</div>
@@ -257,7 +257,7 @@ Release 4, Version 4.2" available for pu
      <div id="footer">
        <!-- Footer -->
        <div id="site-footer">
-         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+         <a href="http://aries.apache.org/privacy-policy.html";>Privacy
 Policy</a> 
        </div>
        <!-- Footer -->

Modified: websites/staging/aries/trunk/content/modules/samples.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/samples.html (original)
+++ websites/staging/aries/trunk/content/modules/samples.html Wed Jan  5 09:01:09 2011
@@ -17,8 +17,8 @@
 -->
 <html>
   <head>
-    <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/aries/resources/site.css"></link>
-    </script><script src="http://incubator.apache.org/aries/resources/menus.js" language="javascript" type="text/javascript"></script>
+    <link type="text/css" rel="stylesheet" href="http://aries.apache.org/resources/site.css"></link>
+    </script><script src="http://aries.apache.org/resources/menus.js" language="javascript" type="text/javascript"></script>
 	<meta name="keywords" content="..."/>
 	<meta name="description" content="..." />
     <title>
@@ -43,10 +43,10 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="left" class="topbardiv" nowrap="">
-						<a href="http://incubator.apache.org/aries/" title="Apache Aries"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+						<a href="http://aries.apache.org/" title="Apache Aries"> <img border="0" src="http://aries.apache.org/images/Arieslogo_Horizontal.gif"> </a>
 					</td>
 					<td align="right" nowrap="">
-						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache_feather.png"> </a>
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://aries.apache.org/images/apache_feather.png"> </a>
       				</td>
 				</tr>
 			</table>
@@ -67,13 +67,13 @@
                 <!-- Quicklinks -->
 					<DIV style="padding: 5px 5px 0px 25px;">
 						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<!-- <A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> --> 
 						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
 						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
 						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
 						<INPUT name="btnG" type="submit" value="Search"></INPUT>
-						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
-						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="domains" type="hidden" value="aries.apache.org"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="aries.apache.org"></INPUT>
 						</FORM>
 					</DIV>
                 <!-- Quicklinks -->
@@ -100,61 +100,61 @@
 					<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/overview/boardreports.html">Board Reports</a> 
+        <a href="/overview/boardreports.html">Board Reports</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/overview/news.html">News</a> 
+        <a href="/overview/news.html">News</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('documentation')" id="documentationTitle" class="menutitle">Documentation</div>
 <div id="documentation" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/documentation/ariesprogrammingmodel.html">Programming Model</a> 
+        <a href="/documentation/ariesprogrammingmodel.html">Programming Model</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
+        <a href="/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/integrators-guide.html">Integrators Guide</a> 
+        <a href="/documentation/integrators-guide.html">Integrators Guide</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/articles.html">Articles</a> 
+        <a href="/documentation/articles.html">Articles</a> 
     </div>
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/slides/">Slides</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/slides/">Slides</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/tutorials.html">Tutorials</a> 
+        <a href="/documentation/tutorials.html">Tutorials</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('downloads')" id="downloadsTitle" class="menutitle">Downloads</div>
 <div id="downloads" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/downloads/currentrelease.html">Current Release</a> 
+        <a href="/downloads/currentrelease.html">Current Release</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/testresults.html">Compliance Tests</a> 
+        <a href="/downloads/testresults.html">Compliance Tests</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/releasenotes.html">Release Notes</a> 
+        <a href="/downloads/releasenotes.html">Release Notes</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/archived-releases.html">Archived Releases</a> 
+        <a href="/downloads/archived-releases.html">Archived Releases</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('community')" id="communityTitle" class="menutitle">Community</div>
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/community/overview.html">Community</a> 
+        <a href="/community/overview.html">Community</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/gettinginvolved.html">Getting Involved</a> 
+        <a href="/community/gettinginvolved.html">Getting Involved</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/people.html">Who we are</a> 
+        <a href="/community/people.html">Who we are</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/mailinglists.html">Mailing lists</a> 
+        <a href="/community/mailinglists.html">Mailing lists</a> 
     </div>
     <div class="menuitem">
         <a href="http://blogs.apache.org/aries/">Aries Group Blog</a> 
@@ -163,58 +163,58 @@
 <div onclick="SwitchMenu('development')" id="developmentTitle" class="menutitle">Development</div>
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/">Source Control</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
     </div>
     <div class="menuitem">
         <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/buildingaries.html">Building Aries </a> 
+        <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/moduledependencies.html">Module Dependencies</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/releasingaries.html">Releasing Aries </a> 
+        <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/compliancetesting.html">OSGi Compliance Tests </a> 
+        <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
         <a href="http://hudson.zones.apache.org/hudson/">Build System</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maintainingthewebpages.html">Web Site Maintenance </a> 
+        <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
 </div>
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
 <div id="modules" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/modules/samples.html">Samples</a> 
+        <a href="/modules/samples.html">Samples</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/blueprint.html">Blueprint</a> 
+        <a href="/modules/blueprint.html">Blueprint</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jndiproject.html">JNDI</a> 
+        <a href="/modules/jndiproject.html">JNDI</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jpaproject.html">JPA</a> 
+        <a href="/modules/jpaproject.html">JPA</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/applications.html">Applications</a> 
+        <a href="/modules/applications.html">Applications</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/transactionsproject.html">Transactions</a> 
+        <a href="/modules/transactionsproject.html">Transactions</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
+        <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/spi-fly.html">SPI Fly</a> 
+        <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('sponsorship')" id="sponsorshipTitle" class="menutitle">Sponsorship</div>
@@ -260,7 +260,7 @@ OSGi bundles running in an OSGi framewor
      <div id="footer">
        <!-- Footer -->
        <div id="site-footer">
-         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+         <a href="http://aries.apache.org/privacy-policy.html";>Privacy
 Policy</a> 
        </div>
        <!-- Footer -->

Modified: websites/staging/aries/trunk/content/modules/samples/ariestrader.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/samples/ariestrader.html (original)
+++ websites/staging/aries/trunk/content/modules/samples/ariestrader.html Wed Jan  5 09:01:09 2011
@@ -17,8 +17,8 @@
 -->
 <html>
   <head>
-    <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/aries/resources/site.css"></link>
-    </script><script src="http://incubator.apache.org/aries/resources/menus.js" language="javascript" type="text/javascript"></script>
+    <link type="text/css" rel="stylesheet" href="http://aries.apache.org/resources/site.css"></link>
+    </script><script src="http://aries.apache.org/resources/menus.js" language="javascript" type="text/javascript"></script>
 	<meta name="keywords" content="..."/>
 	<meta name="description" content="..." />
     <title>
@@ -43,10 +43,10 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="left" class="topbardiv" nowrap="">
-						<a href="http://incubator.apache.org/aries/" title="Apache Aries"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+						<a href="http://aries.apache.org/" title="Apache Aries"> <img border="0" src="http://aries.apache.org/images/Arieslogo_Horizontal.gif"> </a>
 					</td>
 					<td align="right" nowrap="">
-						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache_feather.png"> </a>
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://aries.apache.org/images/apache_feather.png"> </a>
       				</td>
 				</tr>
 			</table>
@@ -67,13 +67,13 @@
                 <!-- Quicklinks -->
 					<DIV style="padding: 5px 5px 0px 25px;">
 						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<!-- <A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> --> 
 						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
 						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
 						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
 						<INPUT name="btnG" type="submit" value="Search"></INPUT>
-						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
-						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="domains" type="hidden" value="aries.apache.org"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="aries.apache.org"></INPUT>
 						</FORM>
 					</DIV>
                 <!-- Quicklinks -->
@@ -100,61 +100,61 @@
 					<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/overview/boardreports.html">Board Reports</a> 
+        <a href="/overview/boardreports.html">Board Reports</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/overview/news.html">News</a> 
+        <a href="/overview/news.html">News</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('documentation')" id="documentationTitle" class="menutitle">Documentation</div>
 <div id="documentation" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/documentation/ariesprogrammingmodel.html">Programming Model</a> 
+        <a href="/documentation/ariesprogrammingmodel.html">Programming Model</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
+        <a href="/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/integrators-guide.html">Integrators Guide</a> 
+        <a href="/documentation/integrators-guide.html">Integrators Guide</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/articles.html">Articles</a> 
+        <a href="/documentation/articles.html">Articles</a> 
     </div>
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/slides/">Slides</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/slides/">Slides</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/tutorials.html">Tutorials</a> 
+        <a href="/documentation/tutorials.html">Tutorials</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('downloads')" id="downloadsTitle" class="menutitle">Downloads</div>
 <div id="downloads" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/downloads/currentrelease.html">Current Release</a> 
+        <a href="/downloads/currentrelease.html">Current Release</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/testresults.html">Compliance Tests</a> 
+        <a href="/downloads/testresults.html">Compliance Tests</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/releasenotes.html">Release Notes</a> 
+        <a href="/downloads/releasenotes.html">Release Notes</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/archived-releases.html">Archived Releases</a> 
+        <a href="/downloads/archived-releases.html">Archived Releases</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('community')" id="communityTitle" class="menutitle">Community</div>
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/community/overview.html">Community</a> 
+        <a href="/community/overview.html">Community</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/gettinginvolved.html">Getting Involved</a> 
+        <a href="/community/gettinginvolved.html">Getting Involved</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/people.html">Who we are</a> 
+        <a href="/community/people.html">Who we are</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/mailinglists.html">Mailing lists</a> 
+        <a href="/community/mailinglists.html">Mailing lists</a> 
     </div>
     <div class="menuitem">
         <a href="http://blogs.apache.org/aries/">Aries Group Blog</a> 
@@ -163,58 +163,58 @@
 <div onclick="SwitchMenu('development')" id="developmentTitle" class="menutitle">Development</div>
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/">Source Control</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
     </div>
     <div class="menuitem">
         <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/buildingaries.html">Building Aries </a> 
+        <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/moduledependencies.html">Module Dependencies</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/releasingaries.html">Releasing Aries </a> 
+        <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/compliancetesting.html">OSGi Compliance Tests </a> 
+        <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
         <a href="http://hudson.zones.apache.org/hudson/">Build System</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maintainingthewebpages.html">Web Site Maintenance </a> 
+        <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
 </div>
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
 <div id="modules" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/modules/samples.html">Samples</a> 
+        <a href="/modules/samples.html">Samples</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/blueprint.html">Blueprint</a> 
+        <a href="/modules/blueprint.html">Blueprint</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jndiproject.html">JNDI</a> 
+        <a href="/modules/jndiproject.html">JNDI</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jpaproject.html">JPA</a> 
+        <a href="/modules/jpaproject.html">JPA</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/applications.html">Applications</a> 
+        <a href="/modules/applications.html">Applications</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/transactionsproject.html">Transactions</a> 
+        <a href="/modules/transactionsproject.html">Transactions</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
+        <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/spi-fly.html">SPI Fly</a> 
+        <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('sponsorship')" id="sponsorshipTitle" class="menutitle">Sponsorship</div>
@@ -363,7 +363,7 @@ support the Apache Aries programming mod
      <div id="footer">
        <!-- Footer -->
        <div id="site-footer">
-         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+         <a href="http://aries.apache.org/privacy-policy.html";>Privacy
 Policy</a> 
        </div>
        <!-- Footer -->

Modified: websites/staging/aries/trunk/content/modules/samples/blog-sample.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/samples/blog-sample.html (original)
+++ websites/staging/aries/trunk/content/modules/samples/blog-sample.html Wed Jan  5 09:01:09 2011
@@ -17,8 +17,8 @@
 -->
 <html>
   <head>
-    <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/aries/resources/site.css"></link>
-    </script><script src="http://incubator.apache.org/aries/resources/menus.js" language="javascript" type="text/javascript"></script>
+    <link type="text/css" rel="stylesheet" href="http://aries.apache.org/resources/site.css"></link>
+    </script><script src="http://aries.apache.org/resources/menus.js" language="javascript" type="text/javascript"></script>
 	<meta name="keywords" content="..."/>
 	<meta name="description" content="..." />
     <title>
@@ -43,10 +43,10 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="left" class="topbardiv" nowrap="">
-						<a href="http://incubator.apache.org/aries/" title="Apache Aries"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+						<a href="http://aries.apache.org/" title="Apache Aries"> <img border="0" src="http://aries.apache.org/images/Arieslogo_Horizontal.gif"> </a>
 					</td>
 					<td align="right" nowrap="">
-						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache_feather.png"> </a>
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://aries.apache.org/images/apache_feather.png"> </a>
       				</td>
 				</tr>
 			</table>
@@ -67,13 +67,13 @@
                 <!-- Quicklinks -->
 					<DIV style="padding: 5px 5px 0px 25px;">
 						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<!-- <A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> --> 
 						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
 						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
 						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
 						<INPUT name="btnG" type="submit" value="Search"></INPUT>
-						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
-						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="domains" type="hidden" value="aries.apache.org"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="aries.apache.org"></INPUT>
 						</FORM>
 					</DIV>
                 <!-- Quicklinks -->
@@ -100,61 +100,61 @@
 					<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/overview/boardreports.html">Board Reports</a> 
+        <a href="/overview/boardreports.html">Board Reports</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/overview/news.html">News</a> 
+        <a href="/overview/news.html">News</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('documentation')" id="documentationTitle" class="menutitle">Documentation</div>
 <div id="documentation" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/documentation/ariesprogrammingmodel.html">Programming Model</a> 
+        <a href="/documentation/ariesprogrammingmodel.html">Programming Model</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
+        <a href="/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/integrators-guide.html">Integrators Guide</a> 
+        <a href="/documentation/integrators-guide.html">Integrators Guide</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/articles.html">Articles</a> 
+        <a href="/documentation/articles.html">Articles</a> 
     </div>
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/slides/">Slides</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/slides/">Slides</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/tutorials.html">Tutorials</a> 
+        <a href="/documentation/tutorials.html">Tutorials</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('downloads')" id="downloadsTitle" class="menutitle">Downloads</div>
 <div id="downloads" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/downloads/currentrelease.html">Current Release</a> 
+        <a href="/downloads/currentrelease.html">Current Release</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/testresults.html">Compliance Tests</a> 
+        <a href="/downloads/testresults.html">Compliance Tests</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/releasenotes.html">Release Notes</a> 
+        <a href="/downloads/releasenotes.html">Release Notes</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/archived-releases.html">Archived Releases</a> 
+        <a href="/downloads/archived-releases.html">Archived Releases</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('community')" id="communityTitle" class="menutitle">Community</div>
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/community/overview.html">Community</a> 
+        <a href="/community/overview.html">Community</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/gettinginvolved.html">Getting Involved</a> 
+        <a href="/community/gettinginvolved.html">Getting Involved</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/people.html">Who we are</a> 
+        <a href="/community/people.html">Who we are</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/mailinglists.html">Mailing lists</a> 
+        <a href="/community/mailinglists.html">Mailing lists</a> 
     </div>
     <div class="menuitem">
         <a href="http://blogs.apache.org/aries/">Aries Group Blog</a> 
@@ -163,58 +163,58 @@
 <div onclick="SwitchMenu('development')" id="developmentTitle" class="menutitle">Development</div>
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/">Source Control</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
     </div>
     <div class="menuitem">
         <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/buildingaries.html">Building Aries </a> 
+        <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/moduledependencies.html">Module Dependencies</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/releasingaries.html">Releasing Aries </a> 
+        <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/compliancetesting.html">OSGi Compliance Tests </a> 
+        <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
         <a href="http://hudson.zones.apache.org/hudson/">Build System</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maintainingthewebpages.html">Web Site Maintenance </a> 
+        <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
 </div>
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
 <div id="modules" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/modules/samples.html">Samples</a> 
+        <a href="/modules/samples.html">Samples</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/blueprint.html">Blueprint</a> 
+        <a href="/modules/blueprint.html">Blueprint</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jndiproject.html">JNDI</a> 
+        <a href="/modules/jndiproject.html">JNDI</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jpaproject.html">JPA</a> 
+        <a href="/modules/jpaproject.html">JPA</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/applications.html">Applications</a> 
+        <a href="/modules/applications.html">Applications</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/transactionsproject.html">Transactions</a> 
+        <a href="/modules/transactionsproject.html">Transactions</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
+        <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/spi-fly.html">SPI Fly</a> 
+        <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('sponsorship')" id="sponsorshipTitle" class="menutitle">Sponsorship</div>
@@ -318,7 +318,7 @@ build the Aries trunk by following the <
      <div id="footer">
        <!-- Footer -->
        <div id="site-footer">
-         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+         <a href="http://aries.apache.org/privacy-policy.html";>Privacy
 Policy</a> 
        </div>
        <!-- Footer -->

Modified: websites/staging/aries/trunk/content/modules/samples/goatsample.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/samples/goatsample.html (original)
+++ websites/staging/aries/trunk/content/modules/samples/goatsample.html Wed Jan  5 09:01:09 2011
@@ -17,8 +17,8 @@
 -->
 <html>
   <head>
-    <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/aries/resources/site.css"></link>
-    </script><script src="http://incubator.apache.org/aries/resources/menus.js" language="javascript" type="text/javascript"></script>
+    <link type="text/css" rel="stylesheet" href="http://aries.apache.org/resources/site.css"></link>
+    </script><script src="http://aries.apache.org/resources/menus.js" language="javascript" type="text/javascript"></script>
 	<meta name="keywords" content="..."/>
 	<meta name="description" content="..." />
     <title>
@@ -43,10 +43,10 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="left" class="topbardiv" nowrap="">
-						<a href="http://incubator.apache.org/aries/" title="Apache Aries"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+						<a href="http://aries.apache.org/" title="Apache Aries"> <img border="0" src="http://aries.apache.org/images/Arieslogo_Horizontal.gif"> </a>
 					</td>
 					<td align="right" nowrap="">
-						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache_feather.png"> </a>
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://aries.apache.org/images/apache_feather.png"> </a>
       				</td>
 				</tr>
 			</table>
@@ -67,13 +67,13 @@
                 <!-- Quicklinks -->
 					<DIV style="padding: 5px 5px 0px 25px;">
 						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<!-- <A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> --> 
 						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
 						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
 						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
 						<INPUT name="btnG" type="submit" value="Search"></INPUT>
-						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
-						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="domains" type="hidden" value="aries.apache.org"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="aries.apache.org"></INPUT>
 						</FORM>
 					</DIV>
                 <!-- Quicklinks -->
@@ -100,61 +100,61 @@
 					<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/overview/boardreports.html">Board Reports</a> 
+        <a href="/overview/boardreports.html">Board Reports</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/overview/news.html">News</a> 
+        <a href="/overview/news.html">News</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('documentation')" id="documentationTitle" class="menutitle">Documentation</div>
 <div id="documentation" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/documentation/ariesprogrammingmodel.html">Programming Model</a> 
+        <a href="/documentation/ariesprogrammingmodel.html">Programming Model</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
+        <a href="/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/integrators-guide.html">Integrators Guide</a> 
+        <a href="/documentation/integrators-guide.html">Integrators Guide</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/articles.html">Articles</a> 
+        <a href="/documentation/articles.html">Articles</a> 
     </div>
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/slides/">Slides</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/slides/">Slides</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/tutorials.html">Tutorials</a> 
+        <a href="/documentation/tutorials.html">Tutorials</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('downloads')" id="downloadsTitle" class="menutitle">Downloads</div>
 <div id="downloads" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/downloads/currentrelease.html">Current Release</a> 
+        <a href="/downloads/currentrelease.html">Current Release</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/testresults.html">Compliance Tests</a> 
+        <a href="/downloads/testresults.html">Compliance Tests</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/releasenotes.html">Release Notes</a> 
+        <a href="/downloads/releasenotes.html">Release Notes</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/archived-releases.html">Archived Releases</a> 
+        <a href="/downloads/archived-releases.html">Archived Releases</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('community')" id="communityTitle" class="menutitle">Community</div>
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/community/overview.html">Community</a> 
+        <a href="/community/overview.html">Community</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/gettinginvolved.html">Getting Involved</a> 
+        <a href="/community/gettinginvolved.html">Getting Involved</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/people.html">Who we are</a> 
+        <a href="/community/people.html">Who we are</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/mailinglists.html">Mailing lists</a> 
+        <a href="/community/mailinglists.html">Mailing lists</a> 
     </div>
     <div class="menuitem">
         <a href="http://blogs.apache.org/aries/">Aries Group Blog</a> 
@@ -163,58 +163,58 @@
 <div onclick="SwitchMenu('development')" id="developmentTitle" class="menutitle">Development</div>
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/">Source Control</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
     </div>
     <div class="menuitem">
         <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/buildingaries.html">Building Aries </a> 
+        <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/moduledependencies.html">Module Dependencies</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/releasingaries.html">Releasing Aries </a> 
+        <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/compliancetesting.html">OSGi Compliance Tests </a> 
+        <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
         <a href="http://hudson.zones.apache.org/hudson/">Build System</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maintainingthewebpages.html">Web Site Maintenance </a> 
+        <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
 </div>
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
 <div id="modules" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/modules/samples.html">Samples</a> 
+        <a href="/modules/samples.html">Samples</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/blueprint.html">Blueprint</a> 
+        <a href="/modules/blueprint.html">Blueprint</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jndiproject.html">JNDI</a> 
+        <a href="/modules/jndiproject.html">JNDI</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jpaproject.html">JPA</a> 
+        <a href="/modules/jpaproject.html">JPA</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/applications.html">Applications</a> 
+        <a href="/modules/applications.html">Applications</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/transactionsproject.html">Transactions</a> 
+        <a href="/modules/transactionsproject.html">Transactions</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
+        <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/spi-fly.html">SPI Fly</a> 
+        <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('sponsorship')" id="sponsorshipTitle" class="menutitle">Sponsorship</div>
@@ -274,7 +274,7 @@ bundle (Done). </li>
      <div id="footer">
        <!-- Footer -->
        <div id="site-footer">
-         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+         <a href="http://aries.apache.org/privacy-policy.html";>Privacy
 Policy</a> 
        </div>
        <!-- Footer -->

Modified: websites/staging/aries/trunk/content/modules/spi-fly.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/spi-fly.html (original)
+++ websites/staging/aries/trunk/content/modules/spi-fly.html Wed Jan  5 09:01:09 2011
@@ -17,8 +17,8 @@
 -->
 <html>
   <head>
-    <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/aries/resources/site.css"></link>
-    </script><script src="http://incubator.apache.org/aries/resources/menus.js" language="javascript" type="text/javascript"></script>
+    <link type="text/css" rel="stylesheet" href="http://aries.apache.org/resources/site.css"></link>
+    </script><script src="http://aries.apache.org/resources/menus.js" language="javascript" type="text/javascript"></script>
 	<meta name="keywords" content="..."/>
 	<meta name="description" content="..." />
     <title>
@@ -43,10 +43,10 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="left" class="topbardiv" nowrap="">
-						<a href="http://incubator.apache.org/aries/" title="Apache Aries"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+						<a href="http://aries.apache.org/" title="Apache Aries"> <img border="0" src="http://aries.apache.org/images/Arieslogo_Horizontal.gif"> </a>
 					</td>
 					<td align="right" nowrap="">
-						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache_feather.png"> </a>
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://aries.apache.org/images/apache_feather.png"> </a>
       				</td>
 				</tr>
 			</table>
@@ -67,13 +67,13 @@
                 <!-- Quicklinks -->
 					<DIV style="padding: 5px 5px 0px 25px;">
 						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<!-- <A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> --> 
 						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
 						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
 						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
 						<INPUT name="btnG" type="submit" value="Search"></INPUT>
-						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
-						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="domains" type="hidden" value="aries.apache.org"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="aries.apache.org"></INPUT>
 						</FORM>
 					</DIV>
                 <!-- Quicklinks -->
@@ -100,61 +100,61 @@
 					<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/overview/boardreports.html">Board Reports</a> 
+        <a href="/overview/boardreports.html">Board Reports</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/overview/news.html">News</a> 
+        <a href="/overview/news.html">News</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('documentation')" id="documentationTitle" class="menutitle">Documentation</div>
 <div id="documentation" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/documentation/ariesprogrammingmodel.html">Programming Model</a> 
+        <a href="/documentation/ariesprogrammingmodel.html">Programming Model</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
+        <a href="/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/integrators-guide.html">Integrators Guide</a> 
+        <a href="/documentation/integrators-guide.html">Integrators Guide</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/articles.html">Articles</a> 
+        <a href="/documentation/articles.html">Articles</a> 
     </div>
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/slides/">Slides</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/slides/">Slides</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/tutorials.html">Tutorials</a> 
+        <a href="/documentation/tutorials.html">Tutorials</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('downloads')" id="downloadsTitle" class="menutitle">Downloads</div>
 <div id="downloads" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/downloads/currentrelease.html">Current Release</a> 
+        <a href="/downloads/currentrelease.html">Current Release</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/testresults.html">Compliance Tests</a> 
+        <a href="/downloads/testresults.html">Compliance Tests</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/releasenotes.html">Release Notes</a> 
+        <a href="/downloads/releasenotes.html">Release Notes</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/archived-releases.html">Archived Releases</a> 
+        <a href="/downloads/archived-releases.html">Archived Releases</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('community')" id="communityTitle" class="menutitle">Community</div>
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/community/overview.html">Community</a> 
+        <a href="/community/overview.html">Community</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/gettinginvolved.html">Getting Involved</a> 
+        <a href="/community/gettinginvolved.html">Getting Involved</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/people.html">Who we are</a> 
+        <a href="/community/people.html">Who we are</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/mailinglists.html">Mailing lists</a> 
+        <a href="/community/mailinglists.html">Mailing lists</a> 
     </div>
     <div class="menuitem">
         <a href="http://blogs.apache.org/aries/">Aries Group Blog</a> 
@@ -163,58 +163,58 @@
 <div onclick="SwitchMenu('development')" id="developmentTitle" class="menutitle">Development</div>
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/">Source Control</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
     </div>
     <div class="menuitem">
         <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/buildingaries.html">Building Aries </a> 
+        <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/moduledependencies.html">Module Dependencies</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/releasingaries.html">Releasing Aries </a> 
+        <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/compliancetesting.html">OSGi Compliance Tests </a> 
+        <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
         <a href="http://hudson.zones.apache.org/hudson/">Build System</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maintainingthewebpages.html">Web Site Maintenance </a> 
+        <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
 </div>
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
 <div id="modules" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/modules/samples.html">Samples</a> 
+        <a href="/modules/samples.html">Samples</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/blueprint.html">Blueprint</a> 
+        <a href="/modules/blueprint.html">Blueprint</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jndiproject.html">JNDI</a> 
+        <a href="/modules/jndiproject.html">JNDI</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jpaproject.html">JPA</a> 
+        <a href="/modules/jpaproject.html">JPA</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/applications.html">Applications</a> 
+        <a href="/modules/applications.html">Applications</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/transactionsproject.html">Transactions</a> 
+        <a href="/modules/transactionsproject.html">Transactions</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
+        <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/spi-fly.html">SPI Fly</a> 
+        <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('sponsorship')" id="sponsorshipTitle" class="menutitle">Sponsorship</div>
@@ -291,7 +291,7 @@ implementation to the last one found. </
      <div id="footer">
        <!-- Footer -->
        <div id="site-footer">
-         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+         <a href="http://aries.apache.org/privacy-policy.html";>Privacy
 Policy</a> 
        </div>
        <!-- Footer -->

Modified: websites/staging/aries/trunk/content/modules/transactionsproject.html
==============================================================================
--- websites/staging/aries/trunk/content/modules/transactionsproject.html (original)
+++ websites/staging/aries/trunk/content/modules/transactionsproject.html Wed Jan  5 09:01:09 2011
@@ -17,8 +17,8 @@
 -->
 <html>
   <head>
-    <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/aries/resources/site.css"></link>
-    </script><script src="http://incubator.apache.org/aries/resources/menus.js" language="javascript" type="text/javascript"></script>
+    <link type="text/css" rel="stylesheet" href="http://aries.apache.org/resources/site.css"></link>
+    </script><script src="http://aries.apache.org/resources/menus.js" language="javascript" type="text/javascript"></script>
 	<meta name="keywords" content="..."/>
 	<meta name="description" content="..." />
     <title>
@@ -43,10 +43,10 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="left" class="topbardiv" nowrap="">
-						<a href="http://incubator.apache.org/aries/" title="Apache Aries"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+						<a href="http://aries.apache.org/" title="Apache Aries"> <img border="0" src="http://aries.apache.org/images/Arieslogo_Horizontal.gif"> </a>
 					</td>
 					<td align="right" nowrap="">
-						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache_feather.png"> </a>
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://aries.apache.org/images/apache_feather.png"> </a>
       				</td>
 				</tr>
 			</table>
@@ -67,13 +67,13 @@
                 <!-- Quicklinks -->
 					<DIV style="padding: 5px 5px 0px 25px;">
 						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<!-- <A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> --> 
 						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
 						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
 						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
 						<INPUT name="btnG" type="submit" value="Search"></INPUT>
-						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
-						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="domains" type="hidden" value="aries.apache.org"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="aries.apache.org"></INPUT>
 						</FORM>
 					</DIV>
                 <!-- Quicklinks -->
@@ -100,61 +100,61 @@
 					<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/overview/boardreports.html">Board Reports</a> 
+        <a href="/overview/boardreports.html">Board Reports</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/overview/news.html">News</a> 
+        <a href="/overview/news.html">News</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('documentation')" id="documentationTitle" class="menutitle">Documentation</div>
 <div id="documentation" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/documentation/ariesprogrammingmodel.html">Programming Model</a> 
+        <a href="/documentation/ariesprogrammingmodel.html">Programming Model</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
+        <a href="/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/integrators-guide.html">Integrators Guide</a> 
+        <a href="/documentation/integrators-guide.html">Integrators Guide</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/articles.html">Articles</a> 
+        <a href="/documentation/articles.html">Articles</a> 
     </div>
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/slides/">Slides</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/slides/">Slides</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/tutorials.html">Tutorials</a> 
+        <a href="/documentation/tutorials.html">Tutorials</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('downloads')" id="downloadsTitle" class="menutitle">Downloads</div>
 <div id="downloads" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/downloads/currentrelease.html">Current Release</a> 
+        <a href="/downloads/currentrelease.html">Current Release</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/testresults.html">Compliance Tests</a> 
+        <a href="/downloads/testresults.html">Compliance Tests</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/releasenotes.html">Release Notes</a> 
+        <a href="/downloads/releasenotes.html">Release Notes</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/archived-releases.html">Archived Releases</a> 
+        <a href="/downloads/archived-releases.html">Archived Releases</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('community')" id="communityTitle" class="menutitle">Community</div>
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/community/overview.html">Community</a> 
+        <a href="/community/overview.html">Community</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/gettinginvolved.html">Getting Involved</a> 
+        <a href="/community/gettinginvolved.html">Getting Involved</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/people.html">Who we are</a> 
+        <a href="/community/people.html">Who we are</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/mailinglists.html">Mailing lists</a> 
+        <a href="/community/mailinglists.html">Mailing lists</a> 
     </div>
     <div class="menuitem">
         <a href="http://blogs.apache.org/aries/">Aries Group Blog</a> 
@@ -163,58 +163,58 @@
 <div onclick="SwitchMenu('development')" id="developmentTitle" class="menutitle">Development</div>
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/">Source Control</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
     </div>
     <div class="menuitem">
         <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/buildingaries.html">Building Aries </a> 
+        <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/moduledependencies.html">Module Dependencies</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/releasingaries.html">Releasing Aries </a> 
+        <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/compliancetesting.html">OSGi Compliance Tests </a> 
+        <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
         <a href="http://hudson.zones.apache.org/hudson/">Build System</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maintainingthewebpages.html">Web Site Maintenance </a> 
+        <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
 </div>
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
 <div id="modules" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/modules/samples.html">Samples</a> 
+        <a href="/modules/samples.html">Samples</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/blueprint.html">Blueprint</a> 
+        <a href="/modules/blueprint.html">Blueprint</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jndiproject.html">JNDI</a> 
+        <a href="/modules/jndiproject.html">JNDI</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jpaproject.html">JPA</a> 
+        <a href="/modules/jpaproject.html">JPA</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/applications.html">Applications</a> 
+        <a href="/modules/applications.html">Applications</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/transactionsproject.html">Transactions</a> 
+        <a href="/modules/transactionsproject.html">Transactions</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
+        <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/spi-fly.html">SPI Fly</a> 
+        <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('sponsorship')" id="sponsorshipTitle" class="menutitle">Sponsorship</div>
@@ -254,7 +254,7 @@ Release 4, Version 4.2" available for pu
      <div id="footer">
        <!-- Footer -->
        <div id="site-footer">
-         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+         <a href="http://aries.apache.org/privacy-policy.html";>Privacy
 Policy</a> 
        </div>
        <!-- Footer -->

Modified: websites/staging/aries/trunk/content/overview/boardreports.html
==============================================================================
--- websites/staging/aries/trunk/content/overview/boardreports.html (original)
+++ websites/staging/aries/trunk/content/overview/boardreports.html Wed Jan  5 09:01:09 2011
@@ -17,8 +17,8 @@
 -->
 <html>
   <head>
-    <link type="text/css" rel="stylesheet" href="http://incubator.apache.org/aries/resources/site.css"></link>
-    </script><script src="http://incubator.apache.org/aries/resources/menus.js" language="javascript" type="text/javascript"></script>
+    <link type="text/css" rel="stylesheet" href="http://aries.apache.org/resources/site.css"></link>
+    </script><script src="http://aries.apache.org/resources/menus.js" language="javascript" type="text/javascript"></script>
 	<meta name="keywords" content="..."/>
 	<meta name="description" content="..." />
     <title>
@@ -43,10 +43,10 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="left" class="topbardiv" nowrap="">
-						<a href="http://incubator.apache.org/aries/" title="Apache Aries"> <img border="0" src="http://incubator.apache.org/aries/images/Arieslogo_Horizontal.gif"> </a>
+						<a href="http://aries.apache.org/" title="Apache Aries"> <img border="0" src="http://aries.apache.org/images/Arieslogo_Horizontal.gif"> </a>
 					</td>
 					<td align="right" nowrap="">
-						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://incubator.apache.org/aries/images/apache_feather.png"> </a>
+						<a href="http://www.apache.org/" title="The Apache Software Foundation"> <img border="0" src="http://aries.apache.org/images/apache_feather.png"> </a>
       				</td>
 				</tr>
 			</table>
@@ -67,13 +67,13 @@
                 <!-- Quicklinks -->
 					<DIV style="padding: 5px 5px 0px 25px;">
 						<FORM action="http://www.google.com/search" method="get" style="font-size: 10px;">
-						<A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> 
+						<!-- <A href="http://www.apache.org/licenses/LICENSE-2.0.html" class="external-link" rel="nofollow">License</A> <A href="sitemap.html" title="SiteMap">Site Map</A> --> 
 						<INPUT name="ie" type="hidden" value="UTF-8"></INPUT>
 						<INPUT name="oe" type="hidden" value="UTF-8"></INPUT>
 						<INPUT maxlength="255" name="q" size="15" type="text" value></INPUT>
 						<INPUT name="btnG" type="submit" value="Search"></INPUT>
-						<INPUT name="domains" type="hidden" value="incubator.apache.org/aries"></INPUT>
-						<INPUT name="sitesearch" type="hidden" value="incubator.apache.org/aries"></INPUT>
+						<INPUT name="domains" type="hidden" value="aries.apache.org"></INPUT>
+						<INPUT name="sitesearch" type="hidden" value="aries.apache.org"></INPUT>
 						</FORM>
 					</DIV>
                 <!-- Quicklinks -->
@@ -100,61 +100,61 @@
 					<div onclick="SwitchMenu('overview')" id="overviewTitle" class="menutitle">Overview</div>
 <div id="overview" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/overview/boardreports.html">Board Reports</a> 
+        <a href="/overview/boardreports.html">Board Reports</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/overview/news.html">News</a> 
+        <a href="/overview/news.html">News</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('documentation')" id="documentationTitle" class="menutitle">Documentation</div>
 <div id="documentation" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/documentation/ariesprogrammingmodel.html">Programming Model</a> 
+        <a href="/documentation/ariesprogrammingmodel.html">Programming Model</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
+        <a href="/documentation/pointerstoosgispecifications.html">Pointers to OSGi specs</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/integrators-guide.html">Integrators Guide</a> 
+        <a href="/documentation/integrators-guide.html">Integrators Guide</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/articles.html">Articles</a> 
+        <a href="/documentation/articles.html">Articles</a> 
     </div>
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/slides/">Slides</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/slides/">Slides</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/documentation/tutorials.html">Tutorials</a> 
+        <a href="/documentation/tutorials.html">Tutorials</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('downloads')" id="downloadsTitle" class="menutitle">Downloads</div>
 <div id="downloads" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/downloads/currentrelease.html">Current Release</a> 
+        <a href="/downloads/currentrelease.html">Current Release</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/testresults.html">Compliance Tests</a> 
+        <a href="/downloads/testresults.html">Compliance Tests</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/releasenotes.html">Release Notes</a> 
+        <a href="/downloads/releasenotes.html">Release Notes</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/downloads/archived-releases.html">Archived Releases</a> 
+        <a href="/downloads/archived-releases.html">Archived Releases</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('community')" id="communityTitle" class="menutitle">Community</div>
 <div id="community" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/community/overview.html">Community</a> 
+        <a href="/community/overview.html">Community</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/gettinginvolved.html">Getting Involved</a> 
+        <a href="/community/gettinginvolved.html">Getting Involved</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/people.html">Who we are</a> 
+        <a href="/community/people.html">Who we are</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/community/mailinglists.html">Mailing lists</a> 
+        <a href="/community/mailinglists.html">Mailing lists</a> 
     </div>
     <div class="menuitem">
         <a href="http://blogs.apache.org/aries/">Aries Group Blog</a> 
@@ -163,58 +163,58 @@
 <div onclick="SwitchMenu('development')" id="developmentTitle" class="menutitle">Development</div>
 <div id="development" class="menuitemgroup">
     <div class="menuitem">
-        <a href="https://svn.apache.org/repos/asf/incubator/aries/">Source Control</a> 
+        <a href="https://svn.apache.org/repos/asf/aries/">Source Control</a> 
     </div>
     <div class="menuitem">
         <a href="https://issues.apache.org/jira/browse/ARIES">Bug Tracking</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/buildingaries.html">Building Aries </a> 
+        <a href="/development/buildingaries.html">Building Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maven-best-practice-in-aries.html">Maven best practice</a> 
+        <a href="/development/maven-best-practice-in-aries.html">Maven best practice</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/moduledependencies.html">Module Dependencies</a> 
+        <a href="/development/moduledependencies.html">Module Dependencies</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/releasingaries.html">Releasing Aries </a> 
+        <a href="/development/releasingaries.html">Releasing Aries </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/compliancetesting.html">OSGi Compliance Tests </a> 
+        <a href="/development/compliancetesting.html">OSGi Compliance Tests </a> 
     </div>
     <div class="menuitem">
         <a href="http://hudson.zones.apache.org/hudson/">Build System</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/development/maintainingthewebpages.html">Web Site Maintenance </a> 
+        <a href="/development/maintainingthewebpages.html">Web Site Maintenance </a> 
     </div>
 </div>
 <div onclick="SwitchMenu('modules')" id="modulesTitle" class="menutitle">Modules</div>
 <div id="modules" class="menuitemgroup">
     <div class="menuitem">
-        <a href="/aries/modules/samples.html">Samples</a> 
+        <a href="/modules/samples.html">Samples</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/blueprint.html">Blueprint</a> 
+        <a href="/modules/blueprint.html">Blueprint</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jndiproject.html">JNDI</a> 
+        <a href="/modules/jndiproject.html">JNDI</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/jpaproject.html">JPA</a> 
+        <a href="/modules/jpaproject.html">JPA</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/applications.html">Applications</a> 
+        <a href="/modules/applications.html">Applications</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/transactionsproject.html">Transactions</a> 
+        <a href="/modules/transactionsproject.html">Transactions</a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
+        <a href="/modules/ebamavenpluginproject.html">EBA Maven Plugin </a> 
     </div>
     <div class="menuitem">
-        <a href="/aries/modules/spi-fly.html">SPI Fly</a> 
+        <a href="/modules/spi-fly.html">SPI Fly</a> 
     </div>
 </div>
 <div onclick="SwitchMenu('sponsorship')" id="sponsorshipTitle" class="menutitle">Sponsorship</div>
@@ -258,7 +258,7 @@
      <div id="footer">
        <!-- Footer -->
        <div id="site-footer">
-         <a href="http://incubator.apache.org/aries/privacy-policy.html";>Privacy
+         <a href="http://aries.apache.org/privacy-policy.html";>Privacy
 Policy</a> 
        </div>
        <!-- Footer -->



Mime
View raw message