Author: svkrish
Date: Wed Nov 28 08:15:18 2007
New Revision: 599051
URL: http://svn.apache.org/viewvc?rev=599051&view=rev
Log:
cleaning up, implemente read method in StAXProcessor...
Modified:
incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java
incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
incubator/tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
Modified:
incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java?rev=599051&r1=599050&r2=599051&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java
Wed Nov 28 08:15:18 2007
@@ -95,7 +95,7 @@
}
Object[] logParams = new Object[]{operation.getName(),
sb.toString()};
- logger.logrb(Level.FINER,"","",policy.getResourceBundleName(),
"CALLING_OPERATION", logParams);
+ logger.logp(Level.FINER,"","", "Inovoking operation {0} with
arguments {1}", logParams);
}
}
}
@@ -117,7 +117,7 @@
Object[] logParams = new Object[]{operation.getName(),
msg.getBody()};
logger.logp(Level.INFO,"", "", " Returned from operation - " +
operation.getName());
- logger.logrb(Level.FINER,"","",policy.getResourceBundleName(),
"OPERATION_RETURNED", logParams);
+ logger.logp(Level.FINER,"","", "Returning from operation {0} with
return value {1}", logParams);
}
}
Modified:
incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java?rev=599051&r1=599050&r2=599051&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
Wed Nov 28 08:15:18 2007
@@ -41,10 +41,11 @@
*
*/
public class JDKLoggingPolicyProcessor implements
StAXArtifactProcessor<JDKLoggingPolicy> {
- public static final QName JDK_LOGGING_POLICY_QNAME = new
QName(Constants.SCA10_TUSCANY_NS, "jdkLogger");
- public static final String LOG_LEVEL = "logLevel";
- public static final String RESOURCE_BUNDLE = "resourceBundle";
- public static final String USE_PARENT_HANDLERS = "useParentHandlers";
+ private static final QName JDK_LOGGING_POLICY_QNAME = new
QName(Constants.SCA10_TUSCANY_NS, "jdkLogger");
+ private static final String LOG_LEVEL = "logLevel";
+ private static final String RESOURCE_BUNDLE = "resourceBundle";
+ private static final String USE_PARENT_HANDLERS = "useParentHandlers";
+ private static final String TUSACNY_NS =
"http://tuscany.apache.org/xmlns/sca/1.0";;
public QName getArtifactType() {
return JDK_LOGGING_POLICY_QNAME;
@@ -94,8 +95,34 @@
return policy;
}
- public void write(JDKLoggingPolicy arg0, XMLStreamWriter arg1) throws
ContributionWriteException,
+ public void write(JDKLoggingPolicy policy, XMLStreamWriter writer) throws
ContributionWriteException,
XMLStreamException {
+ String prefix = "tuscany";
+ writer.writeStartElement(prefix,
+ JDK_LOGGING_POLICY_QNAME.getLocalPart(),
+ JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
+ writer.writeNamespace("tuscany", Constants.SCA10_TUSCANY_NS);
+
+ if (policy.getLoggerName() != null) {
+ writer.writeAttribute(Constants.NAME, policy.getLoggerName());
+ }
+ if ( policy.getLogLevel() != null ) {
+ writer.writeStartElement(prefix,
+ LOG_LEVEL,
+
JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
+ writer.writeCharacters(policy.getLogLevel().getLocalizedName());
+ writer.writeEndElement();
+ }
+
+ if ( policy.getResourceBundleName() != null ) {
+ writer.writeStartElement(prefix,
+ RESOURCE_BUNDLE,
+
JDK_LOGGING_POLICY_QNAME.getNamespaceURI());
+ writer.writeCharacters(policy.getResourceBundleName());
+ writer.writeEndElement();
+ }
+
+ writer.writeEndElement();
}
public Class<JDKLoggingPolicy> getModelType() {
Modified:
incubator/tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java?rev=599051&r1=599050&r2=599051&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
Wed Nov 28 08:15:18 2007
@@ -20,11 +20,17 @@
import java.io.InputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
import java.net.URL;
import java.util.logging.Level;
import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.assembly.xml.Constants;
import junit.framework.TestCase;
@@ -56,6 +62,31 @@
assertEquals(policy.getLoggerName(), "test.logger");
assertEquals(policy.getLogLevel(), Level.INFO );
assertEquals(policy.getResourceBundleName(),
"Trace_Messages.properties");
+ }
+
+ public void testPolicyWriting() throws Exception {
+ JDKLoggingPolicyProcessor processor = new
JDKLoggingPolicyProcessor(null);
+
+ JDKLoggingPolicy policy = new JDKLoggingPolicy();
+ policy.setLoggerName("test.logger");
+ policy.setLogLevel(Level.INFO);
+ policy.setResourceBundleName("Trace_Messages.properties");
+
+ XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+ StringWriter sw = new StringWriter();
+ XMLStreamWriter writer = outputFactory.createXMLStreamWriter(sw);
+ processor.write(policy, writer);
+ writer.close();
+
+ XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+ StringReader sr = new StringReader(sw.toString());
+ XMLStreamReader reader = inputFactory.createXMLStreamReader(sr);
+
+ policy = processor.read(reader);
+ assertEquals(policy.getLoggerName(), "test.logger");
+ assertEquals(policy.getLogLevel(), Level.INFO );
+ assertEquals(policy.getResourceBundleName(),
"Trace_Messages.properties");
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
