OPENJPA-1353 add legal info to the docs and properly add the appendices as a section

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@826106 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2009-10-16 22:09:24 +00:00
parent 732e45caba
commit 9d58228dc6
6 changed files with 166 additions and 12 deletions

View File

@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
<appendix id="jpa_resources">
<appendix id="jpa_resources" role="non-normaive">
<title>
JPA Resources
</title>

View File

@ -22,6 +22,7 @@
<!ENTITY openjpa-version "VERSION">
<!ENTITY openjpa_intro.xml SYSTEM "openjpa_intro.xml">
<!ENTITY openjpa_legal.xml SYSTEM "openjpa_legal.xml">
<!ENTITY jpa_overview_intro.xml SYSTEM "jpa_overview_intro.xml">
<!ENTITY jpa_overview_why.xml SYSTEM "jpa_overview_why.xml">
<!ENTITY jpa_overview_arch.xml SYSTEM "jpa_overview_arch.xml">
@ -60,12 +61,13 @@
]>
<book id="manual">
<bookinfo>
<title>Apache OpenJPA User's Guide</title>
<title>Apache OpenJPA 2.0 User's Guide</title>
</bookinfo>
<part id="introduction">
<title>Introduction</title>
&openjpa_intro.xml;
&openjpa_legal.xml;
</part>
<part id="jpa_overview">
@ -120,7 +122,10 @@
</part>
-->
&jpa_resources.xml;
&supported_databases.xml;
&migration_considerations.xml;
<part id="appendices">
<title>Appendices</title>
&jpa_resources.xml;
&supported_databases.xml;
&migration_considerations.xml;
</part>
</book>

View File

@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
<appendix id="migration_considerations">
<appendix id="migration_considerations" role="non-normative">
<title>
Migration Considerations
</title>

View File

@ -19,17 +19,17 @@
-->
<chapter id="openjpa_intro">
<title>
OpenJPA
About
</title>
<indexterm zone="openjpa_intro">
<primary>
OpenJPA
About
</primary>
</indexterm>
<para>
OpenJPA is Apache's implementation of Sun's Java Persistence API (JPA)
specification for the transparent persistence of Java objects. This
document provides an overview of the JPA standard and technical
OpenJPA is Apache's implementation of Sun's Java Persistence 2.0 API
(JSR-317 JPA 2.0) specification for the transparent persistence of Java objects.
This document provides an overview of the JPA standard and technical
details on the use of OpenJPA.
</para>
<!--
@ -41,10 +41,12 @@ introduction to the JPA specification, begin with
<xref linkend="jpa_overview_intro"/>.
</para>
-->
<!--
<section id="openjpa_intro_about">
<title>
About This Document
</title>
-->
<para>
This document is intended for OpenJPA users. It is divided into several parts:
</para>
@ -103,5 +105,7 @@ details on a specific aspect of OpenJPA.
</para>
</listitem>
</itemizedlist>
<!--
</section>
-->
</chapter>

View File

@ -0,0 +1,145 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<chapter id="openjpa_legal">
<title>
Legal
</title>
<indexterm zone="openjpa_legal">
<primary>
Legal
</primary>
</indexterm>
<para>
</para>
<para>
The Apache OpenJPA website can be found at:
<ulink url="http://openjpa.apache.org/"> http://openjpa.apache.org </ulink>
</para>
<para>
</para>
<section id="openjpa_legal_license">
<title>
License
</title>
<para>
Apache OpenJPA is released under the <ulink url="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache Software License Version 2.0</ulink>
</para>
<para>
Apache OpenJPA includes the persistence and orm schemas from the JPA specifications and elects to include this software in this distribution under the <ulink url="https://glassfish.dev.java.net/public/CDDL+GPL.html">CDDL license.</ulink>
</para>
<para>
Apache OpenJPA includes software developed by the SERP project, which uses the <ulink url="http://www.opensource.org/licenses/bsd-license.php">BSD license</ulink>
</para>
</section>
<section id="openjpa_legal_notice">
<title>
Notice
</title>
<para>
This product includes software developed by
<ulink url="http://www.apache.org/"> The Apache Software Foundation (http://www.apache.org/).</ulink>
</para>
<para>
The openjpa-all aggregate JAR includes software developed by the:
<itemizedlist spacing="compact">
<listitem><para>
Apache Commons Collections project
</para></listitem>
<listitem><para>
Apache Commons Lang project
</para></listitem>
<listitem><para>
Apache Commons Logging project
</para></listitem>
<listitem><para>
Apache Commons Pool project
</para></listitem>
<listitem><para>
Apache Geronimo project (JMS 1.1, JTA 1.1 and JPA 2.0 spec apis)
</para></listitem>
<listitem><para>
JCP JSR-317 JPA 2.0 Schemas
</para></listitem>
<listitem><para>
SERP project
</para></listitem>
</itemizedlist>
</para>
<para>
This is an implementation of an early-draft specification developed under the Java Community Process (JCP). The code is untested and presumed not to be a compatible implementation of the JSR-317 Java Persistence API, Version 2.0 specification. We encourage you to migrate to an implementation of the JSR-317 Java Persistence API, Version 2.0 specification that has been tested and verified to be compatible as soon as such an implementation is available, and we encourage you to retain this notice in any implementation of JSR-317 Java Persistence API, Version 2.0 specification that you distribute.
</para>
</section>
<section id="openjpa_legal_copyright">
<title>
Copyrights
</title>
<section id="openjpa_legal_copyright_apache">
<title>Apache</title>
<para>
Copyright (C) 2005-2009 Apache Software Foundation.
</para>
<para>
Apache, OpenJPA and the Apache feather logo are trademarks of Apache Software Foundation.
</para>
</section>
<section id="openjpa_legal_copyright_serp">
<title>Serp</title>
<para>
OpenJPA includes software developed by the SERP project.
</para>
<para>
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
</para>
</section>
<section id="openjpa_legal_copyright_sun">
<title>Sun</title>
<para>
OpenJPA includes the persistence and orm schemas from the JPA specifications.
</para>
<para>
Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
</para>
<para>
OpenJPA elects to include this software in this distribution under the CDDL license.
</para>
<para>
You can obtain a copy of the License at:
<ulink url="https://glassfish.dev.java.net/public/CDDL+GPL.html">https://glassfish.dev.java.net/public/CDDL+GPL.html</ulink>
</para>
<para>
The source code is available at:
<ulink url="https://glassfish.dev.java.net/source/browse/glassfish/">https://glassfish.dev.java.net/source/browse/glassfish/</ulink>
or <ulink url="http://jcp.org/en/jsr/detail?id=317"> http://jcp.org/en/jsr/detail?id=317 </ulink>
</para>
</section>
<section id="openjpa_legal_copyright_other">
<title>Other</title>
<para>
OpenJPA includes software written by Miroslav Nachev.
</para>
<para>
OpenJPA uses test code written by Charles Tillman.
</para>
</section>
</section>
</chapter>

View File

@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
<appendix id="supported_databases">
<appendix id="supported_databases" role="non-normative">
<title>
Supported Databases
</title>