Author: allee8285
Date: Wed Nov 28 20:49:21 2012
New Revision: 1414915
URL: http://svn.apache.org/viewvc?rev=1414915&view=rev
Log:
CMS migration updates.
Modified:
openjpa/site/trunk/WhoIsWorkingOnWhat.txt
openjpa/site/trunk/content/index.mdtext
openjpa/site/trunk/content/intro.mdtext
openjpa/site/trunk/templates/standard.html
Modified: openjpa/site/trunk/WhoIsWorkingOnWhat.txt
URL:
http://svn.apache.org/viewvc/openjpa/site/trunk/WhoIsWorkingOnWhat.txt?rev=1414915&r1=1414914&r2=1414915&view=diff
==============================================================================
--- openjpa/site/trunk/WhoIsWorkingOnWhat.txt (original)
+++ openjpa/site/trunk/WhoIsWorkingOnWhat.txt Wed Nov 28 20:49:21 2012
@@ -38,10 +38,10 @@ done fetch-statistics.mdtext
done found-a-bug.mdtext
done get-involved.mdtext
helenxu getting-started.mdtext
- index.mdtext
+done index.mdtext
index-top-link.mdtext
done integration.mdtext
- intro.mdtext
+done intro.mdtext
done jconsole-datacache-plugin.mdtext
jest-examples.mdtext
jest.mdtext
Modified: openjpa/site/trunk/content/index.mdtext
URL:
http://svn.apache.org/viewvc/openjpa/site/trunk/content/index.mdtext?rev=1414915&r1=1414914&r2=1414915&view=diff
==============================================================================
--- openjpa/site/trunk/content/index.mdtext (original)
+++ openjpa/site/trunk/content/index.mdtext Wed Nov 28 20:49:21 2012
@@ -1,45 +1,101 @@
Title: Index
<a name="Index-WelcometotheApacheOpenJPAproject"></a>
-## Welcome to the Apache OpenJPA project
-
-
-{include:openjpa:Intro}
-
-
-
-{hide-from}
-{section}
-{column:width=10%}{column}
-{column:width=20%}{lozenge:icon=!http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Download.png!|link=http://openjpa.apache.org/downloads.html|title=Download
-Apache OpenJPA|arrow=none|width=100%}
-{lozenge}{column}
-{column:width=10%}{column}
-{column:width=20%}{lozenge:icon=!http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Clock.png!|link=http://openjpa.apache.org/quick-start.html|title=Quick
-Start Guide|arrow=none|width=100%}
-{lozenge}{column}
-{column:width=10%}{column}
-{column:width=20%}{lozenge:icon=!http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Information.png!|link=http://openjpa.apache.org/documentation.html|title=User's
-Guide|arrow=none|width=100%}
-{lozenge}{column}
-{column:width=10%}{column}
-{section}
-{hide-from}
-
-
+## Welcome to the Apache OpenJPA project
+Apache OpenJPA is a Java persistence project at [The Apache Software
Foundation](http://apache.org)
+ that can be used as a stand-alone [POJO](http://en.wikipedia.org/wiki/POJO)
+ persistence layer or [integrated](integration.html)
+ into any Java EE compliant container and many other lightweight
+frameworks, such as Tomcat and Spring.
+
+The [1.x releases](downloads.html)
+ (1.2.2 is the latest) are a production ready, feature-rich, compliant
+implementation of the Java Persistence API (JPA) 1.0 part of the [JSR-220
Enterprise Java Beans 3.0](http://jcp.org/en/jsr/detail?id=220)
+ specification, which pass the Sun JPA 1.0b Technology Compatibility Kit.
+
+The [2.x releases](downloads.html)
+ (2.2.0 is the latest) are a production ready, compliant implementation of
+the [JSR-317 Java Persistence 2.0](http://jcp.org/en/jsr/detail?id=317)
+ specification, which is backwards compatible to the JPA 1.0 specification
+and passes the Sun JPA 2.0 Technology Compatibility Kit.
+
+The upcoming 2.3 release is based off of the 2.2.x release stream and will
+contain some additional features (TBD).
+
+<TABLE border="0" cellpadding="5" cellspacing="0" width="100%">
+<TBODY><TR>
+<TD valign="top" width="10%"></TD>
+<TD valign="top" width="20%">
+ <TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0"
class="lozenge"
onclick="document.location.href="http://openjpa.apache.org/downloads.html";";
onkeypress="document.location.href="http://openjpa.apache.org/downloads.html";";>
+ <TR>
+ <TD style="background-image:
url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_silver.gif')"
class="icon" rowspan="3"><B><A onclick="return false;"
href="http://openjpa.apache.org/downloads.html"; title="View Download Apache
OpenJPA" class="external-link" rel="nofollow"><SPAN class="image-wrap"
style=""><IMG
src="http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Download.png";
style="border: 0px solid black"></SPAN></A></B></TD>
+ <TD class="top" colspan="2"></TD>
+ <TD class="topRight"></TD>
+ </TR>
+ <TR>
+ <TD class="breaker"> </TD>
+ <TD style="width:auto" class="body" height="59" align="left" valign="top"
bgcolor="#F3F3E9">
+ <B><A onclick="return false;"
href="http://openjpa.apache.org/downloads.html"; title="View Download Apache
OpenJPA" class="external-link" rel="nofollow">Download Apache OpenJPA</A></B>
<BR>
+ </TD>
+ <TD class="right"> </TD>
+ </TR>
+ <TR>
+ <TD class="bottom" colspan="2"></TD>
+ <TD class="bottomRight"></TD>
+ </TR>
+ </TABLE>
+</TD>
+<TD valign="top" width="10%"></TD>
+ <TD valign="top" width="20%">
+ <TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0"
class="lozenge"
onclick="document.location.href="http://openjpa.apache.org/quick-start.html";";
onkeypress="document.location.href="http://openjpa.apache.org/quick-start.html";";>
+ <TR>
+ <TD style="background-image:
url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_silver.gif')"
class="icon" rowspan="3"><B><A onclick="return false;"
href="http://openjpa.apache.org/quick-start.html"; title="View Quick Start
Guide" class="external-link" rel="nofollow"><SPAN class="image-wrap"
style=""><IMG
src="http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Clock.png";
style="border: 0px solid black"></SPAN></A></B></TD>
+ <TD class="top" colspan="2"></TD>
+ <TD class="topRight"></TD>
+ </TR>
+ <TR>
+ <TD class="breaker"> </TD>
+ <TD style="width:auto" class="body" height="59" align="left" valign="top"
bgcolor="#F3F3E9">
+ <B><A onclick="return false;"
href="http://openjpa.apache.org/quick-start.html"; title="View Quick Start
Guide" class="external-link" rel="nofollow">Quick Start Guide</A></B> <BR>
+ </TD>
+ <TD class="right"> </TD>
+ </TR>
+ <TR>
+ <TD class="bottom" colspan="2"></TD>
+ <TD class="bottomRight"></TD>
+ </TR>
+ </TABLE>
+</TD>
+<TD valign="top" width="10%"></TD>
+ <TD valign="top" width="20%">
+ <TABLE style="width:100%;cursor: pointer" cellspacing="0" cellpadding="0"
class="lozenge"
onclick="document.location.href="http://openjpa.apache.org/documentation.html";";
onkeypress="document.location.href="http://openjpa.apache.org/documentation.html";";>
+ <TR>
+ <TD style="background-image:
url('/confluence/download/resources/com.adaptavist.confluence.contentFormattingMacros:lozenge/gfx/lozenge/loz_silver.gif')"
class="icon" rowspan="3"><B><A onclick="return false;"
href="http://openjpa.apache.org/documentation.html"; title="View User's Guide"
class="external-link" rel="nofollow"><SPAN class="image-wrap" style=""><IMG
src="http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Information.png";
style="border: 0px solid black"></SPAN></A></B></TD>
+ <TD class="top" colspan="2"></TD>
+ <TD class="topRight"></TD>
+ </TR>
+ <TR>
+ <TD class="breaker"> </TD>
+ <TD style="width:auto" class="body" height="59" align="left" valign="top"
bgcolor="#F3F3E9">
+ <B><A onclick="return false;"
href="http://openjpa.apache.org/documentation.html"; title="View User's Guide"
class="external-link" rel="nofollow">User's Guide</A></B> <BR>
+ </TD>
+ <TD class="right"> </TD>
+ </TR>
+ <TR>
+ <TD class="bottom" colspan="2"></TD>
+ <TD class="bottomRight"></TD>
+ </TR>
+ </TABLE>
+</TD>
+<TD valign="top" width="10%"></TD>
+</TR></TBODY></TABLE>
-<a name="Index-[News](eventsandnews.html)"></a>
-## [News|Events and News]
-
-
-
+<a name="Index-eventsandnews"></a>
+## [News](events-and-news.html)
{blog-posts:max=5}
-
-
-
<a name="Index-Resources"></a>
## Resources
Modified: openjpa/site/trunk/content/intro.mdtext
URL:
http://svn.apache.org/viewvc/openjpa/site/trunk/content/intro.mdtext?rev=1414915&r1=1414914&r2=1414915&view=diff
==============================================================================
--- openjpa/site/trunk/content/intro.mdtext (original)
+++ openjpa/site/trunk/content/intro.mdtext Wed Nov 28 20:49:21 2012
@@ -1,18 +1,20 @@
Title: Intro
+<a name="Intro"></a>
+
Apache OpenJPA is a Java persistence project at [The Apache Software
Foundation](http://apache.org)
- that can be used as a stand-alone [POJO|http://en.wikipedia.org/wiki/POJO]
- persistence layer or [integrated|Integration]
+ that can be used as a stand-alone [POJO](http://en.wikipedia.org/wiki/POJO)
+ persistence layer or [integrated](integration.html)
into any Java EE compliant container and many other lightweight
frameworks, such as Tomcat and Spring.
-The [1.x releases](openjpa:downloads.html)
+The [1.x releases](downloads.html)
(1.2.2 is the latest) are a production ready, feature-rich, compliant
-implementation of the Java Persistence API (JPA) 1.0 part of the [JSR-220
Enterprise Java Beans 3.0|http://jcp.org/en/jsr/detail?id=220]
+implementation of the Java Persistence API (JPA) 1.0 part of the [JSR-220
Enterprise Java Beans 3.0](http://jcp.org/en/jsr/detail?id=220)
specification, which pass the Sun JPA 1.0b Technology Compatibility Kit.
-The [2.x releases](openjpa:downloads.html)
+The [2.x releases](downloads.html)
(2.2.0 is the latest) are a production ready, compliant implementation of
-the [JSR-317 Java Persistence 2.0|http://jcp.org/en/jsr/detail?id=317]
+the [JSR-317 Java Persistence 2.0](http://jcp.org/en/jsr/detail?id=317)
specification, which is backwards compatible to the JPA 1.0 specification
and passes the Sun JPA 2.0 Technology Compatibility Kit.
Modified: openjpa/site/trunk/templates/standard.html
URL:
http://svn.apache.org/viewvc/openjpa/site/trunk/templates/standard.html?rev=1414915&r1=1414914&r2=1414915&view=diff
==============================================================================
--- openjpa/site/trunk/templates/standard.html (original)
+++ openjpa/site/trunk/templates/standard.html Wed Nov 28 20:49:21 2012
@@ -161,7 +161,7 @@ limitations under the License.
</div>
</div>
<div class="design_attribution">
- Copyright (C) 2006,2010 The Apache Software Foundation.
Licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache
License 2.0</a>.<br />
+ 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>
![http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Download.png"](http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Download.png"){kind=link}
![http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Clock.png"](http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Clock.png"){kind=link}
![http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Information.png"](http://openjpa.apache.org/images/fotolia/Fotolia_9174675_Information.png"){kind=link}