Author: aadamchik
Date: Fri Jul 14 15:42:08 2006
New Revision: 422083

URL: http://svn.apache.org/viewvc?rev=422083&view=rev
Log:
brining the website in line with Apache incubator branding guidelines

Added:
    
incubator/cayenne/main/trunk/cayenne-site/static/images/apache-incubator-logo.png
   (with props)
Removed:
    incubator/cayenne/main/trunk/cayenne-site/static/images/andrus-email.jpg
    incubator/cayenne/main/trunk/cayenne-site/static/images/os_logo.gif
    
incubator/cayenne/main/trunk/cayenne-site/static/images/other/javanet_170.gif
    
incubator/cayenne/main/trunk/cayenne-site/static/images/other/objectstyle-llc-logo.gif
    incubator/cayenne/main/trunk/cayenne-site/xdocs/resources/
Modified:
    incubator/cayenne/main/trunk/cayenne-site/build-subproject.xml
    incubator/cayenne/main/trunk/cayenne-site/default.properties
    incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl
    incubator/cayenne/main/trunk/cayenne-site/xdocs/xml/index.xml

Modified: incubator/cayenne/main/trunk/cayenne-site/build-subproject.xml
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-site/build-subproject.xml?rev=422083&r1=422082&r2=422083&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-site/build-subproject.xml (original)
+++ incubator/cayenne/main/trunk/cayenne-site/build-subproject.xml Fri Jul 14 
15:42:08 2006
@@ -13,13 +13,7 @@
     <target name="assemble">
                <copy todir="${doc.root}">
                        <fileset dir="${build}/${subproject.name}/out"  
includes="**/*.html"/>
-
-                       <filterset begintoken="&lt;!--@" endtoken="@--&gt;">
-                               <filter token="SFLOGO" value="${sf.logo}"/>
-                       </filterset>
-                       <filterset begintoken="&lt;!--@" endtoken="@--&gt;">
-                               <filter token="JNLOGO" 
value="${java.net.logo}"/>
-                       </filterset>
+                       
                        <filterset begintoken="&lt;!--@" endtoken="@--&gt;">
                                <filter token="LICENSE" 
value="${license.text}"/>
                        </filterset>

Modified: incubator/cayenne/main/trunk/cayenne-site/default.properties
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-site/default.properties?rev=422083&r1=422082&r2=422083&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-site/default.properties (original)
+++ incubator/cayenne/main/trunk/cayenne-site/default.properties Fri Jul 14 
15:42:08 2006
@@ -10,8 +10,4 @@
 # Build output directory
 build = build
 
-lib.dir = lib
-
-# SourceForge logo replacement
-java.net.logo = <a href="http://www.java.net/";><img 
src="http://objectstyle.org/cayenne/images/other/javanet_170.gif"; width=120 
border=0 alt="Java.net"></a>
-sf.logo = <a href="http://sourceforge.net/projects/cayenne/";><img 
src=\"http:\/\/sourceforge.net/sflogo.php?group_id=48132&type=1" width=88 
height=31 border=0 alt="SourceForge.net Logo"></a>
\ No newline at end of file
+lib.dir = lib
\ No newline at end of file

Added: 
incubator/cayenne/main/trunk/cayenne-site/static/images/apache-incubator-logo.png
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-site/static/images/apache-incubator-logo.png?rev=422083&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
incubator/cayenne/main/trunk/cayenne-site/static/images/apache-incubator-logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl?rev=422083&r1=422082&r2=422083&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl 
(original)
+++ incubator/cayenne/main/trunk/cayenne-site/xdocs/templates/site.vsl Fri Jul 
14 15:42:08 2006
@@ -24,8 +24,8 @@
 <br>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
   <tbody><tr>
-    <td width="12%" height="70" align="right" valign="top" 
background="${relativePath}/images/778899.gif">
-       <a href="http://objectstyle.org/";><img border="0" 
src="${relativePath}/images/os_logo.gif" width="160" height="32"></a>
+    <td width="12%" height="70" align="center" valign="top" 
background="${relativePath}/images/778899.gif">
+       <a href="http://apache.org/incubator/cayenne/";><img border="0" 
src="${relativePath}/images/apache-incubator-logo.png" width="160"></a>
     </td>
     <td width="1" bgcolor="#333333"><img 
src="${relativePath}/images/spacer.gif" width="1" height="1"></td>
     <td width="${centralWidth}" align="right" 
