You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2001/11/21 11:55:58 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer Installer.java
donaldp 01/11/21 02:55:58
Modified: src/java/org/apache/avalon/phoenix/tools/installer
Installer.java
Log:
Made installer add SAR-INF/classes to classpath of application.
Revision Changes Path
1.23 +11 -0 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java
Index: Installer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer/Installer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Installer.java 2001/11/19 12:21:31 1.22
+++ Installer.java 2001/11/21 10:55:57 1.23
@@ -51,6 +51,7 @@
private static final String META_INF = "META-INF";
private static final String SAR_INF = "SAR-INF";
private static final String LIB = "SAR-INF/lib";
+ private static final String CLASSES = "SAR-INF/classes/";
private static final String ASSEMBLY_XML = "SAR-INF/assembly.xml";
private static final String CONFIG_XML = "SAR-INF/config.xml";
private static final String SERVER_XML = "SAR-INF/server.xml";
@@ -280,6 +281,7 @@
boolean expand = true;
boolean isJar = false;
+ boolean classesAdded = false;
//Don't expand anything below SAR-INF directory unless they
//are the config.xml or server.xml files which will be expanded
@@ -290,6 +292,15 @@
!name.equals( CONFIG_XML ) )
{
expand = false;
+
+ if( false == classesAdded &&
+ name.startsWith( CLASSES ) )
+ {
+ final String classes =
+ "jar:" + getURLAsString( file ) + "!/" + CLASSES;
+ jars.add( classes );
+ expand = false;
+ }
//Grab all the jar files in the
//directory SAR-INF/lib
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>