Author: brett
Date: Fri Jan 20 00:22:33 2006
New Revision: 370755
URL: http://svn.apache.org/viewcvs?rev=370755&view=rev
Log:
- run file reading code privileged
- do the applet tag convert thing
Modified:
maven/repository-manager/trunk/maven-repository-artifact-applet/src/keystore/keystore
maven/repository-manager/trunk/maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf
Modified:
maven/repository-manager/trunk/maven-repository-artifact-applet/src/keystore/keystore
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-artifact-applet/src/keystore/keystore?rev=370755&r1=370754&r2=370755&view=diff
==============================================================================
Binary files - no diff available.
Modified:
maven/repository-manager/trunk/maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java?rev=370755&r1=370754&r2=370755&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java
(original)
+++
maven/repository-manager/trunk/maven-repository-artifact-applet/src/main/java/org/apache/maven/repository/applet/ChecksumApplet.java
Fri Jan 20 00:22:33 2006
@@ -21,8 +21,11 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.security.AccessController;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
+import java.util.Properties;
/**
* TODO: Description.
@@ -41,32 +44,49 @@
super.init();
}
- public String generateMd5( String file )
+ public String generateMd5( final String file )
throws IOException, NoSuchAlgorithmException
{
- MessageDigest digest = MessageDigest.getInstance( "MD5" );
-
- InputStream fis = new FileInputStream( file );
- try
+ return (String) AccessController.doPrivileged( new PrivilegedAction()
{
- byte[] buffer = new byte[CHECKSUM_BUFFER_SIZE];
- int numRead;
- do
+ public Object run()
{
- numRead = fis.read( buffer );
- if ( numRead > 0 )
+ try
+ {
+ MessageDigest digest = MessageDigest.getInstance( "MD5" );
+
+ InputStream fis = new FileInputStream( file );
+ try
+ {
+ byte[] buffer = new byte[CHECKSUM_BUFFER_SIZE];
+ int numRead;
+ do
+ {
+ numRead = fis.read( buffer );
+ if ( numRead > 0 )
+ {
+ digest.update( buffer, 0, numRead );
+ }
+ }
+ while ( numRead != -1 );
+ }
+ finally
+ {
+ fis.close();
+ }
+
+ return byteArrayToHexStr( digest.digest() );
+ }
+ catch ( NoSuchAlgorithmException e )
{
- digest.update( buffer, 0, numRead );
+ throw new RuntimeException( e );
+ }
+ catch ( IOException e )
+ {
+ throw new RuntimeException( e );
}
}
- while ( numRead != -1 );
- }
- finally
- {
- fis.close();
- }
-
- return byteArrayToHexStr( digest.digest() );
+ } );
}
private static String byteArrayToHexStr( byte[] data )
Modified:
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf?rev=370755&r1=370754&r2=370755&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf
(original)
+++
maven/repository-manager/trunk/maven-repository-webapp/src/main/webapp/WEB-INF/jsp/form.jspf
Fri Jan 20 00:22:33 2006
@@ -30,10 +30,55 @@
<input type="submit" value="Search"/>
</form>
- <applet name="ChecksumApplet" archive="maven-repository-artifact-applet.jar"
- width="1" height="1"
- code="org/apache/maven/repository/applet/ChecksumApplet.class">
- </applet>
+ <!--"CONVERTED_APPLET"-->
+<!-- HTML CONVERTER -->
+<script language="JavaScript" type="text/javascript"><!--
+ var _info = navigator.userAgent;
+ var _ns = false;
+ var _ns6 = false;
+ var _ie = (_info.indexOf("MSIE") > 0 && _info.indexOf("Win") > 0 &&
_info.indexOf("Windows 3.1") < 0);
+//--></script>
+
+ <comment>
+ <script language="JavaScript" type="text/javascript"><!--
+ var _ns = (navigator.appName.indexOf("Netscape") >= 0 &&
((_info.indexOf("Win") > 0 && _info.indexOf("Win16") < 0 &&
java.lang.System.getProperty("os.version").indexOf("3.5") < 0) ||
(_info.indexOf("Sun") > 0) || (_info.indexOf("Linux") > 0) ||
(_info.indexOf("AIX") > 0) || (_info.indexOf("OS/2") > 0) ||
(_info.indexOf("IRIX") > 0)));
+ var _ns6 = ((_ns == true) && (_info.indexOf("Mozilla/5") >= 0));
+//--></script>
+ </comment>
+
+<script language="JavaScript" type="text/javascript"><!--
+ if (_ie == true) document.writeln('<object
classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" WIDTH = "1" HEIGHT = "1"
NAME = "ChecksumApplet"
codebase="http://java.sun.com/update/1.5.0/jinstall-1_5-windows-i586.cab#Version=5,0,0,5";><noembed><xmp>');
+ else if (_ns == true && _ns6 == false) document.writeln('<embed ' +
+ 'type="application/x-java-applet;version=1.5" \
+ CODE = "org/apache/maven/repository/applet/ChecksumApplet.class" \
+ ARCHIVE = "maven-repository-artifact-applet.jar" \
+ NAME = "ChecksumApplet" \
+ WIDTH = "1" \
+ HEIGHT = "1" ' +
+ 'scriptable=false ' +
+
'pluginspage="http://java.sun.com/products/plugin/index.html#download";><noembed><xmp>');
+//--></script>
+<applet CODE = "org/apache/maven/repository/applet/ChecksumApplet.class"
ARCHIVE = "maven-repository-artifact-applet.jar" WIDTH = "1" HEIGHT = "1" NAME
= "ChecksumApplet"></xmp>
+ <PARAM NAME = CODE VALUE =
"org/apache/maven/repository/applet/ChecksumApplet.class" >
+ <PARAM NAME = ARCHIVE VALUE = "maven-repository-artifact-applet.jar" >
+ <PARAM NAME = NAME VALUE = "ChecksumApplet" >
+
+ <param name="type" value="application/x-java-applet;version=1.5">
+ <param name="scriptable" value="false">
+
+
+</applet>
+</noembed>
+</embed>
+</object>
+
+<!--
+<APPLET CODE = "org/apache/maven/repository/applet/ChecksumApplet.class"
ARCHIVE = "maven-repository-artifact-applet.jar" WIDTH = "1" HEIGHT = "1" NAME
= "ChecksumApplet">
+
+
+</APPLET>
+-->
+<!--"END_CONVERTED_APPLET"-->
</p>
<p>Search by Java Package:
