You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by bu...@apache.org on 2012/12/09 14:13:50 UTC

svn commit: r841236 [28/35] - in /websites/staging/openjpa/trunk/content: ./ artifacts/ css/ images/ images/datacache-plugin/

Added: websites/staging/openjpa/trunk/content/privacy-policy.html
==============================================================================
--- websites/staging/openjpa/trunk/content/privacy-policy.html (added)
+++ websites/staging/openjpa/trunk/content/privacy-policy.html Sun Dec  9 13:13:35 2012
@@ -0,0 +1,207 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html lang="en">
+    <head>
+        <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+        <link href="http://openjpa.apache.org/styles/site.css" rel="stylesheet" type="text/css"/>
+        <!-- <link href="http://openjpa.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css"/> -->
+        <link href="./css/type-settings.css" rel="stylesheet" type="text/css"/>
+        <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+        <META name="Description" content="Apache OpenJPA -- Privacy Policy
" />
+        <META name="Keywords" content="Apache OpenJPA, JPA, JPA 1.0, JSR-220, JPA2, JPA 2.0, JSR-317, " />
+        <META name="Owner" content="dev@openjpa.apache.org" />
+        <META name="Robots" content="index, follow" />
+        <META name="Security" content="Public" />
+        <META name="Source" content="wiki template" />
+        <META name="DC.Date" scheme="iso8601" content="2010-08-11" />
+        <META name="DC.Language" scheme="rfc1766" content="en" />
+        <META name="DC.Rights" content="Copyright © 2006,2010 The Apache Software Foundation" />
+        <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+        <title>
+            Apache OpenJPA --
+        </title>
+    </head>
+    <body>
+        <div class="white_box">
+            <div class="header">
+                <div class="header_l">
+                    <div class="header_r">
+                    </div>
+                </div>
+            </div>
+            <div class="content">
+                <div class="content_l">
+                    <div class="content_r">
+                        <div>
+                            <!-- Banner -->
+                            <TABLE valign="top" border="0" cellspacing="0" cellpadding="5" width="100%" background="images/header-bg3.png">
+                                <TR>
+                                    <TD valing="top" align="left">
+                                        <A href="http://openjpa.apache.org/"><IMG src="images/openjpa-logo.png" border="0" alt="OpenJPA Logo"></A>
+                                    </TD>
+                                    <TD width="100%">
+                                        &nbsp;
+                                    </TD>
+                                    <TD valing="top" align="right">
+                                        <A href="http://www.apache.org/"><IMG src="images/asf_logo_wide2.png" border="0" alt="ASF Logo"></A>
+                                    </TD>
+                                </TR>
+                            </TABLE>
+
+                            <!-- Navigation Bar -->
+                            <div class="bottom_red_bar">
+                                <div id="site-breadcrumbs">
+                                    <!-- Breadcrumbs --
+                                    <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/privacy-policy.html">Privacy Policy
</a>
+                                     -- Breadcrumbs -->
+                                </div>
+                            </div>
+
+                            <!-- Content -->
+                            <table border="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="top">
+                                            <div class="navigation">
+                                                <div class="navigation_top">
+                                                    <div class="navigation_bottom">
+                                                        <!-- NavigationBar -->
+                                                        <h3><a name="SideNav-Overview"></a><a href="overview.html" title="Overview">Overview</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="quick-start.html" title="Quick Start">Quick Start</a></li>
+                                                            <li><a href="documentation.html" title="Documentation">Documentation</a></li>
+                                                            <li><a href="downloads.html" title="Downloads">Downloads</a></li>
+                                                            <li><a href="site-index.html" title="Site Index">Site Index</a></li>
+                                                            <li><a href="license.html" title="License">License</a></li>
+                                                            <li><a href="privacy-policy.html" title="Privacy Policy">Privacy Policy</a></li>
+                                                        </ul>
+
+                                                        <h3><a name="SideNav-Community"></a><a href="community.html" title="Community">Community</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="index.html#Index-eventsandnews" title="Events and News">Events and News</a></li>
+                                                            <li><a href="found-a-bug.html" title="Found a Bug">Found a Bug</a>?</li>
+                                                            <li><a href="get-involved.html" title="Get Involved">Get Involved</a></li>
+                                                            <li><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+                                                            <li><a href="committers.html" title="Committers">Committers</a></li>
+                                                            <li><a href="integration.html" title="Integration">Integration</a></li>
+                                                            <li><a href="powered-by.html" title="Powered By">Powered By</a></li>
+                                                            <li><a href="thanks.html" title="Thanks">Thanks</a></li>
+                                                        </ul>
+
+
+                                                        <h3><a name="SideNav-Development"></a><a href="development.html" title="Development">Development</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="http://issues.apache.org/jira/browse/OPENJPA" class="external-link" rel="nofollow">Issue Tracker</a></li>
+                                                            <li><a href="source-code.html" title="Source Code">Source Code</a></li>
+                                                            <li><a href="testing.html" title="Testing">Testing</a></li>
+                                                            <li><a href="tools.html" title="Tools">Tools</a></li>
+                                                            <li><a href="samples.html" title="Samples">Samples</a></li>
+                                                            <li><a href="release-management.html" title="Release Management">Release Management</a></li>
+                                                        </ul>
+
+                                                        <h3>Search</h3>
+
+                                                        <div style="padding: 5px 5px 0px 25px;">
+                                                            <form action="http://www.google.com/search" method="get" style="font-size: 10px;">
+                                                                <input name="ie" type="hidden" value="UTF-8">
+                                                                <input name="oe" type="hidden" value="UTF-8">
+                                                                <input maxlength="255" name="q" size="9" type="text" value=""><br><br>
+                                                                <input name="btnG" type="submit" value="Google">
+                                                                <input name="domains" type="hidden" value="openjpa.apache.org">
+                                                                <input name="sitesearch" type="hidden" value="openjpa.apache.org">
+                                                            </form>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                        <td valign="top" width="100%" style="overflow:hidden;">
+                                            <div class="wiki-content">
+                                                <p><a name="Privacy-Policy"></a></p>
+<p>All materials provided on the Apache OpenJPA website (openjpa.apache.org)
+is Copyright &copy; 2005-2009, The Apache Software Foundation and Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">ASL 2.0</a>
+.</p>
+<p>Privacy Policy - Last Updated:  April 29, 2009</p>
+<p>Information about your use of this website is collected using <a href="http://people.apache.org/~vgritsenko/stats/">server access logs</a>
+ and a tracking cookie.  The collected information consists of the following:</p>
+<ul>
+<li>The IP address from which you access the website;</li>
+<li>The type of browser and operating system you use to access our site;</li>
+<li>The date and time you access our site;</li>
+<li>The pages you visit; and</li>
+<li>The addresses of pages from where you followed a link to our site.</li>
+</ul>
+<p>Part of this information is gathered using a tracking cookie set by the <a href="http://www.google.com/analytics/">Google Analytics</a>
+ service and handled by Google as described in their <a href="http://www.google.com/privacy.html">privacy policy</a>
+. See your browser documentation for instructions on how to disable the
+cookie if you prefer not to share this data with Google.</p>
+<p>We use the gathered information to help us make our site more useful to
+visitors and to better understand how and when our site is used. We do not
+track or collect personally identifiable information or associate gathered
+data with any personally identifying information from other sources.</p>
+<p>By using this website, you consent to the collection of this data in the
+manner and for the purpose described above.</p>
+<p>Occasionally, at our discretion, we may include links to other third party
+content or services on our website. These third party sites have separate
+and independent privacy policies and therefore we have no responsibility or
+liability for the content and activities of these linked sites.</p>
+<p>If we make changes to our privacy policy, we will send a notification to
+our mailing lists <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#117;&#115;&#101;&#114;&#115;&#64;&#111;&#112;&#101;&#110;&#106;&#112;&#97;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#117;&#115;&#101;&#114;&#115;&#64;&#111;&#112;&#101;&#110;&#106;&#112;&#97;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a> and <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#100;&#101;&#118;&#64;&#111;&#112;&#101;&#110;&#106;&#112;&#97;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#100;&#101;&#118;&#64;&#111;&#112;&#101;&#110;&#106;&#112;&#97;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>
+along with updating the "Last Updated" date at the top of this page.</p>
+<p>If there are any questions regarding this privacy policy, you can contact
+us on the following mailing list <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#112;&#114;&#105;&#118;&#97;&#116;&#101;&#64;&#111;&#112;&#101;&#110;&#106;&#112;&#97;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#112;&#114;&#105;&#118;&#97;&#116;&#101;&#64;&#111;&#112;&#101;&#110;&#106;&#112;&#97;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>.</p>
+                                            </div>
+                                        </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <div class="bottom_red_bar"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="black_box">
+                    <div class="footer">
+                        <div class="footer_l">
+                            <div class="footer_r">
+                                <div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="design_attribution">
+                Copyright (C) 2006,2012 The Apache Software Foundation. Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.<br />
+                Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.<br />
+                Other names may be trademarks of their respective owners.<br />
+            </div>
+
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+        </script>
+        <script type="text/javascript">
+            _uacct = "UA-1940143-1";
+            urchinTracker();
+        </script>
+
+    </body>
+</html>

