update pom and some cleanup

update pom for build
zznate · Feb 1, 2012 · c927f92 · c927f92
1 parent df983f6
commit c927f92
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 769 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.priam</groupId>
 	<artifactId>Priam</artifactId>
 	<packaging>jar</packaging>
-	<version>0.0.2-SNAPSHOT</version>
+	<version>0.0.2</version>
 
 	<parent>
       <groupId>org.sonatype.oss</groupId>
@@ -44,9 +43,6 @@
         <developerConnection>scm:git:git@github.com:Netflix/Priam.git</developerConnection>
     </scm>
 
-	<repositories>
-
-	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>commons-lang</groupId>
@@ -154,14 +150,14 @@
 			<version>1.5</version>
 		</dependency>
 		<dependency>
-			<groupId>mockit</groupId>
+			<groupId>com.googlecode.jmockit</groupId>
 			<artifactId>jmockit</artifactId>
-			<version>0.999.4</version>
+			<version>0.999.12</version>
 		</dependency>
 		<dependency>
       		<groupId>junit</groupId>
      		 <artifactId>junit</artifactId>
-     		 <version>4.4</version>
+     		 <version>4.8</version>
      	</dependency>
      	<dependency>
       		<groupId>xerces</groupId>
@@ -234,7 +230,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.10</version>
+                <version>2.12</version>
+				<configuration>
+					<argLine>
+						-Xms256m -Xmx1024m -XX:MaxPermSize=512m -javaagent:"${settings.localRepository}"/com/googlecode/jmockit/jmockit/0.999.12/jmockit-0.999.12.jar
+					</argLine>
+					<skipTests>true</skipTests>
+				</configuration>	
             </plugin>
 
             <plugin>

diff --git a/src/main/java/com/priam/aws/S3FileStream.java b/src/main/java/com/priam/aws/S3FileStream.java
diff --git a/src/main/java/com/priam/aws/S3FileSystem.java b/src/main/java/com/priam/aws/S3FileSystem.java
@@ -1,7 +1,6 @@
 package com.priam.aws;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -36,7 +35,6 @@
 import com.priam.conf.IConfiguration;
 import com.priam.scheduler.CustomizedThreadPoolExecutor;
 import com.priam.utils.RetryableCallable;
-import com.priam.utils.SystemUtils;
 import com.priam.utils.Throttle;
 
 @Singleton

diff --git a/src/main/java/com/priam/conf/PriamServer.java b/src/main/java/com/priam/conf/PriamServer.java
@@ -73,13 +73,10 @@ public void intialize(Module module) throws Exception
             scheduler.addTask(IncrementalBackup.JOBNAME, IncrementalBackup.class, IncrementalBackup.getTimer());
             // Start Commit log backup schedule if enabled
             if (config.isCommitLogBackup()){
-                //scheduler.addTask(CLBackup.JOBNAME, CLBackup.class, CLBackup.getTimer());
                 scheduler.addTask(CLStreamBackup.JOBNAME, CLStreamBackup.class, CLStreamBackup.getTimer());
                 scheduler.addTask(CLFileBackup.JOBNAME, CLFileBackup.class, CLFileBackup.getTimer());
             }
         }
-        // NodeToolMonitor monitorObj = injector.getInstance(NodeToolMonitor.class);
-        // scheduler.addTask(monitorObj.getName(), monitorObj.getClass(), monitorObj.getTimer());
     }
 
 }
diff --git a/src/main/java/com/priam/scheduler/CronTimer.java b/src/main/java/com/priam/scheduler/CronTimer.java
@@ -9,7 +9,7 @@
 /**
  * Runs jobs at the specified absolute time and frequency
  * 
- * @author psadhu
+ * @author Praveen Sadhu
  * 
  */
 public class CronTimer implements TaskTimer

diff --git a/src/test/java/com/priam/backup/TestBackupFile.java b/src/test/java/com/priam/backup/TestBackupFile.java
@@ -23,13 +23,11 @@
 public class TestBackupFile
 {
     private static Injector injector;
-    private static IConfiguration conf;
 
     @BeforeClass
     public static void setup() throws IOException
     {
         injector = Guice.createInjector(new BRTestModule());
-        conf = injector.getInstance(IConfiguration.class);
         File file = new File("cass/data/ks1/", "f1.db");
         if (!file.exists())
         {

diff --git a/src/test/java/com/priam/backup/TestCompression.java b/src/test/java/com/priam/backup/TestCompression.java
@@ -38,7 +38,7 @@ public void setup() throws UnsupportedEncodingException, IOException
         for (int i = 0; i < 1 * 1000 * 1000; i++)
         {
             stream.write("This is a test... Random things happen... and you are responsible for it...\n".getBytes("UTF-8"));
-            stream.write("This was intially tested within netflix by Vijay... TODO: Make it random to see the compression work...\n".getBytes("UTF-8"));
+            stream.write("The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.\n".getBytes("UTF-8"));
         }
         IOUtils.closeQuietly(stream);
     }