From 5462ff62528e9a1723bbe210665daba1e79f6480 Mon Sep 17 00:00:00 2001
From: Eric Perret <eperret@salesforce.com>
Date: Sat, 18 Dec 2021 16:30:13 -0800
Subject: [PATCH] upgrade

---
 pom.xml                                       | 247 +++++++++++-------
 .../ThirdPartyBinaryNotFoundException.java    |   0
 .../uiperf/imageoptimization/Main.java        |   2 -
 .../dto/OptimizationResult.java               |   0
 .../service/IImageOptimizationService.java    |   0
 .../service/ImageOptimizationService.java     |   6 +-
 .../utils/FixedFileUtils.java                 |   0
 .../utils/ImageFileOptimizationException.java |   0
 .../imageoptimization/utils/ImageUtils.java   |   6 +-
 src/{ => main/java}/log4j2.xml                |   0
 src/main/resources/META-INF/MANIFEST.MF       |   3 +
 .../uiperf/imageoptimization/AllTests.java    |   0
 .../service/ImageOptimizationServiceTest.java |   0
 .../imageoptimization/service/addCol.gif      | Bin
 .../imageoptimization/service/csv_120.2png    | Bin
 .../imageoptimization/service/csv_120.png     | Bin
 .../service/doctype_16_sprite.png             | Bin
 .../imageoptimization/service/el_icon.gif     | Bin
 .../imageoptimization/service/imagebomb.png   | Bin
 .../imageoptimization/service/loading.gif     | Bin
 .../service/no_transparency.gif               | Bin
 .../service/owner_key_icon.png                | Bin
 .../imageoptimization/service/s arrow bo.gif  | Bin
 .../imageoptimization/service/s-arrow-bo.gif  | Bin
 .../imageoptimization/service/safe32.png      | Bin
 .../service/sharin g model2.jpg               | Bin
 .../service/sharing_model2.jpg                | Bin
 ...rrow enlarge max min shrink x blue.gif.png | Bin
 .../utils/2013_summer_force.gif               | Bin
 .../utils/ImageUtilsTest.java                 |   0
 .../imageoptimization/utils/forceapp_bg.gif   | Bin
 .../imageoptimization/utils/forceapp_bg.png   | Bin
 .../utils/no_transparency.gif                 | Bin
 .../utils/no_transparency.gif.tmp             | Bin
 .../imageoptimization/utils/s-arrow-bo.gif    | Bin
 .../imageoptimization/utils/s-arrow-bo2.gif   | Bin
 .../utils/safe32_optimized.png                | Bin
 .../utils/safe32_unoptimized.png              | Bin
 .../utils/sergey_reasonably_small.jpg         | Bin
 .../sergey_reasonably_small_jpegmini.jpg      | Bin
 .../utils/sergey_reasonably_small_smushit.jpg | Bin
 41 files changed, 151 insertions(+), 113 deletions(-)
 rename src/{ => main/java}/com/salesforce/perfeng/uiperf/ThirdPartyBinaryNotFoundException.java (100%)
 rename src/{ => main/java}/com/salesforce/perfeng/uiperf/imageoptimization/Main.java (99%)
 rename src/{ => main/java}/com/salesforce/perfeng/uiperf/imageoptimization/dto/OptimizationResult.java (100%)
 rename src/{ => main/java}/com/salesforce/perfeng/uiperf/imageoptimization/service/IImageOptimizationService.java (100%)
 rename src/{ => main/java}/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationService.java (99%)
 rename src/{ => main/java}/com/salesforce/perfeng/uiperf/imageoptimization/utils/FixedFileUtils.java (100%)
 rename src/{ => main/java}/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageFileOptimizationException.java (100%)
 rename src/{ => main/java}/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtils.java (98%)
 rename src/{ => main/java}/log4j2.xml (100%)
 create mode 100644 src/main/resources/META-INF/MANIFEST.MF
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/AllTests.java (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationServiceTest.java (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/addCol.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.2png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/doctype_16_sprite.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/el_icon.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/imagebomb.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/loading.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/no_transparency.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/owner_key_icon.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/s arrow bo.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/s-arrow-bo.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/safe32.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/sharin g model2.jpg (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/sharing_model2.jpg (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/service/sprite arrow enlarge max min shrink x blue.gif.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/2013_summer_force.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtilsTest.java (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif.tmp (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo2.gif (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_optimized.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_unoptimized.png (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small.jpg (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_jpegmini.jpg (100%)
 rename {test => src/test}/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_smushit.jpg (100%)

diff --git a/pom.xml b/pom.xml
index 380728c..76f351f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,117 +1,162 @@
 <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>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.salesforce.perfeng.uiperf</groupId>
-  <artifactId>ImageOptimization</artifactId>
-  <version>1.5.0</version>
-  <packaging>jar</packaging>
+    <groupId>com.salesforce.perfeng.uiperf</groupId>
+    <artifactId>ImageOptimization</artifactId>
+    <version>1.6.0</version>
+    <packaging>jar</packaging>
 
-  <name>ImageOptimization</name>
-  <url>https://github.com/SalesforceEng/ImageOptimization</url>
+    <name>ImageOptimization</name>
+    <url>https://github.com/SalesforceEng/ImageOptimization</url>
 
-  <organization>
-    <name>Salesforce</name>
-    <url>https://www.salesforce.com</url>
-  </organization>
-  <description>Library used to optimize images so that they are smaller in size (less bytes) while maintaining the exact same quality.
+    <organization>
+        <name>Salesforce</name>
+        <url>https://www.salesforce.com</url>
+    </organization>
+    <description>Library used to optimize images so that they are smaller in size (less bytes) while maintaining the exact same quality.
 It can also...
 1) convert gif to png
 2) convert images to webp
 
 Note: It only runs on Linux and requires additional binaries</description>
-  <inceptionYear>2013</inceptionYear>
-  <scm>
-    <connection>scm:git:git://github.com/SalesforceEng/ImageOptimization</connection>
-    <developerConnection>scm:git:github.com/SalesforceEng/ImageOptimization</developerConnection>
-    <url>https://github.com/SalesforceEng/ImageOptimization</url>
-  </scm>
-  
-  <licenses>
-    <license>
-      <name>The BSD 3-Clause License</name>
-      <url>http://opensource.org/licenses/BSD-3-Clause</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+    <inceptionYear>2013</inceptionYear>
+    <scm>
+        <connection>scm:git:git://github.com/salesforce/ImageOptimization</connection>
+        <developerConnection>scm:git:github.com/salesforce/ImageOptimization</developerConnection>
+        <url>https://github.com/salesforce/ImageOptimization</url>
+    </scm>
+    
+    <licenses>
+        <license>
+            <name>The BSD 3-Clause License</name>
+            <url>http://opensource.org/licenses/BSD-3-Clause</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
-  <developers>
-    <developer>
-      <id>eperret</id>
-      <name>Eric Perret</name>
-      <email>eperret@salesforce.com</email>
-    </developer>
-  </developers>
+    <developers>
+        <developer>
+            <id>eperret</id>
+            <name>Eric Perret</name>
+            <email>eperret@salesforce.com</email>
+        </developer>
+    </developers>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-	  <groupId>org.hamcrest</groupId>
-	  <artifactId>hamcrest-library</artifactId>
-	  <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
-	<dependency>
-	    <groupId>org.slf4j</groupId>
-	    <artifactId>slf4j-simple</artifactId>
-	    <version>1.7.13</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.7</version>
-    </dependency>
-    <dependency>
-	  <groupId>org.apache.httpcomponents</groupId>
-	  <artifactId>httpclient</artifactId>
-	  <version>4.5.13</version>
+    <dependencies>
+        <dependency>
+	        <groupId>org.slf4j</groupId>
+	        <artifactId>slf4j-simple</artifactId>
+	        <version>1.7.32</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
+        <dependency>
+	    <groupId>org.apache.httpcomponents</groupId>
+	    <artifactId>httpclient</artifactId>
+	    <version>4.5.13</version>
 	</dependency>
 	<dependency>
-	  <groupId>org.webjars</groupId>
-	  <artifactId>svgo</artifactId>
-	  <version>0.3.7-1</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <source>8</source>
-          <target>8</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.4</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-    <outputDirectory>bin</outputDirectory>
-    <testOutputDirectory>bin</testOutputDirectory>
-  </build>
+	    <groupId>org.webjars</groupId>
+	    <artifactId>svgo</artifactId>
+	    <version>0.3.7-1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+	        <groupId>org.hamcrest</groupId>
+	        <artifactId>hamcrest-library</artifactId>
+	        <version>2.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <author>false</author>
+                    <doclint>none</doclint>
+                    <bottom>Copyright (c) 2019, Salesforce.com, Inc. All rights reserved. Licensed under the BSD 3-Clause license. For full license text, see the LICENSE file in the repository.</bottom>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.7</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>3.0.0-M4</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <useReleaseProfile>false</useReleaseProfile>
+                    <releaseProfiles>release</releaseProfiles>
+                    <goals>deploy</goals>
+                    <tagNameFormat>v@{project.version}</tagNameFormat>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/src/com/salesforce/perfeng/uiperf/ThirdPartyBinaryNotFoundException.java b/src/main/java/com/salesforce/perfeng/uiperf/ThirdPartyBinaryNotFoundException.java
similarity index 100%
rename from src/com/salesforce/perfeng/uiperf/ThirdPartyBinaryNotFoundException.java
rename to src/main/java/com/salesforce/perfeng/uiperf/ThirdPartyBinaryNotFoundException.java
diff --git a/src/com/salesforce/perfeng/uiperf/imageoptimization/Main.java b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/Main.java
similarity index 99%
rename from src/com/salesforce/perfeng/uiperf/imageoptimization/Main.java
rename to src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/Main.java
index e8298b8..f3296ee 100644
--- a/src/com/salesforce/perfeng/uiperf/imageoptimization/Main.java
+++ b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/Main.java
@@ -52,7 +52,6 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.http.annotation.Immutable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +67,6 @@
  * 
  * @author eperret (Eric Perret)
  */
-@Immutable
 public class Main {
 
 	/**
diff --git a/src/com/salesforce/perfeng/uiperf/imageoptimization/dto/OptimizationResult.java b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/dto/OptimizationResult.java
similarity index 100%
rename from src/com/salesforce/perfeng/uiperf/imageoptimization/dto/OptimizationResult.java
rename to src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/dto/OptimizationResult.java
diff --git a/src/com/salesforce/perfeng/uiperf/imageoptimization/service/IImageOptimizationService.java b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/service/IImageOptimizationService.java
similarity index 100%
rename from src/com/salesforce/perfeng/uiperf/imageoptimization/service/IImageOptimizationService.java
rename to src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/service/IImageOptimizationService.java
diff --git a/src/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationService.java b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationService.java
similarity index 99%
rename from src/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationService.java
rename to src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationService.java
index 7b61f10..a953976 100644
--- a/src/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationService.java
+++ b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationService.java
@@ -56,8 +56,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.annotation.ThreadSafe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,14 +66,12 @@
 import com.salesforce.perfeng.uiperf.imageoptimization.utils.ImageUtils;
 
 /**
- * Service used to perform the optimization of images.
+ * Service used to perform the optimization of images. This class is thread safe.
  * 
  * @author eperret (Eric Perret)
  * @since 186.internal
  * @param <C> Contains the changeList information.
  */
-@Immutable
-@ThreadSafe
 public class ImageOptimizationService<C> implements IImageOptimizationService<C> {
 
 	/**
diff --git a/src/com/salesforce/perfeng/uiperf/imageoptimization/utils/FixedFileUtils.java b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/FixedFileUtils.java
similarity index 100%
rename from src/com/salesforce/perfeng/uiperf/imageoptimization/utils/FixedFileUtils.java
rename to src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/FixedFileUtils.java
diff --git a/src/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageFileOptimizationException.java b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageFileOptimizationException.java
similarity index 100%
rename from src/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageFileOptimizationException.java
rename to src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageFileOptimizationException.java
diff --git a/src/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtils.java b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtils.java
similarity index 98%
rename from src/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtils.java
rename to src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtils.java
index 53c2a30..2ae7cf0 100644
--- a/src/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtils.java
+++ b/src/main/java/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtils.java
@@ -20,21 +20,17 @@
 import javax.swing.ImageIcon;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.http.annotation.Immutable;
-import org.apache.http.annotation.ThreadSafe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.salesforce.perfeng.uiperf.ThirdPartyBinaryNotFoundException;
 
 /**
- * Utility methods used to interact with images.
+ * Utility methods used to interact with images. This class is thread safe.
  * 
  * @author eperret (Eric Perret)
  * @since 186.internal
  */
-@Immutable
-@ThreadSafe
 public class ImageUtils {
 
 	private final static Logger logger = LoggerFactory.getLogger(ImageUtils.class);
diff --git a/src/log4j2.xml b/src/main/java/log4j2.xml
similarity index 100%
rename from src/log4j2.xml
rename to src/main/java/log4j2.xml
diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5e94951
--- /dev/null
+++ b/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/AllTests.java b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/AllTests.java
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/AllTests.java
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/AllTests.java
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationServiceTest.java b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationServiceTest.java
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationServiceTest.java
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/ImageOptimizationServiceTest.java
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/addCol.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/addCol.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/addCol.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/addCol.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.2png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.2png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.2png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.2png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/csv_120.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/doctype_16_sprite.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/doctype_16_sprite.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/doctype_16_sprite.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/doctype_16_sprite.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/el_icon.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/el_icon.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/el_icon.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/el_icon.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/imagebomb.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/imagebomb.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/imagebomb.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/imagebomb.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/loading.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/loading.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/loading.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/loading.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/no_transparency.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/no_transparency.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/no_transparency.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/no_transparency.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/owner_key_icon.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/owner_key_icon.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/owner_key_icon.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/owner_key_icon.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/s arrow bo.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/s arrow bo.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/s arrow bo.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/s arrow bo.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/s-arrow-bo.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/s-arrow-bo.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/s-arrow-bo.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/s-arrow-bo.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/safe32.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/safe32.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/safe32.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/safe32.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sharin g model2.jpg b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sharin g model2.jpg
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/sharin g model2.jpg
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sharin g model2.jpg
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sharing_model2.jpg b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sharing_model2.jpg
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/sharing_model2.jpg
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sharing_model2.jpg
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sprite arrow enlarge max min shrink x blue.gif.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sprite arrow enlarge max min shrink x blue.gif.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/service/sprite arrow enlarge max min shrink x blue.gif.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/service/sprite arrow enlarge max min shrink x blue.gif.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/2013_summer_force.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/2013_summer_force.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/2013_summer_force.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/2013_summer_force.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtilsTest.java b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtilsTest.java
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtilsTest.java
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/ImageUtilsTest.java
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/forceapp_bg.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif.tmp b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif.tmp
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif.tmp
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/no_transparency.gif.tmp
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo2.gif b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo2.gif
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo2.gif
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/s-arrow-bo2.gif
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_optimized.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_optimized.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_optimized.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_optimized.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_unoptimized.png b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_unoptimized.png
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_unoptimized.png
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/safe32_unoptimized.png
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small.jpg b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small.jpg
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small.jpg
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small.jpg
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_jpegmini.jpg b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_jpegmini.jpg
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_jpegmini.jpg
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_jpegmini.jpg
diff --git a/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_smushit.jpg b/src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_smushit.jpg
similarity index 100%
rename from test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_smushit.jpg
rename to src/test/com/salesforce/perfeng/uiperf/imageoptimization/utils/sergey_reasonably_small_smushit.jpg