You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by br...@apache.org on 2006/06/08 13:11:30 UTC
svn commit: r412744 - in /incubator/yoko/trunk: ./ tools/
tools/src/main/java/org/apache/yoko/tools/processors/idl/
tools/src/main/java/org/apache/yoko/tools/processors/wsdl/
Author: bravi
Date: Thu Jun 8 06:11:29 2006
New Revision: 412744
URL: http://svn.apache.org/viewvc?rev=412744&view=rev
Log:
Apply checkstyle for the tools codebase. JIRA: http://issues.apache.org/jira/browse/YOKO-55
Modified:
incubator/yoko/trunk/pom.xml
incubator/yoko/trunk/tools/pom.xml
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessagePartVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessageVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PrimitiveTypesVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToTypeProcessor.java
Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/pom.xml?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Thu Jun 8 06:11:29 2006
@@ -116,24 +116,6 @@
</projectnatures>
</configuration>
</plugin>
- <!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <executions>
- <execution>
- <id>process-sources</id>
- <phase>process-sources</phase>
- <configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <failsOnError>true</failsOnError>
- </configuration>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- </plugin> -->
</plugins>
<defaultGoal>install</defaultGoal>
@@ -158,6 +140,24 @@
<argLine>-ea</argLine>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <consoleOutput>true</consoleOutput>
+ <failsOnError>true</failsOnError>
+ </configuration>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
Modified: incubator/yoko/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/pom.xml?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/pom.xml (original)
+++ incubator/yoko/trunk/tools/pom.xml Thu Jun 8 06:11:29 2006
@@ -63,7 +63,7 @@
<execution>
<phase>generate-sources</phase>
<configuration>
- <outputDirectory>${basedir}/src/main/java</outputDirectory>
+ <outputDirectory>${basedir}/target/generated/src/main/java</outputDirectory>
<grammars>idl.g</grammars>
<sourceDirectory>${basedir}/src/main/java/org/apache/yoko/tools/processors/idl</sourceDirectory>
</configuration>
@@ -72,8 +72,11 @@
</goals>
</execution>
</executions>
-
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
</plugins>
</build>
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/IDLToWSDLProcessor.java Thu Jun 8 06:11:29 2006
@@ -1,10 +1,5 @@
package org.apache.yoko.tools.processors.idl;
-import antlr.ASTVisitor;
-import antlr.DumpASTVisitor;
-import antlr.collections.AST;
-
-import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
@@ -14,15 +9,15 @@
import javax.wsdl.Definition;
import javax.xml.namespace.QName;
-import org.objectweb.celtix.tools.common.Processor;
-import org.objectweb.celtix.tools.common.ProcessorEnvironment;
-import org.objectweb.celtix.tools.common.ToolException;
+import antlr.collections.AST;
import org.apache.yoko.tools.common.CORBAConstants;
import org.apache.yoko.tools.common.ToolCorbaConstants;
-import org.apache.yoko.tools.common.W3CConstants;
-
import org.apache.yoko.tools.processors.wsdl.WSDLToCorbaBinding;
+
+import org.objectweb.celtix.tools.common.Processor;
+import org.objectweb.celtix.tools.common.ProcessorEnvironment;
+import org.objectweb.celtix.tools.common.ToolException;
public class IDLToWSDLProcessor implements Processor {
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessagePartVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessagePartVisitor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessagePartVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessagePartVisitor.java Thu Jun 8 06:11:29 2006
@@ -1,20 +1,17 @@
package org.apache.yoko.tools.processors.idl;
-import antlr.ASTVisitor;
-import antlr.collections.AST;
-
import javax.wsdl.Definition;
import javax.wsdl.Message;
import javax.wsdl.Part;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
+import antlr.ASTVisitor;
+import antlr.collections.AST;
+
public class MessagePartVisitor implements ASTVisitor {
Definition definition;
- WSDLFactory wsdlFactory;
Message inputMsg;
Message outputMsg;
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessageVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessageVisitor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessageVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/MessageVisitor.java Thu Jun 8 06:11:29 2006
@@ -1,18 +1,16 @@
package org.apache.yoko.tools.processors.idl;
-import antlr.ASTVisitor;
-import antlr.collections.AST;
-
import javax.wsdl.Definition;
import javax.wsdl.Input;
import javax.wsdl.Message;
import javax.wsdl.Operation;
import javax.wsdl.Output;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
+import antlr.ASTVisitor;
+import antlr.collections.AST;
+
public class MessageVisitor implements ASTVisitor {
Definition definition;
@@ -71,9 +69,9 @@
msg.setQName(new QName(definition.getTargetNamespace(), operation.getName()));
input.setMessage(msg);
input.setName(operation.getName() + "Request");
- msg.setUndefined(false);
+ msg.setUndefined(false);
operation.setInput(input);
- definition.addMessage(msg);
+ definition.addMessage(msg);
return msg;
}
@@ -83,9 +81,9 @@
msg.setQName(new QName(definition.getTargetNamespace(), operation.getName() + "Response"));
output.setMessage(msg);
output.setName(operation.getName() + "Response");
- msg.setUndefined(false);
+ msg.setUndefined(false);
operation.setOutput(output);
- definition.addMessage(msg);
+ definition.addMessage(msg);
return msg;
}
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PortTypeVisitor.java Thu Jun 8 06:11:29 2006
@@ -1,15 +1,14 @@
package org.apache.yoko.tools.processors.idl;
-import antlr.ASTVisitor;
-import antlr.collections.AST;
-
import javax.wsdl.Definition;
import javax.wsdl.Operation;
import javax.wsdl.PortType;
-import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
+import antlr.ASTVisitor;
+import antlr.collections.AST;
+
public class PortTypeVisitor implements ASTVisitor {
Definition definition;
@@ -37,7 +36,7 @@
op.setName(node.toString());
msgVisitor.setOperation(op);
msgVisitor.visit(node);
- op.setUndefined(false);
+ op.setUndefined(false);
portType.addOperation(op);
}
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PrimitiveTypesVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PrimitiveTypesVisitor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PrimitiveTypesVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/PrimitiveTypesVisitor.java Thu Jun 8 06:11:29 2006
@@ -3,14 +3,6 @@
import antlr.ASTVisitor;
import antlr.collections.AST;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.WSDLException;
-import javax.wsdl.factory.WSDLFactory;
-
-import javax.xml.namespace.QName;
-
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaType;
@@ -37,6 +29,9 @@
case IDLTokenTypes.LITERAL_string: {
schemaType = schemas.getTypeByQName(Constants.XSD_STRING);
break;
+ }
+ default: {
+ System.out.println("Visit for a type: " + node);
}
}
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/TypesVisitor.java Thu Jun 8 06:11:29 2006
@@ -1,30 +1,23 @@
package org.apache.yoko.tools.processors.idl;
-import antlr.ASTVisitor;
-import antlr.collections.AST;
-
import java.util.ArrayList;
import java.util.List;
import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
import javax.wsdl.extensions.schema.Schema;
import javax.wsdl.factory.WSDLFactory;
import javax.xml.namespace.QName;
+import antlr.ASTVisitor;
+import antlr.collections.AST;
+
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaObject;
-import org.apache.ws.commons.schema.XmlSchemaObjectTable;
-import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.XmlSchemaSerializer;
-import org.apache.ws.commons.schema.XmlSchemaType;
public class TypesVisitor implements ASTVisitor {
@@ -44,9 +37,10 @@
public void attachSchema() throws Exception {
Types types = definition.createTypes();
- Schema wsdlSchema = (Schema) definition.getExtensionRegistry().createExtension(Types.class,
- new QName("http://www.w3.org/2001/XMLSchema",
- "schema"));
+ Schema wsdlSchema = (Schema)
+ definition.getExtensionRegistry().createExtension(Types.class,
+ new QName("http://www.w3.org/2001/XMLSchema",
+ "schema"));
org.w3c.dom.Element el = XmlSchemaSerializer.serializeSchema(schema, true)[0].getDocumentElement();
wsdlSchema.setElement(el);
types.addExtensibilityElement(wsdlSchema);
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/idl/WSDLASTVisitor.java Thu Jun 8 06:11:29 2006
@@ -2,14 +2,14 @@
import java.io.OutputStream;
-import antlr.ASTVisitor;
-import antlr.collections.AST;
-
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLWriter;
+import antlr.ASTVisitor;
+import antlr.collections.AST;
+
import org.objectweb.celtix.tools.common.WSDLConstants;
public class WSDLASTVisitor implements ASTVisitor {
@@ -34,9 +34,11 @@
switch (node.getType()) {
case IDLTokenTypes.LITERAL_interface: {
portTypeVisitor.visit(node);
- }
break;
- default: System.out.println("Visit for node: " + node.getType() + ":" + node);
+ }
+ default: {
+ System.out.println("Visit for node: " + node.getType() + ":" + node);
+ }
}
try {
typesVisitor.attachSchema();
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToCorbaBinding.java Thu Jun 8 06:11:29 2006
@@ -99,7 +99,6 @@
public void generateCORBABinding(Definition definition) throws Exception {
def = definition;
-
if (extReg == null) {
extReg = def.getExtensionRegistry();
addExtensions(extReg);
@@ -129,8 +128,7 @@
Iterator it2 = portTypes.keySet().iterator();
while (it2.hasNext()) {
QName existPortQName = (QName)it2.next();
- String existPortName = existPortQName.getLocalPart();
- if (!existPortName.equals(interfaceName)) {
+ if (!existPortQName.getLocalPart().equals(interfaceName)) {
portType = null;
} else {
portType = (PortType)portTypes.get(existPortQName);
@@ -147,14 +145,11 @@
intfs.add(portType);
}
} else {
- // if interface name wasn't set on command line get list
- // of portTypes in definition - we only want one
Map portTypes = def.getPortTypes();
if (portTypes == null) {
org.objectweb.celtix.common.i18n.Message msg = new org.objectweb.celtix.common.i18n.Message(
- "No PortTypes defined in wsdl",
- LOG);
+ "No PortTypes defined in wsdl", LOG);
throw new Exception(msg.toString());
} else {
PortType portType = null;
@@ -168,12 +163,11 @@
int cnt = 0;
while (it2.hasNext()) {
cnt++;
- QName portTypeName = (QName)it2.next();
- sb.append(" " + cnt + " --> " + portTypeName.getLocalPart());
+ sb.append(" " + cnt + " --> " + ((QName) it2.next()).getLocalPart());
}
throw new Exception(sb.toString());
} else {
- portType = (PortType)portTypes.keySet().iterator().next();
+ portType = (PortType) portTypes.keySet().iterator().next();
interfaceNames.add(portType.getQName().getLocalPart());
}
intfs = new ArrayList<PortType>();
@@ -182,8 +176,7 @@
}
for (int i = 0; i < intfs.size(); i++) {
- PortType intf = (PortType)intfs.get(i);
- generateCORBABinding(def, intf);
+ generateCORBABinding(def, (PortType) intfs.get(i));
}
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToIDLAction.java Thu Jun 8 06:11:29 2006
@@ -13,7 +13,6 @@
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
import javax.wsdl.Definition;
-import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.ExtensionRegistry;
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
@@ -58,9 +57,8 @@
private Definition def;
private IdlRoot root = IdlRoot.create();
private IdlInterface intf;
- ExtensionRegistry extReg;
-
- WSDLToTypeProcessor typeProcessor = new WSDLToTypeProcessor();
+ private ExtensionRegistry extReg;
+ private WSDLToTypeProcessor typeProcessor = new WSDLToTypeProcessor();
public WSDLToIDLAction() {
}
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToProcessor.java Thu Jun 8 06:11:29 2006
@@ -1,16 +1,13 @@
package org.apache.yoko.tools.processors.wsdl;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
import java.util.logging.Logger;
import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
import javax.wsdl.Definition;
import javax.wsdl.Import;
import javax.wsdl.Message;
@@ -24,27 +21,14 @@
import javax.wsdl.extensions.schema.SchemaImport;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-import javax.xml.bind.JAXBException;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.xml.sax.SAXException;
-
-import org.apache.schemas.yoko.bindings.corba.BindingType;
-import org.apache.schemas.yoko.bindings.corba.TypeMappingType;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
-import org.apache.yoko.tools.common.CORBAConstants;
+
import org.objectweb.celtix.common.logging.LogUtils;
import org.objectweb.celtix.tools.common.Processor;
import org.objectweb.celtix.tools.common.ProcessorEnvironment;
import org.objectweb.celtix.tools.common.ToolException;
-import org.objectweb.celtix.wsdl.JAXBExtensionHelper;
public class WSDLToProcessor implements Processor {
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToTypeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToTypeProcessor.java?rev=412744&r1=412743&r2=412744&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToTypeProcessor.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/processors/wsdl/WSDLToTypeProcessor.java Thu Jun 8 06:11:29 2006
@@ -1,6 +1,4 @@
package org.apache.yoko.tools.processors.wsdl;
-import javax.wsdl.Definition;
-
public class WSDLToTypeProcessor extends WSDLToProcessor {
}