openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r666906 - in /openjpa/trunk/openjpa-project/src/doc/manual: ./ img/
Date Wed, 11 Jun 2008 23:48:33 GMT
Author: pcl
Date: Wed Jun 11 16:48:33 2008
New Revision: 666906

URL: http://svn.apache.org/viewvc?rev=666906&view=rev
Log:
OPENJPA-417. Merged r653081 and r653085.

Added:
    openjpa/trunk/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/basic-coll.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/basic-coll.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/embedded-coll.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/embedded-coll.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/enhancement.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/enhancement.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/inher-tpc.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inher-tpc.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/inv-key-coll.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inv-key-coll.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/joins-constant.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/joins-constant.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/secondary-table.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/secondary-table.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/sqlquery-model.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/sqlquery-model.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/string-rel-map.graffle
      - copied, changed from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/string-rel-map.graffle
    openjpa/trunk/openjpa-project/src/doc/manual/img/string-rel-map.png
      - copied unchanged from r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/string-rel-map.png
Modified:
    openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/appid-hierarchy.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/basic-coll.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/basic-coll.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/basic-coll.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/basic-coll.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/basic-coll.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/basic-coll.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/basic-coll.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/embedded-coll.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/embedded-coll.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/embedded-coll.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/embedded-coll.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/embedded-coll.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/embedded-coll.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/embedded-coll.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/enhancement.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/enhancement.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/enhancement.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/enhancement.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/enhancement.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/enhancement.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/enhancement.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle (from
r653081, openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle
(original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/inher-superclass-table.graffle Wed Jun
11 16:48:33 2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/inher-tpc.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inher-tpc.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/inher-tpc.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/inher-tpc.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inher-tpc.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inher-tpc.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/inher-tpc.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/inv-key-coll.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inv-key-coll.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/inv-key-coll.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/inv-key-coll.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inv-key-coll.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/inv-key-coll.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/inv-key-coll.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/joins-constant.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/joins-constant.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/joins-constant.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/joins-constant.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/joins-constant.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/joins-constant.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/joins-constant.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/secondary-table.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/secondary-table.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/secondary-table.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/secondary-table.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/secondary-table.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/secondary-table.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/secondary-table.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/sqlquery-model.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/sqlquery-model.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/sqlquery-model.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/sqlquery-model.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/sqlquery-model.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/sqlquery-model.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/sqlquery-model.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Copied: openjpa/trunk/openjpa-project/src/doc/manual/img/string-rel-map.graffle (from r653081,
openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/string-rel-map.graffle)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/img/string-rel-map.graffle?p2=openjpa/trunk/openjpa-project/src/doc/manual/img/string-rel-map.graffle&p1=openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/string-rel-map.graffle&r1=653081&r2=666906&rev=666906&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-project/src/doc/manual/img/string-rel-map.graffle (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/img/string-rel-map.graffle Wed Jun 11 16:48:33
2008
@@ -1,4 +1,22 @@
 <?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.   
+-->
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>

Modified: openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml?rev=666906&r1=666905&r2=666906&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/ref_guide_mapping.xml Wed Jun 11 16:48:33
2008
@@ -2681,6 +2681,126 @@
             </example>
         </section>
     </section>
+    <section id="ref_guide_mapping_jpa_map_keycols">
+        <title>Key Columns</title>
+        <indexterm zone="ref_guide_mapping_jpa_map_keycols">
+            <primary>KeyColumn</primary>
+            <seealso>mapping metadata</seealso>
+        </indexterm>
+        <para>
+        Key columns serve the same role for map keys as the element
+        columns described in
+        <xref linkend="ref_guide_mapping_jpa_coll_cols"/> serve for
+        collection elements.  OpenJPA's
+        <ulink url="../javadoc/org/apache/openjpa/persistence/jdbc/KeyColumn.html">
+        <classname>org.apache.openjpa.persistence.jdbc.KeyColumn</classname>
+        </ulink> annotation represents a map key.  To map custom
+        multi-column keys, use the
+        <ulink url="../javadoc/org/apache/openjpa/persistence/jdbc/KeyColumns.html">
+        <classname>org.apache.openjpa.persistence.jdbc.KeyColumns</classname>
+        </ulink> annotation, whose value is an array of <classname>KeyColumn</classname>s.
+        </para>
+        <para>
+        A <classname>KeyColumn</classname> always resides in
+        a container table, so it does not have the <literal>table</literal>
+        property of a standard <classname>Column</classname>.  Otherwise, the
+        <classname>KeyColumn</classname> and standard <classname>Column</classname>
+        annotations are equivalent.  See
+        <xref linkend="jpa_overview_mapping_column"/> in the JPA
+        Overview for a review of the <classname>Column</classname> annotation.
+        </para>
+    </section>
+    <section id="ref_guide_mapping_jpa_map_keyjoincols">
+        <title>Key Join Columns</title>
+        <indexterm zone="ref_guide_mapping_jpa_map_keyjoincols">
+            <primary>KeyJoinColumn</primary>
+            <seealso>mapping metadata</seealso>
+        </indexterm>
+        <para>
+        Key join columns are equivalent to standard JPA
+        join columns, except that they represent a join to a map key entity rather than a
direct relation.  You represent
+        a key join column with OpenJPA's
+        <ulink url="../javadoc/org/apache/openjpa/persistence/jdbc/KeyJoinColumn.html">
+        <classname>org.apache.openjpa.persistence.jdbc.KeyJoinColumn</classname></ulink>
annotation.  To declare a compound join, enclose an
+        array of <classname>KeyJoinColumn</classname>s in the
+        <ulink url="../javadoc/org/apache/openjpa/persistence/jdbc/KeyJoinColumns.html">
+        <classname>org.apache.openjpa.persistence.jdbc.KeyJoinColumns</classname>
+        </ulink> annotation.
+        </para>
+        <para>
+        A <classname>KeyJoinColumn</classname> always resides in
+        a container table, so it does not have the <literal>table</literal> property
+        of a standard <classname>JoinColumn</classname>.  Like <classname>XJoinColumn</classname>s
above,
+        <classname>KeyJoinColumn</classname>s can reference a linked field
+        rather than a static linked column.  Otherwise, the <classname>KeyJoinColumn</classname>
+        and standard <classname>JoinColumn</classname> annotations are equivalent.
 See
+        <xref linkend="jpa_overview_mapping_rel"/> in the JPA
+        Overview for a review of the <classname>JoinColumn</classname> annotation.
+        </para>
+    </section>
+    <section id="ref_guide_mapping_jpa_map_embedkey">
+        <title>Key Embedded Mapping</title>
+        <indexterm zone="ref_guide_mapping_jpa_map_embedkey">
+            <primary>KeyEmbeddedMapping</primary>
+            <seealso>mapping metadata</seealso>
+        </indexterm>
+        <para>
+        The
+        <ulink url="../javadoc/org/apache/openjpa/persistence/jdbc/KeyEmbeddedMapping.html">
+        <classname>org.apache.openjpa.persistence.jdbc.KeyEmbeddedMapping</classname>
+        </ulink> annotation allows you to map your map field's embedded
+        key type to your container table.  This annotation has exactly
+        the same properties as the
+        <classname>EmbeddedMapping</classname> annotation described
+        <link linkend="ref_guide_mapping_jpa_embed">above</link>.
+        </para>
+    </section>
+    <section id="ref_guide_mapping_jpa_map_ex">
+        <title>Examples</title>
+        <mediaobject>
+            <imageobject>
+                <!-- PNG image data, 410 x 266 (see README) -->
+                <imagedata fileref="img/string-rel-map.png" width="273px"/>
+            </imageobject>
+        </mediaobject>
+        <para>
+        Map mapping in OpenJPA uses the same principles you saw in
+        collection mapping.  The example below maps the <literal>
+        Article.authors</literal> map according to the diagram above.
+        </para>
+        <example id="ref_guide_mapping_jpa_map_stringrelmap">
+            <title>String Key, Entity Value Map Mapping</title>
+<programlisting>
+package org.mag.pub;
+
+import org.apache.openjpa.persistence.*;
+import org.apache.openjpa.persistence.jdbc.*;
+
+@Entity
+@Table(name="AUTH")
+@DataStoreIdColumn(name="AID" columnDefinition="INTEGER64")
+public class Author {
+    ...
+}
+
+package org.mag;
+
+@Entity
+@Table(name="ART")
+public class Article {
+    @Id private long id;
+
+    @PersistentMap
+    @ContainerTable(name="ART_AUTHS", joinColumns=@XJoinColumn(name="ART_ID"))
+    @KeyColumn(name="LNAME")
+    @ElementJoinColumn(name="AUTH_ID")
+    private Map&lt;String,Author&gt; authors;
+
+    ...
+}
+</programlisting>
+                </example>
+            </section>
     <section id="ref_guide_mapping_limits">
         <title>
             Mapping Limitations



Mime
View raw message