You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/17 09:53:05 UTC

svn commit: r1611274 [2/15] - in /tomee/tomee/branches/tomee-1.7.x/server: ./ openejb-activemq/ openejb-activemq/src/main/java/org/apache/openejb/server/activemq/ openejb-axis/ openejb-axis/src/main/java/org/apache/openejb/server/axis/ openejb-axis/src...

Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/HandlerChainImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/HandlerChainImpl.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/HandlerChainImpl.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/HandlerChainImpl.java Thu Jul 17 07:52:58 2014
@@ -41,20 +41,20 @@ public class HandlerChainImpl extends Ar
     private String[] roles;
     private LinkedList<Handler> invokedHandlers = new LinkedList<Handler>();
 
-    public HandlerChainImpl(List<HandlerInfo> handlerInfos) {
+    public HandlerChainImpl(final List<HandlerInfo> handlerInfos) {
         this(handlerInfos, null);
     }
 
     @SuppressWarnings({"unchecked"})
-    public HandlerChainImpl(List<HandlerInfo> handlerInfos, String[] roles) {
+    public HandlerChainImpl(final List<HandlerInfo> handlerInfos, final String[] roles) {
         this.roles = roles;
         for (int i = 0; i < handlerInfos.size(); i++) {
-            HandlerInfo handlerInfo = handlerInfos.get(i);
+            final HandlerInfo handlerInfo = handlerInfos.get(i);
             try {
-                Handler handler = (Handler) handlerInfo.getHandlerClass().newInstance();
+                final Handler handler = (Handler) handlerInfo.getHandlerClass().newInstance();
                 handler.init(handlerInfo);
                 add(handler);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 throw new JAXRPCException("Unable to initialize handler class: " + handlerInfo.getHandlerClass().getName(), e);
             }
         }
@@ -64,7 +64,7 @@ public class HandlerChainImpl extends Ar
         return roles;
     }
 
-    public void setRoles(String[] roles) {
+    public void setRoles(final String[] roles) {
         if (roles == null) {
             this.roles = new String[0];
         } else {
@@ -72,29 +72,29 @@ public class HandlerChainImpl extends Ar
         }
     }
 
-    public void init(Map map) {
+    public void init(final Map map) {
     }
 
     public void destroy() {
-        for (Iterator iterator = invokedHandlers.iterator(); iterator.hasNext();) {
-            Handler handler = (Handler) iterator.next();
+        for (final Iterator iterator = invokedHandlers.iterator(); iterator.hasNext(); ) {
+            final Handler handler = (Handler) iterator.next();
             handler.destroy();
         }
         invokedHandlers.clear();
         clear();
     }
 
-    public boolean handleRequest(MessageContext context) {
-        MessageSnapshot snapshot = new MessageSnapshot(context);
+    public boolean handleRequest(final MessageContext context) {
+        final MessageSnapshot snapshot = new MessageSnapshot(context);
         try {
             for (int i = 0; i < size(); i++) {
-                Handler currentHandler = (Handler) get(i);
+                final Handler currentHandler = (Handler) get(i);
                 invokedHandlers.addFirst(currentHandler);
                 try {
                     if (!currentHandler.handleRequest(context)) {
                         return false;
                     }
-                } catch (SOAPFaultException e) {
+                } catch (final SOAPFaultException e) {
                     throw e;
                 }
             }
@@ -108,11 +108,11 @@ public class HandlerChainImpl extends Ar
         return true;
     }
 
-    public boolean handleResponse(MessageContext context) {
-        MessageSnapshot snapshot = new MessageSnapshot(context);
+    public boolean handleResponse(final MessageContext context) {
+        final MessageSnapshot snapshot = new MessageSnapshot(context);
         try {
-            for (Iterator iterator = invokedHandlers.iterator(); iterator.hasNext();) {
-                Handler handler = (Handler) iterator.next();
+            for (final Iterator iterator = invokedHandlers.iterator(); iterator.hasNext(); ) {
+                final Handler handler = (Handler) iterator.next();
                 if (!handler.handleResponse(context)) {
                     return false;
                 }
@@ -126,11 +126,11 @@ public class HandlerChainImpl extends Ar
         return true;
     }
 
-    public boolean handleFault(MessageContext context) {
-        MessageSnapshot snapshot = new MessageSnapshot(context);
+    public boolean handleFault(final MessageContext context) {
+        final MessageSnapshot snapshot = new MessageSnapshot(context);
         try {
-            for (Iterator iterator = invokedHandlers.iterator(); iterator.hasNext();) {
-                Handler handler = (Handler) iterator.next();
+            for (final Iterator iterator = invokedHandlers.iterator(); iterator.hasNext(); ) {
+                final Handler handler = (Handler) iterator.next();
                 if (!handler.handleFault(context)) {
                     return false;
                 }
@@ -144,13 +144,13 @@ public class HandlerChainImpl extends Ar
         return true;
     }
 
-    private void saveChanges(MessageContext context) {
+    private void saveChanges(final MessageContext context) {
         try {
-            SOAPMessage message = ((SOAPMessageContext) context).getMessage();
+            final SOAPMessage message = ((SOAPMessageContext) context).getMessage();
             if (message != null) {
                 message.saveChanges();
             }
-        } catch (SOAPException e) {
+        } catch (final SOAPException e) {
             throw new ServerRuntimeException("Unable to save changes to SOAPMessage : " + e.toString());
         }
     }
@@ -168,62 +168,62 @@ public class HandlerChainImpl extends Ar
         private final String operationName;
         private final List<String> parameterNames;
 
-        public MessageSnapshot(MessageContext soapMessage) {
-            SOAPMessage message = ((SOAPMessageContext) soapMessage).getMessage();
+        public MessageSnapshot(final MessageContext soapMessage) {
+            final SOAPMessage message = ((SOAPMessageContext) soapMessage).getMessage();
             if (message == null || message.getSOAPPart() == null) {
                 operationName = null;
                 parameterNames = null;
             } else {
-                SOAPBody body = getBody(message);
+                final SOAPBody body = getBody(message);
 
-                SOAPElement operation = ((SOAPElement) body.getChildElements().next());
+                final SOAPElement operation = ((SOAPElement) body.getChildElements().next());
                 this.operationName = operation.getElementName().toString();
 
                 this.parameterNames = new ArrayList<String>();
-                for (Iterator i = operation.getChildElements(); i.hasNext();) {
-                    SOAPElement parameter = (SOAPElement) i.next();
-                    String element = parameter.getElementName().toString();
+                for (final Iterator i = operation.getChildElements(); i.hasNext(); ) {
+                    final SOAPElement parameter = (SOAPElement) i.next();
+                    final String element = parameter.getElementName().toString();
                     parameterNames.add(element);
                 }
             }
         }
 
-        private SOAPBody getBody(SOAPMessage message) {
+        private SOAPBody getBody(final SOAPMessage message) {
             try {
                 return message.getSOAPPart().getEnvelope().getBody();
-            } catch (SOAPException e) {
+            } catch (final SOAPException e) {
                 throw new ServerRuntimeException(e);
             }
         }
 
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             return (obj instanceof SOAPMessageContext) && equals((SOAPMessageContext) obj);
         }
 
-        private boolean equals(SOAPMessageContext soapMessage) {
-            SOAPMessage message = soapMessage.getMessage();
+        private boolean equals(final SOAPMessageContext soapMessage) {
+            final SOAPMessage message = soapMessage.getMessage();
 
             if (operationName == null) {
                 return message == null || message.getSOAPPart() == null;
             }
 
-            SOAPBody body = getBody(message);
+            final SOAPBody body = getBody(message);
 
             // Handlers can't change the operation
-            SOAPElement operation = ((SOAPElement) body.getChildElements().next());
+            final SOAPElement operation = ((SOAPElement) body.getChildElements().next());
             if (!this.operationName.equals(operation.getElementName().toString())) {
                 return false;
             }
 
-            Iterator parameters = operation.getChildElements();
-            for (Iterator i = parameterNames.iterator(); i.hasNext();) {
+            final Iterator parameters = operation.getChildElements();
+            for (final Iterator i = parameterNames.iterator(); i.hasNext(); ) {
                 // Handlers can't remove parameters
                 if (!parameters.hasNext()) {
                     return false;
                 }
 
-                String original = (String) i.next();
-                SOAPElement parameter = (SOAPElement) parameters.next();
+                final String original = (String) i.next();
+                final SOAPElement parameter = (SOAPElement) parameters.next();
                 // Handlers can't change parameter types
                 if (parameter == null || !original.equals(parameter.getElementName().toString())) {
                     return false;

Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/JavaServiceDescBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/JavaServiceDescBuilder.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/JavaServiceDescBuilder.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/JavaServiceDescBuilder.java Thu Jul 17 07:52:58 2014
@@ -60,25 +60,25 @@ public class JavaServiceDescBuilder {
     private final JaxRpcServiceInfo serviceInfo;
     private final ClassLoader classLoader;
 
-    public JavaServiceDescBuilder(JaxRpcServiceInfo serviceInfo, ClassLoader classLoader) {
+    public JavaServiceDescBuilder(final JaxRpcServiceInfo serviceInfo, final ClassLoader classLoader) {
         this.serviceInfo = serviceInfo;
         this.classLoader = classLoader;
     }
 
     public JavaServiceDesc createServiceDesc() throws OpenEJBException {
-        Class serviceEndpointInterface;
+        final Class serviceEndpointInterface;
         try {
             serviceEndpointInterface = classLoader.loadClass(serviceInfo.serviceEndpointInterface);
-        } catch (ClassNotFoundException e) {
+        } catch (final ClassNotFoundException e) {
             throw new OpenEJBException("Unable to load the service endpoint interface " + serviceInfo.serviceEndpointInterface, e);
         }
 
-        JavaServiceDesc serviceDesc = new JavaServiceDesc();
+        final JavaServiceDesc serviceDesc = new JavaServiceDesc();
         serviceDesc.setName(serviceInfo.name);
         serviceDesc.setEndpointURL(serviceInfo.endpointURL);
         serviceDesc.setWSDLFile(serviceInfo.wsdlFile);
 
-        BindingStyle bindingStyle = serviceInfo.defaultBindingStyle;
+        final BindingStyle bindingStyle = serviceInfo.defaultBindingStyle;
         switch (bindingStyle) {
             case RPC_ENCODED:
                 serviceDesc.setStyle(Style.RPC);
@@ -103,30 +103,30 @@ public class JavaServiceDescBuilder {
         }
 
         // Operations
-        for (JaxRpcOperationInfo operationInfo : serviceInfo.operations) {
-            OperationDesc operationDesc = buildOperationDesc(operationInfo, serviceEndpointInterface);
+        for (final JaxRpcOperationInfo operationInfo : serviceInfo.operations) {
+            final OperationDesc operationDesc = buildOperationDesc(operationInfo, serviceEndpointInterface);
             serviceDesc.addOperationDesc(operationDesc);
         }
 
         // Type mapping registry
-        TypeMappingRegistryImpl typeMappingRegistry = new TypeMappingRegistryImpl();
+        final TypeMappingRegistryImpl typeMappingRegistry = new TypeMappingRegistryImpl();
         typeMappingRegistry.doRegisterFromVersion("1.3");
         serviceDesc.setTypeMappingRegistry(typeMappingRegistry);
 
         // Type mapping
-        TypeMapping typeMapping = typeMappingRegistry.getOrMakeTypeMapping(serviceDesc.getUse().getEncoding());
+        final TypeMapping typeMapping = typeMappingRegistry.getOrMakeTypeMapping(serviceDesc.getUse().getEncoding());
         serviceDesc.setTypeMapping(typeMapping);
 
         // Types
-        for (JaxRpcTypeInfo type : serviceInfo.types) {
+        for (final JaxRpcTypeInfo type : serviceInfo.types) {
             registerType(type, typeMapping);
         }
 
         return new ReadOnlyServiceDesc(serviceDesc);
     }
 
-    private OperationDesc buildOperationDesc(JaxRpcOperationInfo operationInfo, Class serviceEndpointInterface) throws OpenEJBException {
-        OperationDesc operationDesc = new OperationDesc();
+    private OperationDesc buildOperationDesc(final JaxRpcOperationInfo operationInfo, final Class serviceEndpointInterface) throws OpenEJBException {
+        final OperationDesc operationDesc = new OperationDesc();
         operationDesc.setName(operationInfo.name);
 
         // Binding type
@@ -170,21 +170,21 @@ public class JavaServiceDescBuilder {
         }
 
         // Build parameters
-        Class[] paramTypes = new Class[operationInfo.parameters.size()];
+        final Class[] paramTypes = new Class[operationInfo.parameters.size()];
         int i = 0;
-        for (JaxRpcParameterInfo parameterInfo : operationInfo.parameters) {
-            ParameterDesc parameterDesc = buildParameterDesc(parameterInfo);
+        for (final JaxRpcParameterInfo parameterInfo : operationInfo.parameters) {
+            final ParameterDesc parameterDesc = buildParameterDesc(parameterInfo);
             operationDesc.addParameter(parameterDesc);
             paramTypes[i++] = parameterDesc.getJavaType();
         }
 
         // Java method
         try {
-            Method method = serviceEndpointInterface.getMethod(operationInfo.javaMethodName, paramTypes);
+            final Method method = serviceEndpointInterface.getMethod(operationInfo.javaMethodName, paramTypes);
             operationDesc.setMethod(method);
-        } catch (NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             String args = "";
-            for (Class paramType : paramTypes) {
+            for (final Class paramType : paramTypes) {
                 if (args.length() > 0) {
                     args += ", ";
                 }
@@ -200,9 +200,9 @@ public class JavaServiceDescBuilder {
             operationDesc.setReturnQName(operationInfo.returnQName);
             operationDesc.setReturnType(operationInfo.returnXmlType);
             try {
-                Class<?> returnClass = classLoader.loadClass(operationInfo.returnJavaType);
+                final Class<?> returnClass = classLoader.loadClass(operationInfo.returnJavaType);
                 operationDesc.setReturnClass(returnClass);
-            } catch (ClassNotFoundException e) {
+            } catch (final ClassNotFoundException e) {
                 throw new OpenEJBException();
             }
         } else if (operationInfo.operationStyle == JaxRpcOperationInfo.OperationStyle.REQUEST_RESPONSE) {
@@ -212,37 +212,37 @@ public class JavaServiceDescBuilder {
         }
 
         // Build faults
-        for (JaxRpcFaultInfo faultInfo : operationInfo.faults) {
-            FaultDesc faultDesc = buildFaultDesc(faultInfo);
+        for (final JaxRpcFaultInfo faultInfo : operationInfo.faults) {
+            final FaultDesc faultDesc = buildFaultDesc(faultInfo);
             operationDesc.addFault(faultDesc);
         }
 
         return operationDesc;
     }
 
-    private ParameterDesc buildParameterDesc(JaxRpcParameterInfo parameterInfo) throws OpenEJBException {
-        byte mode = ParameterDesc.modeFromString(parameterInfo.mode.toString());
+    private ParameterDesc buildParameterDesc(final JaxRpcParameterInfo parameterInfo) throws OpenEJBException {
+        final byte mode = ParameterDesc.modeFromString(parameterInfo.mode.toString());
 
-        boolean inHeader = parameterInfo.soapHeader && parameterInfo.mode.isIn();
-        boolean outHeader = parameterInfo.soapHeader  && parameterInfo.mode.isOut();
+        final boolean inHeader = parameterInfo.soapHeader && parameterInfo.mode.isIn();
+        final boolean outHeader = parameterInfo.soapHeader && parameterInfo.mode.isOut();
 
-        Class<?> javaType;
+        final Class<?> javaType;
         try {
             javaType = classLoader.loadClass(parameterInfo.javaType);
-        } catch (ClassNotFoundException e) {
+        } catch (final ClassNotFoundException e) {
             throw new OpenEJBException("Unable to load parameter type " + parameterInfo.javaType);
         }
 
-        ParameterDesc parameterDesc = new ParameterDesc(parameterInfo.qname, mode, parameterInfo.xmlType, javaType, inHeader, outHeader);
+        final ParameterDesc parameterDesc = new ParameterDesc(parameterInfo.qname, mode, parameterInfo.xmlType, javaType, inHeader, outHeader);
         return parameterDesc;
     }
 
-    private FaultDesc buildFaultDesc(JaxRpcFaultInfo faultInfo) throws OpenEJBException {
-        FaultDesc faultDesc = new FaultDesc(faultInfo.qname, faultInfo.javaType, faultInfo.xmlType, faultInfo.complex);
+    private FaultDesc buildFaultDesc(final JaxRpcFaultInfo faultInfo) throws OpenEJBException {
+        final FaultDesc faultDesc = new FaultDesc(faultInfo.qname, faultInfo.javaType, faultInfo.xmlType, faultInfo.complex);
 
-        ArrayList<ParameterDesc> parameters = new ArrayList<ParameterDesc>();
-        for (JaxRpcParameterInfo parameterInfo : faultInfo.parameters) {
-            ParameterDesc parameterDesc = buildParameterDesc(parameterInfo);
+        final ArrayList<ParameterDesc> parameters = new ArrayList<ParameterDesc>();
+        for (final JaxRpcParameterInfo parameterInfo : faultInfo.parameters) {
+            final ParameterDesc parameterDesc = buildParameterDesc(parameterInfo);
             parameters.add(parameterDesc);
         }
         faultDesc.setParameters(parameters);
@@ -250,11 +250,11 @@ public class JavaServiceDescBuilder {
         return faultDesc;
     }
 
-    private void registerType(JaxRpcTypeInfo type, TypeMapping typeMapping) throws OpenEJBException {
-        Class javaType;
+    private void registerType(final JaxRpcTypeInfo type, final TypeMapping typeMapping) throws OpenEJBException {
+        final Class javaType;
         try {
             javaType = classLoader.loadClass(type.javaType);
-        } catch (ClassNotFoundException e) {
+        } catch (final ClassNotFoundException e) {
             throw new OpenEJBException("Could not load class for JaxRpc mapping " + type.javaType);
         }
 
@@ -293,8 +293,8 @@ public class JavaServiceDescBuilder {
                 break;
         }
 
-        SerializerFactory serializerFactory = BaseSerializerFactory.createFactory(serializerFactoryClass, javaType, type.qname);
-        DeserializerFactory deserializerFactory = BaseDeserializerFactory.createFactory(deserializerFactoryClass, javaType, type.qname);
+        final SerializerFactory serializerFactory = BaseSerializerFactory.createFactory(serializerFactoryClass, javaType, type.qname);
+        final DeserializerFactory deserializerFactory = BaseDeserializerFactory.createFactory(deserializerFactoryClass, javaType, type.qname);
 
         typeMapping.register(javaType, type.qname, serializerFactory, deserializerFactory);
     }

Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java Thu Jul 17 07:52:58 2014
@@ -26,18 +26,18 @@ import javax.xml.rpc.holders.IntHolder;
 import java.lang.reflect.Method;
 
 public class PojoProvider extends RPCProvider {
-    public Object getServiceObject(MessageContext msgContext, Handler service, String clsName, IntHolder scopeHolder) throws Exception {
-        HttpRequest request = (HttpRequest) msgContext.getProperty(AxisWsContainer.REQUEST);
+    public Object getServiceObject(final MessageContext msgContext, final Handler service, final String clsName, final IntHolder scopeHolder) throws Exception {
+        final HttpRequest request = (HttpRequest) msgContext.getProperty(AxisWsContainer.REQUEST);
         return request.getAttribute(WsConstants.POJO_INSTANCE);
     }
 
-    protected Object invokeMethod(MessageContext msgContext, Method interfaceMethod, Object pojo, Object[] arguments) throws Exception {
-        Class pojoClass = pojo.getClass();
+    protected Object invokeMethod(final MessageContext msgContext, final Method interfaceMethod, final Object pojo, final Object[] arguments) throws Exception {
+        final Class pojoClass = pojo.getClass();
 
         Method pojoMethod = null;
         try {
             pojoMethod = pojoClass.getMethod(interfaceMethod.getName(), interfaceMethod.getParameterTypes());
-        } catch (NoSuchMethodException e) {
+        } catch (final NoSuchMethodException e) {
             throw (NoSuchMethodException) new NoSuchMethodException("The pojo class '" + pojoClass.getName() + "' does not have a method matching signature: " + interfaceMethod).initCause(e);
         }
 

Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java Thu Jul 17 07:52:58 2014
@@ -30,7 +30,7 @@ import java.util.List;
 public class ReadOnlyServiceDesc extends JavaServiceDesc {
     private JavaServiceDesc serviceDesc;
 
-    public ReadOnlyServiceDesc(JavaServiceDesc serviceDesc) {
+    public ReadOnlyServiceDesc(final JavaServiceDesc serviceDesc) {
         this.serviceDesc = serviceDesc;
     }
 
@@ -38,7 +38,7 @@ public class ReadOnlyServiceDesc extends
         return serviceDesc.getImplClass();
     }
 
-    public void setImplClass(Class implClass) {
+    public void setImplClass(final Class implClass) {
         serviceDesc.setImplClass(implClass);
     }
 
@@ -46,18 +46,18 @@ public class ReadOnlyServiceDesc extends
         return serviceDesc.getStopClasses();
     }
 
-    public void setStopClasses(ArrayList stopClasses) {
+    public void setStopClasses(final ArrayList stopClasses) {
     }
 
     public void loadServiceDescByIntrospection() {
         serviceDesc.loadServiceDescByIntrospection();
     }
 
-    public void loadServiceDescByIntrospection(Class implClass) {
+    public void loadServiceDescByIntrospection(final Class implClass) {
         serviceDesc.loadServiceDescByIntrospection(implClass);
     }
 
-    public void loadServiceDescByIntrospection(Class cls, TypeMapping tm) {
+    public void loadServiceDescByIntrospection(final Class cls, final TypeMapping tm) {
         serviceDesc.loadServiceDescByIntrospection(cls, tm);
     }
 
@@ -65,92 +65,92 @@ public class ReadOnlyServiceDesc extends
         return serviceDesc.getStyle();
     }
 
-    public void setStyle(Style style) {
+    public void setStyle(final Style style) {
     }
 
     public Use getUse() {
         return serviceDesc.getUse();
     }
 
-    public void setUse(Use use) {
+    public void setUse(final Use use) {
     }
 
     public String getWSDLFile() {
         return serviceDesc.getWSDLFile();
     }
 
-    public void setWSDLFile(String wsdlFileName) {
+    public void setWSDLFile(final String wsdlFileName) {
     }
 
     public List getAllowedMethods() {
         return serviceDesc.getAllowedMethods();
     }
 
-    public void setAllowedMethods(List allowedMethods) {
+    public void setAllowedMethods(final List allowedMethods) {
     }
 
     public TypeMapping getTypeMapping() {
         return serviceDesc.getTypeMapping();
     }
 
-    public void setTypeMapping(TypeMapping tm) {
+    public void setTypeMapping(final TypeMapping tm) {
     }
 
     public String getName() {
         return serviceDesc.getName();
     }
 
-    public void setName(String name) {
+    public void setName(final String name) {
     }
 
     public String getDocumentation() {
         return serviceDesc.getDocumentation();
     }
 
-    public void setDocumentation(String documentation) {
+    public void setDocumentation(final String documentation) {
     }
 
-    public void removeOperationDesc(OperationDesc operation) {
+    public void removeOperationDesc(final OperationDesc operation) {
     }
 
-    public void addOperationDesc(OperationDesc operation) {
+    public void addOperationDesc(final OperationDesc operation) {
     }
 
     public ArrayList getOperations() {
         return serviceDesc.getOperations();
     }
 
-    public OperationDesc[] getOperationsByName(String methodName) {
+    public OperationDesc[] getOperationsByName(final String methodName) {
         return serviceDesc.getOperationsByName(methodName);
     }
 
-    public OperationDesc getOperationByName(String methodName) {
+    public OperationDesc getOperationByName(final String methodName) {
         return serviceDesc.getOperationByName(methodName);
     }
 
-    public OperationDesc getOperationByElementQName(QName qname) {
+    public OperationDesc getOperationByElementQName(final QName qname) {
         return serviceDesc.getOperationByElementQName(qname);
     }
 
-    public OperationDesc[] getOperationsByQName(QName qname) {
+    public OperationDesc[] getOperationsByQName(final QName qname) {
         return serviceDesc.getOperationsByQName(qname);
     }
 
-    public void setNamespaceMappings(List namespaces) {
+    public void setNamespaceMappings(final List namespaces) {
     }
 
     public String getDefaultNamespace() {
         return serviceDesc.getDefaultNamespace();
     }
 
-    public void setDefaultNamespace(String namespace) {
+    public void setDefaultNamespace(final String namespace) {
     }
 
-    public void setProperty(String name, Object value) {
+    public void setProperty(final String name, final Object value) {
         serviceDesc.setProperty(name, value);
     }
 
-    public Object getProperty(String name) {
+    public Object getProperty(final String name) {
         return serviceDesc.getProperty(name);
     }
 
@@ -158,14 +158,14 @@ public class ReadOnlyServiceDesc extends
         return serviceDesc.getEndpointURL();
     }
 
-    public void setEndpointURL(String endpointURL) {
+    public void setEndpointURL(final String endpointURL) {
     }
 
     public TypeMappingRegistry getTypeMappingRegistry() {
         return serviceDesc.getTypeMappingRegistry();
     }
 
-    public void setTypeMappingRegistry(TypeMappingRegistry tmr) {
+    public void setTypeMappingRegistry(final TypeMappingRegistry tmr) {
     }
 
     public boolean isInitialized() {
@@ -180,6 +180,6 @@ public class ReadOnlyServiceDesc extends
         return serviceDesc.getDisallowedMethods();
     }
 
-    public void setDisallowedMethods(List disallowedMethods) {
+    public void setDisallowedMethods(final List disallowedMethods) {
     }
 }

Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/BindingStyle.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/BindingStyle.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/BindingStyle.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/BindingStyle.java Thu Jul 17 07:52:58 2014
@@ -28,7 +28,7 @@ public enum BindingStyle {
     private final boolean literal;
     private final boolean wrapped;
 
-    BindingStyle(boolean document, boolean literal, boolean wrapped) {
+    BindingStyle(final boolean document, final boolean literal, final boolean wrapped) {
         this.document = document;
         this.literal = literal;
         this.wrapped = wrapped;
@@ -54,9 +54,9 @@ public enum BindingStyle {
         return wrapped;
     }
 
-    public static BindingStyle getBindingStyle(String style, String use) {
+    public static BindingStyle getBindingStyle(final String style, final String use) {
         if ("rpc".equalsIgnoreCase(style)) {
-            if (use == null ||"encoded".equalsIgnoreCase(use)) {
+            if (use == null || "encoded".equalsIgnoreCase(use)) {
                 return RPC_ENCODED;
             } else if ("literal".equalsIgnoreCase(use)) {
                 return RPC_LITERAL;

Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java Thu Jul 17 07:52:58 2014
@@ -68,15 +68,15 @@ public class CommonsSchemaInfoBuilder {
     private final Map<QName, XmlTypeInfo> xmlTypes = new HashMap<QName, XmlTypeInfo>();
     private final Map<QName, XmlElementInfo> xmlElements = new HashMap<QName, XmlElementInfo>();
 
-    public CommonsSchemaInfoBuilder(JarFile moduleFile, URI wsdlUri) throws OpenEJBException {
+    public CommonsSchemaInfoBuilder(final JarFile moduleFile, final URI wsdlUri) throws OpenEJBException {
         if (moduleFile == null) throw new NullPointerException("moduleFile is null");
         if (wsdlUri == null) throw new NullPointerException("wsdlUri is null");
 
-        CommonsSchemaLoader schemaLoader = new CommonsSchemaLoader(wsdlUri, moduleFile);
+        final CommonsSchemaLoader schemaLoader = new CommonsSchemaLoader(wsdlUri, moduleFile);
         xmlSchemaCollection = schemaLoader.loadSchema();
     }
 
-    public CommonsSchemaInfoBuilder(XmlSchemaCollection xmlSchemaCollection) {
+    public CommonsSchemaInfoBuilder(final XmlSchemaCollection xmlSchemaCollection) {
         if (xmlSchemaCollection == null) throw new NullPointerException("schemaTypeSystem is null");
         this.xmlSchemaCollection = xmlSchemaCollection;
     }
@@ -85,7 +85,7 @@ public class CommonsSchemaInfoBuilder {
 
         buildXmlTypeInfos();
 
-        XmlSchemaInfo schemaInfo = new XmlSchemaInfo();
+        final XmlSchemaInfo schemaInfo = new XmlSchemaInfo();
         schemaInfo.types.putAll(xmlTypes);
         schemaInfo.elements.putAll(xmlElements);
         return schemaInfo;
@@ -93,22 +93,22 @@ public class CommonsSchemaInfoBuilder {
 
 
     private void buildXmlTypeInfos() {
-        for (XmlSchema schema : xmlSchemaCollection.getXmlSchemas()) {
+        for (final XmlSchema schema : xmlSchemaCollection.getXmlSchemas()) {
             // Global Elements
-            for (Iterator iterator = schema.getElements().getValues(); iterator.hasNext();) {
-                XmlSchemaElement globalElement = (XmlSchemaElement) iterator.next();
+            for (final Iterator iterator = schema.getElements().getValues(); iterator.hasNext(); ) {
+                final XmlSchemaElement globalElement = (XmlSchemaElement) iterator.next();
                 addGlobalElement(globalElement);
             }
 
             // Global Types
-            for (Iterator iterator = schema.getSchemaTypes().getValues(); iterator.hasNext();) {
-                XmlSchemaType globalType = (XmlSchemaType) iterator.next();
+            for (final Iterator iterator = schema.getSchemaTypes().getValues(); iterator.hasNext(); ) {
+                final XmlSchemaType globalType = (XmlSchemaType) iterator.next();
                 addType(globalType.getQName(), globalType);
             }
         }
     }
 
-    private void addGlobalElement(XmlSchemaElement element) {
+    private void addGlobalElement(final XmlSchemaElement element) {
         // Nested anonymous type
         QName xmlType = element.getSchemaTypeName();
         if (xmlType == null) {
@@ -118,13 +118,13 @@ public class CommonsSchemaInfoBuilder {
         }
 
         // create the XmlElementInfo
-        XmlElementInfo elementInfo = createXmlElementInfo(element.getQName(), xmlType, element);
+        final XmlElementInfo elementInfo = createXmlElementInfo(element.getQName(), xmlType, element);
         xmlElements.put(element.getQName(), elementInfo);
 
     }
 
-    private static XmlElementInfo createXmlElementInfo(QName qname, QName xmlType, XmlSchemaElement element) {
-        XmlElementInfo elementInfo = new XmlElementInfo();
+    private static XmlElementInfo createXmlElementInfo(final QName qname, final QName xmlType, final XmlSchemaElement element) {
+        final XmlElementInfo elementInfo = new XmlElementInfo();
 
         elementInfo.qname = qname;
         elementInfo.xmlType = xmlType;
@@ -135,29 +135,29 @@ public class CommonsSchemaInfoBuilder {
         return elementInfo;
     }
 
-    private void addType(QName typeQName, XmlSchemaType type) {
+    private void addType(final QName typeQName, final XmlSchemaType type) {
         // skip built in xml schema types
         if (XML_SCHEMA_NS.equals(typeQName.getNamespaceURI())) {
             return;
         }
 
-        XmlTypeInfo typeInfo = createXmlTypeInfo(typeQName, type);
+        final XmlTypeInfo typeInfo = createXmlTypeInfo(typeQName, type);
         xmlTypes.put(typeQName, typeInfo);
 
         if (type instanceof XmlSchemaComplexType) {
-            XmlSchemaComplexType complexType = (XmlSchemaComplexType) type;
+            final XmlSchemaComplexType complexType = (XmlSchemaComplexType) type;
 
             // process elements nested inside of this element
-            List<XmlSchemaElement> elements = getNestedElements(complexType);
-            for (XmlSchemaElement element : elements) {
+            final List<XmlSchemaElement> elements = getNestedElements(complexType);
+            for (final XmlSchemaElement element : elements) {
                 addNestedElement(element, typeInfo);
             }
         }
     }
 
-    private void addNestedElement(XmlSchemaElement element, XmlTypeInfo enclosingType) {
-        QName elementQName;
-        QName typeQName;
+    private void addNestedElement(final XmlSchemaElement element, final XmlTypeInfo enclosingType) {
+        final QName elementQName;
+        final QName typeQName;
         if (element.getRefName() == null) {
             //
             // Normal element in a type
@@ -178,8 +178,8 @@ public class CommonsSchemaInfoBuilder {
                 // Anonymous type, so we need to declare it
 
                 // Rule 2.b: Anonymous element absolute name "T>N"
-                String anonymoustName = enclosingType.qname.getLocalPart() + ">" + elementQName.getLocalPart();
-                QName anonymousQName = new QName(elementNamespace, anonymoustName);
+                final String anonymoustName = enclosingType.qname.getLocalPart() + ">" + elementQName.getLocalPart();
+                final QName anonymousQName = new QName(elementNamespace, anonymoustName);
 
                 // Rule 1.b: Anonymous type name ">E"
                 typeQName = new QName(elementNamespace, ">" + anonymousQName.getLocalPart());
@@ -191,7 +191,7 @@ public class CommonsSchemaInfoBuilder {
             //
 
             // Local the referenced global element
-            XmlSchemaElement refElement = xmlSchemaCollection.getElementByQName(element.getRefName());
+            final XmlSchemaElement refElement = xmlSchemaCollection.getElementByQName(element.getRefName());
 
             // The name and type of the nested element are determined by the referenced element
             elementQName = refElement.getQName();
@@ -199,33 +199,33 @@ public class CommonsSchemaInfoBuilder {
         }
 
         // Add element to enclosing type
-        XmlElementInfo nestedElement = createXmlElementInfo(elementQName, typeQName, element);
+        final XmlElementInfo nestedElement = createXmlElementInfo(elementQName, typeQName, element);
         enclosingType.elements.put(nestedElement.qname, nestedElement);
     }
 
-    public static XmlTypeInfo createXmlTypeInfo(QName qname, XmlSchemaType type) {
+    public static XmlTypeInfo createXmlTypeInfo(final QName qname, final XmlSchemaType type) {
         if (qname == null) throw new NullPointerException("qname is null");
         if (type == null) throw new NullPointerException("type is null");
 
-        XmlTypeInfo typeInfo = new XmlTypeInfo();
+        final XmlTypeInfo typeInfo = new XmlTypeInfo();
         typeInfo.qname = qname;
         typeInfo.anonymous = qname.getLocalPart().indexOf('>') >= 0;
 
         if (type instanceof XmlSchemaSimpleType) {
-            XmlSchemaSimpleType simpleType = (XmlSchemaSimpleType) type;
-            XmlSchemaSimpleTypeContent content = simpleType.getContent();
+            final XmlSchemaSimpleType simpleType = (XmlSchemaSimpleType) type;
+            final XmlSchemaSimpleTypeContent content = simpleType.getContent();
             if (content instanceof XmlSchemaSimpleTypeList) {
-                XmlSchemaSimpleTypeList list = (XmlSchemaSimpleTypeList) content;
+                final XmlSchemaSimpleTypeList list = (XmlSchemaSimpleTypeList) content;
                 typeInfo.simpleBaseType = list.getItemType().getQName();
 
                 // this is a list
                 typeInfo.listType = true;
-            } else if(content instanceof XmlSchemaSimpleTypeRestriction) {
-                XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction) content;
+            } else if (content instanceof XmlSchemaSimpleTypeRestriction) {
+                final XmlSchemaSimpleTypeRestriction restriction = (XmlSchemaSimpleTypeRestriction) content;
                 typeInfo.simpleBaseType = restriction.getBaseTypeName();
 
                 // is this an enumeration?
-                for (Iterator iterator = restriction.getFacets().getIterator(); iterator.hasNext();) {
+                for (final Iterator iterator = restriction.getFacets().getIterator(); iterator.hasNext(); ) {
                     if (iterator.next() instanceof XmlSchemaEnumerationFacet) {
                         typeInfo.enumType = true;
                         break;
@@ -234,19 +234,19 @@ public class CommonsSchemaInfoBuilder {
                 }
             }
         } else if (type instanceof XmlSchemaComplexType) {
-            XmlSchemaComplexType complexType = (XmlSchemaComplexType) type;
+            final XmlSchemaComplexType complexType = (XmlSchemaComplexType) type;
 
             // SOAP array component type
             typeInfo.arrayComponentType = extractSoapArrayComponentType(complexType);
 
             // process attributes (skip soap arrays which have non-mappable attributes)
             if (!isSoapArray(complexType)) {
-                XmlSchemaObjectCollection attributes = complexType.getAttributes();
-                for (Iterator iterator = attributes.getIterator(); iterator.hasNext();) {
-                    Object item = iterator.next();
+                final XmlSchemaObjectCollection attributes = complexType.getAttributes();
+                for (final Iterator iterator = attributes.getIterator(); iterator.hasNext(); ) {
+                    final Object item = iterator.next();
                     if (item instanceof XmlSchemaAttribute) {
-                        XmlSchemaAttribute attribute = (XmlSchemaAttribute) item;
-                        Object old = typeInfo.attributes.put(attribute.getQName().getLocalPart(), attribute.getSchemaTypeName());
+                        final XmlSchemaAttribute attribute = (XmlSchemaAttribute) item;
+                        final Object old = typeInfo.attributes.put(attribute.getQName().getLocalPart(), attribute.getSchemaTypeName());
                         if (old != null) {
                             throw new IllegalArgumentException("Complain to your expert group member, spec does not support attributes with the same local name and differing namespaces: original: " + old + ", duplicate local name: " + attribute);
                         }
@@ -260,33 +260,34 @@ public class CommonsSchemaInfoBuilder {
         return typeInfo;
     }
 
-    private static boolean isSoapArray(XmlSchemaComplexType complexType) {
+    private static boolean isSoapArray(final XmlSchemaComplexType complexType) {
         // Soap arrays are based on complex content restriction
-        XmlSchemaContentModel contentModel = complexType.getContentModel();
+        final XmlSchemaContentModel contentModel = complexType.getContentModel();
         if (contentModel == null) {
             return false;
         }
-        XmlSchemaContent content = contentModel.getContent();
+        final XmlSchemaContent content = contentModel.getContent();
         if (!(content instanceof XmlSchemaComplexContentRestriction)) {
             return false;
         }
 
-        XmlSchemaComplexContentRestriction restriction = (XmlSchemaComplexContentRestriction) content;
+        final XmlSchemaComplexContentRestriction restriction = (XmlSchemaComplexContentRestriction) content;
         return SOAP_ARRAY.equals(restriction.getBaseTypeName());
     }
 
     /**
      * Extract the nested component type of an Array from the XML Schema Type.
+     *
      * @return the QName of the nested component type or null if the schema type can not be determined
      * @throws org.apache.openejb.OpenEJBException if the XML Schema Type can not represent an Array @param complexType
      */
-    private static QName extractSoapArrayComponentType(XmlSchemaComplexType complexType) {
+    private static QName extractSoapArrayComponentType(final XmlSchemaComplexType complexType) {
         // Soap arrays are based on complex content restriction
         if (!isSoapArray(complexType)) {
             return null;
         }
 
-        XmlSchemaComplexContentRestriction restriction = (XmlSchemaComplexContentRestriction) complexType.getContentModel().getContent();
+        final XmlSchemaComplexContentRestriction restriction = (XmlSchemaComplexContentRestriction) complexType.getContentModel().getContent();
 
         //First, handle case that looks like this:
         // <complexType name="ArrayOfstring">
@@ -296,29 +297,29 @@ public class CommonsSchemaInfoBuilder {
         //         </restriction>
         //     </complexContent>
         // </complexType>
-        XmlSchemaObjectCollection attributes = restriction.getAttributes();
-        for (Iterator iterator = attributes.getIterator(); iterator.hasNext();) {
-            Object item = iterator.next();
+        final XmlSchemaObjectCollection attributes = restriction.getAttributes();
+        for (final Iterator iterator = attributes.getIterator(); iterator.hasNext(); ) {
+            final Object item = iterator.next();
             if (item instanceof XmlSchemaAttribute) {
-                XmlSchemaAttribute attribute = (XmlSchemaAttribute) item;
+                final XmlSchemaAttribute attribute = (XmlSchemaAttribute) item;
                 if (attribute.getRefName().equals(SOAP_ARRAY_TYPE)) {
-                    for (Attr attr : attribute.getUnhandledAttributes()) {
-                        QName attQName = new QName(attr.getNamespaceURI(), attr.getLocalName());
+                    for (final Attr attr : attribute.getUnhandledAttributes()) {
+                        final QName attQName = new QName(attr.getNamespaceURI(), attr.getLocalName());
                         if (WSDL_ARRAY_TYPE.equals(attQName)) {
                             // value is a namespace prefixed xsd type
-                            String value = attr.getValue();
+                            final String value = attr.getValue();
 
                             // extract local part
-                            int pos = value.lastIndexOf(":");
-                            QName componentType;
+                            final int pos = value.lastIndexOf(":");
+                            final QName componentType;
                             if (pos < 0) {
                                 componentType = new QName("", value);
                             } else {
-                                String localPart = value.substring(pos + 1);
+                                final String localPart = value.substring(pos + 1);
 
                                 // resolve the namespace prefix
-                                String prefix = value.substring(0, pos);
-                                String namespace = getNamespaceForPrefix(prefix, attr.getOwnerElement());
+                                final String prefix = value.substring(0, pos);
+                                final String namespace = getNamespaceForPrefix(prefix, attr.getOwnerElement());
 
                                 componentType = new QName(namespace, localPart);
                             }
@@ -340,16 +341,16 @@ public class CommonsSchemaInfoBuilder {
         //         </restriction>
         //     </complexContent>
         // </complexType>
-        XmlSchemaParticle particle = restriction.getParticle();
+        final XmlSchemaParticle particle = restriction.getParticle();
         if (particle instanceof XmlSchemaSequence) {
-            XmlSchemaSequence sequence = (XmlSchemaSequence) particle;
+            final XmlSchemaSequence sequence = (XmlSchemaSequence) particle;
             if (sequence.getItems().getCount() != 1) {
                 throw new IllegalArgumentException("more than one element inside array definition: " + complexType);
             }
-            XmlSchemaObject item = sequence.getItems().getItem(0);
+            final XmlSchemaObject item = sequence.getItems().getItem(0);
             if (item instanceof XmlSchemaElement) {
-                XmlSchemaElement element = (XmlSchemaElement) item;
-                QName componentType = element.getSchemaTypeName();
+                final XmlSchemaElement element = (XmlSchemaElement) item;
+                final QName componentType = element.getSchemaTypeName();
                 log.debug("determined component type from element type");
                 return componentType;
             }
@@ -358,12 +359,12 @@ public class CommonsSchemaInfoBuilder {
         return null;
     }
 
-    private static String getNamespaceForPrefix(String prefix, Element element) {
-        NamedNodeMap attributes = element.getAttributes();
+    private static String getNamespaceForPrefix(final String prefix, final Element element) {
+        final NamedNodeMap attributes = element.getAttributes();
         for (int i = 0; i < attributes.getLength(); i++) {
-            Node node = attributes.item(i);
+            final Node node = attributes.item(i);
             if (node instanceof Attr) {
-                Attr attr = (Attr) node;
+                final Attr attr = (Attr) node;
                 if (XML_NS_NS.equals(attr.getNamespaceURI())) {
                     // this is a namespace declaration, is it the one we are looking for?
                     if (attr.getLocalName().equals(prefix)) {
@@ -383,18 +384,18 @@ public class CommonsSchemaInfoBuilder {
     }
 
 
-    private static List<XmlSchemaElement> getNestedElements(XmlSchemaComplexType complexType) {
-        List<XmlSchemaElement> elements = new ArrayList<XmlSchemaElement>();
-        XmlSchemaParticle particle = complexType.getParticle();
+    private static List<XmlSchemaElement> getNestedElements(final XmlSchemaComplexType complexType) {
+        final List<XmlSchemaElement> elements = new ArrayList<XmlSchemaElement>();
+        final XmlSchemaParticle particle = complexType.getParticle();
         if (particle instanceof XmlSchemaElement) {
-            XmlSchemaElement element = (XmlSchemaElement) particle;
+            final XmlSchemaElement element = (XmlSchemaElement) particle;
             elements.add(element);
         } else if (particle instanceof XmlSchemaGroupBase && !(particle instanceof XmlSchemaChoice)) {
-            XmlSchemaGroupBase groupBase = (XmlSchemaGroupBase) particle;
-            for (Iterator iterator = groupBase.getItems().getIterator(); iterator.hasNext();) {
-                XmlSchemaParticle child = (XmlSchemaParticle) iterator.next();
+            final XmlSchemaGroupBase groupBase = (XmlSchemaGroupBase) particle;
+            for (final Iterator iterator = groupBase.getItems().getIterator(); iterator.hasNext(); ) {
+                final XmlSchemaParticle child = (XmlSchemaParticle) iterator.next();
                 if (child instanceof XmlSchemaElement) {
-                    XmlSchemaElement element = (XmlSchemaElement) child;
+                    final XmlSchemaElement element = (XmlSchemaElement) child;
                     elements.add(element);
                 }
             }

Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java Thu Jul 17 07:52:58 2014
@@ -54,35 +54,35 @@ public class CommonsSchemaLoader {
     private final JarFile moduleFile;
     private final XmlSchemaCollection xmlSchemaCollection = new XmlSchemaCollection();
 
-    public CommonsSchemaLoader(URI wsdlUri, JarFile moduleFile) {
+    public CommonsSchemaLoader(final URI wsdlUri, final JarFile moduleFile) {
         this.wsdlUri = wsdlUri;
         this.moduleFile = moduleFile;
     }
 
     public XmlSchemaCollection loadSchema() throws OpenEJBException {
-        Definition definition = readWsdl(wsdlUri);
+        final Definition definition = readWsdl(wsdlUri);
         addImportsFromDefinition(definition);
         return xmlSchemaCollection;
     }
 
-    private void addImportsFromDefinition(Definition definition) throws OpenEJBException {
-        Types types = definition.getTypes();
+    private void addImportsFromDefinition(final Definition definition) throws OpenEJBException {
+        final Types types = definition.getTypes();
         if (types != null) {
-            for (Object extensibilityElement : types.getExtensibilityElements()) {
+            for (final Object extensibilityElement : types.getExtensibilityElements()) {
                 if (extensibilityElement instanceof Schema) {
-                    Schema unknownExtensibilityElement = (Schema) extensibilityElement;
-                    QName elementType = unknownExtensibilityElement.getElementType();
+                    final Schema unknownExtensibilityElement = (Schema) extensibilityElement;
+                    final QName elementType = unknownExtensibilityElement.getElementType();
                     if (new QName("http://www.w3.org/2001/XMLSchema", "schema").equals(elementType)) {
-                        Element element = unknownExtensibilityElement.getElement();
+                        final Element element = unknownExtensibilityElement.getElement();
                         xmlSchemaCollection.read(element);
                     }
                 } else if (extensibilityElement instanceof UnknownExtensibilityElement) {
                     //This is allegedly obsolete as of axis-wsdl4j-1.2-RC3.jar which includes the Schema extension above.
                     //The change notes imply that imported schemas should end up in Schema elements.  They don't, so this is still needed.
-                    UnknownExtensibilityElement unknownExtensibilityElement = (UnknownExtensibilityElement) extensibilityElement;
-                    Element element = unknownExtensibilityElement.getElement();
-                    String elementNamespace = element.getNamespaceURI();
-                    String elementLocalName = element.getNodeName();
+                    final UnknownExtensibilityElement unknownExtensibilityElement = (UnknownExtensibilityElement) extensibilityElement;
+                    final Element element = unknownExtensibilityElement.getElement();
+                    final String elementNamespace = element.getNamespaceURI();
+                    final String elementLocalName = element.getNodeName();
                     if ("http://www.w3.org/2001/XMLSchema".equals(elementNamespace) && "schema".equals(elementLocalName)) {
                         xmlSchemaCollection.read(element);
                     }
@@ -91,15 +91,15 @@ public class CommonsSchemaLoader {
         }
 
         //noinspection unchecked
-        Map<String,List<Import>> imports = definition.getImports();
+        final Map<String, List<Import>> imports = definition.getImports();
         if (imports != null) {
-            for (Map.Entry<String, List<Import>> entry : imports.entrySet()) {
-                String namespaceURI = entry.getKey();
-                List<Import> importList = entry.getValue();
-                for (Import anImport : importList) {
+            for (final Map.Entry<String, List<Import>> entry : imports.entrySet()) {
+                final String namespaceURI = entry.getKey();
+                final List<Import> importList = entry.getValue();
+                for (final Import anImport : importList) {
                     //according to the 1.1 jwsdl mr shcema imports are supposed to show up here,
                     //but according to the 1.0 spec there is supposed to be no Definition.
-                    Definition importedDef = anImport.getDefinition();
+                    final Definition importedDef = anImport.getDefinition();
                     if (importedDef != null) {
                         addImportsFromDefinition(importedDef);
                     } else {
@@ -110,51 +110,51 @@ public class CommonsSchemaLoader {
         }
     }
 
-    private Definition readWsdl(URI wsdlURI) throws OpenEJBException {
+    private Definition readWsdl(final URI wsdlURI) throws OpenEJBException {
         Definition definition;
-        WSDLFactory wsdlFactory;
+        final WSDLFactory wsdlFactory;
         try {
             wsdlFactory = WSDLFactory.newInstance();
-        } catch (WSDLException e) {
+        } catch (final WSDLException e) {
             throw new OpenEJBException("Could not create WSDLFactory", e);
         }
-        WSDLReader wsdlReaderNoImport = wsdlFactory.newWSDLReader();
+        final WSDLReader wsdlReaderNoImport = wsdlFactory.newWSDLReader();
         wsdlReaderNoImport.setFeature("javax.wsdl.importDocuments", false);
-        ExtensionRegistry extensionRegistry = new PopulatedExtensionRegistry();
+        final ExtensionRegistry extensionRegistry = new PopulatedExtensionRegistry();
         extensionRegistry.mapExtensionTypes(Types.class, SchemaConstants.Q_ELEM_XSD_1999,
-                UnknownExtensibilityElement.class);
+            UnknownExtensibilityElement.class);
         extensionRegistry.registerDeserializer(Types.class, SchemaConstants.Q_ELEM_XSD_1999,
-                extensionRegistry.getDefaultDeserializer());
+            extensionRegistry.getDefaultDeserializer());
         extensionRegistry.registerSerializer(Types.class, SchemaConstants.Q_ELEM_XSD_1999,
-                extensionRegistry.getDefaultSerializer());
+            extensionRegistry.getDefaultSerializer());
 
         extensionRegistry.mapExtensionTypes(Types.class, SchemaConstants.Q_ELEM_XSD_2000,
-                UnknownExtensibilityElement.class);
+            UnknownExtensibilityElement.class);
         extensionRegistry.registerDeserializer(Types.class, SchemaConstants.Q_ELEM_XSD_2000,
-                extensionRegistry.getDefaultDeserializer());
+            extensionRegistry.getDefaultDeserializer());
         extensionRegistry.registerSerializer(Types.class, SchemaConstants.Q_ELEM_XSD_2000,
-                extensionRegistry.getDefaultSerializer());
+            extensionRegistry.getDefaultSerializer());
 
         extensionRegistry.mapExtensionTypes(Types.class, SchemaConstants.Q_ELEM_XSD_2001,
-                UnknownExtensibilityElement.class);
+            UnknownExtensibilityElement.class);
         extensionRegistry.registerDeserializer(Types.class, SchemaConstants.Q_ELEM_XSD_2001,
-                extensionRegistry.getDefaultDeserializer());
+            extensionRegistry.getDefaultDeserializer());
         extensionRegistry.registerSerializer(Types.class, SchemaConstants.Q_ELEM_XSD_2001,
-                extensionRegistry.getDefaultSerializer());
+            extensionRegistry.getDefaultSerializer());
         wsdlReaderNoImport.setExtensionRegistry(extensionRegistry);
 
-        JarWSDLLocator wsdlLocator = new JarWSDLLocator(wsdlURI);
-        WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
+        final JarWSDLLocator wsdlLocator = new JarWSDLLocator(wsdlURI);
+        final WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
 
-        Thread thread = Thread.currentThread();
-        ClassLoader oldCl = thread.getContextClassLoader();
+        final Thread thread = Thread.currentThread();
+        final ClassLoader oldCl = thread.getContextClassLoader();
         thread.setContextClassLoader(this.getClass().getClassLoader());
         try {
             try {
                 definition = wsdlReader.readWSDL(wsdlLocator);
-            } catch (WSDLException e) {
+            } catch (final WSDLException e) {
                 throw new OpenEJBException("Failed to read wsdl document", e);
-            } catch (RuntimeException e) {
+            } catch (final RuntimeException e) {
                 throw new OpenEJBException(e.getMessage(), e);
             }
         } finally {
@@ -170,21 +170,21 @@ public class CommonsSchemaLoader {
         private final URI wsdlURI;
         private URI latestImportURI;
 
-        public JarWSDLLocator(URI wsdlURI) {
+        public JarWSDLLocator(final URI wsdlURI) {
             this.wsdlURI = wsdlURI;
         }
 
         public InputSource getBaseInputSource() {
-            ZipEntry entry = moduleFile.getEntry(wsdlURI.toString());
-            if(entry == null){
-                throw new ServerRuntimeException("The webservices.xml file points to a non-existant WSDL file "+wsdlURI.toString());
+            final ZipEntry entry = moduleFile.getEntry(wsdlURI.toString());
+            if (entry == null) {
+                throw new ServerRuntimeException("The webservices.xml file points to a non-existant WSDL file " + wsdlURI.toString());
             }
 
-            InputStream wsdlInputStream;
+            final InputStream wsdlInputStream;
             try {
                 wsdlInputStream = moduleFile.getInputStream(entry);
                 streams.add(wsdlInputStream);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 throw new ServerRuntimeException("Could not open stream to wsdl file", e);
             }
             return new InputSource(wsdlInputStream);
@@ -194,20 +194,20 @@ public class CommonsSchemaLoader {
             return wsdlURI.toString();
         }
 
-        public InputSource getImportInputSource(String parentLocation, String relativeLocation) {
-            URI parentURI = URI.create(parentLocation);
+        public InputSource getImportInputSource(final String parentLocation, final String relativeLocation) {
+            final URI parentURI = URI.create(parentLocation);
             latestImportURI = parentURI.resolve(relativeLocation);
 
-            InputStream importInputStream;
+            final InputStream importInputStream;
             try {
-                ZipEntry entry = moduleFile.getEntry(latestImportURI.toString());
+                final ZipEntry entry = moduleFile.getEntry(latestImportURI.toString());
                 importInputStream = moduleFile.getInputStream(entry);
                 streams.add(importInputStream);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 throw new ServerRuntimeException("Could not open stream to import file", e);
             }
 
-            InputSource inputSource = new InputSource(importInputStream);
+            final InputSource inputSource = new InputSource(importInputStream);
             inputSource.setSystemId(getLatestImportURI());
             return inputSource;
         }
@@ -217,10 +217,10 @@ public class CommonsSchemaLoader {
         }
 
         public void close() {
-            for (InputStream inputStream : streams) {
+            for (final InputStream inputStream : streams) {
                 try {
                     inputStream.close();
-                } catch (IOException e) {
+                } catch (final IOException e) {
                     //ignore
                 }
             }