Author: lresende
Date: Tue Sep 23 08:23:36 2008
New Revision: 698203
URL: http://svn.apache.org/viewvc?rev=698203&view=rev
Log:
TUSCANY-2538 - Merging updates from trunk
Added:
tuscany/branches/sca-java-1.3.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
- copied unchanged from r698108,
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/
- copied from r698108,
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/
tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/
- copied from r698108,
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/
tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
- copied unchanged from r698108,
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
- copied unchanged from r698108,
tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
- copied unchanged from r698108,
tuscany/java/sca/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
Removed:
tuscany/branches/sca-java-1.3.2/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnkonwnElement.java
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java
Modified:
tuscany/branches/sca-java-1.3.2/modules/ (props changed)
tuscany/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/ (props
changed)
tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/resources/contribution-validation-messages.properties
Propchange: tuscany/branches/sca-java-1.3.2/modules/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 23 08:23:36 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules:673298,674894-674933,675006,675061,694165,695536
+/tuscany/java/sca/modules:673298,674894-674933,675006,675061,694165,695536,698102-698108
Propchange: tuscany/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 23 08:23:36 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-ws-wsdlgen:673298,675013,675061,694165,695536
+/tuscany/java/sca/modules/binding-ws-wsdlgen:673298,675013,675061,694165,695536,698102-698108
Modified:
tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=698203&r1=698202&r2=698203&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
(original)
+++
tuscany/branches/sca-java-1.3.2/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
Tue Sep 23 08:23:36 2008
@@ -17,3 +17,4 @@
# Implementation class for the artifact processor extension
org.apache.tuscany.sca.contribution.xml.ContributionMetadataProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#contribution,model=org.apache.tuscany.sca.contribution.ContributionMetadata
+org.apache.tuscany.sca.contribution.processor.xml.AnyElementProcessor;qname=http://www.w3.org/2001/XMLSchema#anyElement,model=java.lang.Object
Modified:
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java?rev=698203&r1=698202&r2=698203&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
(original)
+++
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
Tue Sep 23 08:23:36 2008
@@ -25,6 +25,8 @@
* @version $Rev$ $Date$
*/
public interface Constants {
- String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
+ String XMLSCHEMA_NS = "http://www.w3.org/2001/XMLSchema";;
+
+ String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";;
String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";;
}
Modified:
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java?rev=698203&r1=698202&r2=698203&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
(original)
+++
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
Tue Sep 23 08:23:36 2008
@@ -34,12 +34,12 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
+import org.apache.tuscany.sca.contribution.Constants;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import
org.apache.tuscany.sca.contribution.service.UnrecognizedElementException;
-import
org.apache.tuscany.sca.contribution.processor.DefaultUnknownElementProcessor;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.Problem.Severity;
@@ -52,8 +52,9 @@
*
* @version $Rev$ $Date$
*/
-public class ExtensibleStAXArtifactProcessor
- implements StAXArtifactProcessor<Object> {
+public class ExtensibleStAXArtifactProcessor implements
StAXArtifactProcessor<Object> {
+
+ private static final QName ANY_ELEMENT = new
QName(Constants.XMLSCHEMA_NS, "anyElement");
private static final Logger logger =
Logger.getLogger(ExtensibleStAXArtifactProcessor.class.getName());
private XMLInputFactory inputFactory;
@@ -134,14 +135,19 @@
QName name = source.getName();
StAXArtifactProcessor<?> processor =
(StAXArtifactProcessor<?>)processors.getProcessor(name);
if (processor == null) {
- DefaultUnknownElementProcessor unknownElementProcessor = new
DefaultUnknownElementProcessor(monitor);
Location location = source.getLocation();
if (logger.isLoggable(Level.WARNING)) {
logger.warning("Element " + name + " cannot be processed. (" +
location + ")");
}
warning("ElementCannotBeProcessed", processors, name, location);
- //return null;
- return unknownElementProcessor.read(source,name);
+
+ StAXArtifactProcessor anyElementProcessor =
processors.getProcessor(ANY_ELEMENT);
+ if(anyElementProcessor != null) {
+ return anyElementProcessor.read(source);
+ } else {
+ return null;
+ }
+
}
return processor.read(source);
}
@@ -155,12 +161,14 @@
if (processor != null) {
processor.write(model, outputSource);
} else {
- DefaultUnknownElementProcessor unknownElementProcessor = new
DefaultUnknownElementProcessor(monitor);
- unknownElementProcessor.write(model,outputSource);
if (logger.isLoggable(Level.WARNING)) {
logger.warning("No StAX processor is configured to handle
" + model.getClass());
}
warning("NoStaxProcessor", processors, model.getClass());
+ StAXArtifactProcessor anyElementProcessor =
processors.getProcessor(ANY_ELEMENT);
+ if(anyElementProcessor != null) {
+ anyElementProcessor.write(model, outputSource);
+ }
}
}
}
Modified:
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java?rev=698203&r1=698202&r2=698203&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
(original)
+++
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
Tue Sep 23 08:23:36 2008
@@ -147,6 +147,17 @@
return processor.read(attributeName, source);
}
+
+ //handle extension attributes without processors
+ processor =
(StAXAttributeProcessor<?>)processors.getProcessor(UNKNOWN_ATTRIBUTE);
+ if (processor == null) {
+ Location location = source.getLocation();
+ if (logger.isLoggable(Level.WARNING)) {
+ logger.warning("Could not find Default Attribute processor !");
+ }
+ warning("DefaultAttributeProcessorNotAvailable", processors,
UNKNOWN_ATTRIBUTE, location);
+ }
+
return processor == null ? null : processor.read(attributeName,
source);
}
@@ -168,6 +179,18 @@
processor.write(model, outputSource);
return;
}
+
+ //handle extension attributes without processors
+ processor =
(StAXAttributeProcessor<?>)processors.getProcessor(UNKNOWN_ATTRIBUTE);
+ if(processor == null) {
+ if (logger.isLoggable(Level.WARNING)) {
+ logger.warning("No Default StAX processor is configured
to handle " + model.getClass());
+ }
+ warning("NoDefaultStaxProcessor", processors,
model.getClass());
+ } else {
+ processor.write(model, outputSource);
+ return;
+ }
}
Modified:
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/resources/contribution-validation-messages.properties
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/resources/contribution-validation-messages.properties?rev=698203&r1=698202&r2=698203&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/resources/contribution-validation-messages.properties
(original)
+++
tuscany/branches/sca-java-1.3.2/modules/contribution/src/main/resources/contribution-validation-messages.properties
Tue Sep 23 08:23:36 2008
@@ -23,9 +23,12 @@
SchemaWarning = XMLSchema validation warning occured in: {0} ,line = {1},
column = {2}, Message = {3}
UnsupportedPackageTypeException = Unsupported contribution package type: {0}
ElementCannotBeProcessed = Element {0} cannot be processed. ({1})
+AttributeCannotBeProcessed = Attribute {0} cannot be processed. ({1})
NoStaxProcessor = No StAX processor is configured to handle {0}
ContributionWriteException = ContributionWriteException occured due to :
ContributionReadException = ContributionReadException occured due to :
UnrecognizedElementException = Unrecognized Element : {0}
IllegalArgumentException = Invalid qname: {0}
PrivilegedActionException = PrivilegedActionException occured due to :
+AttributeCannotBeProcessed = Attribute {0} cannot be processed. ({1})
+
