Author: allee8285
Date: Thu Nov 29 16:24:00 2012
New Revision: 1415247
URL: http://svn.apache.org/viewvc?rev=1415247&view=rev
Log:
CMS migration updates.
Added:
openjpa/site/trunk/content/images/embeddables.jpeg (with props)
openjpa/site/trunk/content/images/embeddables_entities.jpeg (with props)
Modified:
openjpa/site/trunk/WhoIsWorkingOnWhat.txt
openjpa/site/trunk/content/embeddable-samples.mdtext
Modified: openjpa/site/trunk/WhoIsWorkingOnWhat.txt
URL:
http://svn.apache.org/viewvc/openjpa/site/trunk/WhoIsWorkingOnWhat.txt?rev=1415247&r1=1415246&r2=1415247&view=diff
==============================================================================
--- openjpa/site/trunk/WhoIsWorkingOnWhat.txt (original)
+++ openjpa/site/trunk/WhoIsWorkingOnWhat.txt Thu Nov 29 16:24:00 2012
@@ -26,7 +26,7 @@ done documentation-top-link.mdtext
done domain-model-browser.mdtext
done downloads.mdtext
done downloads-top-link.mdtext
- embeddable-samples.mdtext
+done embeddable-samples.mdtext
done enhancement-with-ant.mdtext
done enhancement-with-eclipse.mdtext
done enhancement-with-maven.mdtext
Modified: openjpa/site/trunk/content/embeddable-samples.mdtext
URL:
http://svn.apache.org/viewvc/openjpa/site/trunk/content/embeddable-samples.mdtext?rev=1415247&r1=1415246&r2=1415247&view=diff
==============================================================================
--- openjpa/site/trunk/content/embeddable-samples.mdtext (original)
+++ openjpa/site/trunk/content/embeddable-samples.mdtext Thu Nov 29 16:24:00
2012
@@ -1,5 +1,5 @@
Title: Embeddable samples
-{excerpt:hidden=true}Embeddable samples{excerpt}
+<a name="Embeddable-samples"></a>
<a name="Embeddablesamples-Embeddableclasses"></a>
## Embeddable classes
@@ -19,14 +19,20 @@ Review the [getting started](getting-sta
<a name="Embeddablesamples-Samples"></a>
## Samples
<table>
-<tr><th>Schema</th><th>Class diagram</th></tr>
-<tr><td>!embeddables.jpeg!</td><td>!embeddables_entities.jpeg!
+<tr><th>Schema</th></tr>
+<tr><td><img src="images/embeddables.jpeg"/></td>
</tr>
</table>
-[#Collections of Embeddables](#collections-of-embeddables.html)
-[#Relationships from Embeddables](#relationships-from-embeddables.html)
-[#Nested Embeddables](#nested-embeddables.html)
+<table>
+<tr><th>Class diagram</th></tr>
+<tr><td><img src="images/embeddables_entities.jpeg"/>
+</tr>
+</table>
+
+* [Collections of Embeddables](#collections-of-embeddables.html)
+* [Relationships from Embeddables](#relationships-from-embeddables.html)
+* [Nested Embeddables](#nested-embeddables.html)
<a name="Embeddablesamples-CollectionsofEmbeddables"></a>
## Collections of Embeddables
@@ -34,7 +40,8 @@ Review the [getting started](getting-sta
In the code snippet below, there is a User Entity which has a collection of
Embedded addresses.
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style:
solid;"><B>Address.java|borderStyle=solid</B></DIV><DIV class="codeContent
panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style:
solid;"><B>Address.java|borderStyle=solid</B></DIV><DIV class="codeContent
panelContent">
+
@Embeddable
public class Address {
@Basic
@@ -50,9 +57,9 @@ Embedded addresses.
}
//...
}
+<br/>
-
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>User.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>User.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
@Entity
public class User {
@Id
@@ -67,12 +74,13 @@ Embedded addresses.
}
//...
}
+<br/>
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>JPQL.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>JPQL.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+
...
// Select Entity based off a query over a collection of embeddables
- Query q = em.createQuery("SELECT u FROM User u , in (u.addresses) a WHERE
-a.state='xx'");
+ Query q = em.createQuery("SELECT u FROM User u , in (u.addresses) a WHERE
a.state='xx'");
// TODO -- add more!
...
@@ -82,7 +90,8 @@ a.state='xx'");
In the code snippet below, there is an Address embeddable with a ManyToOne
relationship to a Coordinates Entity.
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style:
solid;"><B>Address.java|borderStyle=solid</B></DIV><DIV class="codeContent
panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style:
solid;"><B>Address.java|borderStyle=solid</B></DIV><DIV class="codeContent
panelContent">
+
@Embeddable
public class Address {
@Basic
@@ -103,7 +112,8 @@ relationship to a Coordinates Entity.
}
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>Coordinates
.java|borderStyle=solid</B></DIV><DIV class="codeContent panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>Coordinates
.java|borderStyle=solid</B></DIV><DIV class="codeContent panelContent">
+
@Entity
public class Coordinates {
@Id
@@ -124,11 +134,11 @@ relationship to a Coordinates Entity.
}
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>JPQL.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>JPQL.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+
...
// Embedded -> relationship traversal
- Query q = em.createQuery("SELECT u FROM User u , in (u.addresses) a WHERE
-a.coordinates.longitude=xxx");
+ Query q = em.createQuery("SELECT u FROM User u , in (u.addresses) a WHERE
a.coordinates.longitude=xxx");
// TODO -- add more!
...
@@ -139,7 +149,8 @@ In the code snippet below, there is a Us
ContactInfo. ContactInfo contains two other embeddeded embeddables, Address
and Phone.
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style:
solid;"><B>Address.java|borderStyle=solid</B></DIV><DIV class="codeContent
panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style:
solid;"><B>Address.java|borderStyle=solid</B></DIV><DIV class="codeContent
panelContent">
+
@Embeddable
public class Address {
@Basic
@@ -157,7 +168,8 @@ and Phone.
}
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>Phone.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>Phone.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+
@Embeddable
public class Phone {
@Basic
@@ -168,7 +180,8 @@ and Phone.
}
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style:
solid;"><B>ContactInfo.java|borderStyle=solid</B></DIV><DIV class="codeContent
panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style:
solid;"><B>ContactInfo.java|borderStyle=solid</B></DIV><DIV class="codeContent
panelContent">
+
@Embeddable
public class ContactInfo {
public ContactInfo(){
@@ -183,7 +196,8 @@ and Phone.
}
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>User.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>User.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+
@Entity
public class User {
@Id
@@ -197,12 +211,11 @@ and Phone.
//...
}
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>JPQL.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+ <DIV class="code panel" style="border-style: solid;border-width: 0px;"><DIV
class="codeHeader panelHeader" style="border-bottom-width:
1px;border-bottom-style: solid;"><B>JPQL.java|borderStyle=solid</B></DIV><DIV
class="codeContent panelContent">
+
...
// Nested embeddables traversal
- Query q = em.createQuery("SELECT u FROM User u WHERE
-u.contactInfo.homePhone.number='507-555-5555' AND
-u.contactInfo.homePhone.type='cell'");
+ Query q = em.createQuery("SELECT u FROM User u WHERE
u.contactInfo.homePhone.number='507-555-5555' " +
+ "AND u.contactInfo.homePhone.type='cell'");
// TODO -- add more!
...
-
Added: openjpa/site/trunk/content/images/embeddables.jpeg
URL:
http://svn.apache.org/viewvc/openjpa/site/trunk/content/images/embeddables.jpeg?rev=1415247&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openjpa/site/trunk/content/images/embeddables.jpeg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openjpa/site/trunk/content/images/embeddables_entities.jpeg
URL:
http://svn.apache.org/viewvc/openjpa/site/trunk/content/images/embeddables_entities.jpeg?rev=1415247&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openjpa/site/trunk/content/images/embeddables_entities.jpeg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream