You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ca...@apache.org on 2007/09/25 01:29:07 UTC
svn commit: r579017 - in /xmlgraphics/batik/trunk:
sources/org/apache/batik/bridge/ScriptingEnvironment.java
test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java
test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java
Author: cam
Date: Mon Sep 24 16:29:05 2007
New Revision: 579017
URL: http://svn.apache.org/viewvc?rev=579017&view=rev
Log:
Files missing from previous commit.
Modified:
xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java
xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java
xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java?rev=579017&r1=579016&r2=579017&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/bridge/ScriptingEnvironment.java Mon Sep 24 16:29:05 2007
@@ -950,10 +950,10 @@
(XMLResourceDescriptor.getXMLParserClassName());
ParsedURL urlObj = null;
if ((doc != null) && (doc instanceof SVGOMDocument))
- urlObj = ((SVGOMDocument)doc).getURLObject();
+ urlObj = ((SVGOMDocument)doc).getParsedURL();
if (urlObj == null) {
urlObj = ((SVGOMDocument)bridgeContext.getDocument()).
- getURLObject();
+ getParsedURL();
}
String uri = (urlObj==null)?"":urlObj.toString();
try {
@@ -1055,7 +1055,7 @@
public void run() {
try {
ParsedURL burl;
- burl = ((SVGOMDocument)document).getURLObject();
+ burl = ((SVGOMDocument)document).getParsedURL();
final ParsedURL purl = new ParsedURL(burl, uri);
String e = null;
if (enc != null) {
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java?rev=579017&r1=579016&r2=579017&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsDenied.java Mon Sep 24 16:29:05 2007
@@ -24,7 +24,6 @@
import java.lang.reflect.ReflectPermission;
import java.net.NetPermission;
import java.net.SocketPermission;
-import java.net.URL;
import java.security.AllPermission;
import java.security.Permission;
import java.sql.SQLPermission;
@@ -42,6 +41,7 @@
import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.script.ScriptHandler;
import org.apache.batik.script.Window;
+import org.apache.batik.util.ParsedURL;
/**
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
@@ -151,7 +151,7 @@
// If the document is loaded over the network, check that the
// class has permission to access the server
//
- URL docURL = ((SVGOMDocument)document).getURLObject();
+ ParsedURL docURL = ((SVGOMDocument)document).getParsedURL();
if ((docURL != null) &&
(docURL.getHost() != null) &&
(!"".equals(docURL.getHost()))) {
Modified: xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java?rev=579017&r1=579016&r2=579017&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java (original)
+++ xmlgraphics/batik/trunk/test-resources/org/apache/batik/bridge/JarCheckPermissionsGranted.java Mon Sep 24 16:29:05 2007
@@ -24,7 +24,6 @@
import java.lang.reflect.ReflectPermission;
import java.net.NetPermission;
import java.net.SocketPermission;
-import java.net.URL;
import java.security.AllPermission;
import java.security.Permission;
import java.sql.SQLPermission;
@@ -42,6 +41,7 @@
import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.script.ScriptHandler;
import org.apache.batik.script.Window;
+import org.apache.batik.util.ParsedURL;
/**
* @author <a href="mailto:vhardy@apache.org">Vincent Hardy</a>
@@ -150,8 +150,9 @@
// If the document is loaded over the network, check that the
// class has permission to access the server
//
- URL docURL = ((SVGOMDocument)document).getURLObject();
- if (docURL != null && docURL.getHost() != null && !"".equals(docURL.getHost())) {
+ ParsedURL docURL = ((SVGOMDocument)document).getParsedURL();
+ if (docURL != null && docURL.getHost() != null &&
+ !"".equals(docURL.getHost())) {
permissions = new Object[basePermissions.length + 3][2];
System.arraycopy(basePermissions, 0,
permissions, 3, basePermissions.length);