You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/10 07:20:46 UTC
svn commit: r1229476 - in /cxf/trunk:
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/
rt/datab...
Author: dkulp
Date: Tue Jan 10 06:20:45 2012
New Revision: 1229476
URL: http://svn.apache.org/viewvc?rev=1229476&view=rev
Log:
Apparently the command line checkstyle is stricter than the in-eclipse
version. Not sure why yet.
Modified:
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java
cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java Tue Jan 10 06:20:45 2012
@@ -343,7 +343,7 @@ public class CorbaStreamWriter implement
}
public String getPrefix(String namespaceURI) {
- for (Map.Entry<String, String> entry: map.entrySet()) {
+ for (Map.Entry<String, String> entry : map.entrySet()) {
if (namespaceURI.equals(entry.getValue())) {
return entry.getKey();
}
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java Tue Jan 10 06:20:45 2012
@@ -144,7 +144,7 @@ public final class CorbaObjectReferenceE
if (wsdlBinding == null && bindingName.getNamespaceURI().equals("")
&& !bindingName.getLocalPart().equals("")) {
Collection<Binding> bindingsCollection = CastUtils.cast(wsdlDef.getBindings().values());
- for (Binding b: bindingsCollection) {
+ for (Binding b : bindingsCollection) {
if (b.getQName().getLocalPart().equals(bindingName.getLocalPart())) {
wsdlBinding = b;
break;
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java Tue Jan 10 06:20:45 2012
@@ -57,9 +57,9 @@ public final class CorbaObjectReferenceH
public static QName getServiceName(Binding binding, Definition wsdlDef) {
LOG.log(Level.FINE, "Getting service name for an object reference");
Collection<Service> services = CastUtils.cast(wsdlDef.getServices().values());
- for (Service serv: services) {
+ for (Service serv : services) {
Collection<Port> ports = CastUtils.cast(serv.getPorts().values());
- for (Port pt: ports) {
+ for (Port pt : ports) {
if (pt.getBinding().equals(binding)) {
return serv.getQName();
}
@@ -71,9 +71,9 @@ public final class CorbaObjectReferenceH
public static String getEndpointName(Binding binding, Definition wsdlDef) {
LOG.log(Level.FINE, "Getting endpoint name for an object reference");
Collection<Service> services = CastUtils.cast(wsdlDef.getServices().values());
- for (Service serv: services) {
+ for (Service serv : services) {
Collection<Port> ports = CastUtils.cast(serv.getPorts().values());
- for (Port pt: ports) {
+ for (Port pt : ports) {
if (pt.getBinding().equals(binding)) {
return pt.getName();
}
@@ -85,7 +85,7 @@ public final class CorbaObjectReferenceH
public static Binding getDefaultBinding(Object obj, Definition wsdlDef) {
LOG.log(Level.FINEST, "Getting binding for a default object reference");
Collection<Binding> bindings = CastUtils.cast(wsdlDef.getBindings().values());
- for (Binding b: bindings) {
+ for (Binding b : bindings) {
List<?> extElements = b.getExtensibilityElements();
// Get the list of all extensibility elements
for (Iterator<?> extIter = extElements.iterator(); extIter.hasNext();) {
Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java Tue Jan 10 06:20:45 2012
@@ -377,7 +377,7 @@ public class AegisDatabinding extends Ab
return;
}
SchemaCollection col = s.getXmlSchemaCollection();
- for (MessagePartInfo part: container.getMessageParts()) {
+ for (MessagePartInfo part : container.getMessageParts()) {
if (part.getXmlSchema() == null) {
if (part.isElement()) {
XmlSchemaAnnotated tp = col.getElementByQName(part.getElementQName());
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorSignatureTokenBuilder.java Tue Jan 10 06:20:45 2012
@@ -70,7 +70,7 @@ public class InitiatorSignatureTokenBuil
}
private void processAlternative(List<Assertion> assertions, InitiatorSignatureToken parent) {
- for (Assertion token: assertions) {
+ for (Assertion token : assertions) {
if (token instanceof Token) {
parent.setInitiatorSignatureToken((Token)token);
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/InitiatorTokenBuilder.java Tue Jan 10 06:20:45 2012
@@ -71,7 +71,7 @@ public class InitiatorTokenBuilder imple
}
private void processAlternative(List<Assertion> assertions, InitiatorToken parent) {
- for (Assertion token: assertions) {
+ for (Assertion token : assertions) {
if (token instanceof Token) {
parent.setInitiatorToken((Token)token);
}
Modified: cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java (original)
+++ cxf/trunk/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java Tue Jan 10 06:20:45 2012
@@ -377,7 +377,7 @@ public class ObjectReferenceVisitor exte
for (Binding b : bindings) {
List<?> extElements = b.getExtensibilityElements();
- for (java.lang.Object element: extElements) {
+ for (java.lang.Object element : extElements) {
if (element instanceof BindingType) {
BindingType bt = (BindingType)element;
if (bt.getRepositoryID().equals(repositoryID)) {
Modified: cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java (original)
+++ cxf/trunk/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java Tue Jan 10 06:20:45 2012
@@ -576,7 +576,7 @@ public class WSDLToCorbaBindingTypeTest
assertEquals(5, mapType.getStructOrExceptionOrUnion().size());
int strcnt = 0;
int unioncnt = 0;
- for (CorbaTypeImpl corbaType: mapType.getStructOrExceptionOrUnion()) {
+ for (CorbaTypeImpl corbaType : mapType.getStructOrExceptionOrUnion()) {
if (corbaType instanceof Struct) {
strcnt++;
}
Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java (original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java Tue Jan 10 06:20:45 2012
@@ -43,7 +43,7 @@ public class MIMEBindingValidator
public boolean isValid() {
Collection<Binding> bindings = CastUtils.cast(def.getBindings().values());
- for (Binding binding: bindings) {
+ for (Binding binding : bindings) {
Collection<BindingOperation> bindingOps = CastUtils.cast(binding.getBindingOperations());
for (BindingOperation bindingOperation : bindingOps) {
if (bindingOperation.getBindingInput() == null) {
@@ -102,7 +102,7 @@ public class MIMEBindingValidator
String operationName) {
// validate mime:content(s) in the mime:part as per R2909
String partName = null;
- for (MIMEContent mimeContent: mimeContents) {
+ for (MIMEContent mimeContent : mimeContents) {
String mimeContnetPart = mimeContent.getPart();
if (mimeContnetPart == null) {
addErrorMessage("Operation("
Modified: cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java (original)
+++ cxf/trunk/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Tue Jan 10 06:20:45 2012
@@ -294,7 +294,7 @@ public class WSIBPValidator extends Abst
public boolean checkR2203And2204() {
Collection<Binding> bindings = CastUtils.cast(def.getBindings().values());
- for (Binding binding: bindings) {
+ for (Binding binding : bindings) {
String style = SOAPBindingUtil.getCanonicalBindingStyle(binding);
@@ -365,7 +365,7 @@ public class WSIBPValidator extends Abst
// TODO: Should also check SoapHeader/SoapHeaderFault
public boolean checkR2205() {
Collection<Binding> bindings = CastUtils.cast(def.getBindings().values());
- for (Binding binding: bindings) {
+ for (Binding binding : bindings) {
if (!SOAPBindingUtil.isSOAPBinding(binding)) {
System.err.println("WSIBP Validator found <"
@@ -399,7 +399,7 @@ public class WSIBPValidator extends Abst
public boolean checkR2705() {
Collection<Binding> bindings = CastUtils.cast(def.getBindings().values());
- for (Binding binding: bindings) {
+ for (Binding binding : bindings) {
if (SOAPBindingUtil.isMixedStyle(binding)) {
addErrorMessage("Mixed style, invalid WSDL");
return false;
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java Tue Jan 10 06:20:45 2012
@@ -80,7 +80,7 @@ public class ClientGenerator extends Abs
}
Map<String, JavaInterface> interfaces = javaModel.getInterfaces();
- for (JavaServiceClass js: javaModel.getServiceClasses().values()) {
+ for (JavaServiceClass js : javaModel.getServiceClasses().values()) {
for (JavaPort jp : js.getPorts()) {
String interfaceName = jp.getInterfaceClass();
JavaInterface intf = interfaces.get(interfaceName);
Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java (original)
+++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java Tue Jan 10 06:20:45 2012
@@ -88,7 +88,7 @@ public class ImplGenerator extends Abstr
}
}
} else {
- for (String interfaceName: interfaces.keySet()) {
+ for (String interfaceName : interfaces.keySet()) {
JavaInterface intf = interfaces.get(interfaceName);
outputImpl(intf, service, "", penv);
}
Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToServiceProcessor.java Tue Jan 10 06:20:45 2012
@@ -71,7 +71,7 @@ public class WSDLToServiceProcessor exte
if (services == null) {
return false;
}
- for (QName serviceQName: services.keySet()) {
+ for (QName serviceQName : services.keySet()) {
String serviceName = serviceQName.getLocalPart();
if (serviceName.equals(env.get(ToolConstants.CFG_SERVICE))) {
service = services.get(serviceQName);
@@ -86,7 +86,7 @@ public class WSDLToServiceProcessor exte
if (ports == null) {
return false;
}
- for (String portName: ports.keySet()) {
+ for (String portName : ports.keySet()) {
if (portName.equals(env.get(ToolConstants.CFG_PORT))) {
port = ports.get(portName);
break;
@@ -100,7 +100,7 @@ public class WSDLToServiceProcessor exte
if (bindings == null) {
return false;
}
- for (QName bindingQName: bindings.keySet()) {
+ for (QName bindingQName : bindings.keySet()) {
String bindingName = bindingQName.getLocalPart();
String attrBinding = (String)env.get(ToolConstants.CFG_BINDING_ATTR);
if (attrBinding.equals(bindingName)) {
Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessor.java Tue Jan 10 06:20:45 2012
@@ -90,7 +90,7 @@ public class WSDLToSoapProcessor extends
Input input = op.getInput();
if (input != null && input.getMessage() != null) {
Collection<Part> parts = CastUtils.cast(input.getMessage().getParts().values());
- for (Part part: parts) {
+ for (Part part : parts) {
if (part.getTypeName() == null || "".equals(part.getTypeName().toString())) {
Message msg = new Message("RPC_PART_ILLEGAL", LOG, new Object[] {part.getName()});
throw new ToolException(msg);
@@ -100,7 +100,7 @@ public class WSDLToSoapProcessor extends
Output output = op.getOutput();
if (output != null && output.getMessage() != null) {
Collection<Part> parts = CastUtils.cast(output.getMessage().getParts().values());
- for (Part part: parts) {
+ for (Part part : parts) {
if (part.getTypeName() == null || "".equals(part.getTypeName().toString())) {
Message msg = new Message("RPC_PART_ILLEGAL", LOG, new Object[] {part.getName()});
throw new ToolException(msg);
Modified: cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java?rev=1229476&r1=1229475&r2=1229476&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java (original)
+++ cxf/trunk/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/WSDLToXMLProcessor.java Tue Jan 10 06:20:45 2012
@@ -118,7 +118,7 @@ public class WSDLToXMLProcessor extends
if (portTypes == null) {
return false;
}
- for (QName existPortQName: portTypes.keySet()) {
+ for (QName existPortQName : portTypes.keySet()) {
String existPortName = existPortQName.getLocalPart();
if (existPortName.equals(env.get(ToolConstants.CFG_PORTTYPE))) {
portType = portTypes.get(existPortQName);