Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 83732 invoked from network); 28 Oct 2001 09:58:26 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 28 Oct 2001 09:58:26 -0000 Received: (qmail 8950 invoked by uid 97); 28 Oct 2001 09:58:39 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 8939 invoked from network); 28 Oct 2001 09:58:39 -0000 Date: 28 Oct 2001 09:49:43 -0000 Message-ID: <20011028094943.44754.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-avalon-phoenix-cvs@apache.org Subject: cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/installer Installer.java X-Spam-Rating: taz3.hyperreal.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 01/10/28 01:49:42 Modified: src/java/org/apache/avalon/phoenix/tools/installer Installer.java Log: Keep assembly.xml in .sar file and add a warning note that jars still expanded onto filesystem is a hack. Revision Changes Path 1.14 +13 -16 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Installer.java 2001/10/28 03:39:43 1.13 +++ Installer.java 2001/10/28 09:49:42 1.14 @@ -58,7 +58,6 @@ private static final String SERVER_XML = "SAR-INF/server.xml"; //The names on the native filesystem - private static final String FS_ASSEMBLY_XML = "SAR-INF" + File.separator + "assembly.xml"; private static final String FS_CONFIG_XML = "SAR-INF" + File.separator + "config.xml"; private static final String FS_SERVER_XML = "SAR-INF" + File.separator + "server.xml"; @@ -74,18 +73,18 @@ final FileDigest[] infos = installation.getFileDigests(); final Checksum checksum = new CRC32(); - if ( infos != null ) + if( infos != null ) { - for ( int i = 0; i < infos.length; i++ ) + for( int i = 0; i < infos.length; i++ ) { final File file = infos[i].getFile(); final File parent = file.getParentFile(); - if ( file.exists() ) + if( file.exists() ) { final String message = REZ.getString( "skip-removal", file ); - if ( file.lastModified() != infos[i].getModified() ) + if( file.lastModified() != infos[i].getModified() ) { getLogger().debug( message ); continue; @@ -93,14 +92,14 @@ checksum( file, checksum ); - if ( checksum.getValue() != infos[i].getChecksum() ) + if( checksum.getValue() != infos[i].getChecksum() ) { getLogger().debug( message ); continue; } file.delete(); - if ( parent.list().length == 0 ) parent.delete(); + if( 0 == parent.list().length ) parent.delete(); } } } @@ -113,15 +112,15 @@ */ private void checksum( final File file, final Checksum checksum ) { - InputStream input = null; checksum.reset(); - + + InputStream input = null; try { input = new CheckedInputStream( new FileInputStream( file ), checksum ); IOUtil.toByteArray( input ); } - catch ( IOException ioe ) + catch( final IOException ioe ) { final String message = REZ.getString( "checksum-failure", file ); getLogger().warn( message ); @@ -280,18 +279,16 @@ final String name = fixName( entry.getName() ); boolean expand = true; - boolean isJar = false; //Don't expand anything below SAR-INF directory unless they //are the config.xml or server.xml files which will be expanded //as a special case atm. if( name.startsWith( SAR_INF ) && - !name.equals( ASSEMBLY_XML ) && !name.equals( SERVER_XML ) && !name.equals( CONFIG_XML ) ) { - //expand = false; + expand = false; //Grab all the jar files in the //directory SAR-INF/lib @@ -300,7 +297,8 @@ LIB.length() == name.lastIndexOf( "/" ) ) { isJar = true; - //expand = false; + expand = true; + //HACK: expand files until ClassLoader works properly //final String jar = baseURL + name; //jars.add( jar ); } @@ -336,8 +334,7 @@ //Prepare and create Installation final String[] classPath = (String[])jars.toArray( new String[ 0 ] ); - //final String assembly = baseURL + ASSEMBLY_XML; - final String assembly = getURLAsString( new File( directory, FS_ASSEMBLY_XML ) ); + final String assembly = "jar:" + getURLAsString( file ) + "!/" + ASSEMBLY_XML; final String config = getURLAsString( new File( directory, FS_CONFIG_XML ) ); final String server = getURLAsString( new File( directory, FS_SERVER_XML ) ); final FileDigest[] fileDigests = (FileDigest[])digests.toArray( new FileDigest[0] ); -- To unsubscribe, e-mail: For additional commands, e-mail: