[Jetty-cvslog] CVS update: JettyExperimental/modules/maven-plugin/src/main/java/org/mortbay/jetty/plugin JettyMavenConfiguration.java JettyMojo.java

[Jan B. <ja...@us...>]

  User: janb    
  Date: 05/10/30 09:20:26

  Modified:    modules/maven-plugin/src/main/java/org/mortbay/jetty/plugin
                        JettyMavenConfiguration.java JettyMojo.java
  Log:
  use jasper 5.5.9 as it does not require tools.jar to be on the system classpath for jsp compilation
  
  Revision  Changes    Path
  1.5       +38 -1     JettyExperimental/modules/maven-plugin/src/main/java/org/mortbay/jetty/plugin/JettyMavenConfiguration.java
  
  Index: JettyMavenConfiguration.java
  ===================================================================
  RCS file: /cvsroot/jetty/JettyExperimental/modules/maven-plugin/src/main/java/org/mortbay/jetty/plugin/JettyMavenConfiguration.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- JettyMavenConfiguration.java	28 Oct 2005 12:18:06 -0000	1.4
  +++ JettyMavenConfiguration.java	30 Oct 2005 17:20:26 -0000	1.5
  @@ -69,8 +69,11 @@
       public void configureClassLoader() throws Exception 
       {
           getLog().info("Setting up classpath ...");
  +        
  +        //put the classes into the classpath
           ((WebAppClassLoader)getWebAppContext().getClassLoader()).addClassPath(classesDir.getCanonicalPath());
           
  +        //put the dependencies into the classpath
           Iterator itor = libFiles.iterator();
           while (itor.hasNext())
               ((WebAppClassLoader)getWebAppContext().getClassLoader()).addClassPath(((File)itor.next()).getCanonicalPath());
  @@ -79,6 +82,11 @@
           while (itor.hasNext())
               ((WebAppClassLoader)getWebAppContext().getClassLoader()).addClassPath(((File)itor.next()).getCanonicalPath());
   
  +        //put tools.jar into the classpath
  +        //File toolsJar = findToolsJar();
  +        //if (toolsJar != null)       	
  +        //	((WebAppClassLoader)getWebAppContext().getClassLoader()).addClassPath(toolsJar.getCanonicalPath());
  +        
           getLog().info("Finished setting up classpath");
       }
   
  @@ -123,5 +131,34 @@
       }
       
      
  +    private File findToolsJar()
  +    throws Exception
  +    {
  +    	 String javaHomeStr = System.getProperty("java.home");
  +         if ((javaHomeStr==null) || (javaHomeStr.equals("")))
  +         {
  +         		getLog().info("Environment variable JAVA_HOME not set, JSP compilation not available");
  +         		return null;
  +         }
  +         
  +    	getLog().info("java.home="+javaHomeStr);
  +    	File jdkHomeDir = new File (javaHomeStr);
  +    	File jdkLibDir = new File(jdkHomeDir, "lib");
  +    	File toolsJar = new File (jdkLibDir, "tools.jar");
  +    	
  +    	if (!toolsJar.exists())
  +    	{
  +    		jdkLibDir = new File (jdkHomeDir.getParentFile(), "lib");
  +    		toolsJar = new File(jdkLibDir, "tools.jar");
  +    		
  +    		if (!toolsJar.exists())
  +    		{
  +    			getLog().info("tools.jar does not exist, JSP compilation not available");
  +    			return null;
  +    		}
  +    	}
  +    	return toolsJar;
  +    }
  +   
   
   }
  
  
  
  1.9       +2 -1      JettyExperimental/modules/maven-plugin/src/main/java/org/mortbay/jetty/plugin/JettyMojo.java
  
  Index: JettyMojo.java
  ===================================================================
  RCS file: /cvsroot/jetty/JettyExperimental/modules/maven-plugin/src/main/java/org/mortbay/jetty/plugin/JettyMojo.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -r1.8 -r1.9
  --- JettyMojo.java	27 Oct 2005 18:44:54 -0000	1.8
  +++ JettyMojo.java	30 Oct 2005 17:20:26 -0000	1.9
  @@ -51,6 +51,7 @@
    *  </p>
    *  
    * @goal run
  + * @requiresDependencyResolution runtime
    * @description Runs jetty6 directly from a maven project
    *
    */