diff --git a/iron-blogger-server/ironblogger/pom.xml b/iron-blogger-server/ironblogger/pom.xml
index 342578d..0f7553f 100644
--- a/iron-blogger-server/ironblogger/pom.xml
+++ b/iron-blogger-server/ironblogger/pom.xml
@@ -65,13 +65,6 @@
org.hibernate
hibernate-entitymanager
3.4.0.GA
-
-
-
- javax.transaction
- jta
-
-
org.hibernate
@@ -87,13 +80,6 @@
org.hibernate
hibernate-core
3.3.1.GA
-
-
-
- javax.transaction
- jta
-
-
org.slf4j
@@ -113,6 +99,11 @@
log4j
1.2.16
+
+ mysql
+ mysql-connector-java
+ 5.1.26
+
4.1.0.Final
diff --git a/iron-blogger-server/ironblogger/src/main/java/de/wazong/ironblogger/persistence/Feed.java b/iron-blogger-server/ironblogger/src/main/java/de/wazong/ironblogger/persistence/Feed.java
index e2dc562..8508bce 100644
--- a/iron-blogger-server/ironblogger/src/main/java/de/wazong/ironblogger/persistence/Feed.java
+++ b/iron-blogger-server/ironblogger/src/main/java/de/wazong/ironblogger/persistence/Feed.java
@@ -1,14 +1,36 @@
package de.wazong.ironblogger.persistence;
import javax.persistence.Entity;
+import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name="feed")
public class Feed {
+ @Id
private long id;
private String name;
private String feedURL;
+
+
+ public long getId() {
+ return id;
+ }
+ public void setId(long id) {
+ this.id = id;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getFeedURL() {
+ return feedURL;
+ }
+ public void setFeedURL(String feedURL) {
+ this.feedURL = feedURL;
+ }
}
\ No newline at end of file
diff --git a/iron-blogger-server/ironblogger/src/test/java/de/wazong/ironblogger/TestTest.java b/iron-blogger-server/ironblogger/src/test/java/de/wazong/ironblogger/TestTest.java
index 26ddd65..faab578 100644
--- a/iron-blogger-server/ironblogger/src/test/java/de/wazong/ironblogger/TestTest.java
+++ b/iron-blogger-server/ironblogger/src/test/java/de/wazong/ironblogger/TestTest.java
@@ -32,7 +32,7 @@ public class TestTest {
public static void setUp() throws Exception {
if (em == null) {
final EntityManagerFactory emf = Persistence
- .createEntityManagerFactory("gwmTest");
+ .createEntityManagerFactory("ibTest");
em = emf.createEntityManager();
}
}
diff --git a/iron-blogger-server/ironblogger/src/test/resources/META-INF/persistence.xml b/iron-blogger-server/ironblogger/src/test/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..5c22bd3
--- /dev/null
+++ b/iron-blogger-server/ironblogger/src/test/resources/META-INF/persistence.xml
@@ -0,0 +1,16 @@
+
+
+
+ de.wazong.ironblogger.persistence.Feed
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/iron-blogger-server/ironblogger/src/test/resources/log4j.xml b/iron-blogger-server/ironblogger/src/test/resources/log4j.xml
new file mode 100644
index 0000000..7027800
--- /dev/null
+++ b/iron-blogger-server/ironblogger/src/test/resources/log4j.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file