From 7eb41fd1431019f44227af6f5d707e7c98e0416e Mon Sep 17 00:00:00 2001
From: geronimo <geronimo013@gmx.de>
Date: Wed, 15 Aug 2012 05:33:17 +0200
Subject: removed junit from client project and added -lcrypto to server
 makefile (fix for ubuntu)

---
 cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'cmpcj/src')

diff --git a/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java b/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java
index 8f69af0..4b46a13 100644
--- a/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java
+++ b/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java
@@ -7,7 +7,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
 import com.google.gson.stream.JsonReader;
 import de.schwarzrot.cmpc.domain.Media;
 import de.schwarzrot.cmpc.domain.MediaType;
@@ -35,7 +34,7 @@ public class MedialistParser {
     }
 
 
-    @Test
+    //    @Test
     public void testJSonParsing() {
         FileInputStream fis = null;
 
-- 
cgit v1.2.3