aruny 2004/02/23 02:29:37
Modified: java/src/org/apache/xalan/extensions ExtensionHandler.java
ExtensionHandlerGeneral.java
java/src/org/apache/xalan/lib Extensions.java
java/src/org/apache/xalan/lib/sql DefaultConnectionPool.java
java/src/org/apache/xalan/xslt EnvironmentCheck.java
Process.java
java/src/org/apache/xalan/xsltc/cmdline Transform.java
java/src/org/apache/xalan/xsltc/compiler
FunctionAvailableCall.java FunctionCall.java
Parser.java
java/src/org/apache/xalan/xsltc/compiler/util
ObjectType.java
java/src/org/apache/xalan/xsltc/dom NodeSortRecord.java
NodeSortRecordFactory.java XSLTCDTMManager.java
java/src/org/apache/xalan/xsltc/trax
SmartTransformerFactoryImpl.java TemplatesImpl.java
TransformerFactoryImpl.java
java/src/org/apache/xml/dtm DTMManager.java
java/src/org/apache/xml/dtm/ref
IncrementalSAXSource_Xerces.java
java/src/org/apache/xml/serializer CharInfo.java
Encodings.java SecuritySupport.java
SecuritySupport12.java SerializerFactory.java
java/src/org/apache/xml/utils ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xpath/compiler FuncLoader.java
java/src/org/apache/xpath/functions FuncSystemProperty.java
SecuritySupport.java SecuritySupport12.java
Added: java/src/org/apache/xalan/extensions ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xalan/lib ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xalan/lib/sql ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xalan/xslt ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xalan/xsltc/cmdline ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xalan/xsltc/compiler ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xalan/xsltc/compiler/util
ObjectFactory.java SecuritySupport.java
SecuritySupport12.java
java/src/org/apache/xalan/xsltc/dom ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xalan/xsltc/trax ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xml/dtm ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xml/dtm/ref ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xml/serializer ObjectFactory.java
java/src/org/apache/xpath/compiler ObjectFactory.java
SecuritySupport.java SecuritySupport12.java
java/src/org/apache/xpath/functions ObjectFactory.java
Log:
Description :
ObjectFactory was designed to be package private. ObjectFactory class exposes
class loaders publicly which allow untrusted code to access internal classes.
Making following changes to fix it.
1.Coping the ObjectFactory, SecuritySupport.java and SecuritySupport12.java
class in the sub packages in order to make it package private.
2.Using checkPackageAccess() to prevent access to internal packages of
jdk(sun.*).
Revision Changes Path
1.21 +1 -2
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandler.java
Index: ExtensionHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandler.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ExtensionHandler.java 11 Feb 2004 05:26:23 -0000 1.20
+++ ExtensionHandler.java 23 Feb 2004 10:29:34 -0000 1.21
@@ -27,7 +27,6 @@
import org.apache.xalan.templates.Stylesheet;
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xpath.functions.FuncExtFunction;
-import org.apache.xml.utils.ObjectFactory;
/**
* Abstract base class for handling an extension namespace for XPath.
1.23 +1 -2
xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
Index: ExtensionHandlerGeneral.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ExtensionHandlerGeneral.java 11 Feb 2004 05:26:23 -0000 1.22
+++ ExtensionHandlerGeneral.java 23 Feb 2004 10:29:34 -0000 1.23
@@ -35,7 +35,6 @@
import org.apache.xalan.transformer.TransformerImpl;
import org.apache.xml.dtm.DTMIterator;
import org.apache.xml.dtm.ref.DTMNodeList;
-import org.apache.xml.utils.ObjectFactory;
import org.apache.xml.utils.StringVector;
import org.apache.xml.utils.SystemIDResolver;
import org.apache.xpath.XPathProcessorException;
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/extensions/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/extensions/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/extensions/SecuritySupport12.java
1.29 +1 -2 xml-xalan/java/src/org/apache/xalan/lib/Extensions.java
Index: Extensions.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/Extensions.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Extensions.java 11 Feb 2004 17:56:36 -0000 1.28
+++ Extensions.java 23 Feb 2004 10:29:34 -0000 1.29
@@ -31,7 +31,6 @@
import org.apache.xpath.objects.XBoolean;
import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XObject;
-import org.apache.xml.utils.ObjectFactory;
import org.w3c.dom.Document;
import org.w3c.dom.DocumentFragment;
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/lib/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/lib/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/lib/SecuritySupport12.java
1.20 +1 -2
xml-xalan/java/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java
Index: DefaultConnectionPool.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/DefaultConnectionPool.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultConnectionPool.java 11 Feb 2004 17:56:36 -0000 1.19
+++ DefaultConnectionPool.java 23 Feb 2004 10:29:35 -0000 1.20
@@ -29,7 +29,6 @@
import org.apache.xalan.res.XSLMessages;
import org.apache.xalan.res.XSLTErrorResources;
-import org.apache.xml.utils.ObjectFactory;
/**
* For internal connectiones, i.e. Connection information supplies in the
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/lib/sql/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/lib/sql/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/lib/sql/SecuritySupport12.java
1.25 +4 -6
xml-xalan/java/src/org/apache/xalan/xslt/EnvironmentCheck.java
Index: EnvironmentCheck.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/EnvironmentCheck.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- EnvironmentCheck.java 16 Feb 2004 20:51:55 -0000 1.24
+++ EnvironmentCheck.java 23 Feb 2004 10:29:35 -0000 1.25
@@ -28,8 +28,6 @@
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.xml.utils.ObjectFactory;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
1.62 +1 -2 xml-xalan/java/src/org/apache/xalan/xslt/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/Process.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Process.java 16 Feb 2004 20:51:55 -0000 1.61
+++ Process.java 23 Feb 2004 10:29:35 -0000 1.62
@@ -52,7 +52,6 @@
import org.apache.xalan.trace.TraceManager;
import org.apache.xalan.transformer.XalanProperties;
import org.apache.xml.utils.DefaultErrorHandler;
-import org.apache.xml.utils.ObjectFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/xslt/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/xslt/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/xslt/SecuritySupport12.java
1.32 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/Transform.java
Index: Transform.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/Transform.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Transform.java 16 Feb 2004 21:07:51 -0000 1.31
+++ Transform.java 23 Feb 2004 10:29:35 -0000 1.32
@@ -34,7 +34,6 @@
import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
import org.apache.xalan.xsltc.runtime.Constants;
-import org.apache.xml.utils.ObjectFactory;
import org.apache.xalan.xsltc.runtime.Parameter;
import org.apache.xalan.xsltc.runtime.output.TransletOutputHandlerFactory;
import org.apache.xml.serializer.SerializationHandler;
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/xsltc/cmdline/SecuritySupport12.java
1.19 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java
Index: FunctionAvailableCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionAvailableCall.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FunctionAvailableCall.java 16 Feb 2004 22:24:29 -0000 1.18
+++ FunctionAvailableCall.java 23 Feb 2004 10:29:35 -0000 1.19
@@ -31,7 +31,6 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.compiler.util.Util;
-import org.apache.xml.utils.ObjectFactory;
/**
* @author G. Todd Miller
1.37 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionCall.java
Index: FunctionCall.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/FunctionCall.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- FunctionCall.java 16 Feb 2004 22:24:29 -0000 1.36
+++ FunctionCall.java 23 Feb 2004 10:29:35 -0000 1.37
@@ -48,7 +48,6 @@
import org.apache.xalan.xsltc.compiler.util.ReferenceType;
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
-import org.apache.xml.utils.ObjectFactory;
/**
* @author Jacek Ambroziak
1.64 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Parser.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Parser.java 16 Feb 2004 22:24:28 -0000 1.63
+++ Parser.java 23 Feb 2004 10:29:35 -0000 1.64
@@ -40,7 +40,6 @@
import org.apache.xalan.xsltc.compiler.util.Type;
import org.apache.xalan.xsltc.compiler.util.TypeCheckError;
import org.apache.xalan.xsltc.runtime.AttributeList;
-import org.apache.xml.utils.ObjectFactory;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/SecuritySupport12.java
1.9 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ObjectType.java
Index: ObjectType.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ObjectType.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ObjectType.java 16 Feb 2004 22:26:44 -0000 1.8
+++ ObjectType.java 23 Feb 2004 10:29:35 -0000 1.9
@@ -30,7 +30,6 @@
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.PUSH;
import org.apache.xalan.xsltc.compiler.Constants;
-import org.apache.xml.utils.ObjectFactory;
/**
* @author Todd Miller
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/util/SecuritySupport12.java
1.18 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java
Index: NodeSortRecord.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NodeSortRecord.java 16 Feb 2004 22:54:59 -0000 1.17
+++ NodeSortRecord.java 23 Feb 2004 10:29:35 -0000 1.18
@@ -27,7 +27,6 @@
import org.apache.xalan.xsltc.DOM;
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xml.utils.ObjectFactory;
import org.apache.xml.utils.StringComparable;
/**
1.13 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java
Index: NodeSortRecordFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecordFactory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- NodeSortRecordFactory.java 16 Feb 2004 22:54:59 -0000 1.12
+++ NodeSortRecordFactory.java 23 Feb 2004 10:29:35 -0000 1.13
@@ -23,7 +23,6 @@
import org.apache.xalan.xsltc.Translet;
import org.apache.xalan.xsltc.TransletException;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.apache.xml.utils.ObjectFactory;
import org.apache.xml.utils.LocaleUtility;
import java.util.Locale;
import java.text.Collator;
1.6 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java
Index: XSLTCDTMManager.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/XSLTCDTMManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSLTCDTMManager.java 16 Feb 2004 22:54:59 -0000 1.5
+++ XSLTCDTMManager.java 23 Feb 2004 10:29:36 -0000 1.6
@@ -30,7 +30,6 @@
import org.apache.xml.dtm.ref.DTMManagerDefault;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.ObjectFactory;
import org.apache.xml.utils.SystemIDResolver;
import org.apache.xalan.xsltc.trax.DOM2SAX;
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/xsltc/dom/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/xsltc/dom/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/xsltc/dom/SecuritySupport12.java
1.11 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java
Index: SmartTransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/SmartTransformerFactoryImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SmartTransformerFactoryImpl.java 16 Feb 2004 22:57:21 -0000 1.10
+++ SmartTransformerFactoryImpl.java 23 Feb 2004 10:29:36 -0000 1.11
@@ -37,7 +37,6 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.xml.utils.ObjectFactory;
import org.xml.sax.XMLFilter;
/**
1.34 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesImpl.java
Index: TemplatesImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TemplatesImpl.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TemplatesImpl.java 16 Feb 2004 22:57:21 -0000 1.33
+++ TemplatesImpl.java 23 Feb 2004 10:29:36 -0000 1.34
@@ -37,7 +37,6 @@
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
import org.apache.xalan.xsltc.runtime.Hashtable;
-import org.apache.xml.utils.ObjectFactory;
/**
* @author Morten Jorgensen
1.73 +1 -2
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- TransformerFactoryImpl.java 16 Feb 2004 22:57:21 -0000 1.72
+++ TransformerFactoryImpl.java 23 Feb 2004 10:29:36 -0000 1.73
@@ -63,7 +63,6 @@
import org.apache.xalan.xsltc.compiler.util.ErrorMsg;
import org.apache.xalan.xsltc.dom.XSLTCDTMManager;
-import org.apache.xml.utils.ObjectFactory;
import org.xml.sax.InputSource;
import org.xml.sax.XMLFilter;
1.2 +631 -0
xml-xalan/java/src/org/apache/xalan/xsltc/trax/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xalan/xsltc/trax/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xalan/xsltc/trax/SecuritySupport12.java
1.18 +1 -2 xml-xalan/java/src/org/apache/xml/dtm/DTMManager.java
Index: DTMManager.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/dtm/DTMManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DTMManager.java 16 Feb 2004 23:03:44 -0000 1.17
+++ DTMManager.java 23 Feb 2004 10:29:36 -0000 1.18
@@ -20,7 +20,6 @@
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.ObjectFactory;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.XMLStringFactory;
1.2 +631 -0 xml-xalan/java/src/org/apache/xml/dtm/ObjectFactory.java
1.5 +40 -58
xml-xalan/java/src/org/apache/xml/dtm/SecuritySupport.java
1.5 +87 -73
xml-xalan/java/src/org/apache/xml/dtm/SecuritySupport12.java
1.15 +1 -2
xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java
Index: IncrementalSAXSource_Xerces.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/dtm/ref/IncrementalSAXSource_Xerces.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- IncrementalSAXSource_Xerces.java 16 Feb 2004 23:06:11 -0000 1.14
+++ IncrementalSAXSource_Xerces.java 23 Feb 2004 10:29:36 -0000 1.15
@@ -26,7 +26,6 @@
import org.apache.xerces.parsers.SAXParser;
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.ObjectFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
1.2 +631 -0
xml-xalan/java/src/org/apache/xml/dtm/ref/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xml/dtm/ref/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xml/dtm/ref/SecuritySupport12.java
1.11 +1 -2
xml-xalan/java/src/org/apache/xml/serializer/CharInfo.java
Index: CharInfo.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/CharInfo.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CharInfo.java 17 Feb 2004 04:18:19 -0000 1.10
+++ CharInfo.java 23 Feb 2004 10:29:37 -0000 1.11
@@ -33,7 +33,6 @@
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
import org.apache.xml.utils.CharKey;
-import org.apache.xml.utils.ObjectFactory;
import org.apache.xml.utils.SystemIDResolver;
import org.apache.xml.utils.WrappedRuntimeException;
1.8 +2 -3
xml-xalan/java/src/org/apache/xml/serializer/Encodings.java
Index: Encodings.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/Encodings.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Encodings.java 17 Feb 2004 04:18:18 -0000 1.7
+++ Encodings.java 23 Feb 2004 10:29:37 -0000 1.8
@@ -32,7 +32,6 @@
import java.security.PrivilegedAction;
import java.security.AccessController;
-import org.apache.xml.utils.ObjectFactory;
/**
* Provides information about encodings. Depends on the Java runtime
1.3 +9 -9
xml-xalan/java/src/org/apache/xml/serializer/SecuritySupport.java
Index: SecuritySupport.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SecuritySupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecuritySupport.java 17 Feb 2004 04:18:18 -0000 1.2
+++ SecuritySupport.java 23 Feb 2004 10:29:37 -0000 1.3
@@ -77,33 +77,33 @@
* Return an appropriate instance of this class, depending on whether
* we're on a JDK 1.1 or J2SE 1.2 (or later) system.
*/
- public static SecuritySupport getInstance() {
+ static SecuritySupport getInstance() {
return (SecuritySupport)securitySupport;
}
- public ClassLoader getContextClassLoader() {
+ ClassLoader getContextClassLoader() {
return null;
}
- public ClassLoader getSystemClassLoader() {
+ ClassLoader getSystemClassLoader() {
return null;
}
- public ClassLoader getParentClassLoader(ClassLoader cl) {
+ ClassLoader getParentClassLoader(ClassLoader cl) {
return null;
}
- public String getSystemProperty(String propName) {
+ String getSystemProperty(String propName) {
return System.getProperty(propName);
}
- public FileInputStream getFileInputStream(File file)
+ FileInputStream getFileInputStream(File file)
throws FileNotFoundException
{
return new FileInputStream(file);
}
- public InputStream getResourceAsStream(ClassLoader cl, String name) {
+ InputStream getResourceAsStream(ClassLoader cl, String name) {
InputStream ris;
if (cl == null) {
ris = ClassLoader.getSystemResourceAsStream(name);
@@ -113,11 +113,11 @@
return ris;
}
- public boolean getFileExists(File f) {
+ boolean getFileExists(File f) {
return f.exists();
}
- public long getLastModified(File f) {
+ long getLastModified(File f) {
return f.lastModified();
}
}
1.3 +8 -8
xml-xalan/java/src/org/apache/xml/serializer/SecuritySupport12.java
Index: SecuritySupport12.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SecuritySupport12.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecuritySupport12.java 17 Feb 2004 04:18:18 -0000 1.2
+++ SecuritySupport12.java 23 Feb 2004 10:29:37 -0000 1.3
@@ -40,7 +40,7 @@
*/
class SecuritySupport12 extends SecuritySupport {
- public ClassLoader getContextClassLoader() {
+ ClassLoader getContextClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -53,7 +53,7 @@
});
}
- public ClassLoader getSystemClassLoader() {
+ ClassLoader getSystemClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -66,7 +66,7 @@
});
}
- public ClassLoader getParentClassLoader(final ClassLoader cl) {
+ ClassLoader getParentClassLoader(final ClassLoader cl) {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -82,7 +82,7 @@
});
}
- public String getSystemProperty(final String propName) {
+ String getSystemProperty(final String propName) {
return (String)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -91,7 +91,7 @@
});
}
- public FileInputStream getFileInputStream(final File file)
+ FileInputStream getFileInputStream(final File file)
throws FileNotFoundException
{
try {
@@ -106,7 +106,7 @@
}
}
- public InputStream getResourceAsStream(final ClassLoader cl,
+ InputStream getResourceAsStream(final ClassLoader cl,
final String name)
{
return (InputStream)
@@ -123,7 +123,7 @@
});
}
- public boolean getFileExists(final File f) {
+ boolean getFileExists(final File f) {
return ((Boolean)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -132,7 +132,7 @@
})).booleanValue();
}
- public long getLastModified(final File f) {
+ long getLastModified(final File f) {
return ((Long)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
1.6 +1 -2
xml-xalan/java/src/org/apache/xml/serializer/SerializerFactory.java
Index: SerializerFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/serializer/SerializerFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SerializerFactory.java 17 Feb 2004 04:18:18 -0000 1.5
+++ SerializerFactory.java 23 Feb 2004 10:29:37 -0000 1.6
@@ -25,7 +25,6 @@
import org.apache.xml.res.XMLErrorResources;
import org.apache.xml.res.XMLMessages;
-import org.apache.xml.utils.ObjectFactory;
import org.xml.sax.ContentHandler;
/**
1.2 +631 -0
xml-xalan/java/src/org/apache/xml/serializer/ObjectFactory.java
1.6 +24 -13
xml-xalan/java/src/org/apache/xml/utils/ObjectFactory.java
Index: ObjectFactory.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/ObjectFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ObjectFactory.java 17 Feb 2004 04:21:14 -0000 1.5
+++ ObjectFactory.java 23 Feb 2004 10:29:37 -0000 1.6
@@ -45,7 +45,7 @@
*
* @version $Id$
*/
-public class ObjectFactory {
+class ObjectFactory {
//
// Constants
@@ -96,7 +96,7 @@
*
* @exception ObjectFactory.ConfigurationError
*/
- public static Object createObject(String factoryId, String
fallbackClassName)
+ static Object createObject(String factoryId, String fallbackClassName)
throws ConfigurationError {
return createObject(factoryId, null, fallbackClassName);
} // createObject(String,String):Object
@@ -123,7 +123,7 @@
*
* @exception ObjectFactory.ConfigurationError
*/
- public static Object createObject(String factoryId,
+ static Object createObject(String factoryId,
String propertiesFilename,
String fallbackClassName)
throws ConfigurationError
@@ -170,7 +170,7 @@
*
* @exception ObjectFactory.ConfigurationError
*/
- public static Class lookUpFactoryClass(String factoryId)
+ static Class lookUpFactoryClass(String factoryId)
throws ConfigurationError
{
return lookUpFactoryClass(factoryId, null, null);
@@ -198,7 +198,7 @@
*
* @exception ObjectFactory.ConfigurationError
*/
- public static Class lookUpFactoryClass(String factoryId,
+ static Class lookUpFactoryClass(String factoryId,
String propertiesFilename,
String fallbackClassName)
throws ConfigurationError
@@ -252,7 +252,7 @@
*
* @exception ObjectFactory.ConfigurationError
*/
- public static String lookUpFactoryClassName(String factoryId,
+ static String lookUpFactoryClassName(String factoryId,
String propertiesFilename,
String fallbackClassName)
{
@@ -370,7 +370,7 @@
* Figure out which ClassLoader to use. For JDK 1.2 and later use
* the context ClassLoader.
*/
- public static ClassLoader findClassLoader()
+ static ClassLoader findClassLoader()
throws ConfigurationError
{
SecuritySupport ss = SecuritySupport.getInstance();
@@ -429,7 +429,7 @@
/**
* Create an instance of a class using the specified ClassLoader
*/
- public static Object newInstance(String className, ClassLoader cl,
+ static Object newInstance(String className, ClassLoader cl,
boolean doFallback)
throws ConfigurationError
{
@@ -453,10 +453,21 @@
/**
* Find a Class using the specified ClassLoader
*/
- public static Class findProviderClass(String className, ClassLoader cl,
+ static Class findProviderClass(String className, ClassLoader cl,
boolean doFallback)
throws ClassNotFoundException, ConfigurationError
- {
+ {
+ //throw security exception if the calling thread is not allowed to
access the
+ //class. Restrict the access to the package classes as specified in
java.security policy.
+ SecurityManager security = System.getSecurityManager();
+ try{
+ if (security != null){
+ security.checkPackageAccess(className);
+ }
+ }catch(SecurityException e){
+ throw e;
+ }
+
Class providerClass;
if (cl == null) {
// XXX Use the bootstrap ClassLoader. There is no way to
@@ -583,7 +594,7 @@
/**
* A configuration error.
*/
- public static class ConfigurationError
+ static class ConfigurationError
extends Error {
//
@@ -601,7 +612,7 @@
* Construct a new instance with the specified detail string and
* exception.
*/
- public ConfigurationError(String msg, Exception x) {
+ ConfigurationError(String msg, Exception x) {
super(msg);
this.exception = x;
} // <init>(String,Exception)
@@ -611,7 +622,7 @@
//
/** Returns the exception associated to this error. */
- public Exception getException() {
+ Exception getException() {
return exception;
} // getException():Exception
1.4 +9 -9
xml-xalan/java/src/org/apache/xml/utils/SecuritySupport.java
Index: SecuritySupport.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/SecuritySupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SecuritySupport.java 17 Feb 2004 04:21:14 -0000 1.3
+++ SecuritySupport.java 23 Feb 2004 10:29:37 -0000 1.4
@@ -77,33 +77,33 @@
* Return an appropriate instance of this class, depending on whether
* we're on a JDK 1.1 or J2SE 1.2 (or later) system.
*/
- public static SecuritySupport getInstance() {
+ static SecuritySupport getInstance() {
return (SecuritySupport)securitySupport;
}
- public ClassLoader getContextClassLoader() {
+ ClassLoader getContextClassLoader() {
return null;
}
- public ClassLoader getSystemClassLoader() {
+ ClassLoader getSystemClassLoader() {
return null;
}
- public ClassLoader getParentClassLoader(ClassLoader cl) {
+ ClassLoader getParentClassLoader(ClassLoader cl) {
return null;
}
- public String getSystemProperty(String propName) {
+ String getSystemProperty(String propName) {
return System.getProperty(propName);
}
- public FileInputStream getFileInputStream(File file)
+ FileInputStream getFileInputStream(File file)
throws FileNotFoundException
{
return new FileInputStream(file);
}
- public InputStream getResourceAsStream(ClassLoader cl, String name) {
+ InputStream getResourceAsStream(ClassLoader cl, String name) {
InputStream ris;
if (cl == null) {
ris = ClassLoader.getSystemResourceAsStream(name);
@@ -113,11 +113,11 @@
return ris;
}
- public boolean getFileExists(File f) {
+ boolean getFileExists(File f) {
return f.exists();
}
- public long getLastModified(File f) {
+ long getLastModified(File f) {
return f.lastModified();
}
}
1.4 +8 -8
xml-xalan/java/src/org/apache/xml/utils/SecuritySupport12.java
Index: SecuritySupport12.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xml/utils/SecuritySupport12.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SecuritySupport12.java 17 Feb 2004 04:21:14 -0000 1.3
+++ SecuritySupport12.java 23 Feb 2004 10:29:37 -0000 1.4
@@ -40,7 +40,7 @@
*/
class SecuritySupport12 extends SecuritySupport {
- public ClassLoader getContextClassLoader() {
+ ClassLoader getContextClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -53,7 +53,7 @@
});
}
- public ClassLoader getSystemClassLoader() {
+ ClassLoader getSystemClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -66,7 +66,7 @@
});
}
- public ClassLoader getParentClassLoader(final ClassLoader cl) {
+ ClassLoader getParentClassLoader(final ClassLoader cl) {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -82,7 +82,7 @@
});
}
- public String getSystemProperty(final String propName) {
+ String getSystemProperty(final String propName) {
return (String)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -91,7 +91,7 @@
});
}
- public FileInputStream getFileInputStream(final File file)
+ FileInputStream getFileInputStream(final File file)
throws FileNotFoundException
{
try {
@@ -106,7 +106,7 @@
}
}
- public InputStream getResourceAsStream(final ClassLoader cl,
+ InputStream getResourceAsStream(final ClassLoader cl,
final String name)
{
return (InputStream)
@@ -123,7 +123,7 @@
});
}
- public boolean getFileExists(final File f) {
+ boolean getFileExists(final File f) {
return ((Boolean)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -132,7 +132,7 @@
})).booleanValue();
}
- public long getLastModified(final File f) {
+ long getLastModified(final File f) {
return ((Long)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
1.10 +1 -2
xml-xalan/java/src/org/apache/xpath/compiler/FuncLoader.java
Index: FuncLoader.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/compiler/FuncLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FuncLoader.java 17 Feb 2004 04:32:49 -0000 1.9
+++ FuncLoader.java 23 Feb 2004 10:29:37 -0000 1.10
@@ -20,7 +20,6 @@
import javax.xml.transform.TransformerException;
-import org.apache.xml.utils.ObjectFactory;
import org.apache.xpath.functions.Function;
/**
1.2 +631 -0
xml-xalan/java/src/org/apache/xpath/compiler/ObjectFactory.java
1.2 +123 -0
xml-xalan/java/src/org/apache/xpath/compiler/SecuritySupport.java
1.2 +144 -0
xml-xalan/java/src/org/apache/xpath/compiler/SecuritySupport12.java
1.18 +1 -3
xml-xalan/java/src/org/apache/xpath/functions/FuncSystemProperty.java
Index: FuncSystemProperty.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/FuncSystemProperty.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FuncSystemProperty.java 17 Feb 2004 04:34:00 -0000 1.17
+++ FuncSystemProperty.java 23 Feb 2004 10:29:37 -0000 1.18
@@ -22,8 +22,6 @@
import java.io.InputStream;
import java.util.Properties;
-import org.apache.xml.utils.ObjectFactory;
-
import org.apache.xpath.XPathContext;
import org.apache.xpath.objects.XNumber;
import org.apache.xpath.objects.XObject;
1.3 +9 -9
xml-xalan/java/src/org/apache/xpath/functions/SecuritySupport.java
Index: SecuritySupport.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/SecuritySupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecuritySupport.java 17 Feb 2004 04:34:01 -0000 1.2
+++ SecuritySupport.java 23 Feb 2004 10:29:37 -0000 1.3
@@ -77,33 +77,33 @@
* Return an appropriate instance of this class, depending on whether
* we're on a JDK 1.1 or J2SE 1.2 (or later) system.
*/
- public static SecuritySupport getInstance() {
+ static SecuritySupport getInstance() {
return (SecuritySupport)securitySupport;
}
- public ClassLoader getContextClassLoader() {
+ ClassLoader getContextClassLoader() {
return null;
}
- public ClassLoader getSystemClassLoader() {
+ ClassLoader getSystemClassLoader() {
return null;
}
- public ClassLoader getParentClassLoader(ClassLoader cl) {
+ ClassLoader getParentClassLoader(ClassLoader cl) {
return null;
}
- public String getSystemProperty(String propName) {
+ String getSystemProperty(String propName) {
return System.getProperty(propName);
}
- public FileInputStream getFileInputStream(File file)
+ FileInputStream getFileInputStream(File file)
throws FileNotFoundException
{
return new FileInputStream(file);
}
- public InputStream getResourceAsStream(ClassLoader cl, String name) {
+ InputStream getResourceAsStream(ClassLoader cl, String name) {
InputStream ris;
if (cl == null) {
ris = ClassLoader.getSystemResourceAsStream(name);
@@ -113,11 +113,11 @@
return ris;
}
- public boolean getFileExists(File f) {
+ boolean getFileExists(File f) {
return f.exists();
}
- public long getLastModified(File f) {
+ long getLastModified(File f) {
return f.lastModified();
}
}
1.3 +8 -8
xml-xalan/java/src/org/apache/xpath/functions/SecuritySupport12.java
Index: SecuritySupport12.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/functions/SecuritySupport12.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecuritySupport12.java 17 Feb 2004 04:34:01 -0000 1.2
+++ SecuritySupport12.java 23 Feb 2004 10:29:37 -0000 1.3
@@ -40,7 +40,7 @@
*/
class SecuritySupport12 extends SecuritySupport {
- public ClassLoader getContextClassLoader() {
+ ClassLoader getContextClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -53,7 +53,7 @@
});
}
- public ClassLoader getSystemClassLoader() {
+ ClassLoader getSystemClassLoader() {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -66,7 +66,7 @@
});
}
- public ClassLoader getParentClassLoader(final ClassLoader cl) {
+ ClassLoader getParentClassLoader(final ClassLoader cl) {
return (ClassLoader)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -82,7 +82,7 @@
});
}
- public String getSystemProperty(final String propName) {
+ String getSystemProperty(final String propName) {
return (String)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -91,7 +91,7 @@
});
}
- public FileInputStream getFileInputStream(final File file)
+ FileInputStream getFileInputStream(final File file)
throws FileNotFoundException
{
try {
@@ -106,7 +106,7 @@
}
}
- public InputStream getResourceAsStream(final ClassLoader cl,
+ InputStream getResourceAsStream(final ClassLoader cl,
final String name)
{
return (InputStream)
@@ -123,7 +123,7 @@
});
}
- public boolean getFileExists(final File f) {
+ boolean getFileExists(final File f) {
return ((Boolean)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
@@ -132,7 +132,7 @@
})).booleanValue();
}
- public long getLastModified(final File f) {
+ long getLastModified(final File f) {
return ((Long)
AccessController.doPrivileged(new PrivilegedAction() {
public Object run() {
1.2 +631 -0
xml-xalan/java/src/org/apache/xpath/functions/ObjectFactory.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
