Various build fixes

diff --git a/acid/src/main/java/net/rizon/acid/messages/Encap.java b/acid/src/main/java/net/rizon/acid/messages/Encap.java
index 9df87cacf6f187226509c5460e7554c03262f2da..07569d7cf069934e1189c4ad8ad122ab1ed334f9 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/messages/Encap.java
+++ b/acid/src/main/java/net/rizon/acid/messages/Encap.java
@@ -19,16 +19,16 @@ public class Encap extends Message
        @Override
        public void onUser(User user, String[] params)
        {
-               processEncap(params);
+               processEncap(user, null, params);
        }
 
        @Override
        public void onServer(Server source, String[] params)
        {
-               processEncap(params);
+               processEncap(null, source, params);
        }
        
-       private void processEncap(String[] params)
+       private void processEncap(User source_user, Server source, String[] params)
        {
                if (!Util.iswm(params[0], AcidCore.me.getName()) && !params[1].equalsIgnoreCase(AcidCore.me.getSID()))
                        ;
@@ -85,7 +85,7 @@ public class Encap extends Message
                else if (params[1].equals("SWEBIRC"))
                {
                        int parc = params.length;
-                       if (parc < 10)
+                       if (parc < 10 || source == null)
                                return;
                        
                        Acidictive.onWebIRC(source,
@@ -108,4 +108,4 @@ public class Encap extends Message
                        user.setRealhost(params[3], params[4]);
                }
        }
-}
\ No newline at end of file
+}

diff --git a/pyva/core/pom.xml b/pyva/core/pom.xml
index 61a02a9583363e3f70c12169d18b1e5201d204c4..5dbc01d5baa052e83844261769581622df4042da 100644 (file)
--- a/pyva/core/pom.xml
+++ b/pyva/core/pom.xml
@@ -18,8 +18,8 @@
       <version>4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>net.rizon</groupId>
-      <artifactId>pyva-java</artifactId>
+      <groupId>net.rizon.pyva</groupId>
+      <artifactId>pyva</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>

diff --git a/pyva/pom.xml b/pyva/pom.xml
index fc3a6b46330a999d1c4f153d512c9cb7fd56213e..f9f7bdd978f06a3de5027fd41892c45b76164704 100644 (file)
--- a/pyva/pom.xml
+++ b/pyva/pom.xml
@@ -19,6 +19,6 @@
     <module>pyva</module>
     <!-- Native pyva library, external (is a submodule). 'Core' packages with this it
         as a dependency.  -->
-    <module>pyva-native</module>
+    <module>libpyva</module>
   </modules>
 </project>

diff --git a/pyva/pyva.example.yml b/pyva/pyva.example.yml
index bf76a29c0fdab12916dfc676ca3c96c1af5d8e58..15ac194f1c1c297b028f4f505253d7e1e3f48f24 100644 (file)
--- a/pyva/pyva.example.yml
+++ b/pyva/pyva.example.yml
@@ -92,7 +92,7 @@ clients:
   channels: [ py ]
 
 path:
- - "./pyva/pyva-native/pyva-java/src/main/python/"
+ - "./pyva/libpyva/pyva/src/main/python"
  - "./pyva/pyva/src/main/python/"
 
 plugins:

diff --git a/pyva/pyva/pom.xml b/pyva/pyva/pom.xml
index 78a915c6311b485caee25835b3e039c83f08ad41..887f01262352fe22b10278fa668a8040563f3612 100644 (file)
--- a/pyva/pyva/pom.xml
+++ b/pyva/pyva/pom.xml
@@ -18,8 +18,8 @@
       <version>4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>net.rizon</groupId>
-      <artifactId>pyva-java</artifactId>
+      <groupId>net.rizon.pyva</groupId>
+      <artifactId>pyva</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
   </dependencies>