You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/27 08:48:00 UTC
svn commit: r532988 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/
assembly/src/main/java/org/apache/tuscany/assembly/util/
binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ implement...
Author: jsdelfino
Date: Thu Apr 26 23:47:58 2007
New Revision: 532988
URL: http://svn.apache.org/viewvc?view=rev&rev=532988
Log:
Moved the creation of a problems list out of CompositeUtil.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java
incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java?view=diff&rev=532988&r1=532987&r2=532988
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java Thu Apr 26 23:47:58 2007
@@ -499,12 +499,33 @@
// Process the composite configuration
CompositeUtil compositeUtil = new CompositeUtil(factory, interfaceContractMapper, composite);
- List<Base> problems = new ArrayList<Base>();
+
+ List<Base> problems = new ArrayList<Base>() {
+ private static final long serialVersionUID = 4819831446590718923L;
+
+
+ @Override
+ public boolean add(Base o) {
+ //TODO Use a monitor to report configuration problems
+
+ // Uncommenting the following two lines can be useful to detect
+ // and troubleshoot SCA assembly XML composite configuration
+ // problems.
+
+// System.err.println("Composite configuration problem:");
+// new PrintUtil(System.err).print(o);
+ return super.add(o);
+ }
+ };
+
compositeUtil.configure(problems);
- /*if (!problems.isEmpty()) {
- throw new ContributionWireException("Problems in the composite...");
- }*/
+ // Uncommenting the following three lines can be useful to detect
+ // and troubleshoot SCA assembly XML composite configuration
+ // problems.
+// if (!problems.isEmpty()) {
+// throw new ContributionWireException("Problems in the composite...");
+// }
}
public QName getArtifactType() {
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java?view=diff&rev=532988&r1=532987&r2=532988
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java Thu Apr 26 23:47:58 2007
@@ -69,25 +69,6 @@
}
public void configure(List<Base> problems) {
- if (true || problems == null) {
- problems = new ArrayList<Base>() {
- private static final long serialVersionUID = 4819831446590718923L;
-
-
- @Override
- public boolean add(Base o) {
- //TODO Use a monitor to report configuration problems
-
- // Uncommenting the following two lines can be useful to detect
- // and troubleshoot SCA assembly XML composite configuration
- // problems.
-
-// System.err.println("Composite configuration problem:");
-// new PrintUtil(System.err).print(o);
- return super.add(o);
- }
- };
- }
// Collect and fuse includes
List<Composite> includes = new ArrayList<Composite>();
Modified: incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java?view=diff&rev=532988&r1=532987&r2=532988
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-xml/src/test/java/org/apache/tuscany/binding/ws/xml/ReadTestCase.java Thu Apr 26 23:47:58 2007
@@ -20,12 +20,14 @@
package org.apache.tuscany.binding.ws.xml;
import java.io.InputStream;
+import java.util.ArrayList;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import junit.framework.TestCase;
+import org.apache.tuscany.assembly.Base;
import org.apache.tuscany.assembly.ComponentType;
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.util.CompositeUtil;
@@ -74,7 +76,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- new CompositeUtil(composite).configure(null);
+ new CompositeUtil(composite).configure(new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
Modified: incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java?view=diff&rev=532988&r1=532987&r2=532988
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/implementation/java/xml/ReadTestCase.java Thu Apr 26 23:47:58 2007
@@ -20,12 +20,14 @@
package org.apache.tuscany.implementation.java.xml;
import java.io.InputStream;
+import java.util.ArrayList;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import junit.framework.TestCase;
+import org.apache.tuscany.assembly.Base;
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.util.CompositeUtil;
import org.apache.tuscany.assembly.xml.CompositeProcessor;
@@ -66,7 +68,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- new CompositeUtil(composite).configure(null);
+ new CompositeUtil(composite).configure(new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
@@ -81,7 +83,7 @@
ArtifactResolver resolver = new DefaultArtifactResolver();
staxProcessors.resolve(composite, resolver);
- new CompositeUtil(composite).configure(null);
+ new CompositeUtil(composite).configure(new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
Modified: incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java?view=diff&rev=532988&r1=532987&r2=532988
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java-xml/src/test/java/org/apache/tuscany/interfacedef/java/xml/ReadTestCase.java Thu Apr 26 23:47:58 2007
@@ -20,12 +20,14 @@
package org.apache.tuscany.interfacedef.java.xml;
import java.io.InputStream;
+import java.util.ArrayList;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import junit.framework.TestCase;
+import org.apache.tuscany.assembly.Base;
import org.apache.tuscany.assembly.ComponentType;
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.ConstrainingType;
@@ -85,7 +87,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- new CompositeUtil(composite).configure(null);
+ new CompositeUtil(composite).configure(new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
Modified: incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java?view=diff&rev=532988&r1=532987&r2=532988
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/interface-wsdl-xml/src/test/java/org/apache/tuscany/interfacedef/wsdl/xml/ReadTestCase.java Thu Apr 26 23:47:58 2007
@@ -20,12 +20,14 @@
package org.apache.tuscany.interfacedef.wsdl.xml;
import java.io.InputStream;
+import java.util.ArrayList;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import junit.framework.TestCase;
+import org.apache.tuscany.assembly.Base;
import org.apache.tuscany.assembly.ComponentType;
import org.apache.tuscany.assembly.Composite;
import org.apache.tuscany.assembly.ConstrainingType;
@@ -85,7 +87,7 @@
Composite composite = compositeProcessor.read(reader);
assertNotNull(composite);
- new CompositeUtil(composite).configure(null);
+ new CompositeUtil(composite).configure(new ArrayList<Base>());
//new PrintUtil(System.out).print(composite);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org