You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/12/18 11:51:46 UTC
git commit: [OLINGO-82] Remove unwanted files that got added in
Commit - 1b479e6c0c5b48cf843654a6668abb0827b95a10
Updated Branches:
refs/heads/master 1b479e6c0 -> 98bbeed32
[OLINGO-82] Remove unwanted files that got added in Commit -
1b479e6c0c5b48cf843654a6668abb0827b95a10
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/98bbeed3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/98bbeed3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/98bbeed3
Branch: refs/heads/master
Commit: 98bbeed328f515e226ab0a7032e0e5db8f7690c3
Parents: 1b479e6
Author: Chandan V A <ch...@sap.com>
Authored: Wed Dec 18 16:21:17 2013 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Wed Dec 18 16:21:17 2013 +0530
----------------------------------------------------------------------
.../exception/InvalidPartyRoleException.java | 10 ----
.../jpa/processor/ref/model/Activity.java | 59 --------------------
.../jpa/processor/ref/model/ActivityParty.java | 46 ---------------
.../ref/model/AppointmentActivity.java | 44 ---------------
.../jpa/processor/ref/model/EmailActivity.java | 46 ---------------
.../jpa/processor/ref/model/PartyRole.java | 5 --
6 files changed, 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/98bbeed3/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/exception/InvalidPartyRoleException.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/exception/InvalidPartyRoleException.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/exception/InvalidPartyRoleException.java
deleted file mode 100644
index 3eb7d5a..0000000
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/exception/InvalidPartyRoleException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.olingo.odata2.jpa.processor.ref.exception;
-
-public class InvalidPartyRoleException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/98bbeed3/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Activity.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Activity.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Activity.java
deleted file mode 100644
index c20e5b8..0000000
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/Activity.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.apache.olingo.odata2.jpa.processor.ref.model;
-
-import java.util.Calendar;
-
-import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-@MappedSuperclass
-public abstract class Activity {
-
- @Column(name = "ACTIVITY_ID")
- @Id
- protected long id;
-
- @Column
- protected String subject;
-
- @Temporal(TemporalType.TIMESTAMP)
- protected Calendar creationDate;
-
- @Column
- protected String note;
-
- public Calendar getCreationDate() {
- return creationDate;
- }
-
- public void setCreationDate(final Calendar creationDate) {
- this.creationDate = creationDate;
- }
-
- public String getNote() {
- return note;
- }
-
- public void setNote(final String note) {
- this.note = note;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(final long id) {
- this.id = id;
- }
-
- public String getSubject() {
- return subject;
- }
-
- public void setSubject(final String subject) {
- this.subject = subject;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/98bbeed3/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/ActivityParty.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/ActivityParty.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/ActivityParty.java
deleted file mode 100644
index c92908c..0000000
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/ActivityParty.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.apache.olingo.odata2.jpa.processor.ref.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class ActivityParty {
-
- @Id
- @Column(name = "PARTY_ID")
- private long id;
-
- @Column(name = "ACTIVITY_ID")
- private long activityId;
-
- @Column
- private String name;
- @Column
- private short role;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public short getRole() {
- return role;
- }
-
- public void setRole(final short role) {
- this.role = role;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(final long id) {
- this.id = id;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/98bbeed3/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/AppointmentActivity.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/AppointmentActivity.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/AppointmentActivity.java
deleted file mode 100644
index aafedb2..0000000
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/AppointmentActivity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.olingo.odata2.jpa.processor.ref.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.PrePersist;
-
-import org.apache.olingo.odata2.jpa.processor.ref.exception.InvalidPartyRoleException;
-
-@Entity
-public class AppointmentActivity extends Activity {
-
- @OneToMany(cascade = CascadeType.ALL)
- private List<ActivityParty> parties = new ArrayList<ActivityParty>();
-
- public List<ActivityParty> getParties() {
- return parties;
- }
-
- public void setParties(final List<ActivityParty> parties) {
- this.parties = parties;
- }
-
- @PrePersist
- public void validatePartyRoles() throws InvalidPartyRoleException {
- boolean maxOrganizer = false;
- for (ActivityParty party : getParties()) {
- Short role = party.getRole();
- if (role != PartyRole.ATTENDEE.ordinal() ||
- role != PartyRole.ORGANIZER.ordinal()) {
- throw new InvalidPartyRoleException();
- }
- if (role == PartyRole.ORGANIZER.ordinal() && maxOrganizer == false) {
- maxOrganizer = true;
- } else if (role == PartyRole.ORGANIZER.ordinal() && maxOrganizer == true) {
- throw new InvalidPartyRoleException();
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/98bbeed3/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/EmailActivity.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/EmailActivity.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/EmailActivity.java
deleted file mode 100644
index 521d124..0000000
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/EmailActivity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.apache.olingo.odata2.jpa.processor.ref.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.PrePersist;
-
-import org.apache.olingo.odata2.jpa.processor.ref.exception.InvalidPartyRoleException;
-
-@Entity
-public class EmailActivity extends Activity {
-
- @OneToMany(cascade = CascadeType.ALL)
- private List<ActivityParty> parties = new ArrayList<ActivityParty>();
-
- public List<ActivityParty> getParties() {
- return parties;
- }
-
- public void setParties(final List<ActivityParty> parties) {
- this.parties = parties;
- }
-
- @PrePersist
- public void validatePartyRoles() throws InvalidPartyRoleException {
- boolean maxFrom = false;
- for (ActivityParty party : getParties()) {
- Short role = party.getRole();
- if (role != PartyRole.FROM.ordinal() ||
- role != PartyRole.TO.ordinal() ||
- role != PartyRole.CC.ordinal() ||
- role != PartyRole.BCC.ordinal()) {
- throw new InvalidPartyRoleException();
- }
- if (role == PartyRole.FROM.ordinal() && maxFrom == false) {
- maxFrom = true;
- } else if (role == PartyRole.FROM.ordinal() && maxFrom == true) {
- throw new InvalidPartyRoleException();
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/98bbeed3/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/PartyRole.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/PartyRole.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/PartyRole.java
deleted file mode 100644
index c1adaf9..0000000
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/PartyRole.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.apache.olingo.odata2.jpa.processor.ref.model;
-
-public enum PartyRole {
- FROM, TO, CC, BCC, ORGANIZER, ATTENDEE
-}