vhardy 2002/06/21 09:35:14
Modified: test-sources/org/apache/batik/util
ApplicationSecurityEnforcerTest.java
sources/org/apache/batik/apps/rasterizer Main.java
sources/org/apache/batik/apps/svgbrowser Main.java
sources/org/apache/batik/util
ApplicationSecurityEnforcer.java
Log:
Removed unneeded jar file name in ApplicationSecurityEnforcer
Revision Changes Path
1.3 +3 -6
xml-batik/test-sources/org/apache/batik/util/ApplicationSecurityEnforcerTest.java
Index: ApplicationSecurityEnforcerTest.java
===================================================================
RCS file:
/home/cvs/xml-batik/test-sources/org/apache/batik/util/ApplicationSecurityEnforcerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationSecurityEnforcerTest.java 21 Jun 2002 13:28:05 -0000 1.2
+++ ApplicationSecurityEnforcerTest.java 21 Jun 2002 16:35:13 -0000 1.3
@@ -19,7 +19,6 @@
public class ApplicationSecurityEnforcerTest extends DefaultTestSuite {
final static Class APP_MAIN_CLASS =
org.apache.batik.apps.svgbrowser.Main.class;
final static String APP_SECURITY_POLICY =
"org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy";
- final static String APP_JAR = "batik-squiggle.jar";
/**
* In the constructor, append atomic tests
@@ -33,8 +32,7 @@
static ApplicationSecurityEnforcer buildTestTarget(){
return new ApplicationSecurityEnforcer(APP_MAIN_CLASS,
- APP_SECURITY_POLICY,
- APP_JAR);
+ APP_SECURITY_POLICY);
}
static class CheckNoSecurityManagerOverride extends AbstractTest {
@@ -108,8 +106,7 @@
public boolean runImplBasic() {
ApplicationSecurityEnforcer ase =
new ApplicationSecurityEnforcer(APP_MAIN_CLASS,
- "dont.exist.policy",
- APP_JAR);
+ "dont.exist.policy");
try {
ase.enforceSecurity(true);
1.21 +2 -9 xml-batik/sources/org/apache/batik/apps/rasterizer/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/rasterizer/Main.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Main.java 5 Jun 2002 21:14:46 -0000 1.20
+++ Main.java 21 Jun 2002 16:35:13 -0000 1.21
@@ -54,12 +54,6 @@
*/
public class Main implements SVGConverterController {
/**
- * Name of the rasterizer jar file
- */
- public static final String RASTERIZER_JAR_NAME
- = "batik-rasterizer.jar";
-
- /**
* URL for Squiggle's security policy file
*/
public static final String RASTERIZER_SECURITY_POLICY
@@ -786,8 +780,7 @@
// Apply script security option
ApplicationSecurityEnforcer securityEnforcer =
new ApplicationSecurityEnforcer(this.getClass(),
- RASTERIZER_SECURITY_POLICY,
- RASTERIZER_JAR_NAME);
+ RASTERIZER_SECURITY_POLICY);
securityEnforcer.enforceSecurity(!c.getSecurityOff());
1.39 +2 -9 xml-batik/sources/org/apache/batik/apps/svgbrowser/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/Main.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Main.java 21 Jun 2002 13:28:05 -0000 1.38
+++ Main.java 21 Jun 2002 16:35:13 -0000 1.39
@@ -159,12 +159,6 @@
"org.apache.batik.apps.svgbrowser.resources.Main";
/**
- * Name of the batik browser jar file
- */
- public static final String SQUIGGLE_JAR_NAME
- = "batik-squiggle.jar";
-
- /**
* URL for Squiggle's security policy file
*/
public static final String SQUIGGLE_SECURITY_POLICY
@@ -300,8 +294,7 @@
securityEnforcer
= new ApplicationSecurityEnforcer(this.getClass(),
- SQUIGGLE_SECURITY_POLICY,
- SQUIGGLE_JAR_NAME);
+ SQUIGGLE_SECURITY_POLICY);
try {
preferenceManager = new
XMLPreferenceManager(SQUIGGLE_CONFIGURATION_FILE,
1.9 +28 -11
xml-batik/sources/org/apache/batik/util/ApplicationSecurityEnforcer.java
Index: ApplicationSecurityEnforcer.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/util/ApplicationSecurityEnforcer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplicationSecurityEnforcer.java 17 Jun 2002 08:07:39 -0000 1.8
+++ ApplicationSecurityEnforcer.java 21 Jun 2002 16:35:13 -0000 1.9
@@ -92,11 +92,6 @@
protected String securityPolicy;
/**
- * The jar file into which the application is packaged
- */
- protected String appJarFile;
-
- /**
* The resource name for the application's main class
*/
protected String appMainClassRelativeURL;
@@ -112,13 +107,26 @@
* should be enforced for the application.
* @param appJarFile the Jar file into which the application is
* packaged.
+ * @deprecated This constructor is now deprecated. Use the two
+ * argument constructor instead as this version will
+ * be removed after the 1.5beta4 release.
*/
public ApplicationSecurityEnforcer(Class appMainClass,
String securityPolicy,
String appJarFile){
+ this(appMainClass, securityPolicy);
+ }
+
+
+ /**
+ * @param appClass class of the applications's main entry point
+ * @param securityPolicy resource for the security policy which
+ * should be enforced for the application.
+ */
+ public ApplicationSecurityEnforcer(Class appMainClass,
+ String securityPolicy){
this.appMainClass = appMainClass;
this.securityPolicy = securityPolicy;
- this.appJarFile = appJarFile;
this.appMainClassRelativeURL =
appMainClass.getName().replace('.', '/')
+
@@ -248,8 +256,7 @@
expandedMainClassName =
expandedMainClassName.substring(JAR_PROTOCOL.length());
int codeBaseEnd =
- expandedMainClassName.indexOf(appJarFile +
- JAR_URL_FILE_SEPARATOR +
+ expandedMainClassName.indexOf(JAR_URL_FILE_SEPARATOR +
appMainClassRelativeURL);
if (codeBaseEnd == -1){
@@ -260,6 +267,16 @@
}
String appCodeBase = expandedMainClassName.substring(0, codeBaseEnd);
+
+ // At this point appCodeBase contains the JAR file name
+ // Now, we extract it.
+ codeBaseEnd = appCodeBase.lastIndexOf('/');
+ if (codeBaseEnd == -1) {
+ appCodeBase = "";
+ } else {
+ appCodeBase = appCodeBase.substring(0, codeBaseEnd);
+ }
+
System.setProperty(PROPERTY_APP_JAR_BASE, appCodeBase);
}
}
@@ -277,8 +294,8 @@
String curAppCodeBase = System.getProperty(PROPERTY_APP_DEV_BASE);
if (curAppCodeBase == null) {
int codeBaseEnd =
- expandedMainClassName.indexOf(APP_MAIN_CLASS_DIR +
- appMainClassRelativeURL);
+ expandedMainClassName.indexOf(APP_MAIN_CLASS_DIR
+ + appMainClassRelativeURL);
if (codeBaseEnd == -1){
// Something is seriously wrong. This should *never* happen
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
