Author: lresende
Date: Wed Jan 14 10:40:38 2009
New Revision: 734475
URL: http://svn.apache.org/viewvc?rev=734475&view=rev
Log:
Reverting changes from revision #734356 and there was some merge conflicts that
were not supposed to get to svn.
Added:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
- copied unchanged from r734355,
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/AnyElementReadWriteTestCase.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
- copied unchanged from r734355,
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
- copied unchanged from r734355,
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
Removed:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeWrapper.java
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-java-dsl/ (props changed)
tuscany/branches/sca-java-1.x/modules/assembly-xml/pom.xml
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
tuscany/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
Propchange: tuscany/branches/sca-java-1.x/modules/assembly-java-dsl/
('svn:mergeinfo' removed)
Modified: tuscany/branches/sca-java-1.x/modules/assembly-xml/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/pom.xml?rev=734475&r1=734474&r2=734475&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/assembly-xml/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/assembly-xml/pom.xml Wed Jan 14
10:40:38 2009
@@ -55,12 +55,6 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-contribution-xml</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-contribution-namespace</artifactId>
<version>1.5-SNAPSHOT</version>
</dependency>
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=734475&r1=734474&r2=734475&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
Wed Jan 14 10:40:38 2009
@@ -60,7 +60,6 @@
import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.processor.xml.AnyAttributeWrapper;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
@@ -137,6 +136,8 @@
this.extensionProcessor =
(StAXArtifactProcessor<Object>)extensionProcessor;
this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
this.monitor = monitor;
+
+ //TODO - this constructor should take a monitor too.
}
/**
@@ -869,8 +870,8 @@
QName attributeName = reader.getAttributeName(a);
if( attributeName.getNamespaceURI() != null &&
attributeName.getNamespaceURI().length() > 0) {
if( !
elementName.getNamespaceURI().equals(attributeName.getNamespaceURI()) ) {
- Object o =
extensionAttributeProcessor.read(attributeName, reader);
- estensibleElement.getExtensions().add(o);
+ String attributeExtension = (String)
extensionAttributeProcessor.read(attributeName, reader);
+
estensibleElement.getExtensions().add(attributeExtension);
}
}
}
@@ -888,7 +889,8 @@
*/
protected void writeExtendedAttributes(XMLStreamWriter writer, Extensible
extensibleElement, StAXAttributeProcessor extensionAttributeProcessor) throws
ContributionWriteException, XMLStreamException {
for(Object o : extensibleElement.getExtensions()) {
- if(o instanceof AnyAttributeWrapper) {
+ //FIXME How to identify it's a extended attribute ?
+ if(o instanceof String) {
extensionAttributeProcessor.write(o, writer);
}
}
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java?rev=734475&r1=734474&r2=734475&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
Wed Jan 14 10:40:38 2009
@@ -47,7 +47,8 @@
}
public void write(String value, XMLStreamWriter writer) throws
ContributionWriteException, XMLStreamException {
- writer.writeAttribute(ATTRIBUTE.getPrefix(),
ATTRIBUTE.getNamespaceURI(), ATTRIBUTE.getLocalPart(), value);
+ writer.setPrefix(ATTRIBUTE.getPrefix(), ATTRIBUTE.getNamespaceURI());
+ writer.writeAttribute(ATTRIBUTE.getLocalPart(), value);
}
public Class<String> getModelType() {
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java?rev=734475&r1=734474&r2=734475&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
Wed Jan 14 10:40:38 2009
@@ -38,7 +38,7 @@
*
* @version $Rev$ $Date$
*/
-public class AnyAttributeProcessor extends BaseStAXArtifactProcessor
implements StAXAttributeProcessor<AnyAttributeWrapper> {
+public class AnyAttributeProcessor extends BaseStAXArtifactProcessor
implements StAXAttributeProcessor<String> {
private static final QName ANY_ATTRIBUTE = new
QName(Constants.XMLSCHEMA_NS, "anyAttribute");
public AnyAttributeProcessor(ModelFactoryExtensionPoint modelFactories,
Monitor monitor) {
@@ -49,23 +49,21 @@
return ANY_ATTRIBUTE;
}
- public Class<AnyAttributeWrapper> getModelType() {
- return AnyAttributeWrapper.class;
+ public Class<String> getModelType() {
+ return String.class;
}
- public AnyAttributeWrapper read(QName attributeName, XMLStreamReader
reader) throws ContributionReadException, XMLStreamException {
- AnyAttributeWrapper attributeWrapper = new AnyAttributeWrapper();
- attributeWrapper.setQName(attributeName);
-
attributeWrapper.setValue(reader.getAttributeValue(attributeName.getNamespaceURI(),
attributeName.getLocalPart()));
- return attributeWrapper;
+ public String read(QName attributeName, XMLStreamReader reader) throws
ContributionReadException, XMLStreamException {
+ return reader.getAttributeValue(attributeName.getNamespaceURI(),
attributeName.getLocalPart());
}
- public void write(AnyAttributeWrapper attributeWrapper, XMLStreamWriter
writer) throws ContributionWriteException, XMLStreamException {
- writer.writeAttribute(attributeWrapper.getQName().getPrefix(),
attributeWrapper.getQName().getNamespaceURI(),
attributeWrapper.getQName().getLocalPart(),
attributeWrapper.getValue().toString());
+ public void write(String value, XMLStreamWriter writer) throws
ContributionWriteException, XMLStreamException {
+ writer.setPrefix(ANY_ATTRIBUTE.getPrefix(),
ANY_ATTRIBUTE.getNamespaceURI());
+ writer.writeAttribute(ANY_ATTRIBUTE.getLocalPart(), value);
}
- public void resolve(AnyAttributeWrapper arg0, ModelResolver arg1) throws
ContributionResolveException {
+ public void resolve(String arg0, ModelResolver arg1) throws
ContributionResolveException {
}
}
Modified:
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java?rev=734475&r1=734474&r2=734475&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
Wed Jan 14 10:40:38 2009
@@ -18,23 +18,28 @@
*/
package org.apache.tuscany.sca.contribution.processor.xml;
-import static javax.xml.stream.XMLStreamConstants.CDATA;
-import static javax.xml.stream.XMLStreamConstants.CHARACTERS;
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.CHARACTERS;
+import static javax.xml.stream.XMLStreamConstants.COMMENT;
+import static javax.xml.stream.XMLStreamConstants.CDATA;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Stack;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.events.Characters;
import javax.xml.stream.events.XMLEvent;
import org.apache.tuscany.sca.contribution.Constants;
@@ -44,9 +49,11 @@
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.contribution.processor.xml.XMLEventsStreamReader;
public class AnyElementProcessor implements StAXArtifactProcessor<Object> {
- private static final QName ANY_ELEMENT = new
QName(Constants.XMLSCHEMA_NS, "anyElement");
+ private static final QName ANY_ELEMENT = new
QName(Constants.XMLSCHEMA_NS,
+ "anyElement");
private XMLInputFactory xmlInputFactory;
@SuppressWarnings("unused")
Modified:
tuscany/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java?rev=734475&r1=734474&r2=734475&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
Wed Jan 14 10:40:38 2009
@@ -55,7 +55,7 @@
private static final Logger logger =
Logger.getLogger(ExtensibleStAXAttributeProcessor.class.getName());
- private static final QName ANY_ATTRIBUTE = new
QName(Constants.XMLSCHEMA_NS, "anyAttribute");
+ private static final QName UNKNOWN_ATTRIBUTE = new
QName(Constants.SCA10_TUSCANY_NS, "unknown");
private XMLInputFactory inputFactory;
private XMLOutputFactory outputFactory;
@@ -149,13 +149,13 @@
//handle extension attributes without processors
- processor =
(StAXAttributeProcessor<?>)processors.getProcessor(ANY_ATTRIBUTE);
+ 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,
ANY_ATTRIBUTE, location);
+ warning("DefaultAttributeProcessorNotAvailable", processors,
UNKNOWN_ATTRIBUTE, location);
}
return processor == null ? null : processor.read(attributeName,
source);
@@ -181,7 +181,7 @@
}
//handle extension attributes without processors
- processor =
(StAXAttributeProcessor<?>)processors.getProcessor(ANY_ATTRIBUTE);
+ 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());
