shuber 2004/10/12 19:40:57 CEST
Modified files:
src/java/org/jahia/tomcat/jasper FilteringClassLoader.java
JasperLaunch.java
Log:
- Code cleanup
- Bugfix when running with Tomcat 5.0 (must still test with Tomcat 5.5)
Revision Changes Path
1.2 +1 -0
maven-jahiawar-plugin/src/java/org/jahia/tomcat/jasper/FilteringClassLoader.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/src/java/org/jahia/tomcat/jasper/FilteringClassLoader.java.diff?r1=1.1&r2=1.2&f=h
1.2 +0 -20
maven-jahiawar-plugin/src/java/org/jahia/tomcat/jasper/JasperLaunch.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/src/java/org/jahia/tomcat/jasper/JasperLaunch.java.diff?r1=1.1&r2=1.2&f=h
Index: FilteringClassLoader.java
===================================================================
RCS file:
/home/cvs/repository/maven-jahiawar-plugin/src/java/org/jahia/tomcat/jasper/FilteringClassLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilteringClassLoader.java 12 Oct 2004 17:21:33 -0000 1.1
+++ FilteringClassLoader.java 12 Oct 2004 17:40:56 -0000 1.2
@@ -20,6 +20,7 @@
public Class findClass(String name) throws ClassNotFoundException {
if (name.startsWith("java.") ||
+ name.startsWith("sun.") ||
name.startsWith("javax.xml.") ||
name.startsWith("org.apache.xerces.") ||
name.startsWith("org.xml.sax.") ||
Index: JasperLaunch.java
===================================================================
RCS file:
/home/cvs/repository/maven-jahiawar-plugin/src/java/org/jahia/tomcat/jasper/JasperLaunch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JasperLaunch.java 12 Oct 2004 17:21:33 -0000 1.1
+++ JasperLaunch.java 12 Oct 2004 17:40:56 -0000 1.2
@@ -24,8 +24,6 @@
ClassLoader originalClassLoader = null;
//context variables
- private static final String MAVEN_DEPENDENCY_CLASSPATH_PROPERTY =
- "maven.dependency.classpath";
private static final String MAVEN_BUILD_DEST_PROPERTY =
"maven.build.dest";
private static final String POM_PROPERTY =
@@ -106,24 +104,6 @@
*/
void setupClassLoader() throws IOException, JellyTagException {
- /*
- <ant:path id="jspc.classpath">
- <echo message="Java home=${java.home}" />
- <ant:pathelement location="${java.home}/../lib/tools.jar"/>
- <ant:fileset dir="${catalina.home.dir}/bin">
- <ant:include name="*.jar"/>
- </ant:fileset>
- <ant:fileset dir="${catalina.home.dir}/server/lib">
- <ant:include name="*.jar"/>
- </ant:fileset>
- <ant:fileset dir="${catalina.home.dir}/common/lib">
- <ant:include name="*.jar"/>
- </ant:fileset>
- <ant:path refid="maven.dependency.classpath"/>
- <ant:pathelement path="${maven.build.dest}"/>
- </ant:path>
- */
-
ArrayList pathURLs = new ArrayList();
String javaHome = (String) context.getVariable(JAVA_HOME_PROPERTY);
File toolsJar = new File(javaHome + File.separator + ".." + File.separator
+ "tools.jar");
