Changeset 5746

Timestamp:

Sep 15, 2011, 1:42:31 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1592: Unified installation procedure for plug-ins, extensions and more...

Fixed the problem with the XJspCompiler.

File:

• trunk/src/misc/compiler/net/sf/basedb/clients/web/extensions/XJspCompiler.java (modified) (4 diffs)

trunk/src/misc/compiler/net/sf/basedb/clients/web/extensions/XJspCompiler.java

@@ -64 +64 @@
   
   /**
-    The location where the extension system is looking for extensions.
-  */
-  public static final String EXTENSIONS_URL = "/WEB-INF/extensions";
-  
-  /**
     The location where the extensions resources are extracted.
   */
@@ -80 +75 @@
     Pattern.compile(RESOURCES_URL + "/([^/]+)/(.+\\.xjsp)");
     
+  // The path to the plug-ins directory
+  private File pluginsDir;
   // If this JSP is an extensions JSP
   private boolean isXJsp;
@@ -100 +97 @@
   */
   @Override
-  public void init(JspCompilationContext ctxt, JspServletWrapper jsw) 
-  {
+  public void init(JspCompilationContext ctxt, JspServletWrapper jsw)
+  {
+    super.init(ctxt, jsw);
     String jspName = ctxt.getJspFile();
+    if (log.isDebugEnabled())
+    {
+      log.debug("Initialising XJSP compiler for file: " + jspName);
+    }
     Matcher m = PATH_MATCH.matcher(jspName);
     if (m.matches())
     {
       String jarName = m.group(1);
-      String jarPath = ctxt.getRealPath(EXTENSIONS_URL + "/" + jarName);
-      extensionsJar = new File(jarPath);
+      File pluginsDir = getPluginsDir();
+      extensionsJar = new File(pluginsDir, jarName);
       isXJsp = extensionsJar.exists();
-        }
-    if (log.isDebugEnabled())
-    {
-      log.debug("Initialising XJSP compiler for file: " + jspName + 
-        "; JAR=" + extensionsJar + "; isXJsp=" + isXJsp);
-    }
-    super.init(ctxt, jsw);
+      }
+    if (log.isDebugEnabled())
+    {
+      log.debug("JAR=" + extensionsJar + "; isXJsp=" + isXJsp);
+    }
   }
 
@@ -201 +201 @@
   protected ClassLoader getWebAppClassLoader()
   {
-    return ctxt.getRuntimeContext().getParentClassLoader();
-  }
-
+    return getCompilationContext().getRuntimeContext().getParentClassLoader();
+  }
+
+  /**
+    Get the path to the plug-in directory from BASE.
+    @since 3.0
+  */
+  protected File getPluginsDir()
+  {
+    if (pluginsDir == null)
+    {
+      try
+      {
+        ClassLoader webAppLoader = getWebAppClassLoader();
+        Class<?> appClass = Class.forName("net.sf.basedb.core.Application", true, webAppLoader);
+        Method getPluginsDirectory = appClass.getMethod("getPluginsDirectory");
+        pluginsDir = (File)getPluginsDirectory.invoke(null);
+      }
+      catch (Exception ex)
+      {
+        log.error("Could not get plug-ins directory", ex);
+      }
+    }
+    return pluginsDir;
+  }
   
 }