Author: jmarino
Date: Tue Apr 25 14:23:58 2006
New Revision: 396985
URL: http://svn.apache.org/viewcvs?rev=396985&view=rev
Log:
changes to pass checkstyle
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/checkstyle.xml
incubator/tuscany/sandbox/celtix/binding.celtix/pom.xml
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/ExternalWebServiceContextFactory.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/WebServiceEntryPointContextFactory.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceTargetInvoker.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataReader.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataWriter.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/SCADataBindingCallback.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/resources/system.fragment
Modified: incubator/tuscany/sandbox/celtix/binding.celtix/checkstyle.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/checkstyle.xml?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
--- incubator/tuscany/sandbox/celtix/binding.celtix/checkstyle.xml (original)
+++ incubator/tuscany/sandbox/celtix/binding.celtix/checkstyle.xml Tue Apr 25
14:23:58 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
<!--
Checks to make sure the code meets the Celtix coding guidelines
@@ -41,8 +41,9 @@
<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
<module name="AbstractClassName">
- <property name="format"
value="^Abstract.*$|^.*Factory$|^.*Bus$|^.*ConfigurationRepository$|^.*Base$|^Exception$|^.*Builder$"/>
- </module>
+ <property name="format"
+
value="^Abstract.*$|^.*Factory$|^.*Bus$|^.*ConfigurationRepository$|^.*Base$|^Exception$|^.*Builder$"/>
+ </module>
<module name="ConstantName"/>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
@@ -52,7 +53,7 @@
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
-
+
<!-- Header checks -->
<!-- <module name="Header"/> -->
<!-- <module name="RegexpHeader"/> -->
@@ -61,9 +62,11 @@
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport">
- <property name="excludes"
value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
+ <property name="excludes"
+
value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
</module>
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="IllegalImport"/>
+ <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
<module name="UnusedImports"/>
<module name="ImportOrder">
@@ -75,7 +78,7 @@
<property name="file" value="etc/import-control.xml"/>
</module>
-->
-
+
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
@@ -112,9 +115,10 @@
<property name="tokens" value="COMMA, SEMI"/>
</module>
<module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL,
GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO,
LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN,
MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST,
SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>
+ <property name="tokens"
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR,
BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND,
LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED,
LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN,
NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>
</module>
-
+
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
@@ -164,16 +168,16 @@
<module name="SuperClone"/>
<module name="SuperFinalize"/>
<!--<module name="IllegalCatch"/>-->
- <module name="IllegalThrows">
- <property name="illegalClassNames"
value="java.lang.Error,java.lang.RuntimeException"/>
- </module>
+ <module name="IllegalThrows">
+ <property name="illegalClassNames"
value="java.lang.Error,java.lang.RuntimeException"/>
+ </module>
<!--<module name="RedundantThrows"/>-->
<module name="PackageDeclaration"/>
<module name="JUnitTestCase"/>
<module name="ReturnCount">
<property name="max" value="6"/>
</module>
-
+
<module name="IllegalType">
<property name="format" value="^xxx$"/>
</module>
@@ -187,8 +191,7 @@
<module name="MultipleVariableDeclarations"/>
<!--<module name="RequireThis"/>-->
<module name="UnnecessaryParentheses"/>
-
-
+
<!-- Checks for class design -->
<!-- See http://checkstyle.sf.net/config_design.html -->
@@ -198,33 +201,32 @@
<module name="InterfaceIsType"/>
<module name="MutableException"/>
<module name="ThrowsCount">
- <property name="max" value="5"/>
+ <property name="max" value="5"/>
</module>
<module name="VisibilityModifier">
<property name="protectedAllowed" value="true"/>
<property name="packageAllowed" value="true"/>
- <!-- this is needed for the resource injection unit
tests. It will removed
- when private member inject is supported.
- -->
- <property name="publicMemberPattern" value="resource[12].*"/>
+ <!-- this is needed for the resource injection unit tests. It
will removed
+ when private member inject is supported.
+ -->
+ <property name="publicMemberPattern" value="resource[12].*"/>
</module>
-
<!-- Metrics checks. -->
<!-- See http://checkstyle.sf.net/config_metrics.html -->
<module name="BooleanExpressionComplexity">
- <property name="max" value="6"/>
+ <property name="max" value="6"/>
</module>
<!--<module name="ClassDataAbstractionCoupling"/>-->
<!--<module name="ClassFanOutComplexity"/>-->
<!--<module name="CyclomaticComplexity"/>-->
<!--<module name="NPathComplexity"/>-->
<module name="JavaNCSS">
- <property name="methodMaximum" value="75"/>
+ <property name="methodMaximum" value="75"/>
</module>
-
+
<!-- Miscellaneous other checks. -->
<!-- See http://checkstyle.sf.net/config_misc.html -->
<!--
@@ -238,18 +240,19 @@
</module>
-->
<module name="TodoComment">
- <property name="format" value="WARNING"/>
- </module>
+ <property name="format" value="WARNING"/>
+ </module>
<module name="UpperEll"/>
-
+
<!--Assert statement may have side effects:-->
- <module name="DescendantToken">
- <property name="tokens" value="LITERAL_ASSERT"/>
- <property name="limitedTokens"
value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN"/>
- <property name="maximumNumber" value="0"/>
- </module>
-
+ <module name="DescendantToken">
+ <property name="tokens" value="LITERAL_ASSERT"/>
+ <property name="limitedTokens"
+
value="ASSIGN,DEC,INC,POST_DEC,POST_INC,PLUS_ASSIGN,MINUS_ASSIGN,STAR_ASSIGN,DIV_ASSIGN,MOD_ASSIGN,BSR_ASSIGN,SR_ASSIGN,SL_ASSIGN,BAND_ASSIGN,BXOR_ASSIGN,BOR_ASSIGN"/>
+ <property name="maximumNumber" value="0"/>
+ </module>
+
<!--<module name="UncommentedMain"/>-->
<module name="TrailingComment"/>
<module name="Indentation">
Modified: incubator/tuscany/sandbox/celtix/binding.celtix/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/pom.xml?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
--- incubator/tuscany/sandbox/celtix/binding.celtix/pom.xml (original)
+++ incubator/tuscany/sandbox/celtix/binding.celtix/pom.xml Tue Apr 25 14:23:58
2006
@@ -128,7 +128,8 @@
<downloadSources>true</downloadSources>
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
-
<java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
+ <java.lang.String>
+
com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
<java.lang.String>net.sourceforge.pmd.eclipse.pmdBuilder</java.lang.String>
</buildcommands>
<projectnatures>
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/WebServiceBinding.java
Tue Apr 25 14:23:58 2006
@@ -46,6 +46,7 @@
/**
* Returns the WSDL definition containing the WSDL port.
+ *
* @return the WSDL definition containing the WSDL port
*/
Definition getWSDLDefinition();
@@ -57,6 +58,7 @@
/**
* Sets the WSDL definition containing the WSDL port.
+ *
* @param definition
*/
void setWSDLDefinition(Definition definition);
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/assembly/impl/WebServiceBindingImpl.java
Tue Apr 25 14:23:58 2006
@@ -18,7 +18,6 @@
import java.util.Collection;
import java.util.List;
-
import javax.wsdl.Definition;
import javax.wsdl.Port;
import javax.wsdl.Service;
@@ -49,6 +48,7 @@
public Port getWSDLPort() {
return port;
}
+
public Service getWSDLService() {
return service;
}
@@ -107,7 +107,7 @@
for (Definition def : definitions) {
// Find the port with the given name
- for (Service serv :
(Collection<Service>)def.getServices().values()) {
+ for (Service serv : (Collection<Service>)
def.getServices().values()) {
Port p = serv.getPort(portName);
if (p != null) {
service = serv;
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceBuilder.java
Tue Apr 25 14:23:58 2006
@@ -20,15 +20,16 @@
import org.apache.tuscany.core.builder.impl.ExternalServiceContextFactory;
import org.apache.tuscany.core.extension.ExternalServiceBuilderSupport;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
-import org.apache.tuscany.model.assembly.ExternalService;
import org.apache.tuscany.model.assembly.Binding;
+import org.apache.tuscany.model.assembly.ExternalService;
import org.objectweb.celtix.Bus;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
/**
- * Creates a <code>ContextFactoryBuilder</code> for an external service
configured with the [EMAIL PROTECTED] WebServiceBinding}
+ * Creates a <code>ContextFactoryBuilder</code> for an external service
configured with the [EMAIL PROTECTED]
+ * WebServiceBinding}
*
* @version $Rev$ $Date$
*/
@@ -48,7 +49,8 @@
return binding instanceof WebServiceBinding;
}
- protected ExternalServiceContextFactory
createExternalServiceContextFactory(ExternalService externalService) {
+ protected ExternalServiceContextFactory
createExternalServiceContextFactory(
+ ExternalService externalService) {
ExternalWebServiceClient externalWebServiceClient = new
ExternalWebServiceClient(bus,
externalService);
return new ExternalWebServiceContextFactory(externalService.getName(),
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/ExternalWebServiceWireBuilder.java
Tue Apr 25 14:23:58 2006
@@ -14,6 +14,8 @@
*/
package org.apache.tuscany.binding.celtix.builder;
+import java.lang.reflect.Method;
+
import
org.apache.tuscany.binding.celtix.config.ExternalWebServiceContextFactory;
import
org.apache.tuscany.binding.celtix.handler.ExternalWebServiceTargetInvoker;
import org.apache.tuscany.core.context.QualifiedName;
@@ -22,8 +24,6 @@
import org.apache.tuscany.core.wire.TargetInvoker;
import org.osoa.sca.annotations.Scope;
-import java.lang.reflect.Method;
-
@Scope("MODULE")
public class ExternalWebServiceWireBuilder extends WireBuilderSupport {
@@ -32,7 +32,8 @@
return
ExternalWebServiceContextFactory.class.isAssignableFrom(targetType);
}
- protected TargetInvoker createInvoker(QualifiedName targetName, Method
operation, ScopeContext context, boolean downScope) {
+ protected TargetInvoker createInvoker(QualifiedName targetName, Method
operation,
+ ScopeContext context, boolean
downScope) {
return new ExternalWebServiceTargetInvoker(targetName, operation,
context);
}
}
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/builder/WebServiceEntryPointBuilder.java
Tue Apr 25 14:23:58 2006
@@ -19,8 +19,8 @@
import org.apache.tuscany.core.builder.impl.EntryPointContextFactory;
import org.apache.tuscany.core.extension.EntryPointBuilderSupport;
import org.apache.tuscany.core.message.MessageFactory;
-import org.apache.tuscany.model.assembly.EntryPoint;
import org.apache.tuscany.model.assembly.Binding;
+import org.apache.tuscany.model.assembly.EntryPoint;
import org.osoa.sca.annotations.Scope;
/**
@@ -35,7 +35,8 @@
return binding instanceof WebServiceBinding;
}
- protected EntryPointContextFactory
createEntryPointContextFactory(EntryPoint entryPoint, MessageFactory
msgFactory) {
+ protected EntryPointContextFactory
createEntryPointContextFactory(EntryPoint entryPoint,
+
MessageFactory msgFactory) {
return new WebServiceEntryPointContextFactory(entryPoint.getName(),
msgFactory);
}
}
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/ExternalWebServiceContextFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/ExternalWebServiceContextFactory.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/ExternalWebServiceContextFactory.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/ExternalWebServiceContextFactory.java
Tue Apr 25 14:23:58 2006
@@ -20,11 +20,10 @@
import org.apache.tuscany.core.builder.impl.ExternalServiceContextFactory;
/**
- * Creates instances of [EMAIL PROTECTED]
org.apache.tuscany.core.context.ExternalServiceContext}
- * configured with the appropriate invocation chains and bindings. This
implementation
- * serves as a marker for
- * [EMAIL PROTECTED]
org.apache.tuscany.binding.celtix.builder.ExternalWebServiceWireBuilder}
- *
+ * Creates instances of [EMAIL PROTECTED]
org.apache.tuscany.core.context.ExternalServiceContext} configured with the
+ * appropriate invocation chains and bindings. This implementation serves as a
marker for [EMAIL PROTECTED]
+ * org.apache.tuscany.binding.celtix.builder.ExternalWebServiceWireBuilder}
+ *
* @version $Rev$ $Date$
*/
public class ExternalWebServiceContextFactory extends
ExternalServiceContextFactory {
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/WebServiceEntryPointContextFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/WebServiceEntryPointContextFactory.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/WebServiceEntryPointContextFactory.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/config/WebServiceEntryPointContextFactory.java
Tue Apr 25 14:23:58 2006
@@ -20,8 +20,8 @@
import org.apache.tuscany.core.message.MessageFactory;
/**
- * Creates instances of [EMAIL PROTECTED]
org.apache.tuscany.core.context.EntryPointContext} configured with the
appropriate invocation
- * chains and bindings. This implementation serves as a marker for
+ * Creates instances of [EMAIL PROTECTED]
org.apache.tuscany.core.context.EntryPointContext} configured with the
+ * appropriate invocation chains and bindings. This implementation serves as a
marker for
*
* @version $Rev$ $Date$
*/
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceClient.java
Tue Apr 25 14:23:58 2006
@@ -17,6 +17,19 @@
package org.apache.tuscany.binding.celtix.handler;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import javax.jws.WebParam.Mode;
+import javax.wsdl.Binding;
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.xml.ws.Holder;
+import javax.xml.ws.ProtocolException;
+
import commonj.sdo.helper.TypeHelper;
import org.apache.tuscany.binding.celtix.assembly.WebServiceBinding;
import org.apache.tuscany.binding.celtix.handler.io.SCADataBindingCallback;
@@ -34,19 +47,6 @@
import org.objectweb.celtix.wsdl.EndpointReferenceUtils;
import org.xmlsoap.schemas.wsdl.http.AddressType;
-import javax.jws.WebParam.Mode;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.ws.Holder;
-import javax.xml.ws.ProtocolException;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
/**
* An ExternalWebServiceClient using Celtix
@@ -96,7 +96,8 @@
}
}
- clientBinding =
bus.getBindingManager().getBindingFactory(bindingId).createClientBinding(reference);
+ clientBinding =
bus.getBindingManager().getBindingFactory(bindingId).createClientBinding(
+ reference);
} catch (MalformedURLException e) {
throw new BuilderInitException(e);
} catch (BusException e) {
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceTargetInvoker.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceTargetInvoker.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceTargetInvoker.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/ExternalWebServiceTargetInvoker.java
Tue Apr 25 14:23:58 2006
@@ -31,7 +31,7 @@
/**
* Responsible for invoking an external web service
- *
+ *
* @version $Rev$ $Date$
*/
public class ExternalWebServiceTargetInvoker implements TargetInvoker {
@@ -67,11 +67,11 @@
te.addContextName(iContext.getName());
throw te;
}
- context = (ExternalServiceContext)iContext;
+ context = (ExternalServiceContext) iContext;
}
- ExternalWebServiceClient client =
(ExternalWebServiceClient)context.getHandler();
+ ExternalWebServiceClient client = (ExternalWebServiceClient)
context.getHandler();
if (payload != null) {
- return client.invoke(method.getName(), (Object[])payload);
+ return client.invoke(method.getName(), (Object[]) payload);
} else {
return client.invoke(method.getName(), null);
}
@@ -99,7 +99,7 @@
public Object clone() throws CloneNotSupportedException {
try {
- ExternalWebServiceTargetInvoker invoker =
(ExternalWebServiceTargetInvoker)super.clone();
+ ExternalWebServiceTargetInvoker invoker =
(ExternalWebServiceTargetInvoker) super.clone();
invoker.container = container;
invoker.context = this.context;
invoker.esName = this.esName;
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataReader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataReader.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataReader.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataReader.java
Tue Apr 25 14:23:58 2006
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceException;
@@ -13,18 +12,17 @@
import org.w3c.dom.ls.DOMImplementationLS;
import org.w3c.dom.ls.LSOutput;
import org.w3c.dom.ls.LSSerializer;
-
import commonj.sdo.DataObject;
import commonj.sdo.Property;
import commonj.sdo.helper.XMLDocument;
-
import org.apache.tuscany.sdo.helper.XMLHelperImpl;
import org.objectweb.celtix.bindings.DataReader;
import org.objectweb.celtix.context.ObjectMessageContext;
public class NodeDataReader implements DataReader<Node> {
+
SCADataBindingCallback callback;
-
+
public NodeDataReader(SCADataBindingCallback cb) {
callback = cb;
}
@@ -35,7 +33,7 @@
public Object read(QName name, int idx, Node input) {
//REVISIT - doc/lit and rpc/lit support
-
+
return null;
}
@@ -46,15 +44,15 @@
wrapperName =
callback.getOperationInfo().getResponseWrapperQName();
} else {
wrapperName =
callback.getOperationInfo().getRequestWrapperQName();
- }
-
+ }
+
Node nd = input.getFirstChild();
while (nd != null
- && !wrapperName.getNamespaceURI().equals(nd.getNamespaceURI())
- && !wrapperName.getLocalPart().equals(nd.getLocalName())) {
+ &&
!wrapperName.getNamespaceURI().equals(nd.getNamespaceURI())
+ && !wrapperName.getLocalPart().equals(nd.getLocalName())) {
nd = nd.getNextSibling();
}
-
+
//REVISIT - This is SUCH a HACK. This needs to be done with StAX
or something
//a bit better than streaming and reparsing
InputStream in = getNodeStream(nd);
@@ -66,7 +64,7 @@
for (int i = 0; i < os.length; i++) {
os[i] = object.get((Property) ips.get(i));
}
-
+
if (callback.hasInOut()) {
//REVISIT - inOuts
} else {
@@ -84,21 +82,22 @@
throw new WebServiceException(e);
}
}
+
private InputStream getNodeStream(Node node)
throws ClassCastException, ClassNotFoundException,
- InstantiationException, IllegalAccessException {
-
+ InstantiationException, IllegalAccessException {
+
//This is also a hack, the JDK should already have this set, but it
doesn't
System.setProperty(DOMImplementationRegistry.PROPERTY,
-
"com.sun.org.apache.xerces.internal.dom.DOMImplementationSourceImpl");
+
"com.sun.org.apache.xerces.internal.dom.DOMImplementationSourceImpl");
DOMImplementationRegistry registry =
DOMImplementationRegistry.newInstance();
- DOMImplementationLS impl =
(DOMImplementationLS)registry.getDOMImplementation("LS");
+ DOMImplementationLS impl = (DOMImplementationLS)
registry.getDOMImplementation("LS");
LSOutput output = impl.createLSOutput();
RawByteArrayOutputStream bout = new RawByteArrayOutputStream();
output.setByteStream(bout);
LSSerializer writer = impl.createLSSerializer();
- writer.write(node, output);
-
+ writer.write(node, output);
+
return new ByteArrayInputStream(bout.getBytes(), 0, bout.size());
}
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataWriter.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataWriter.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataWriter.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/NodeDataWriter.java
Tue Apr 25 14:23:58 2006
@@ -4,7 +4,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.List;
-
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
@@ -15,16 +14,13 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-
import commonj.sdo.DataObject;
import commonj.sdo.Property;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XSDHelper;
-
import org.apache.tuscany.sdo.helper.DataFactoryImpl;
import org.apache.tuscany.sdo.helper.XMLHelperImpl;
import org.apache.tuscany.sdo.helper.XSDHelperImpl;
@@ -33,7 +29,7 @@
public class NodeDataWriter implements DataWriter<Node> {
SCADataBindingCallback callback;
-
+
public NodeDataWriter(SCADataBindingCallback cb) {
callback = cb;
}
@@ -53,24 +49,24 @@
} else {
wrapperName = callback.getOperationInfo().getRequestWrapperQName();
}
-
+
DataObject obj = toWrappedDataObject(callback.getTypeHelper(),
- objCtx.getMessageObjects(),
- wrapperName);
-
+ objCtx.getMessageObjects(),
+ wrapperName);
+
try {
//REVISIT - this is SUCH a hack. SDO needs to be able to
//go directly to some formats other than streams. They are working
//on stax, but not there yet.
RawByteArrayOutputStream bout = new RawByteArrayOutputStream();
new XMLHelperImpl(callback.getTypeHelper()).save(obj,
-
wrapperName.getNamespaceURI(),
-
wrapperName.getLocalPart(),
- bout);
-
+ wrapperName.getNamespaceURI(),
+ wrapperName.getLocalPart(),
+ bout);
+
ByteArrayInputStream bin = new
ByteArrayInputStream(bout.getBytes(),
- 0,
- bout.size());
+ 0,
+ bout.size());
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setNamespaceAware(true);
SAXParser parser = factory.newSAXParser();
@@ -83,19 +79,19 @@
throw new WebServiceException(e);
}
}
-
-
+
+
public static DataObject toWrappedDataObject(TypeHelper typeHelper,
Object[] os,
QName typeQN) {
XSDHelper xsdHelper = new XSDHelperImpl(typeHelper);
Property property =
xsdHelper.getGlobalProperty(typeQN.getNamespaceURI(),
- typeQN.getLocalPart(),
true);
+ typeQN.getLocalPart(), true);
DataObject dataObject = new
DataFactoryImpl(typeHelper).create(property.getType());
List ips = dataObject.getInstanceProperties();
for (int i = 0; i < ips.size(); i++) {
if (os[i] instanceof Holder) {
- Holder<?> holder = (Holder<?>)os[i];
+ Holder<?> holder = (Holder<?>) os[i];
dataObject.set(i, holder.value);
} else {
dataObject.set(i, os[i]);
@@ -103,19 +99,20 @@
}
return dataObject;
}
-
+
private class NodeContentHandler extends DefaultHandler {
Element current;
Document doc;
-
+
public NodeContentHandler(Node nd) {
- current = (Element)nd;
+ current = (Element) nd;
doc = nd.getOwnerDocument();
}
-
+
public void characters(char[] ch, int start, int length) {
current.appendChild(doc.createTextNode(new String(ch, start,
length)));
}
+
public void startElement(String uri, String localName,
String qName, Attributes attributes) {
Element newEl = doc.createElementNS(uri, qName);
@@ -123,14 +120,15 @@
current = newEl;
for (int x = 0; x < attributes.getLength(); x++) {
current.setAttributeNS(attributes.getURI(x),
- attributes.getQName(x),
- attributes.getValue(x));
+ attributes.getQName(x),
+ attributes.getValue(x));
}
- }
+ }
+
public void endElement(String uri, String localName, String qName) {
- current = (Element)current.getParentNode();
+ current = (Element) current.getParentNode();
}
}
-
-
+
+
}
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/SCADataBindingCallback.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/SCADataBindingCallback.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/SCADataBindingCallback.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/handler/io/SCADataBindingCallback.java
Tue Apr 25 14:23:58 2006
@@ -1,10 +1,7 @@
package org.apache.tuscany.binding.celtix.handler.io;
import org.w3c.dom.Node;
-
import commonj.sdo.helper.TypeHelper;
-
-import org.objectweb.celtix.bindings.DataBindingCallback.Mode;
import org.objectweb.celtix.bindings.DataReader;
import org.objectweb.celtix.bindings.DataWriter;
import
org.objectweb.celtix.bus.bindings.AbstractWSDLOperationDataBindingCallback;
@@ -13,7 +10,7 @@
public class SCADataBindingCallback extends
AbstractWSDLOperationDataBindingCallback {
TypeHelper typeHelper;
boolean hasInOut;
-
+
public SCADataBindingCallback(WSDLOperationInfo op, TypeHelper helper,
boolean inout) {
super(op);
typeHelper = helper;
@@ -23,22 +20,23 @@
public TypeHelper getTypeHelper() {
return typeHelper;
}
+
public boolean hasInOut() {
return hasInOut;
}
-
+
public Mode getMode() {
return Mode.PARTS;
}
public Class<?>[] getSupportedFormats() {
- return new Class<?>[] {Node.class};
+ return new Class<?>[]{Node.class};
}
@SuppressWarnings("unchecked")
public <T> DataWriter<T> createWriter(Class<T> cls) {
if (cls == Node.class) {
- return (DataWriter<T>)new NodeDataWriter(this);
+ return (DataWriter<T>) new NodeDataWriter(this);
}
return null;
}
@@ -46,7 +44,7 @@
@SuppressWarnings("unchecked")
public <T> DataReader<T> createReader(Class<T> cls) {
if (cls == Node.class) {
- return (DataReader<T>)new NodeDataReader(this);
+ return (DataReader<T>) new NodeDataReader(this);
}
//REVISIT - need to figure out what to do with Faults
return null;
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/java/org/apache/tuscany/binding/celtix/loader/WebServiceBindingLoader.java
Tue Apr 25 14:23:58 2006
@@ -24,11 +24,10 @@
import org.apache.tuscany.binding.celtix.assembly.WebServiceBinding;
import
org.apache.tuscany.binding.celtix.assembly.impl.WebServiceAssemblyFactoryImpl;
import org.apache.tuscany.core.config.ConfigurationLoadException;
+import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.loader.StAXElementLoader;
import org.apache.tuscany.core.loader.StAXLoaderRegistry;
-import org.apache.tuscany.core.loader.LoaderContext;
import org.apache.tuscany.core.system.annotation.Autowire;
-
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
@@ -62,7 +61,7 @@
public WebServiceBinding load(XMLStreamReader reader, LoaderContext
loaderContext)
throws XMLStreamException, ConfigurationLoadException {
-
+
WebServiceBinding binding = WS_FACTORY.createWebServiceBinding();
binding.setURI(reader.getAttributeValue(null, "uri"));
binding.setPortURI(reader.getAttributeValue(null, "port"));
Modified:
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/resources/system.fragment
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/celtix/binding.celtix/src/main/resources/system.fragment?rev=396985&r1=396984&r2=396985&view=diff
==============================================================================
---
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/resources/system.fragment
(original)
+++
incubator/tuscany/sandbox/celtix/binding.celtix/src/main/resources/system.fragment
Tue Apr 25 14:23:58 2006
@@ -15,23 +15,27 @@
limitations under the License.
-->
<moduleFragment xmlns="http://www.osoa.org/xmlns/sca/0.9";
xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9";
- xmlns:system="http://org.apache.tuscany/xmlns/system/0.9";
- name="org.apache.tuscany.binding.axis">
+ xmlns:system="http://org.apache.tuscany/xmlns/system/0.9";
+ name="org.apache.tuscany.binding.axis">
<component
name="org.apache.tuscany.binding.celtix.builder.ExternalWebServiceBuilder">
- <system:implementation.system
class="org.apache.tuscany.binding.celtix.builder.ExternalWebServiceBuilder"/>
+ <system:implementation.system
+
class="org.apache.tuscany.binding.celtix.builder.ExternalWebServiceBuilder"/>
</component>
<component
name="org.apache.tuscany.binding.celtix.builder.ExternalWebServiceWireBuilder">
- <system:implementation.system
class="org.apache.tuscany.binding.celtix.builder.ExternalWebServiceWireBuilder"/>
+ <system:implementation.system
+
class="org.apache.tuscany.binding.celtix.builder.ExternalWebServiceWireBuilder"/>
</component>
<component
name="org.apache.tuscany.binding.celtix.builder.WebServiceEntryPointBuilder">
- <system:implementation.system
class="org.apache.tuscany.binding.celtix.builder.WebServiceEntryPointBuilder"/>
+ <system:implementation.system
+
class="org.apache.tuscany.binding.celtix.builder.WebServiceEntryPointBuilder"/>
</component>
<component
name="org.apache.tuscany.binding.celtix.loader.WebServiceBindingLoaderr">
- <system:implementation.system
class="org.apache.tuscany.binding.celtix.loader.WebServiceBindingLoader"/>
+ <system:implementation.system
+
class="org.apache.tuscany.binding.celtix.loader.WebServiceBindingLoader"/>
</component>
</moduleFragment>
