From d6658809cf690fcdacb8ac2c5666a7cb2477b86e Mon Sep 17 00:00:00 2001
From: mbechler <bechler@agno3.eu>
Date: Sat, 5 Mar 2016 17:28:44 +0100
Subject: [PATCH] Move payload annotation to annotation package.

---
 src/main/java/ysoserial/payloads/C3P0.java                      | 2 +-
 src/main/java/ysoserial/payloads/FileUpload1.java               | 2 +-
 src/main/java/ysoserial/payloads/Hibernate2.java                | 2 +-
 src/main/java/ysoserial/payloads/JRMPClient.java                | 2 +-
 src/main/java/ysoserial/payloads/JRMPListener.java              | 2 +-
 src/main/java/ysoserial/payloads/Jdk7u21.java                   | 2 +-
 .../java/ysoserial/{ => payloads/annotation}/PayloadTest.java   | 2 +-
 src/test/java/ysoserial/payloads/PayloadsTest.java              | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename src/main/java/ysoserial/{ => payloads/annotation}/PayloadTest.java (88%)

diff --git a/src/main/java/ysoserial/payloads/C3P0.java b/src/main/java/ysoserial/payloads/C3P0.java
index 035a7fb..36900c5 100644
--- a/src/main/java/ysoserial/payloads/C3P0.java
+++ b/src/main/java/ysoserial/payloads/C3P0.java
@@ -15,8 +15,8 @@ import javax.sql.PooledConnection;
 import com.mchange.v2.c3p0.PoolBackedDataSource;
 import com.mchange.v2.c3p0.impl.PoolBackedDataSourceBase;
 
-import ysoserial.PayloadTest;
 import ysoserial.payloads.annotation.Dependencies;
+import ysoserial.payloads.annotation.PayloadTest;
 import ysoserial.payloads.util.PayloadRunner;
 import ysoserial.payloads.util.Reflections;
 
diff --git a/src/main/java/ysoserial/payloads/FileUpload1.java b/src/main/java/ysoserial/payloads/FileUpload1.java
index db84ac7..38f926d 100644
--- a/src/main/java/ysoserial/payloads/FileUpload1.java
+++ b/src/main/java/ysoserial/payloads/FileUpload1.java
@@ -12,8 +12,8 @@ import org.apache.commons.fileupload.disk.DiskFileItem;
 import org.apache.commons.io.output.DeferredFileOutputStream;
 import org.apache.commons.io.output.ThresholdingOutputStream;
 
-import ysoserial.PayloadTest;
 import ysoserial.payloads.annotation.Dependencies;
+import ysoserial.payloads.annotation.PayloadTest;
 import ysoserial.payloads.util.PayloadRunner;
 import ysoserial.payloads.util.Reflections;
 
diff --git a/src/main/java/ysoserial/payloads/Hibernate2.java b/src/main/java/ysoserial/payloads/Hibernate2.java
index 601f554..b8c1ae5 100644
--- a/src/main/java/ysoserial/payloads/Hibernate2.java
+++ b/src/main/java/ysoserial/payloads/Hibernate2.java
@@ -1,7 +1,7 @@
 package ysoserial.payloads;
 
 
-import ysoserial.PayloadTest;
+import ysoserial.payloads.annotation.PayloadTest;
 import ysoserial.payloads.util.PayloadRunner;
 
 import com.sun.rowset.JdbcRowSetImpl;
diff --git a/src/main/java/ysoserial/payloads/JRMPClient.java b/src/main/java/ysoserial/payloads/JRMPClient.java
index 093debc..e224542 100644
--- a/src/main/java/ysoserial/payloads/JRMPClient.java
+++ b/src/main/java/ysoserial/payloads/JRMPClient.java
@@ -10,7 +10,7 @@ import java.util.Random;
 import sun.rmi.server.UnicastRef;
 import sun.rmi.transport.LiveRef;
 import sun.rmi.transport.tcp.TCPEndpoint;
-import ysoserial.PayloadTest;
+import ysoserial.payloads.annotation.PayloadTest;
 import ysoserial.payloads.util.PayloadRunner;
 
 
diff --git a/src/main/java/ysoserial/payloads/JRMPListener.java b/src/main/java/ysoserial/payloads/JRMPListener.java
index 4f05e70..0d6f599 100644
--- a/src/main/java/ysoserial/payloads/JRMPListener.java
+++ b/src/main/java/ysoserial/payloads/JRMPListener.java
@@ -7,7 +7,7 @@ import java.rmi.server.UnicastRemoteObject;
 
 import sun.rmi.server.ActivationGroupImpl;
 import sun.rmi.server.UnicastServerRef;
-import ysoserial.PayloadTest;
+import ysoserial.payloads.annotation.PayloadTest;
 import ysoserial.payloads.util.PayloadRunner;
 import ysoserial.payloads.util.Reflections;
 
diff --git a/src/main/java/ysoserial/payloads/Jdk7u21.java b/src/main/java/ysoserial/payloads/Jdk7u21.java
index 1645a3b..811c2e0 100755
--- a/src/main/java/ysoserial/payloads/Jdk7u21.java
+++ b/src/main/java/ysoserial/payloads/Jdk7u21.java
@@ -6,8 +6,8 @@ import java.util.LinkedHashSet;
 
 import javax.xml.transform.Templates;
 
-import ysoserial.PayloadTest;
 import ysoserial.payloads.annotation.Dependencies;
+import ysoserial.payloads.annotation.PayloadTest;
 import ysoserial.payloads.util.Gadgets;
 import ysoserial.payloads.util.PayloadRunner;
 import ysoserial.payloads.util.Reflections;
diff --git a/src/main/java/ysoserial/PayloadTest.java b/src/main/java/ysoserial/payloads/annotation/PayloadTest.java
similarity index 88%
rename from src/main/java/ysoserial/PayloadTest.java
rename to src/main/java/ysoserial/payloads/annotation/PayloadTest.java
index 544f53a..f729988 100644
--- a/src/main/java/ysoserial/PayloadTest.java
+++ b/src/main/java/ysoserial/payloads/annotation/PayloadTest.java
@@ -1,4 +1,4 @@
-package ysoserial;
+package ysoserial.payloads.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/test/java/ysoserial/payloads/PayloadsTest.java b/src/test/java/ysoserial/payloads/PayloadsTest.java
index 4513037..bc86bd2 100644
--- a/src/test/java/ysoserial/payloads/PayloadsTest.java
+++ b/src/test/java/ysoserial/payloads/PayloadsTest.java
@@ -26,13 +26,13 @@ import org.junit.runners.Parameterized.Parameters;
 import ysoserial.CustomPayloadArgs;
 import ysoserial.CustomTest;
 import ysoserial.Deserializer;
-import ysoserial.PayloadTest;
 import ysoserial.Serializer;
 import ysoserial.Throwables;
 import ysoserial.WrappedTest;
 import ysoserial.payloads.TestHarnessTest.ExecMockPayload;
 import ysoserial.payloads.TestHarnessTest.NoopMockPayload;
 import ysoserial.payloads.annotation.Dependencies;
+import ysoserial.payloads.annotation.PayloadTest;
 import ysoserial.payloads.util.ClassFiles;
 import ysoserial.secmgr.ExecCheckingSecurityManager;
 import ysoserial.secmgr.ExecCheckingSecurityManager.ExecException;