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 2002/05/15 14:48:59 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer Installer.java Resources.properties
donaldp 02/05/15 05:48:59
Modified: src/java/org/apache/avalon/phoenix/components/deployer/installer
Installer.java Resources.properties
Log:
Remove support for deploying a directory as a pseudo-sar file
Revision Changes Path
1.7 +3 -25 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installer.java
Index: Installer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Installer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Installer.java 15 May 2002 12:27:38 -0000 1.6
+++ Installer.java 15 May 2002 12:48:59 -0000 1.7
@@ -34,7 +34,7 @@
* and installing it as appropriate.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
- * @version $Revision: 1.6 $ $Date: 2002/05/15 12:27:38 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/15 12:48:59 $
*/
public class Installer
extends AbstractLogEnabled
@@ -170,10 +170,8 @@
if( file.isDirectory() )
{
final String message =
- REZ.getString( "deprecated-sar-format", url );
- System.err.println( message );
- getLogger().warn( message );
- return installDeprecated( file );
+ REZ.getString( "install.sar-isa-dir.error", name, url );
+ throw new InstallationException( message );
}
//Get Zipfile representing .sar file
@@ -607,26 +605,6 @@
return new Installation( file, directory, directory,
config, assembly, server,
classPath, fileDigests, timestamp );
- }
-
- /**
- * Create an Installation from a Sar in deprecated format.
- *
- * @param directory the directory containing extracted .sar
- * @return the Installaiton
- */
- private Installation installDeprecated( final File directory )
- throws InstallationException
- {
- final String[] classPath = getClassPathForDirectory( directory );
- final String config = getURLAsString( new File( directory, OLD_CONFIG_XML ) );
- final String assembly = getURLAsString( new File( directory, OLD_ASSEMBLY_XML ) );
- final String server = getURLAsString( new File( directory, OLD_SERVER_XML ) );
- final long timestamp = System.currentTimeMillis();
-
- return new Installation( directory, directory, directory,
- config, assembly, server,
- classPath, null, timestamp );
}
/**
1.2 +2 -1 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Resources.properties
Index: Resources.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/installer/Resources.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resources.properties 11 May 2002 02:05:13 -0000 1.1
+++ Resources.properties 15 May 2002 12:48:59 -0000 1.2
@@ -14,4 +14,5 @@
checksum-failure=Failed to compute checksum for {0} file.
deprecated-environment-xml=The .sar at "{0}" uses a deprecated format to refer to environment information. Environment information should not be stored in "SAR-INF/server.xml" but in "SAR-INF/environment.xml".
-nodelete-workdir.error=Error deleting Work Directory "{0}". (Reason: {1})
\ No newline at end of file
+nodelete-workdir.error=Error deleting Work Directory "{0}". (Reason: {1})
+install.sar-isa-dir.error=While attempting to install aplication named "{0}" via URL {1}. The URL resolved to a directory.
\ No newline at end of file
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>