Author: rfeng
Date: Thu May 28 00:46:20 2009
New Revision: 779378
URL: http://svn.apache.org/viewvc?rev=779378&view=rev
Log:
Expose the setting of schema validation to subclasses
Modified:
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
Modified:
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java?rev=779378&r1=779377&r2=779378&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
(original)
+++
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
Thu May 28 00:46:20 2009
@@ -23,6 +23,7 @@
import java.net.URL;
import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.logging.Level;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.extensibility.equinox.OSGiExtensionPointRegistry;
@@ -111,4 +112,9 @@
return new OSGiExtensionPointRegistry(bundleContext);
}
+ @Override
+ protected boolean isSchemaValidationEnabled() {
+ return logger.isLoggable(Level.FINE);
+ }
+
}
Modified:
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=779378&r1=779377&r2=779378&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
(original)
+++
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
Thu May 28 00:46:20 2009
@@ -210,7 +210,7 @@
}
}
- private static String getSystemProperty(final String name) {
+ protected static String getSystemProperty(final String name) {
return AccessController.doPrivileged(new PrivilegedAction<String>() {
public String run() {
return System.getProperty(name);
@@ -360,6 +360,15 @@
return extensionPoints;
}
+ protected boolean isSchemaValidationEnabled() {
+ String enabled =
getSystemProperty(ValidationSchemaExtensionPoint.class.getName() + ".enabled");
+ if (enabled == null) {
+ enabled = "true";
+ }
+ boolean debug = logger.isLoggable(Level.FINE);
+ return "true".equals(enabled) || debug;
+ }
+
public synchronized void init() {
if (inited) {
return;
@@ -370,15 +379,12 @@
extensionPoints = createExtensionPointRegistry();
// Enable schema validation only of the logger level is FINE or higher
- ValidationSchemaExtensionPoint schemas =
-
extensionPoints.getExtensionPoint(ValidationSchemaExtensionPoint.class);
- if (schemas != null) {
- String enabled =
getSystemProperty(ValidationSchemaExtensionPoint.class.getName() + ".enabled");
- if (enabled == null) {
- enabled = "true";
+ if (isSchemaValidationEnabled()) {
+ ValidationSchemaExtensionPoint schemas =
+
extensionPoints.getExtensionPoint(ValidationSchemaExtensionPoint.class);
+ if (schemas != null) {
+ schemas.setEnabled(true);
}
- boolean debug = logger.isLoggable(Level.FINE);
- schemas.setEnabled("true".equals(enabled) || debug);
}
// Use the runtime-enabled assembly factory
