You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/10/18 08:19:07 UTC
svn commit: r826363 - in
/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml:
ContributionGeneratedMetadataDocumentProcessor.java
ContributionMetadataDocumentProcessor.java
Author: lresende
Date: Sun Oct 18 06:19:06 2009
New Revision: 826363
URL: http://svn.apache.org/viewvc?rev=826363&view=rev
Log:
Properly fixing merge conflict
Modified:
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
Modified: tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java?rev=826363&r1=826362&r2=826363&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java (original)
+++ tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java Sun Oct 18 06:19:06 2009
@@ -32,15 +32,13 @@
public class ContributionGeneratedMetadataDocumentProcessor extends ContributionMetadataDocumentProcessor {
public ContributionGeneratedMetadataDocumentProcessor(XMLInputFactory inputFactory,
- StAXArtifactProcessor staxProcessor,
- Monitor monitor) {
- super(inputFactory, staxProcessor, monitor);
+ StAXArtifactProcessor staxProcessor) {
+ super(inputFactory, staxProcessor);
}
public ContributionGeneratedMetadataDocumentProcessor(FactoryExtensionPoint modelFactories,
- StAXArtifactProcessor staxProcessor,
- Monitor monitor) {
- super(modelFactories, staxProcessor, monitor);
+ StAXArtifactProcessor staxProcessor) {
+ super(modelFactories, staxProcessor);
}
@Override
Modified: tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java?rev=826363&r1=826362&r2=826363&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java (original)
+++ tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java Sun Oct 18 06:19:06 2009
@@ -51,15 +51,13 @@
private final XMLInputFactory inputFactory;
public ContributionMetadataDocumentProcessor(XMLInputFactory inputFactory,
- StAXArtifactProcessor staxProcessor,
- Monitor monitor) {
+ StAXArtifactProcessor staxProcessor) {
this.inputFactory = inputFactory;
this.staxProcessor = staxProcessor;
}
public ContributionMetadataDocumentProcessor(FactoryExtensionPoint modelFactories,
- StAXArtifactProcessor staxProcessor,
- Monitor monitor) {
+ StAXArtifactProcessor staxProcessor) {
this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
this.staxProcessor = staxProcessor;
}