--- old/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java 2013-06-03 18:25:44.000000000 +0200
+++ new/src/com/sun/org/apache/xml/internal/dtm/DTMManager.java 2013-06-03 18:25:43.000000000 +0200
@@ -52,14 +52,6 @@
public abstract class DTMManager
{
- /** The default property name to load the manager. */
- private static final String defaultPropName =
- "com.sun.org.apache.xml.internal.dtm.DTMManager";
-
- /** The default class name to use as the manager. */
- private static String defaultClassName =
- "com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault";
-
/**
* Factory for creating XMLString objects.
* %TBD% Make this set by the caller.
@@ -97,29 +89,7 @@
/**
* Obtain a new instance of a DTMManager
.
* This static method creates a new factory instance
- * This method uses the following ordered lookup procedure to determine
- * the DTMManager
implementation class to
- * load:
- *
- * -
- * Use the
com.sun.org.apache.xml.internal.dtm.DTMManager
system
- * property.
- *
- * -
- * Use the JAVA_HOME(the parent directory where jdk is
- * installed)/lib/xalan.properties for a property file that contains the
- * name of the implementation class keyed on the same value as the
- * system property defined above.
- *
- * -
- * Use the Services API (as detailed in the JAR specification), if
- * available, to determine the classname. The Services API will look
- * for a classname in the file
- *
META-INF/services/com.sun.org.apache.xml.internal.dtm.DTMManager
- * in jars available to the runtime.
- *
- * -
- * Use the default
DTMManager
classname, which is
+ * using the default DTMManager
implementation, which is
* com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault
.
*
*
@@ -136,39 +106,10 @@
public static DTMManager newInstance(XMLStringFactory xsf)
throws DTMConfigurationException
{
- return newInstance(xsf, true);
- }
-
- public static DTMManager newInstance(XMLStringFactory xsf, boolean useServicesMechanism)
- throws DTMConfigurationException
- {
- DTMManager factoryImpl = null;
- try
- {
- if (useServicesMechanism) {
- factoryImpl = (DTMManager) ObjectFactory
- .createObject(defaultPropName, defaultClassName);
- } else {
- factoryImpl = new com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault();
- }
- }
- catch (ConfigurationError e)
- {
- throw new DTMConfigurationException(XMLMessages.createXMLMessage(
- XMLErrorResources.ER_NO_DEFAULT_IMPL, null), e.getException());
- //"No default implementation found");
- }
-
- if (factoryImpl == null)
- {
- throw new DTMConfigurationException(XMLMessages.createXMLMessage(
- XMLErrorResources.ER_NO_DEFAULT_IMPL, null));
- //"No default implementation found");
- }
-
- factoryImpl.setXMLStringFactory(xsf);
+ final DTMManager factoryImpl = new com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault();
+ factoryImpl.setXMLStringFactory(xsf);
- return factoryImpl;
+ return factoryImpl;
}
/**