From 04dd70e627d90e05519309ea0d059e2d71720e90 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 23 Mar 2013 01:15:35 +0100
Subject: [PATCH] use mysql instead of postgresql

---
 .openshift/config/standalone.xml              | 14 +++++++++++++
 pom.xml                                       |  2 +-
 .../java/com/commafeed/model/FeedEntry.java   | 20 ++++++++-----------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.openshift/config/standalone.xml b/.openshift/config/standalone.xml
index b2796d4b..1f07673e 100644
--- a/.openshift/config/standalone.xml
+++ b/.openshift/config/standalone.xml
@@ -89,6 +89,17 @@
 		<subsystem xmlns="urn:jboss:domain:configadmin:1.0" />
 		<subsystem xmlns="urn:jboss:domain:datasources:1.1">
 			<datasources>
+				<datasource jndi-name="java:jboss/datasources/MysqlDS" enabled="${mysql.enabled}" use-java-context="true" pool-name="MysqlDS">
+                    <connection-url>jdbc:mysql://${env.OPENSHIFT_DB_HOST}:${env.OPENSHIFT_DB_PORT}/${env.OPENSHIFT_APP_NAME}</connection-url>
+                    <driver>mysql</driver>
+                    <security>
+                      <user-name>${env.OPENSHIFT_DB_USERNAME}</user-name>
+                      <password>${env.OPENSHIFT_DB_PASSWORD}</password>
+                    </security>
+                    <validation>
+                      <check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
+                	</validation>
+                </datasource>
 				<datasource jndi-name="java:/jdbc/commafeedDS"
 					enabled="${postgresql.enabled}" use-java-context="true" pool-name="PostgreSQLDS"
 					use-ccm="true">
@@ -109,6 +120,9 @@
 					</pool>
 				</datasource>
 				<drivers>
+					<driver name="mysql" module="com.mysql.jdbc">
+                        <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
+                    </driver>
 					<driver name="postgresql" module="org.postgresql.jdbc">
 						<xa-datasource-class>org.postgresql.xa.PGXADataSource
 						</xa-datasource-class>
diff --git a/pom.xml b/pom.xml
index 5ed56206..95a228a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,7 +236,7 @@
 		<profile>
 			<id>openshift</id>
 			<properties>
-				<jpa.datasource.name>java:/jdbc/commafeedDS</jpa.datasource.name>
+				<jpa.datasource.name>java:jboss/datasources/MysqlDS</jpa.datasource.name>
 			</properties>
 			<build>
 				<finalName>commafeed</finalName>
diff --git a/src/main/java/com/commafeed/model/FeedEntry.java b/src/main/java/com/commafeed/model/FeedEntry.java
index cc16d974..9d5e5f5b 100644
--- a/src/main/java/com/commafeed/model/FeedEntry.java
+++ b/src/main/java/com/commafeed/model/FeedEntry.java
@@ -12,9 +12,6 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.binary.StringUtils;
-
 @Entity
 @Table(name = "FEEDENTRIES")
 @SuppressWarnings("serial")
@@ -39,15 +36,6 @@ public class FeedEntry implements Serializable {
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date updated;
 
-	public String getContent() {
-		return StringUtils.newStringUtf8(Base64.decodeBase64(content));
-	}
-
-	public void setContent(String content) {
-		this.content = Base64.encodeBase64String(StringUtils
-				.getBytesUtf8(content));
-	}
-
 	public String getGuid() {
 		return guid;
 	}
@@ -64,6 +52,14 @@ public class FeedEntry implements Serializable {
 		this.title = title;
 	}
 
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
 	public String getUrl() {
 		return url;
 	}