Changed path to web.xml according to new location defined in build.xml.

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1281 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/container/PluginManager.java

@@ -181,7 +181,7 @@ public class PluginManager {
                 pluginDirs.put(plugin, pluginDir);
                 classloaders.put(plugin, pluginLoader);
                 // Load any JSP's defined by the plugin.
-                File webXML = new File(pluginDir, "web" + File.separator + "web.xml");
+                File webXML = new File(pluginDir, "web" + File.separator + "WEB-INF" + File.separator + "web.xml");
                 if (webXML.exists()) {
                     PluginServlet.registerServlets(this, plugin, webXML);
                 }

src/java/org/jivesoftware/messenger/container/PluginServlet.java

@@ -114,7 +114,7 @@ public class PluginServlet extends HttpServlet {
         }
         // Find the name of the plugin directory given that the webXML file
         // lives in plugins/[pluginName]/web/web.xml
-        String pluginName = webXML.getParentFile().getParentFile().getName();
+        String pluginName = webXML.getParentFile().getParentFile().getParentFile().getName();
         try {
             // Make the reader non-validating so that it doesn't try to resolve external
             // DTD's. Trying to resolve external DTD's can break on some firewall configurations.