Added: websites/staging/openjpa/trunk/content/publishing-serp-to-maven-central-repository.html
==============================================================================
--- websites/staging/openjpa/trunk/content/publishing-serp-to-maven-central-repository.html (added)
+++ websites/staging/openjpa/trunk/content/publishing-serp-to-maven-central-repository.html Sun Dec  9 13:13:35 2012
@@ -0,0 +1,287 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html lang="en">
+    <head>
+        <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+        <link href="http://openjpa.apache.org/styles/site.css" rel="stylesheet" type="text/css"/>
+        <!-- <link href="http://openjpa.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css"/> -->
+        <link href="./css/type-settings.css" rel="stylesheet" type="text/css"/>
+        <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+        <META name="Description" content="Apache OpenJPA -- Publishing Serp to Maven Central Repository
" />
+        <META name="Keywords" content="Apache OpenJPA, JPA, JPA 1.0, JSR-220, JPA2, JPA 2.0, JSR-317, " />
+        <META name="Owner" content="dev@openjpa.apache.org" />
+        <META name="Robots" content="index, follow" />
+        <META name="Security" content="Public" />
+        <META name="Source" content="wiki template" />
+        <META name="DC.Date" scheme="iso8601" content="2010-08-11" />
+        <META name="DC.Language" scheme="rfc1766" content="en" />
+        <META name="DC.Rights" content="Copyright © 2006,2010 The Apache Software Foundation" />
+        <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+        <title>
+            Apache OpenJPA --
+        </title>
+    </head>
+    <body>
+        <div class="white_box">
+            <div class="header">
+                <div class="header_l">
+                    <div class="header_r">
+                    </div>
+                </div>
+            </div>
+            <div class="content">
+                <div class="content_l">
+                    <div class="content_r">
+                        <div>
+                            <!-- Banner -->
+                            <TABLE valign="top" border="0" cellspacing="0" cellpadding="5" width="100%" background="images/header-bg3.png">
+                                <TR>
+                                    <TD valing="top" align="left">
+                                        <A href="http://openjpa.apache.org/"><IMG src="images/openjpa-logo.png" border="0" alt="OpenJPA Logo"></A>
+                                    </TD>
+                                    <TD width="100%">
+                                        &nbsp;
+                                    </TD>
+                                    <TD valing="top" align="right">
+                                        <A href="http://www.apache.org/"><IMG src="images/asf_logo_wide2.png" border="0" alt="ASF Logo"></A>
+                                    </TD>
+                                </TR>
+                            </TABLE>
+
+                            <!-- Navigation Bar -->
+                            <div class="bottom_red_bar">
+                                <div id="site-breadcrumbs">
+                                    <!-- Breadcrumbs --
+                                    <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/publishing-serp-to-maven-central-repository.html">Publishing Serp to Maven Central Repository
</a>
+                                     -- Breadcrumbs -->
+                                </div>
+                            </div>
+
+                            <!-- Content -->
+                            <table border="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="top">
+                                            <div class="navigation">
+                                                <div class="navigation_top">
+                                                    <div class="navigation_bottom">
+                                                        <!-- NavigationBar -->
+                                                        <h3><a name="SideNav-Overview"></a><a href="overview.html" title="Overview">Overview</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="quick-start.html" title="Quick Start">Quick Start</a></li>
+                                                            <li><a href="documentation.html" title="Documentation">Documentation</a></li>
+                                                            <li><a href="downloads.html" title="Downloads">Downloads</a></li>
+                                                            <li><a href="site-index.html" title="Site Index">Site Index</a></li>
+                                                            <li><a href="license.html" title="License">License</a></li>
+                                                            <li><a href="privacy-policy.html" title="Privacy Policy">Privacy Policy</a></li>
+                                                        </ul>
+
+                                                        <h3><a name="SideNav-Community"></a><a href="community.html" title="Community">Community</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="index.html#Index-eventsandnews" title="Events and News">Events and News</a></li>
+                                                            <li><a href="found-a-bug.html" title="Found a Bug">Found a Bug</a>?</li>
+                                                            <li><a href="get-involved.html" title="Get Involved">Get Involved</a></li>
+                                                            <li><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+                                                            <li><a href="committers.html" title="Committers">Committers</a></li>
+                                                            <li><a href="integration.html" title="Integration">Integration</a></li>
+                                                            <li><a href="powered-by.html" title="Powered By">Powered By</a></li>
+                                                            <li><a href="thanks.html" title="Thanks">Thanks</a></li>
+                                                        </ul>
+
+
+                                                        <h3><a name="SideNav-Development"></a><a href="development.html" title="Development">Development</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="http://issues.apache.org/jira/browse/OPENJPA" class="external-link" rel="nofollow">Issue Tracker</a></li>
+                                                            <li><a href="source-code.html" title="Source Code">Source Code</a></li>
+                                                            <li><a href="testing.html" title="Testing">Testing</a></li>
+                                                            <li><a href="tools.html" title="Tools">Tools</a></li>
+                                                            <li><a href="samples.html" title="Samples">Samples</a></li>
+                                                            <li><a href="release-management.html" title="Release Management">Release Management</a></li>
+                                                        </ul>
+
+                                                        <h3>Search</h3>
+
+                                                        <div style="padding: 5px 5px 0px 25px;">
+                                                            <form action="http://www.google.com/search" method="get" style="font-size: 10px;">
+                                                                <input name="ie" type="hidden" value="UTF-8">
+                                                                <input name="oe" type="hidden" value="UTF-8">
+                                                                <input maxlength="255" name="q" size="9" type="text" value=""><br><br>
+                                                                <input name="btnG" type="submit" value="Google">
+                                                                <input name="domains" type="hidden" value="openjpa.apache.org">
+                                                                <input name="sitesearch" type="hidden" value="openjpa.apache.org">
+                                                            </form>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                        <td valign="top" width="100%" style="overflow:hidden;">
+                                            <div class="wiki-content">
+                                                <p><a name="PublishingSerptoMavenCentralRepository-PublishingSerptoMavenCentralRepository"></a></p>
+<h1 id="publishing-serp-to-maven-central-repository">Publishing Serp to Maven Central Repository</h1>
+<p><a name="PublishingSerptoMavenCentralRepository-SerpProject"></a></p>
+<h2 id="serp-project">Serp Project</h2>
+<p>Serp is used by OpenJPA for the bytecode enhancement processing.  It is
+maintained as a <a href="http://sourceforge.net/projects/serp">SourceForge project</a>
+.  Serp has been a very solid third-party dependent software project. 
+OpenJPA has had a dependency on Serp v1.13.1 for a long time.  Recently, a
+problem was discovered <a href="http://issues.apache.org/jira/browse/OPENJPA-2240">JIRA OPENJPA-2240</a> which
+required an update to Serp.  Eventually, it was determined that this
+problem was resolved in the 1.14.1 version of Serp.  Unfortunately, the
+last version of Serp that was published to Maven Central was version
+1.13.1.  This page discusses how to get an updated Serp release into the
+Maven Central repository.</p>
+<p>SourceForge Serp:  <a href="https://sourceforge.net/projects/serp/">https://sourceforge.net/projects/serp/</a> <br/>
+Serp homepage:  <a href="http://serp.sourceforge.net">http://serp.sourceforge.net</a> <br/>
+Serp sourcecode:  <a href="http://serp.cvs.sourceforge.net/serp">http://serp.cvs.sourceforge.net/serp</a> <br/></p>
+<p><a name="PublishingSerptoMavenCentralRepository-MavenInstructions"></a></p>
+<h2 id="maven-instructions">Maven Instructions</h2>
+<p>The easiest way to get the updated artifacts for Serp 1.14.1 into Maven
+Central was to follow the instructions on this page: 
+<a href="https://docs.sonatype.org/display/Repository/Uploading+3rd-party+Artifacts+to+The+Central+Repository">https://docs.sonatype.org/display/Repository/Uploading+3rd-party+Artifacts+to+The+Central+Repository</a>.
+ You will need a GPG utility and signature (instructions on that page). 
+You will also need a login for Sonatype's Nexus server (instructions also
+on that page).</p>
+<p>Since this exercise shouldn't be a common occurrence, I just went the
+manual route and signed each of the artifacts that were built into my local
+repository:</p>
+<div class="codehilite"><pre><span class="o">&gt;</span> <span class="n">gpg</span> <span class="o">-</span><span class="n">ab</span> <span class="n">serp</span><span class="o">-</span><span class="mf">1.14.1</span><span class="o">-</span><span class="n">javadoc</span><span class="o">.</span><span class="n">jar</span>
+<span class="o">&gt;</span> <span class="n">gpg</span> <span class="o">-</span><span class="n">ab</span> <span class="n">serp</span><span class="o">-</span><span class="mf">1.14.1</span><span class="o">.</span><span class="n">jar</span>
+<span class="o">&gt;</span> <span class="n">gpg</span> <span class="o">-</span><span class="n">ab</span> <span class="n">serp</span><span class="o">-</span><span class="mf">1.14.1</span><span class="o">-</span><span class="n">sources</span><span class="o">.</span><span class="n">jar</span>
+<span class="o">&gt;</span> <span class="n">gpg</span> <span class="o">-</span><span class="n">ab</span> <span class="n">serp</span><span class="o">-</span><span class="mf">1.14.1</span><span class="o">.</span><span class="n">pom</span>
+</pre></div>
+
+
+<p>And, then I created a bundle:</p>
+<div class="codehilite"><pre><span class="o">&gt;</span> <span class="n">jar</span> <span class="o">-</span><span class="n">cvf</span> <span class="n">serp</span><span class="o">-</span><span class="mf">1.14.1</span><span class="o">-</span><span class="n">bundle</span><span class="o">.</span><span class="n">jar</span> <span class="n">serp</span><span class="o">-*</span>
+</pre></div>
+
+
+<p>The bundle contained:</p>
+<div class="codehilite"><pre><span class="err">Archive:</span>  <span class="err">serp-1.14.1-bundle.jar</span>
+  <span class="err">Length</span>     <span class="err">Date</span>   <span class="err">Time</span>    <span class="err">Name</span>
+ <span class="err">--------</span>    <span class="err">----</span>   <span class="err">----</span>    <span class="err">----</span>
+    <span class="err">0</span>  <span class="err">09-04-12</span> <span class="err">15:23</span>   <span class="err">META-INF/</span>
+       <span class="err">62</span>  <span class="err">09-04-12</span> <span class="err">15:23</span>   <span class="err">META-INF/MANIFEST.MF</span>
+   <span class="err">962397</span>  <span class="err">09-04-12</span> <span class="err">15:21</span>   <span class="err">serp-1.14.1-javadoc.jar</span>
+      <span class="err">499</span>  <span class="err">09-04-12</span> <span class="err">15:22</span>   <span class="err">serp-1.14.1-javadoc.jar.asc</span>
+   <span class="err">140576</span>  <span class="err">09-04-12</span> <span class="err">15:21</span>   <span class="err">serp-1.14.1-sources.jar</span>
+      <span class="err">499</span>  <span class="err">09-04-12</span> <span class="err">15:21</span>   <span class="err">serp-1.14.1-sources.jar.asc</span>
+   <span class="err">206638</span>  <span class="err">09-04-12</span> <span class="err">15:21</span>   <span class="err">serp-1.14.1.jar</span>
+      <span class="err">499</span>  <span class="err">09-04-12</span> <span class="err">15:22</span>   <span class="err">serp-1.14.1.jar.asc</span>
+     <span class="err">5508</span>  <span class="err">09-04-12</span> <span class="err">15:21</span>   <span class="err">serp-1.14.1.pom</span>
+      <span class="err">499</span>  <span class="err">09-04-12</span> <span class="err">15:23</span>   <span class="err">serp-1.14.1.pom.asc</span>
+ <span class="err">--------</span>           <span class="err">-------</span>
+  <span class="err">1317177</span>           <span class="err">10</span> <span class="err">files</span>
+</pre></div>
+
+
+<p>This bundle is what I uploaded to the Sonatype Staging repository as
+outlined on that <a href="https://docs.sonatype.org/display/Repository/Uploading+3rd-party+Artifacts+to+The+Central+Repository">wiki page</a>
+.</p>
+<table class="note"><tr>
+  <td valign="top"> <IMG src="images/warning.gif" width="16" height="16" border="0">
+  <td> <B>Not documented..</B><BR>One process point that was not documented on that
+<a href="https://docs.sonatype.org/display/Repository/Uploading+3rd-party+Artifacts+to+The+Central+Repository">wiki page</a>
+was the need for a JIRA to be created against the OSSRH project (Open
+Source Project Repository Hosting).  This JIRA should include the Central
+Repository staging URL that is provided after you upload the bundle. 
+Here's an <a href="https://issues.sonatype.org/browse/OSSRH-4247">example JIRA</a>
+ that worked for me.  If all else fails, contact Joel Orlina,
+jorlina@sonatype.com.
+</tr></table>
+
+<p><a name="PublishingSerptoMavenCentralRepository-SerpCodeUpdates"></a></p>
+<h2 id="serp-code-updates">Serp Code Updates</h2>
+<p>In order to create the -javadoc and -sources jar files, I had to make a
+couple of minor updates to the existing pom file for serp 1.14.1.  I
+committed these changes to HEAD (1.14.2 snapshot) for future reference:</p>
+<div class="codehilite"><pre>    <span class="nt">&lt;plugin&gt;</span>
+      <span class="nt">&lt;artifactId&gt;</span>maven-source-plugin<span class="nt">&lt;/artifactId&gt;</span>
+      <span class="nt">&lt;executions&gt;</span>
+        <span class="nt">&lt;execution&gt;</span>
+        <span class="nt">&lt;id&gt;</span>attach-sources<span class="nt">&lt;/id&gt;</span>
+        <span class="nt">&lt;goals&gt;</span>
+            <span class="nt">&lt;goal&gt;</span>jar<span class="nt">&lt;/goal&gt;</span>
+        <span class="nt">&lt;/goals&gt;</span>
+        <span class="nt">&lt;/execution&gt;</span>
+      <span class="nt">&lt;/executions&gt;</span>
+    <span class="nt">&lt;/plugin&gt;</span>
+
+    <span class="nt">&lt;plugin&gt;</span>
+      <span class="nt">&lt;artifactId&gt;</span>maven-javadoc-plugin<span class="nt">&lt;/artifactId&gt;</span>
+      <span class="nt">&lt;executions&gt;</span>
+        <span class="nt">&lt;execution&gt;</span>
+        <span class="nt">&lt;id&gt;</span>attach-javadoc<span class="nt">&lt;/id&gt;</span>
+        <span class="nt">&lt;goals&gt;</span>
+          <span class="nt">&lt;goal&gt;</span>jar<span class="nt">&lt;/goal&gt;</span>
+        <span class="nt">&lt;/goals&gt;</span>
+        <span class="nt">&lt;/execution&gt;</span>
+      <span class="nt">&lt;/executions&gt;</span>
+    <span class="nt">&lt;/plugin&gt;</span>
+</pre></div>
+
+
+<p>If we continue to require changes to Serp, we may want to do more extensive
+changes in the maven processing to make it easier to deploy the artifacts. 
+Several of the deployment locations in the pom.xml no longer exist.  I made
+a couple of updates, but the permissions don't show up right, so the
+deployment step is still manual.</p>
+<p>Another idea would be to consume Serp into OpenJPA as an Apache
+sub-project...  That might be the best long-term solution.  But, I will
+leave that for another day.</p>
+                                            </div>
+                                        </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <div class="bottom_red_bar"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="black_box">
+                    <div class="footer">
+                        <div class="footer_l">
+                            <div class="footer_r">
+                                <div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="design_attribution">
+                Copyright (C) 2006,2012 The Apache Software Foundation. Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.<br />
+                Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.<br />
+                Other names may be trademarks of their respective owners.<br />
+            </div>
+
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+        </script>
+        <script type="text/javascript">
+            _uacct = "UA-1940143-1";
+            urchinTracker();
+        </script>
+
+    </body>
+</html>

Added: websites/staging/openjpa/trunk/content/query-notes.html
==============================================================================
--- websites/staging/openjpa/trunk/content/query-notes.html (added)
+++ websites/staging/openjpa/trunk/content/query-notes.html Sun Dec  9 13:13:35 2012
@@ -0,0 +1,199 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html lang="en">
+    <head>
+        <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+        <link href="http://openjpa.apache.org/styles/site.css" rel="stylesheet" type="text/css"/>
+        <!-- <link href="http://openjpa.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css"/> -->
+        <link href="./css/type-settings.css" rel="stylesheet" type="text/css"/>
+        <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+        <META name="Description" content="Apache OpenJPA -- Query Notes
" />
+        <META name="Keywords" content="Apache OpenJPA, JPA, JPA 1.0, JSR-220, JPA2, JPA 2.0, JSR-317, " />
+        <META name="Owner" content="dev@openjpa.apache.org" />
+        <META name="Robots" content="index, follow" />
+        <META name="Security" content="Public" />
+        <META name="Source" content="wiki template" />
+        <META name="DC.Date" scheme="iso8601" content="2010-08-11" />
+        <META name="DC.Language" scheme="rfc1766" content="en" />
+        <META name="DC.Rights" content="Copyright © 2006,2010 The Apache Software Foundation" />
+        <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+        <title>
+            Apache OpenJPA --
+        </title>
+    </head>
+    <body>
+        <div class="white_box">
+            <div class="header">
+                <div class="header_l">
+                    <div class="header_r">
+                    </div>
+                </div>
+            </div>
+            <div class="content">
+                <div class="content_l">
+                    <div class="content_r">
+                        <div>
+                            <!-- Banner -->
+                            <TABLE valign="top" border="0" cellspacing="0" cellpadding="5" width="100%" background="images/header-bg3.png">
+                                <TR>
+                                    <TD valing="top" align="left">
+                                        <A href="http://openjpa.apache.org/"><IMG src="images/openjpa-logo.png" border="0" alt="OpenJPA Logo"></A>
+                                    </TD>
+                                    <TD width="100%">
+                                        &nbsp;
+                                    </TD>
+                                    <TD valing="top" align="right">
+                                        <A href="http://www.apache.org/"><IMG src="images/asf_logo_wide2.png" border="0" alt="ASF Logo"></A>
+                                    </TD>
+                                </TR>
+                            </TABLE>
+
+                            <!-- Navigation Bar -->
+                            <div class="bottom_red_bar">
+                                <div id="site-breadcrumbs">
+                                    <!-- Breadcrumbs --
+                                    <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/query-notes.html">Query Notes
</a>
+                                     -- Breadcrumbs -->
+                                </div>
+                            </div>
+
+                            <!-- Content -->
+                            <table border="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="top">
+                                            <div class="navigation">
+                                                <div class="navigation_top">
+                                                    <div class="navigation_bottom">
+                                                        <!-- NavigationBar -->
+                                                        <h3><a name="SideNav-Overview"></a><a href="overview.html" title="Overview">Overview</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="quick-start.html" title="Quick Start">Quick Start</a></li>
+                                                            <li><a href="documentation.html" title="Documentation">Documentation</a></li>
+                                                            <li><a href="downloads.html" title="Downloads">Downloads</a></li>
+                                                            <li><a href="site-index.html" title="Site Index">Site Index</a></li>
+                                                            <li><a href="license.html" title="License">License</a></li>
+                                                            <li><a href="privacy-policy.html" title="Privacy Policy">Privacy Policy</a></li>
+                                                        </ul>
+
+                                                        <h3><a name="SideNav-Community"></a><a href="community.html" title="Community">Community</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="index.html#Index-eventsandnews" title="Events and News">Events and News</a></li>
+                                                            <li><a href="found-a-bug.html" title="Found a Bug">Found a Bug</a>?</li>
+                                                            <li><a href="get-involved.html" title="Get Involved">Get Involved</a></li>
+                                                            <li><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+                                                            <li><a href="committers.html" title="Committers">Committers</a></li>
+                                                            <li><a href="integration.html" title="Integration">Integration</a></li>
+                                                            <li><a href="powered-by.html" title="Powered By">Powered By</a></li>
+                                                            <li><a href="thanks.html" title="Thanks">Thanks</a></li>
+                                                        </ul>
+
+
+                                                        <h3><a name="SideNav-Development"></a><a href="development.html" title="Development">Development</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="http://issues.apache.org/jira/browse/OPENJPA" class="external-link" rel="nofollow">Issue Tracker</a></li>
+                                                            <li><a href="source-code.html" title="Source Code">Source Code</a></li>
+                                                            <li><a href="testing.html" title="Testing">Testing</a></li>
+                                                            <li><a href="tools.html" title="Tools">Tools</a></li>
+                                                            <li><a href="samples.html" title="Samples">Samples</a></li>
+                                                            <li><a href="release-management.html" title="Release Management">Release Management</a></li>
+                                                        </ul>
+
+                                                        <h3>Search</h3>
+
+                                                        <div style="padding: 5px 5px 0px 25px;">
+                                                            <form action="http://www.google.com/search" method="get" style="font-size: 10px;">
+                                                                <input name="ie" type="hidden" value="UTF-8">
+                                                                <input name="oe" type="hidden" value="UTF-8">
+                                                                <input maxlength="255" name="q" size="9" type="text" value=""><br><br>
+                                                                <input name="btnG" type="submit" value="Google">
+                                                                <input name="domains" type="hidden" value="openjpa.apache.org">
+                                                                <input name="sitesearch" type="hidden" value="openjpa.apache.org">
+                                                            </form>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                        <td valign="top" width="100%" style="overflow:hidden;">
+                                            <div class="wiki-content">
+                                                <p><a name="Query-Notes"></a></p>
+<pre>
+name conflict: QueryImpl from JDBC vs. QueryImpl from kernel
+openjpa.kernel.jpql.JPQLParser
+joins are done by SelectImpl
+subselects have some issues especially with non-relationship 
+src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt has rules
+all queries always have a "candidate class" 
+openjpa.jdbc.kernel.exps.JDBCExpressionFactory implements
+openjpa.kernel.exps.ExpressionFactory
+openjpa.kernel.exps.InMemoryExpressionFactory implements
+openjpa.kernel.exps.ExpressionFactory
+can do in memory filtering by downcasting the JPA Query instance and
+passing it a collection to filter
+can traverse entity parameters via :param.firstname or
+:param.relationship.deptname
+DBDictionary contains fields that can be customized per database type
+JPQLExpressionBuilder does semantic analysis by walking the syntax tree and
+generating the semantic tree
+SQLFactoryImpl constructs the SQL for the query
+SQLBuffer is the result of applying DBDictionary rules to the semantic tree
+Can append SQLBuffer to another SQLBuffer for e.g. subselects
+SQLBuffer is almost a StringBuffer
+ResultSetResult will call ResultSet.getInt etc.
+</pre>
+                                            </div>
+                                        </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <div class="bottom_red_bar"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="black_box">
+                    <div class="footer">
+                        <div class="footer_l">
+                            <div class="footer_r">
+                                <div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="design_attribution">
+                Copyright (C) 2006,2012 The Apache Software Foundation. Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.<br />
+                Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.<br />
+                Other names may be trademarks of their respective owners.<br />
+            </div>
+
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+        </script>
+        <script type="text/javascript">
+            _uacct = "UA-1940143-1";
+            urchinTracker();
+        </script>
+
+    </body>
+</html>

