Move pyva.core and pyva.pyva packages to match their names

diff --git a/acid/src/main/java/net/rizon/acid/core/Plugin.java b/acid/src/main/java/net/rizon/acid/core/Plugin.java
index dedb89fb6c1489f71d2b1b1be67e54181a3fddcf..ff28c301f90fa6296cf3c408e5cf86566457f141 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/core/Plugin.java
+++ b/acid/src/main/java/net/rizon/acid/core/Plugin.java
@@ -51,7 +51,7 @@ public abstract class Plugin
                String finalName = name.substring(name.lastIndexOf('.') + 1);
 
                ClassLoader cl = new ClassLoader(name, pluginBase + name);
-               Class<?> c = cl.loadClass(pluginBase + finalName + "." + finalName);
+               Class<?> c = cl.loadClass(pluginBase + name + "." + finalName);
                Constructor<?> con = c.getConstructor();
                p = (Plugin) con.newInstance();
                p.name = name;

diff --git a/pyva/core/src/main/java/net/rizon/acid/plugins/pyvacore/core.java b/pyva/core/src/main/java/net/rizon/acid/plugins/pyva/core/core.java
similarity index 88%
rename from pyva/core/src/main/java/net/rizon/acid/plugins/pyvacore/core.java
rename to pyva/core/src/main/java/net/rizon/acid/plugins/pyva/core/core.java
index b491c3d786c4f0ad3172ead67b96f188c4acc70b..6c129c3de536763c66a866bc872d9a8a96f7fa18 100644 (file)
--- a/pyva/core/src/main/java/net/rizon/acid/plugins/pyvacore/core.java
+++ b/pyva/core/src/main/java/net/rizon/acid/plugins/pyva/core/core.java
@@ -1,4 +1,4 @@
-package net.rizon.acid.plugins.core;
+package net.rizon.acid.plugins.pyva.core;
 
 import net.rizon.acid.core.Plugin;
 import net.rizon.acid.util.ClassLoader;

diff --git a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/Interface.java b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/Interface.java
similarity index 94%
rename from pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/Interface.java
rename to pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/Interface.java
index 1ac6f3d40221dc935464c0104fd72f1349175e42..87dd5e6a619ade7fabc88873fb22fd014a1db68f 100644 (file)
--- a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/Interface.java
+++ b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/Interface.java
@@ -1,4 +1,4 @@
-package net.rizon.acid.plugins.pyva;
+package net.rizon.acid.plugins.pyva.pyva;
 
 import net.rizon.acid.core.Acidictive;
 import net.rizon.acid.core.Channel;

diff --git a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/commands/GC.java b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/commands/GC.java
similarity index 90%
rename from pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/commands/GC.java
rename to pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/commands/GC.java
index bcbdc1f034bca0a54d5f9080dd4cc8769e00c65d..d678e9b7a1ad4ab20a3b75e531d3aa9ffafe4651 100644 (file)
--- a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/commands/GC.java
+++ b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/commands/GC.java
@@ -1,11 +1,11 @@
-package net.rizon.acid.plugins.pyva.commands;
+package net.rizon.acid.plugins.pyva.pyva.commands;
 
 import static net.rizon.acid.core.Acidictive.reply;
 import net.rizon.acid.core.AcidUser;
 import net.rizon.acid.core.Channel;
 import net.rizon.acid.core.Command;
 import net.rizon.acid.core.User;
-import net.rizon.acid.plugins.pyva.pyva;
+import net.rizon.acid.plugins.pyva.pyva.pyva;
 
 public class GC extends Command
 {

diff --git a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/commands/Plugins.java b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/commands/Plugins.java
similarity index 95%
rename from pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/commands/Plugins.java
rename to pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/commands/Plugins.java
index caff42a083e2b6e418e7ca83ac27bb407a073e06..86aea62eeb3f060ea8aaff3583aef6beea5f4741 100644 (file)
--- a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/commands/Plugins.java
+++ b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/commands/Plugins.java
@@ -1,4 +1,4 @@
-package net.rizon.acid.plugins.pyva.commands;
+package net.rizon.acid.plugins.pyva.pyva.commands;
 
 import java.util.logging.Level;
 
@@ -8,7 +8,7 @@ import net.rizon.acid.core.Channel;
 import net.rizon.acid.core.Command;
 import net.rizon.acid.core.Logger;
 import net.rizon.acid.core.User;
-import net.rizon.acid.plugins.pyva.pyva;
+import net.rizon.acid.plugins.pyva.pyva.pyva;
 import net.rizon.pyva.PyvaException;
 
 public class Plugins extends Command

diff --git a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/conf/Config.java b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/conf/Config.java
similarity index 88%
rename from pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/conf/Config.java
rename to pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/conf/Config.java
index 1cb1977c669aa811f1ce523edd0b0b4673d7d869..0023e06a76a4193640ea05484319462c677ef430 100644 (file)
--- a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/conf/Config.java
+++ b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/conf/Config.java
@@ -1,4 +1,4 @@
-package net.rizon.acid.plugins.pyva.conf;
+package net.rizon.acid.plugins.pyva.pyva.conf;
 
 import java.util.List;
 

diff --git a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva.java b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/pyva.java
similarity index 97%
rename from pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva.java
rename to pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/pyva.java
index 06cd4f51c6eb02224e329b77c077f79a81961d1c..4388fc8f1a17d2c5e48623a2d0f775266f360c29 100644 (file)
--- a/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva.java
+++ b/pyva/pyva/src/main/java/net/rizon/acid/plugins/pyva/pyva/pyva.java
@@ -1,4 +1,4 @@
-package net.rizon.acid.plugins.pyva;
+package net.rizon.acid.plugins.pyva.pyva;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -11,7 +11,7 @@ import net.rizon.acid.core.Logger;
 import net.rizon.acid.core.Plugin;
 import net.rizon.acid.core.Timer;
 import net.rizon.acid.core.User;
-import net.rizon.acid.plugins.pyva.conf.Config;
+import net.rizon.acid.plugins.pyva.pyva.conf.Config;
 import net.rizon.acid.util.ClassLoader;
 import net.rizon.pyva.Pyva;
 import net.rizon.pyva.PyvaException;