Author: mfranklin
Date: Fri Jan 18 18:33:56 2013
New Revision: 1435289
URL: http://svn.apache.org/viewvc?rev=1435289&view=rev
Log:
Updated Page, AppData & PageUser converters to be eclipselink compatible
RAVE-875
Modified:
rave/trunk/rave-components/rave-jpa/pom.xml
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
Modified: rave/trunk/rave-components/rave-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/pom.xml?rev=1435289&r1=1435288&r2=1435289&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/pom.xml (original)
+++ rave/trunk/rave-components/rave-jpa/pom.xml Fri Jan 18 18:33:56 2013
@@ -157,7 +157,7 @@
<build>
<defaultGoal>install</defaultGoal>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java?rev=1435289&r1=1435288&r2=1435289&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
Fri Jan 18 18:33:56 2013
@@ -37,6 +37,8 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.TableGenerator;
+import javax.persistence.JoinColumn;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -74,6 +76,7 @@ public class JpaPortalPreference impleme
@ElementCollection(fetch = FetchType.EAGER)
@CollectionTable(name = "portal_preference_values")
+ @Column(name="element")
private List<String> values = new LinkedList<String>();
public JpaPortalPreference() {
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java?rev=1435289&r1=1435288&r2=1435289&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
Fri Jan 18 18:33:56 2013
@@ -48,10 +48,7 @@ public class JpaApplicationDataConverter
private JpaApplicationData createEntity(ApplicationData source) {
JpaApplicationData converted = null;
if (source != null) {
- converted = manager.find(JpaApplicationData.class, source.getId()
== null ? null : Long.parseLong(source.getId()));
- if (converted == null) {
- converted = new JpaApplicationData();
- }
+ converted = source.getId() == null ? new JpaApplicationData() :
manager.find(JpaApplicationData.class, Long.parseLong(source.getId()));
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java?rev=1435289&r1=1435288&r2=1435289&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
Fri Jan 18 18:33:56 2013
@@ -49,10 +49,7 @@ public class JpaPageConverter implements
private JpaPage createEntity(Page source) {
JpaPage converted = null;
if (source != null) {
- converted = manager.find(JpaPage.class, source.getId() == null ?
null : Long.parseLong(source.getId()));
- if (converted == null) {
- converted = new JpaPage();
- }
+ converted = source.getId() == null ? new JpaPage() :
manager.find(JpaPage.class, source.getId());
updateProperties(source, converted);
}
return converted;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java?rev=1435289&r1=1435288&r2=1435289&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
Fri Jan 18 18:33:56 2013
@@ -48,10 +48,7 @@ public class JpaPageUserConverter implem
private JpaPageUser createEntity(PageUser source) {
JpaPageUser converted = null;
if (source != null) {
- converted = manager.find(JpaPageUser.class, source.getId() == null
? null : Long.parseLong(source.getId()));
- if (converted == null) {
- converted = new JpaPageUser();
- }
+ converted = source.getId() == null ? new JpaPageUser() :
manager.find(JpaPageUser.class, Long.parseLong(source.getId()));
updateProperties(source, converted);
}
return converted;