Added: websites/staging/openjpa/trunk/content/quick-start.html
==============================================================================
--- websites/staging/openjpa/trunk/content/quick-start.html (added)
+++ websites/staging/openjpa/trunk/content/quick-start.html Sun Dec  9 13:13:35 2012
@@ -0,0 +1,229 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html lang="en">
+    <head>
+        <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+        <link href="http://openjpa.apache.org/styles/site.css" rel="stylesheet" type="text/css"/>
+        <!-- <link href="http://openjpa.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css"/> -->
+        <link href="./css/type-settings.css" rel="stylesheet" type="text/css"/>
+        <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+        <META name="Description" content="Apache OpenJPA -- Quick Start
" />
+        <META name="Keywords" content="Apache OpenJPA, JPA, JPA 1.0, JSR-220, JPA2, JPA 2.0, JSR-317, " />
+        <META name="Owner" content="dev@openjpa.apache.org" />
+        <META name="Robots" content="index, follow" />
+        <META name="Security" content="Public" />
+        <META name="Source" content="wiki template" />
+        <META name="DC.Date" scheme="iso8601" content="2010-08-11" />
+        <META name="DC.Language" scheme="rfc1766" content="en" />
+        <META name="DC.Rights" content="Copyright © 2006,2010 The Apache Software Foundation" />
+        <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+        <title>
+            Apache OpenJPA --
+        </title>
+    </head>
+    <body>
+        <div class="white_box">
+            <div class="header">
+                <div class="header_l">
+                    <div class="header_r">
+                    </div>
+                </div>
+            </div>
+            <div class="content">
+                <div class="content_l">
+                    <div class="content_r">
+                        <div>
+                            <!-- Banner -->
+                            <TABLE valign="top" border="0" cellspacing="0" cellpadding="5" width="100%" background="images/header-bg3.png">
+                                <TR>
+                                    <TD valing="top" align="left">
+                                        <A href="http://openjpa.apache.org/"><IMG src="images/openjpa-logo.png" border="0" alt="OpenJPA Logo"></A>
+                                    </TD>
+                                    <TD width="100%">
+                                        &nbsp;
+                                    </TD>
+                                    <TD valing="top" align="right">
+                                        <A href="http://www.apache.org/"><IMG src="images/asf_logo_wide2.png" border="0" alt="ASF Logo"></A>
+                                    </TD>
+                                </TR>
+                            </TABLE>
+
+                            <!-- Navigation Bar -->
+                            <div class="bottom_red_bar">
+                                <div id="site-breadcrumbs">
+                                    <!-- Breadcrumbs --
+                                    <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/quick-start.html">Quick Start
</a>
+                                     -- Breadcrumbs -->
+                                </div>
+                            </div>
+
+                            <!-- Content -->
+                            <table border="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="top">
+                                            <div class="navigation">
+                                                <div class="navigation_top">
+                                                    <div class="navigation_bottom">
+                                                        <!-- NavigationBar -->
+                                                        <h3><a name="SideNav-Overview"></a><a href="overview.html" title="Overview">Overview</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="quick-start.html" title="Quick Start">Quick Start</a></li>
+                                                            <li><a href="documentation.html" title="Documentation">Documentation</a></li>
+                                                            <li><a href="downloads.html" title="Downloads">Downloads</a></li>
+                                                            <li><a href="site-index.html" title="Site Index">Site Index</a></li>
+                                                            <li><a href="license.html" title="License">License</a></li>
+                                                            <li><a href="privacy-policy.html" title="Privacy Policy">Privacy Policy</a></li>
+                                                        </ul>
+
+                                                        <h3><a name="SideNav-Community"></a><a href="community.html" title="Community">Community</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="index.html#Index-eventsandnews" title="Events and News">Events and News</a></li>
+                                                            <li><a href="found-a-bug.html" title="Found a Bug">Found a Bug</a>?</li>
+                                                            <li><a href="get-involved.html" title="Get Involved">Get Involved</a></li>
+                                                            <li><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+                                                            <li><a href="committers.html" title="Committers">Committers</a></li>
+                                                            <li><a href="integration.html" title="Integration">Integration</a></li>
+                                                            <li><a href="powered-by.html" title="Powered By">Powered By</a></li>
+                                                            <li><a href="thanks.html" title="Thanks">Thanks</a></li>
+                                                        </ul>
+
+
+                                                        <h3><a name="SideNav-Development"></a><a href="development.html" title="Development">Development</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="http://issues.apache.org/jira/browse/OPENJPA" class="external-link" rel="nofollow">Issue Tracker</a></li>
+                                                            <li><a href="source-code.html" title="Source Code">Source Code</a></li>
+                                                            <li><a href="testing.html" title="Testing">Testing</a></li>
+                                                            <li><a href="tools.html" title="Tools">Tools</a></li>
+                                                            <li><a href="samples.html" title="Samples">Samples</a></li>
+                                                            <li><a href="release-management.html" title="Release Management">Release Management</a></li>
+                                                        </ul>
+
+                                                        <h3>Search</h3>
+
+                                                        <div style="padding: 5px 5px 0px 25px;">
+                                                            <form action="http://www.google.com/search" method="get" style="font-size: 10px;">
+                                                                <input name="ie" type="hidden" value="UTF-8">
+                                                                <input name="oe" type="hidden" value="UTF-8">
+                                                                <input maxlength="255" name="q" size="9" type="text" value=""><br><br>
+                                                                <input name="btnG" type="submit" value="Google">
+                                                                <input name="domains" type="hidden" value="openjpa.apache.org">
+                                                                <input name="sitesearch" type="hidden" value="openjpa.apache.org">
+                                                            </form>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                        <td valign="top" width="100%" style="overflow:hidden;">
+                                            <div class="wiki-content">
+                                                <p><a name="QuickStart-QuickStartGuide"></a></p>
+<h1 id="quick-start-guide">Quick Start Guide</h1>
+<p>We know it can be hard to find the right help sometimes and search engines
+can be overwhelming, so we will try to put the most commonly asked for
+topics with some overview and links to more in-depth resources here for you
+to checkout, before wasting your time searching through our <a href="documentation.html">Documentation</a>
+ and [Mailing Lists]
+ for help.</p>
+<p><a name="QuickStart-RuntimeDependencies"></a></p>
+<h2 id="runtime-dependencies">Runtime Dependencies</h2>
+<p>To use OpenJPA as a stand-alone Java component or with a lightweight
+non-Java EE framework, please refer to the following <a href="build-and-runtime-dependencies.html">Build and Runtime Dependencies</a>
+ page for the supported levels of Java SE.</p>
+<p>To use OpenJPA in a Java EE application server, please refer to the
+following <a href="integration.html">Integration</a>
+ page for the known platforms that either include OpenJPA or have been
+tested with OpenJPA.</p>
+<p><a name="QuickStart-JPAExamples"></a></p>
+<h2 id="jpa-examples">JPA Examples</h2>
+<p>OpenJPA provides some simple examples as part of the binary distribution on
+the <a href="downloads.html">Downloads</a>
+ page.  The following [Samples]
+ page provides quick start instructions on how to build and run these
+samples, along with pointers to other JPA samples from the Apache Geronimo
+project.</p>
+<p><a name="QuickStart-EnhancingEntities"></a></p>
+<h2 id="enhancing-entities">Enhancing Entities</h2>
+<p>The JPA spec requires some type of monitoring of Entity objects, but the
+spec does not define how to implement this monitoring. Some JPA providers
+auto-generate new subclasses or proxy objects that front the user's Entity
+objects at <em>runtime</em>, while others use byte-code weaving technologies to
+enhance the actual Entity class objects at <strong>build time</strong>.  OpenJPA supports
+both <a href="entity-enhancement.html">enhancement</a>
+ methods, but strongly suggests only using the <strong>build time</strong> enhancement. 
+The following [Entity Enhancement]
+ page includes more details on both enhancement types, along with examples
+on how to setup <em>build time</em> enhancement in ANT, Maven and Eclipse
+environments.</p>
+<p><a name="QuickStart-Tools"></a></p>
+<h2 id="tools">Tools</h2>
+<p>OpenJPA provides several design-time and runtime tools, to perform such
+tasks as entity enhancement, schema mapping, generating metamodel classes
+and to help migrate from other JPA providers.  Please checkout the <a href="tools.html">Tools</a>
+ page for more details.</p>
+<p><a name="QuickStart-FAQ"></a></p>
+<h2 id="faq">FAQ</h2>
+<p>Some common questions concerning the history, architecture and usage of
+OpenJPA can be found on the <a href="faq.html">FAQ</a>
+ page.</p>
+<p><a name="QuickStart-TaketheRedPill"></a></p>
+<h2 id="take-the-red-pill">Take the Red Pill</h2>
+<p>If you want to dive into the rabbit-hole (Hey, It's open source!), then
+checkout the <a href="found-a-bug.html">Found a Bug</a>
+ page, which covers everything from posting questions to our mailing lists,
+to getting the source code and building it, and creating bug patches....</p>
+                                            </div>
+                                        </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <div class="bottom_red_bar"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="black_box">
+                    <div class="footer">
+                        <div class="footer_l">
+                            <div class="footer_r">
+                                <div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="design_attribution">
+                Copyright (C) 2006,2012 The Apache Software Foundation. Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.<br />
+                Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.<br />
+                Other names may be trademarks of their respective owners.<br />
+            </div>
+
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+        </script>
+        <script type="text/javascript">
+            _uacct = "UA-1940143-1";
+            urchinTracker();
+        </script>
+
+    </body>
+</html>

Added: websites/staging/openjpa/trunk/content/recovering-from-a-vetoed-release.html
==============================================================================
--- websites/staging/openjpa/trunk/content/recovering-from-a-vetoed-release.html (added)
+++ websites/staging/openjpa/trunk/content/recovering-from-a-vetoed-release.html Sun Dec  9 13:13:35 2012
@@ -0,0 +1,191 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html lang="en">
+    <head>
+        <META http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+        <link href="http://openjpa.apache.org/styles/site.css" rel="stylesheet" type="text/css"/>
+        <!-- <link href="http://openjpa.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css"/> -->
+        <link href="./css/type-settings.css" rel="stylesheet" type="text/css"/>
+        <LINK rel="schema.DC" href="http://purl.org/DC/elements/1.0/">
+        <META name="Description" content="Apache OpenJPA -- Recovering from a vetoed release
" />
+        <META name="Keywords" content="Apache OpenJPA, JPA, JPA 1.0, JSR-220, JPA2, JPA 2.0, JSR-317, " />
+        <META name="Owner" content="dev@openjpa.apache.org" />
+        <META name="Robots" content="index, follow" />
+        <META name="Security" content="Public" />
+        <META name="Source" content="wiki template" />
+        <META name="DC.Date" scheme="iso8601" content="2010-08-11" />
+        <META name="DC.Language" scheme="rfc1766" content="en" />
+        <META name="DC.Rights" content="Copyright © 2006,2010 The Apache Software Foundation" />
+        <META http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))'/>
+
+        <title>
+            Apache OpenJPA --
+        </title>
+    </head>
+    <body>
+        <div class="white_box">
+            <div class="header">
+                <div class="header_l">
+                    <div class="header_r">
+                    </div>
+                </div>
+            </div>
+            <div class="content">
+                <div class="content_l">
+                    <div class="content_r">
+                        <div>
+                            <!-- Banner -->
+                            <TABLE valign="top" border="0" cellspacing="0" cellpadding="5" width="100%" background="images/header-bg3.png">
+                                <TR>
+                                    <TD valing="top" align="left">
+                                        <A href="http://openjpa.apache.org/"><IMG src="images/openjpa-logo.png" border="0" alt="OpenJPA Logo"></A>
+                                    </TD>
+                                    <TD width="100%">
+                                        &nbsp;
+                                    </TD>
+                                    <TD valing="top" align="right">
+                                        <A href="http://www.apache.org/"><IMG src="images/asf_logo_wide2.png" border="0" alt="ASF Logo"></A>
+                                    </TD>
+                                </TR>
+                            </TABLE>
+
+                            <!-- Navigation Bar -->
+                            <div class="bottom_red_bar">
+                                <div id="site-breadcrumbs">
+                                    <!-- Breadcrumbs --
+                                    <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/recovering-from-a-vetoed-release.html">Recovering from a vetoed release
</a>
+                                     -- Breadcrumbs -->
+                                </div>
+                            </div>
+
+                            <!-- Content -->
+                            <table border="0">
+                                <tbody>
+                                    <tr>
+                                        <td valign="top">
+                                            <div class="navigation">
+                                                <div class="navigation_top">
+                                                    <div class="navigation_bottom">
+                                                        <!-- NavigationBar -->
+                                                        <h3><a name="SideNav-Overview"></a><a href="overview.html" title="Overview">Overview</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="quick-start.html" title="Quick Start">Quick Start</a></li>
+                                                            <li><a href="documentation.html" title="Documentation">Documentation</a></li>
+                                                            <li><a href="downloads.html" title="Downloads">Downloads</a></li>
+                                                            <li><a href="site-index.html" title="Site Index">Site Index</a></li>
+                                                            <li><a href="license.html" title="License">License</a></li>
+                                                            <li><a href="privacy-policy.html" title="Privacy Policy">Privacy Policy</a></li>
+                                                        </ul>
+
+                                                        <h3><a name="SideNav-Community"></a><a href="community.html" title="Community">Community</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="index.html#Index-eventsandnews" title="Events and News">Events and News</a></li>
+                                                            <li><a href="found-a-bug.html" title="Found a Bug">Found a Bug</a>?</li>
+                                                            <li><a href="get-involved.html" title="Get Involved">Get Involved</a></li>
+                                                            <li><a href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+                                                            <li><a href="committers.html" title="Committers">Committers</a></li>
+                                                            <li><a href="integration.html" title="Integration">Integration</a></li>
+                                                            <li><a href="powered-by.html" title="Powered By">Powered By</a></li>
+                                                            <li><a href="thanks.html" title="Thanks">Thanks</a></li>
+                                                        </ul>
+
+
+                                                        <h3><a name="SideNav-Development"></a><a href="development.html" title="Development">Development</a></h3>
+
+                                                        <ul class="alternate" type="square">
+                                                            <li><a href="http://issues.apache.org/jira/browse/OPENJPA" class="external-link" rel="nofollow">Issue Tracker</a></li>
+                                                            <li><a href="source-code.html" title="Source Code">Source Code</a></li>
+                                                            <li><a href="testing.html" title="Testing">Testing</a></li>
+                                                            <li><a href="tools.html" title="Tools">Tools</a></li>
+                                                            <li><a href="samples.html" title="Samples">Samples</a></li>
+                                                            <li><a href="release-management.html" title="Release Management">Release Management</a></li>
+                                                        </ul>
+
+                                                        <h3>Search</h3>
+
+                                                        <div style="padding: 5px 5px 0px 25px;">
+                                                            <form action="http://www.google.com/search" method="get" style="font-size: 10px;">
+                                                                <input name="ie" type="hidden" value="UTF-8">
+                                                                <input name="oe" type="hidden" value="UTF-8">
+                                                                <input maxlength="255" name="q" size="9" type="text" value=""><br><br>
+                                                                <input name="btnG" type="submit" value="Google">
+                                                                <input name="domains" type="hidden" value="openjpa.apache.org">
+                                                                <input name="sitesearch" type="hidden" value="openjpa.apache.org">
+                                                            </form>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </td>
+                                        <td valign="top" width="100%" style="overflow:hidden;">
+                                            <div class="wiki-content">
+                                                <p><a name="Recoveringfromavetoedrelease-Recoveringfromabadreleaseoravetoedrelease"></a></p>
+<h2 id="recovering-from-a-bad-release-or-a-vetoed-release">Recovering from a bad release or a vetoed release</h2>
+<p>Recovering from a bad release actually isn't that difficult. You'll have to delete the bad tag in SVN and rollback the version numbers in all of our pom.xml files. </p>
+<p><a name="Recoveringfromavetoedrelease-Deletethetaginsvn"></a></p>
+<h3 id="delete-the-tag-in-svn">Delete the tag in svn</h3>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">del</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/openjpa/</span><span class="n">tags</span><span class="o">/</span><span class="mf">1.2.0</span> <span class="o">-</span><span class="n">m</span> <span class="s">&quot;Rollback release&quot;</span>
+</pre></div>
+
+
+<h3 id="rollback-version-numbers">Rollback version numbers</h3>
+<p>If you have perl installed you can do this in a single command for example to rollback from 1.2.1-SNAPSHOT to 1.2.0-SNAPSHOT</p>
+<div class="codehilite"><pre>$ perl -pi -e &quot;s;<span class="nt">&lt;version&gt;</span>1.2.1-SNAPSHOT<span class="nt">&lt;/version&gt;</span>;<span class="nt">&lt;version&gt;</span>1.2.0-SNAPSHOT<span class="nt">&lt;/version&gt;</span>;g&quot; \
+    pom.xml */pom.xml */*/pom.xml
+</pre></div>
+
+
+<p>If you do not have perl installed you can use a similar tool to edit multiple files or edit them all by hand.</p>
+                                            </div>
+                                        </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <div class="bottom_red_bar"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="black_box">
+                    <div class="footer">
+                        <div class="footer_l">
+                            <div class="footer_r">
+                                <div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="design_attribution">
+                Copyright (C) 2006,2012 The Apache Software Foundation. Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.<br />
+                Apache, the Apache feather logo and OpenJPA are trademarks of The Apache Software Foundation.<br />
+                Other names may be trademarks of their respective owners.<br />
+            </div>
+
+        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+        </script>
+        <script type="text/javascript">
+            _uacct = "UA-1940143-1";
+            urchinTracker();
+        </script>
+
+    </body>
+</html>