background="${relativePath}/images/cccc99.gif">
@@ -51,12 +51,6 @@
             <br>
 
 search          </form>          </td>
-      </tr>
-      <tr>
-        <td align="right"><[EMAIL PROTECTED]@--></td>
-      </tr>
-      <tr>
-        <td align="right"><[EMAIL PROTECTED]@--></td>
       </tr>
     </tbody></table></td>
     <td width="1" bgcolor="#333333"><img 
src="${relativePath}/images/spacer.gif" width="1" height="1"></td>

Modified: incubator/cayenne/main/trunk/cayenne-site/xdocs/xml/index.xml
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-site/xdocs/xml/index.xml?rev=422083&r1=422082&r2=422083&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-site/xdocs/xml/index.xml (original)
+++ incubator/cayenne/main/trunk/cayenne-site/xdocs/xml/index.xml Fri Jul 14 
15:42:08 2006
@@ -1,79 +1,208 @@
 <?xml version="1.0"?>
 <document>
-    <title>Overview</title>
+       <title>Overview</title>
 
-    <body>        
-         <section name="Cayenne: Professional Object Relational Mapping">
-        <p>Cayenne is a powerful, full-featured Java Object Relational Mapping 
framework. It is open source
-        and completely free. Cayenne cross-platform modeling GUI tools place 
it in the league of its own, 
-        making it a very attractive
-        choice over both closed source commercial products and traditional 
"edit your own XML" open 
-        source solutions.
-        </p>
-        
-        <p>Cayenne provides management of persistent Java objects mapped to 
relational databases, 
-        single method call queries and updates (including atomic updates of 
all modified objects), 
-        seamless integration of multiple databases into a single virtual data 
source. 
-        Cayenne is distributed with CayenneModeler - a complete GUI mapping 
tool. Cayenne has been successfully deployed in 
-        production environment on high volume sites and has a constantly 
growing international community.</p>
-        
-        <p>Cayenne is a true open source project drawing its strength from the 
developer and user community.</p>
-        </section>
-        
-        <section name="Project News">
-        <a 
href="http://objectstyle.org/confluence/createrssfeed.action?types=blogpost&amp;statuses=created&amp;spaces=CAY&amp;rssType=rss1&amp;maxResults=10&amp;timeSpan=60&amp;publicFeed=true&amp;title=Cayenne+News";><img
 align="left" src="images/rss.png" border="0" hspace="3"/></a><br/>
-        
-<p><u><i>[June 23, 2006]</i></u> <strong>Cayenne 1.2 Release Candidate 2 Is 
Available</strong></p>
-               <p>It includes a new "Quick Start" tutorial and fixes remaining 
bugs. Check out
-               <a 
href="http://objectstyle.org/confluence/display/CAY/2006/06/23/";>full release 
announcement</a>.</p>
-               
-<p><u><i>[March 20, 2006]</i></u> <strong>Cayenne Accepted to Apache 
Incubator</strong></p>
-               <p>Some time ago Cayenne developers submitted a proposal to the 
ASF to join Apache. Recently
-               we've been accepted to <a 
href="http://incubator.apache.org/projects/cayenne.html";>Apache
-               Incubator</a>. We are in the process of the infrastructure 
migration to Apache. Watch the
-               mailing list (that has already been migrated) for further 
updates.</p>
- 
-       
-
-
-       <p><u><i>[Sep 4, 2005]</i></u> <strong>More Cayenne Success 
Stories</strong></p>
-       <p>Recently two more big sites reported success using Cayenne. First 
one is 
-       US Government <a target="_new" href="http://www.glin.gov/";>Global Legal 
-       Information Network</a> (GLIN) - a huge full-text searchable online 
database 
-       of legal information. (They are doing some very interesting stuff with 
database internationalization!)
-       Second one is <a target="_new" 
href="http://www.rossoalice.it/";>RossoAlice</a> - 
-       an Italian media portal. For more details go <a 
href="poweredby.html">here</a>.</p>
-
-           
-
-        <p><u><i>[Aug 30, 2004]</i></u> <strong>Cayenne on the Cover of 
JavaWorld Japan</strong></p>
-               <p><img align="left" hspace="3" height="80" 
src="images/other/javaworld-200409.gif"/>
-               Cayenne sure gets some press coverage in Japan lately. A 
September edition of JavaWorld Japan has 
-               a big article on Cayenne, including a sample Tapestry 
application
-               (pp. 94-112, Cayenne 1.0.7 is used). Big thanks to Manabu 
Yoneyama for sending me a copy of the magazine.
-               <br/><br/><br/><br/></p>
-                               
-        <p><u><i>[June 2, 2004]</i></u> <strong>Cayenne Article on 
TheServerSide.com</strong></p>
-               <p><img align="left" width="73" height="45" hspace="3" 
src="images/other/cayenne_tss.gif"/>  TheServerSide.com <a target="_blank" 
href="http://theserverside.com/articles/article.tss?l=Cayenne";>published 
-               an article</a>  by Andrus Adamchik and Eric Schneider 
introducing
-               Cayenne and its productivity tools.  Discuss this article on <a 
target="_blank" 
-               
href="http://theserverside.com/news/thread.tss?thread_id=26325";>TheServerSide 
forum</a>.
-               <br/><br/></p>
-               
-        <p><u><i>[May 1 2003]</i></u> <strong>National Hockey League Switches 
to Cayenne</strong></p>
-        
-        <p><img align="left" hspace="3" src="images/other/nhl_logo.gif"/> 
-        After the initial trial of Cayenne last October, NHL
-        switched all their public applications running at <a 
href="http://www.nhl.com";>NHL.com</a>
-        to use Cayenne. With the help from <a 
href="http://objectstyle.com";>ObjectStyle</a> and 
-        <a href="http://www.centralparksoftware.com/";>Central Park 
Software</a> the site was successfully
-        launched to production. Currently applications receive more than 5 
million hits a day. 
-        <br/><br/>
-        </p>
-<p> </p>
-        
-        <p><a 
href="http://objectstyle.org/confluence/pages/viewrecentblogposts.action?key=CAY";><strong>all
 news...</strong></a></p>
-        
-        </section>
-      </body>
+       <body>
+               <section name="Disclaimer">
+                       <p>
+                               <i>
+                                       Apache Cayenne is an effort undergoing 
incubation at
+                                       The Apache Software Foundation (ASF), 
sponsored by
+                                       the DB PMC. Incubation is required of 
all newly
+                                       accepted projects until a further 
review indicates
+                                       that the infrastructure, 
communications, and
+                                       decision making process have stabilized 
in a manner
+                                       consistent with other successful ASF 
projects. While
+                                       incubation status is not necessarily a 
reflection of
+                                       the completeness or stability of the 
code, it does
+                                       indicate that the project has yet to be 
fully
+                                       endorsed by the ASF.
+                               </i>
+                       </p>
+               </section>
+
+               <section
+                       name="Apache Cayenne: Professional Object Relational 
Mapping">
+                       <p>
+                               Apache Cayenne is a powerful, full-featured 
Java Object
+                               Relational Mapping framework. It is open source 
and
+                               completely free. Cayenne cross-platform 
modeling GUI
+                               tools place it in the league of its own, making 
it a
+                               very attractive choice over both closed source
+                               commercial products and traditional "edit your 
own XML"
+                               open source solutions.
+                       </p>
+
+                       <p>
+                               Cayenne provides management of persistent Java 
objects
+                               mapped to relational databases, single method 
call
+                               queries and updates (including atomic updates 
of all
+                               modified objects), seamless integration of 
multiple
+                               databases into a single virtual data source. 
Cayenne is
+                               distributed with CayenneModeler - a complete 
GUI mapping
+                               tool. Cayenne has been successfully deployed in
+                               production environment on high volume sites and 
has a
+                               constantly growing international community.
+                       </p>
+
+                       <p>
+                               Cayenne is a true open source project drawing 
its
+                               strength from the developer and user community.
+                       </p>
+               </section>
+
+               <section name="Project News">
+                       <a
+                               
href="http://objectstyle.org/confluence/createrssfeed.action?types=blogpost&amp;statuses=created&amp;spaces=CAY&amp;rssType=rss1&amp;maxResults=10&amp;timeSpan=60&amp;publicFeed=true&amp;title=Cayenne+News";>
+                               <img align="left" src="images/rss.png" 
border="0"
+                                       hspace="3" />
+                       </a>
+                       <br />
+
+                       <p>
+                               <u>
+                                       <i>[June 23, 2006]</i>
+                               </u>
+                               <strong>
+                                       Cayenne 1.2 Release Candidate 2 Is 
Available
+                               </strong>
+                       </p>
+                       <p>
+                               It includes a new "Quick Start" tutorial and 
fixes
+                               remaining bugs. Check out
+                               <a
+                                       
href="http://objectstyle.org/confluence/display/CAY/2006/06/23/";>
+                                       full release announcement
+                               </a>
+                               .
+                       </p>
+
+                       <p>
+                               <u>
+                                       <i>[March 20, 2006]</i>
+                               </u>
+                               <strong>Cayenne Accepted to Apache 
Incubator</strong>
+                       </p>
+                       <p>
+                               Some time ago Cayenne developers submitted a 
proposal to
+                               the ASF to join Apache. Recently we've been 
accepted to
+                               <a
+                                       
href="http://incubator.apache.org/projects/cayenne.html";>
+                                       Apache Incubator
+                               </a>
+                               . We are in the process of the infrastructure 
migration
+                               to Apache. Watch the mailing list (that has 
already been
+                               migrated) for further updates.
+                       </p>
+
+
+                       <p>
+                               <u>
+                                       <i>[Sep 4, 2005]</i>
+                               </u>
+                               <strong>More Cayenne Success Stories</strong>
+                       </p>
+                       <p>
+                               Recently two more big sites reported success 
using
+                               Cayenne. First one is US Government
+                               <a target="_new" href="http://www.glin.gov/";>
+                                       Global Legal Information Network
+                               </a>
+                               (GLIN) - a huge full-text searchable online 
database of
+                               legal information. (They are doing some very 
interesting
+                               stuff with database internationalization!) 
Second one is
+                               <a target="_new" 
href="http://www.rossoalice.it/";>
+                                       RossoAlice
+                               </a>
+                               - an Italian media portal. For more details go
+                               <a href="poweredby.html">here</a>
+                               .
+                       </p>
+
+
+
+                       <p>
+                               <u>
+                                       <i>[Aug 30, 2004]</i>
+                               </u>
+                               <strong>Cayenne on the Cover of JavaWorld 
Japan</strong>
+                       </p>
+                       <p>
+                               <img align="left" hspace="3" height="80"
+                                       src="images/other/javaworld-200409.gif" 
/>
+                               Cayenne sure gets some press coverage in Japan 
lately. A
+                               September edition of JavaWorld Japan has a big 
article
+                               on Cayenne, including a sample Tapestry 
application (pp.
+                               94-112, Cayenne 1.0.7 is used). Big thanks to 
Manabu
+                               Yoneyama for sending me a copy of the magazine.
+                               <br />
+                               <br />
+                               <br />
+                               <br />
+                       </p>
+
+                       <p>
+                               <u>
+                                       <i>[June 2, 2004]</i>
+                               </u>
+                               <strong>Cayenne Article on 
TheServerSide.com</strong>
+                       </p>
+                       <p>
+                               <img align="left" width="73" height="45" 
hspace="3"
+                                       src="images/other/cayenne_tss.gif" />
+                               TheServerSide.com
+                               <a target="_blank"
+                                       
href="http://theserverside.com/articles/article.tss?l=Cayenne";>
+                                       published an article
+                               </a>
+                               by Andrus Adamchik and Eric Schneider 
introducing
+                               Cayenne and its productivity tools. Discuss 
this article
+                               on
+                               <a target="_blank"
+                                       
href="http://theserverside.com/news/thread.tss?thread_id=26325";>
+                                       TheServerSide forum
+                               </a>
+                               .
+                               <br />
+                               <br />
+                       </p>
+
+                       <p>
+                               <u>
+                                       <i>[May 1 2003]</i>
+                               </u>
+                               <strong>
+                                       National Hockey League Switches to 
Cayenne
+                               </strong>
+                       </p>
+
+                       <p>
+                               <img align="left" hspace="3"
+                                       src="images/other/nhl_logo.gif" />
+                               After the initial trial of Cayenne last 
October, NHL
+                               switched all their public applications running 
at
+                               <a href="http://www.nhl.com";>NHL.com</a>
+                               to use Cayenne. With the help from
+                               <a href="http://objectstyle.com";>ObjectStyle</a>
+                               and
+                               <a href="http://www.centralparksoftware.com/";>
+                                       Central Park Software
+                               </a>
+                               the site was successfully launched to 
production.
+                               Currently applications receive more than 5 
million hits
+                               a day.
+                               <br />
+                               <br />
+                       </p>
+                       <p></p>
+
+                       <p>
+                               <a
+                                       
href="http://objectstyle.org/confluence/pages/viewrecentblogposts.action?key=CAY";>
+                                       <strong>all news...</strong>
+                               </a>
+                       </p>
+
+               </section>
+       </body>
 </document>


Reply via email to