[savara-commits] savara SVN: r469 - in trunk/tools: bundles and 72 other directories.

Author: objectiser Date: 2010-11-17 15:40:33 -0500 (Wed, 17 Nov 2010) New Revision: 469 Added: trunk/tools/bundles/ trunk/tools/bundles/org.jboss.savara.wsdl/ trunk/tools/bundles/org.jboss.savara.wsdl/pom.xml trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLBinding.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLGenerator.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLGeneratorUtil.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPDocLitWSDLBinding.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPRPCWSDLBinding.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/osgi/ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/util/ trunk/tools/bundles/pom.xml Removed: trunk/tools/bundles/org.jboss.savara.wsdl/plugin.xml trunk/tools/bundles/org.jboss.savara.wsdl/pom.xml trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/osgi/ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/util/ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPDocLitWSDLBinding.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPRPCWSDLBinding.java trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java Modified: trunk/tools/bundles/org.jboss.savara.wsdl/.classpath trunk/tools/bundles/org.jboss.savara.wsdl/.project trunk/tools/bundles/org.jboss.savara.wsdl/META-INF/MANIFEST.MF trunk/tools/bundles/org.jboss.savara.wsdl/build.properties trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/osgi/Activator.java trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/util/XMLUtils.java trunk/tools/features/org.jboss.savara.tools.feature/feature.xml trunk/tools/features/org.jboss.savara.tools.feature/pom.xml trunk/tools/features/org.scribble.protocol.feature/feature.xml trunk/tools/features/org.scribble.protocol.feature/pom.xml trunk/tools/features/pom.xml trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.contract.model/pom.xml trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/pom.xml trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.protocol.contract/pom.xml trunk/tools/plugins/org.jboss.savara.tap.eclipse/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tap.eclipse/pom.xml trunk/tools/plugins/org.jboss.savara.tap.model/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tap.model/pom.xml trunk/tools/plugins/org.jboss.savara.tap.validation/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tap.validation/pom.xml trunk/tools/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.bpel/pom.xml trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.bpmn/pom.xml trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.monitor/pom.xml trunk/tools/plugins/org.jboss.savara.tools.validator/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.validator/pom.xml trunk/tools/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF trunk/tools/plugins/org.jboss.savara.tools.wsdl/pom.xml trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java trunk/tools/plugins/org.scribble.conformance/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.conformance/pom.xml trunk/tools/plugins/org.scribble.conversation.comparator/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.conversation.comparator/pom.xml trunk/tools/plugins/org.scribble.conversation.export.text/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.conversation.export.text/pom.xml trunk/tools/plugins/org.scribble.conversation.model/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.conversation.model/pom.xml trunk/tools/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.conversation.parser/pom.xml trunk/tools/plugins/org.scribble.conversation.projector/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.conversation.projector/pom.xml trunk/tools/plugins/org.scribble.conversation.validation/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.conversation.validation/pom.xml trunk/tools/plugins/org.scribble.core/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.core/pom.xml trunk/tools/plugins/org.scribble.eclipse/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.eclipse/pom.xml trunk/tools/plugins/org.scribble.expression.xpath/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.expression.xpath/pom.xml trunk/tools/plugins/org.scribble.lang.model/META-INF/MANIFEST.MF trunk/tools/plugins/org.scribble.lang.model/pom.xml trunk/tools/plugins/pom.xml trunk/tools/pom.xml trunk/tools/site/pom.xml trunk/tools/tests/org.jboss.savara.protocol.contract.tests/META-INF/MANIFEST.MF trunk/tools/tests/org.jboss.savara.protocol.contract.tests/pom.xml trunk/tools/tests/org.jboss.savara.tools.bpel.tests/ trunk/tools/tests/org.jboss.savara.tools.bpel.tests/META-INF/MANIFEST.MF trunk/tools/tests/org.jboss.savara.tools.bpel.tests/pom.xml trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/META-INF/MANIFEST.MF trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/pom.xml trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java trunk/tools/tests/pom.xml Log: Update versions to 1.2.0-SNAPSHOT and separate out WSDL generation to separate OSGi bundle in preparation for establishing a separate action framework (with validation support). Copied: trunk/tools/bundles/org.jboss.savara.wsdl (from rev 425, trunk/tools/plugins/org.jboss.savara.tools.wsdl) Property changes on: trunk/tools/bundles/org.jboss.savara.wsdl ___________________________________________________________________ Name: svn:ignore + classes target bin Modified: trunk/tools/bundles/org.jboss.savara.wsdl/.classpath =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/.classpath 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/.classpath 2010-11-17 20:40:33 UTC (rev 469) @@ -3,5 +3,5 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/java"/> - <classpathentry kind="output" path="classes"/> + <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/tools/bundles/org.jboss.savara.wsdl/.project =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/.project 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/.project 2010-11-17 20:40:33 UTC (rev 469) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.jboss.savara.tools.wsdl</name> + <name>org.jboss.savara.wsdl</name> <comment></comment> <projects> </projects> Modified: trunk/tools/bundles/org.jboss.savara.wsdl/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -1,21 +1,17 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: JBoss SAVARA Tools WSDL Plug-in -Bundle-SymbolicName: org.jboss.savara.tools.wsdl;singleton:=true -Bundle-Version: 1.1.0.qualifier -Bundle-Activator: org.jboss.savara.tools.wsdl.osgi.Activator +Bundle-Name: JBoss SAVARA WSDL +Bundle-SymbolicName: org.jboss.savara.wsdl +Bundle-Version: 1.2.0.qualifier +Bundle-Activator: org.jboss.savara.wsdl.osgi.Activator +Bundle-Vendor: www.savara.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Bundle-Vendor: www.jboss.org +Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: javax.wsdl;visibility:=reexport, org.jboss.savara.contract.model, org.apache.commons.logging, org.scribble.core;bundle-version="[1.0.0,2.0.0)", - org.eclipse.core.resources, - org.eclipse.jface, - org.eclipse.ui, org.scribble.eclipse;bundle-version="[1.0.0,2.0.0)", - org.eclipse.core.runtime, org.scribble.conversation.model;bundle-version="[1.0.0,2.0.0)" -Export-Package: org.jboss.savara.tools.wsdl.generator, - org.jboss.savara.tools.wsdl.generator.soap -Bundle-ActivationPolicy: lazy +Export-Package: org.jboss.savara.wsdl.generator, + org.jboss.savara.wsdl.generator.soap Modified: trunk/tools/bundles/org.jboss.savara.wsdl/build.properties =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/build.properties 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/build.properties 2010-11-17 20:40:33 UTC (rev 469) @@ -1,14 +1,4 @@ source.. = src/java/ -output.. = classes/ +output.. = bin/ bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - build.properties,\ - Copyright.txt -src.includes = .classpath,\ - .project,\ - Copyright.txt,\ - META-INF/,\ - build.properties,\ - plugin.xml,\ - src/ + . Deleted: trunk/tools/bundles/org.jboss.savara.wsdl/plugin.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/plugin.xml 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/plugin.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - - <extension point="org.eclipse.ui.popupMenus"> - <objectContribution - id="org.jboss.tools.overlord.cdl.bpel.object.contribution" - objectClass="org.eclipse.core.resources.IFile" - nameFilter="*.cdm"> - <menu - id="org.jboss.savara.tools.menu" - label="Savara" - path="additions"> - <separator name="group1"/> - </menu> - <menu - id="generate.menu" - label="Generate" - path="org.jboss.savara.tools.menu/additions"> - <separator name="group2"/> - </menu> - <action - label="WSDL" - class="org.jboss.savara.tools.wsdl.actions.GenerateAction" - menubarPath="org.jboss.savara.tools.menu/generate.menu/group2" - enablesFor="1" - id="org.jboss.savara.tools.wsdl.actions.GenerateAction"> - </action> - </objectContribution> - </extension> - -</plugin> Deleted: trunk/tools/bundles/org.jboss.savara.wsdl/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/pom.xml 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -1,16 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara.tools</groupId> - <artifactId>org.jboss.savara.tools.wsdl</artifactId> - <version>1.1.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> - <name>Savara::Tools::Plugins::ToolsWSDL</name> - - <parent> - <groupId>org.jboss.savara.tools</groupId> - <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> - </parent> - -</project> Copied: trunk/tools/bundles/org.jboss.savara.wsdl/pom.xml (from rev 467, trunk/tools/plugins/org.jboss.savara.tools.wsdl/pom.xml) =================================================================== --- trunk/tools/bundles/org.jboss.savara.wsdl/pom.xml (rev 0) +++ trunk/tools/bundles/org.jboss.savara.wsdl/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.savara.bundles</groupId> + <artifactId>org.jboss.savara.wsdl</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + <name>Savara::Bundles::WSDL</name> + + <parent> + <groupId>org.jboss.savara.tools</groupId> + <artifactId>bundles</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + +</project> Deleted: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator; - -/** - * This interface is used to establish binding information on a - * WSDL definition. - * - */ -public interface WSDLBinding { - - /** - * This method returns the name of the WSDL binding implementation. - * - * @return The WSDL binding - */ - public String getName(); - - /** - * This method initializes the WSDL definition for the binding. - * - * @param defn The definition - */ - public void initDefinition(javax.wsdl.Definition defn); - - /** - * This method adds WSDL binding information to the port binding. - * - * @param defn The definition - * @param binding The port type - */ - public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding); - - /** - * This method adds WSDL binding information to the operation. - * - * @param defn The definition - * @param mep The message exchange pattern - * @param operation The operation - */ - public void updateOperation(javax.wsdl.Definition defn, - org.jboss.savara.contract.model.MessageExchangePattern mep, - javax.wsdl.BindingOperation operation); - - /** - * This method adds WSDL binding information to the input. - * - * @param defn The definition - * @param input The input - */ - public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input); - - /** - * This method adds WSDL binding information to the output. - * - * @param defn The definition - * @param output The output - */ - public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output); - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param fault The fault - */ - public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault); - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param port The port - */ - public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port); - -} Deleted: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,535 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator; - -import javax.wsdl.Part; -import javax.xml.namespace.QName; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.savara.contract.model.FaultDetails; -import org.jboss.savara.contract.model.Interface; -import org.jboss.savara.contract.model.Namespace; -import org.jboss.savara.contract.model.RequestResponseMEP; -import org.jboss.savara.contract.model.Type; -import org.jboss.savara.contract.model.TypeDefinition; -import org.scribble.model.TypeReference; - -/** - * This class generates a WSDL definition from a Contract model. - * - */ -public class WSDLGenerator { - - public static final String BINDING_SUFFIX = "Binding"; - - private static Log logger = LogFactory.getLog(WSDLGenerator.class); - - public WSDLGenerator() { - } - - /** - * This method generates a WSDL definition from a Scribble contract model. - * - * @param contract The contract model - * @param wsdlBinding The WSDL binding to use, or null if no binding - * @return The WSDL definition - */ - public java.util.List<javax.wsdl.Definition> generateDefinitions(org.jboss.savara.contract.model.Contract contract, - WSDLBinding wsdlBinding) { - java.util.List<javax.wsdl.Definition> ret=new java.util.Vector<javax.wsdl.Definition>(); - - try { - // Create definition for contract's target namespace - javax.wsdl.Definition main=getDefinition(ret, contract, contract.getNamespace(), wsdlBinding); - - // If no definition, then return - if (main == null) { - return(ret); - } - - // Create service - javax.wsdl.Service service=main.createService(); - service.setQName(new javax.xml.namespace.QName(contract.getNamespace(), - contract.getName()+"Service")); - - main.addService(service); - - // Define a port type per interface - java.util.Iterator<Interface> iter=contract.getInterfaces().iterator(); - - while (iter.hasNext()) { - Interface intf=iter.next(); - - javax.wsdl.PortType portType= - createPortType(ret, contract, intf, wsdlBinding); - - javax.wsdl.Binding binding= - createBinding(ret, contract, intf, portType, wsdlBinding); - - // Create service port for interface - javax.wsdl.Port port=main.createPort(); - - port.setName(intf.getName()+"Port"); - port.setBinding(binding); - - service.addPort(port); - - if (wsdlBinding != null) { - wsdlBinding.updatePort(main, port); - } - } - - } catch(Exception e) { - logger.error("Failed to generate WSDL", e); - } - - return(ret); - } - - /** - * This method returns the definition associated with the supplied target namespace. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param targetNamespace The target namespace - * @param wsdlBinding The WSDL binding to use, or null if no binding - * @return The WSDL definition for the target namespace, or null if unable to find or create - */ - protected javax.wsdl.Definition getDefinition(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, String targetNamespace, - WSDLBinding wsdlBinding) { - javax.wsdl.Definition ret=null; - - if (targetNamespace != null) { - for (int i=0; ret == null && i < wsdls.size(); i++) { - ret = wsdls.get(i); - - if (ret.getTargetNamespace() == null || - ret.getTargetNamespace().equals(targetNamespace) == false) { - ret = null; - } - } - - if (ret == null) { - ret = createDefinition(contract, targetNamespace); - - if (ret != null) { - - // Initialize definition using the WSDL binding - if (wsdlBinding != null) { - wsdlBinding.initDefinition(ret); - } - - wsdls.add(ret); - } - } - } - - return(ret); - } - - /** - * This method creates a new WSDL definition associated with the supplied - * target namespace. - * - * @param contract The contract - * @param targetNamespace The target namespace - * @return The WSDL definition - */ - protected javax.wsdl.Definition createDefinition(org.jboss.savara.contract.model.Contract contract, - String targetNamespace) { - javax.wsdl.Definition ret=null; - - try { - javax.wsdl.factory.WSDLFactory fact= - javax.wsdl.factory.WSDLFactory.newInstance(); - - ret = fact.newDefinition(); - - // Set details on the definition - if (contract.getName() != null) { - ret.setQName(new javax.xml.namespace.QName(contract.getName())); - } - ret.setTargetNamespace(targetNamespace); - - // Set up namespace mappings - java.util.Iterator<Namespace> iter=contract.getNamespaces().iterator(); - - while (iter.hasNext()) { - Namespace ns=iter.next(); - - ret.addNamespace(ns.getPrefix(), ns.getURI()); - } - - } catch(Exception e) { - logger.error("Failed to create WSDL definition for target namespace '"+targetNamespace+"'", e); - } - - return(ret); - } - - /** - * This method generates a port type, using the supplied WSDL definition, - * based on the information in the supplied interface definition. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param intf The interface model - * @return The WSDL port type - */ - public javax.wsdl.PortType createPortType(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, - org.jboss.savara.contract.model.Interface intf, - WSDLBinding wsdlBinding) { - javax.wsdl.PortType ret=null; - - if (intf != null) { - javax.wsdl.Definition defn=getDefinition(wsdls, contract, intf.getNamespace(), wsdlBinding); - - if (defn != null) { - ret = defn.createPortType(); - ret.setUndefined(false); - - if (intf.getName() != null) { - ret.setQName(new javax.xml.namespace.QName(intf.getNamespace(), intf.getName())); - } - - for (int i=0; i < intf.getMessageExchangePatterns().size(); i++) { - createOperation(wsdls, contract, ret, - intf.getMessageExchangePatterns().get(i), wsdlBinding); - } - - // Only add portType to definition if they have atleast one operation - if (ret != null && ret.getOperations().size() > 0) { - defn.addPortType(ret); - } - } - } - - return(ret); - } - - /** - * This method generates a port type binding, using the supplied WSDL definition, - * based on the information in the supplied interface definition. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param intf The interface model - * @param portType The port type - * @return The WSDL port type binding - */ - public javax.wsdl.Binding createBinding(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, - org.jboss.savara.contract.model.Interface intf, - javax.wsdl.PortType portType, - WSDLBinding wsdlBinding) { - javax.wsdl.Binding ret=null; - - if (intf != null) { - javax.wsdl.Definition defn=getDefinition(wsdls, contract, intf.getNamespace(), wsdlBinding); - - if (defn != null) { - ret = defn.createBinding(); - ret.setUndefined(false); - - // Check if WSDL binding details - if (wsdlBinding != null) { - wsdlBinding.updateBinding(defn, ret); - } - - if (intf.getName() != null) { - ret.setQName(new javax.xml.namespace.QName(intf.getNamespace(), - intf.getName()+BINDING_SUFFIX)); - } - - ret.setPortType(portType); - - for (int i=0; i < intf.getMessageExchangePatterns().size(); i++) { - createBindingOperation(wsdls, contract, ret, - intf.getMessageExchangePatterns().get(i), wsdlBinding); - } - - // Only add portType to definition if they have atleast one operation - if (ret != null && ret.getBindingOperations().size() > 0) { - defn.addBinding(ret); - } - } - } - - return(ret); - } - - /** - * This method generates an operation, using the supplied WSDL definition, - * based on the information in the supplied message exchange pattern. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param portType The port type - * @param mep The message exchange pattern - * @return The WSDL operation - */ - public javax.wsdl.Operation createOperation(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, javax.wsdl.PortType portType, - org.jboss.savara.contract.model.MessageExchangePattern mep, - WSDLBinding wsdlBinding) { - javax.wsdl.Operation ret=null; - - javax.wsdl.Definition defn=null; - - if (portType != null) { - defn = getDefinition(wsdls, contract, portType.getQName().getNamespaceURI(), wsdlBinding); - } - - if (defn != null && mep != null) { - ret = defn.createOperation(); - ret.setUndefined(false); - - ret.setName(mep.getOperation()); - - QName msgname=WSDLGeneratorUtil.getRequestMessageType(portType.getQName().getNamespaceURI(), - mep.getOperation()); - - javax.wsdl.Message mesg=getMessage(wsdls, contract, msgname, - mep.getTypes(), wsdlBinding); - - if (mesg != null) { - javax.wsdl.Input input=defn.createInput(); - input.setMessage(mesg); - ret.setInput(input); - } - - // Check if a request/response MEP - if (mep instanceof RequestResponseMEP) { - RequestResponseMEP rr=(RequestResponseMEP)mep; - - msgname=WSDLGeneratorUtil.getResponseMessageType(portType.getQName().getNamespaceURI(), - mep.getOperation()); - - javax.wsdl.Message om=getMessage(wsdls, contract, msgname, - rr.getResponseTypes(), wsdlBinding); - if (om != null) { - javax.wsdl.Output output=defn.createOutput(); - output.setMessage(om); - ret.setOutput(output); - } - - // Generate fault details - if (rr.getFaultDetails() != null) { - for (int i=0; i < rr.getFaultDetails().size(); i++) { - FaultDetails fd=rr.getFaultDetails().get(i); - - msgname = WSDLGeneratorUtil.getFaultMessageType(portType.getQName().getNamespaceURI(), - fd.getName()); - - javax.wsdl.Message fm=getMessage(wsdls, contract, msgname, - fd.getTypes(), wsdlBinding); - if (fm != null) { - javax.wsdl.Fault fault=defn.createFault(); - fault.setName(fd.getName()); - fault.setMessage(fm); - - ret.addFault(fault); - } - } - } - } - - portType.addOperation(ret); - } - - return(ret); - } - - /** - * This method generates a binding operation, using the supplied WSDL definition, - * based on the information in the supplied message exchange pattern. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param binding The port type binding - * @param mep The message exchange pattern - * @return The WSDL binding operation - */ - public javax.wsdl.BindingOperation createBindingOperation(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, javax.wsdl.Binding binding, - org.jboss.savara.contract.model.MessageExchangePattern mep, - WSDLBinding wsdlBinding) { - javax.wsdl.BindingOperation ret=null; - - javax.wsdl.Definition defn=null; - - if (binding != null) { - defn = getDefinition(wsdls, contract, binding.getQName().getNamespaceURI(), wsdlBinding); - } - - if (defn != null && mep != null) { - ret = defn.createBindingOperation(); - //ret.setUndefined(false); - - // Check if WSDL operation details - if (wsdlBinding != null) { - wsdlBinding.updateOperation(defn, mep, ret); - } - - ret.setName(mep.getOperation()); - - QName msgname=WSDLGeneratorUtil.getRequestMessageType(binding.getQName().getNamespaceURI(), - mep.getOperation()); - - javax.wsdl.Message mesg=getMessage(wsdls, contract,msgname, - mep.getTypes(), wsdlBinding); - - if (mesg != null) { - javax.wsdl.BindingInput input=defn.createBindingInput(); - - // Check if WSDL operation details - if (wsdlBinding != null) { - wsdlBinding.updateInput(defn, input); - } - - ret.setBindingInput(input); - } - - // Check if a request/response MEP - if (mep instanceof RequestResponseMEP) { - RequestResponseMEP rr=(RequestResponseMEP)mep; - - msgname=WSDLGeneratorUtil.getResponseMessageType(binding.getQName().getNamespaceURI(), - mep.getOperation()); - - javax.wsdl.Message om=getMessage(wsdls, contract, msgname, - rr.getResponseTypes(), wsdlBinding); - if (om != null) { - javax.wsdl.BindingOutput output=defn.createBindingOutput(); - - // Check if WSDL operation details - if (wsdlBinding != null) { - wsdlBinding.updateOutput(defn, output); - } - - ret.setBindingOutput(output); - } - - // Generate fault details - if (rr.getFaultDetails() != null) { - for (int i=0; i < rr.getFaultDetails().size(); i++) { - FaultDetails fd=rr.getFaultDetails().get(i); - - msgname = WSDLGeneratorUtil.getFaultMessageType(binding.getQName().getNamespaceURI(), - fd.getName()); - - javax.wsdl.Message fm=getMessage(wsdls, contract, msgname, - fd.getTypes(), wsdlBinding); - if (fm != null) { - javax.wsdl.BindingFault fault=defn.createBindingFault(); - fault.setName(fd.getName()); - - // Check if WSDL operation details - if (wsdlBinding != null) { - wsdlBinding.updateFault(defn, fault); - } - - ret.addBindingFault(fault); - } - } - } - } - - binding.addBindingOperation(ret); - } - - return(ret); - } - - /** - * This method returns a message, using the supplied WSDL definition, - * based on the information supplied in the list of type references. If - * a single type reference is supplied, this will be the message type, - * if multiple type references are supplied, then these will be considered - * the message parts.<p> - * <p> - * The returned message will be part of the supplied definition. If it - * does not exist prior to the call to this method, then it will be - * created and added to the definition upon returning the message. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param msgname The message name - * @param types The list of type references - * @return The WSDL message - */ - public javax.wsdl.Message getMessage(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, - javax.xml.namespace.QName msgname, - java.util.List<org.jboss.savara.contract.model.Type> types, - WSDLBinding wsdlBinding) { - javax.wsdl.Message ret=null; - - if (types == null || types.size() == 0) { - throw new UnsupportedOperationException("Expecting single type reference"); - } else if (types.size() > 1) { - throw new UnsupportedOperationException("Currently only supports single type reference"); - } else { - Type ref=types.get(0); - - java.util.Iterator<TypeDefinition> iter=ref.getTypeDefinitions().iterator(); - boolean f_done=false; - - while (f_done == false && iter.hasNext()) { - TypeDefinition td=iter.next(); - - if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem()) || - TypeDefinition.XSD_TYPE.equals(td.getTypeSystem())) { - javax.xml.namespace.QName qname= - new javax.xml.namespace.QName(td.getNamespace(),td.getName()); - javax.wsdl.Definition defn= - getDefinition(wsdls, contract, msgname.getNamespaceURI(), wsdlBinding); - - if (defn != null && qname != null && - (ret = defn.getMessage(msgname)) == null) { - ret = defn.createMessage(); - ret.setUndefined(false); - - ret.setQName(msgname); - - // Create single part for type or element - Part part=defn.createPart(); - part.setName("content"); - - if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem())) { - part.setElementName(qname); - } else { - part.setTypeName(qname); - } - - ret.addPart(part); - - defn.addMessage(ret); - - f_done = true; - } - } - } - } - - return(ret); - } -} Deleted: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; - -/** - * This class provides general utility functions for - * use when generating artefacts. - */ -public class WSDLGeneratorUtil { - - private static final String RESPONSE = "Response"; - private static final String FAULT = "Fault"; - private static final String REQUEST = "Request"; - - /** - * This method checks whether the folder exists, - * and if not attempts to create it. - * - * @param res The current resource - */ - public static void createFolder(IResource res) { - if (res instanceof IFolder) { - IFolder folder=(IFolder)res; - - if (folder.exists() == false) { - createFolder(folder.getParent()); - - try { - folder.create(true, true, - new org.eclipse.core.runtime.NullProgressMonitor()); - } catch(Exception e) { - e.printStackTrace(); - } - } - } else if (res.getParent() != null) { - createFolder(res.getParent()); - } - } - - /** - * This method returns the request message type QName. - * - * @param intfNamespace The interface namespace - * @param op The operation name - * @return The request message type - */ - public static javax.xml.namespace.QName getRequestMessageType(String intfNamespace, String op) { - return(new javax.xml.namespace.QName(intfNamespace, op+REQUEST)); - } - - /** - * This method returns the response message type QName. - * - * @param intfNamespace The interface namespace - * @param op The operation name - * @return The response message type - */ - public static javax.xml.namespace.QName getResponseMessageType(String intfNamespace, String op) { - return(new javax.xml.namespace.QName(intfNamespace, op+RESPONSE)); - } - - /** - * This method returns the fault message type QName. - * - * @param intfNamespace The interface namespace - * @param faultName The fault name - * @return The fault message type - */ - public static javax.xml.namespace.QName getFaultMessageType(String intfNamespace, String faultName) { - return(new javax.xml.namespace.QName(intfNamespace, faultName+FAULT)); - } -} Copied: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLBinding.java (from rev 425, trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java) =================================================================== --- trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLBinding.java (rev 0) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.wsdl.generator; + +/** + * This interface is used to establish binding information on a + * WSDL definition. + * + */ +public interface WSDLBinding { + + /** + * This method returns the name of the WSDL binding implementation. + * + * @return The WSDL binding + */ + public String getName(); + + /** + * This method initializes the WSDL definition for the binding. + * + * @param defn The definition + */ + public void initDefinition(javax.wsdl.Definition defn); + + /** + * This method adds WSDL binding information to the port binding. + * + * @param defn The definition + * @param binding The port type + */ + public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding); + + /** + * This method adds WSDL binding information to the operation. + * + * @param defn The definition + * @param mep The message exchange pattern + * @param operation The operation + */ + public void updateOperation(javax.wsdl.Definition defn, + org.jboss.savara.contract.model.MessageExchangePattern mep, + javax.wsdl.BindingOperation operation); + + /** + * This method adds WSDL binding information to the input. + * + * @param defn The definition + * @param input The input + */ + public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input); + + /** + * This method adds WSDL binding information to the output. + * + * @param defn The definition + * @param output The output + */ + public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output); + + /** + * This method adds WSDL binding information to the fault. + * + * @param defn The definition + * @param fault The fault + */ + public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault); + + /** + * This method adds WSDL binding information to the fault. + * + * @param defn The definition + * @param port The port + */ + public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port); + +} Copied: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLGenerator.java (from rev 425, trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java) =================================================================== --- trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLGenerator.java (rev 0) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLGenerator.java 2010-11-17 20:40:33 UTC (rev 469) @@ -0,0 +1,535 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.wsdl.generator; + +import javax.wsdl.Part; +import javax.xml.namespace.QName; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.savara.contract.model.FaultDetails; +import org.jboss.savara.contract.model.Interface; +import org.jboss.savara.contract.model.Namespace; +import org.jboss.savara.contract.model.RequestResponseMEP; +import org.jboss.savara.contract.model.Type; +import org.jboss.savara.contract.model.TypeDefinition; +import org.scribble.model.TypeReference; + +/** + * This class generates a WSDL definition from a Contract model. + * + */ +public class WSDLGenerator { + + public static final String BINDING_SUFFIX = "Binding"; + + private static Log logger = LogFactory.getLog(WSDLGenerator.class); + + public WSDLGenerator() { + } + + /** + * This method generates a WSDL definition from a Scribble contract model. + * + * @param contract The contract model + * @param wsdlBinding The WSDL binding to use, or null if no binding + * @return The WSDL definition + */ + public java.util.List<javax.wsdl.Definition> generateDefinitions(org.jboss.savara.contract.model.Contract contract, + WSDLBinding wsdlBinding) { + java.util.List<javax.wsdl.Definition> ret=new java.util.Vector<javax.wsdl.Definition>(); + + try { + // Create definition for contract's target namespace + javax.wsdl.Definition main=getDefinition(ret, contract, contract.getNamespace(), wsdlBinding); + + // If no definition, then return + if (main == null) { + return(ret); + } + + // Create service + javax.wsdl.Service service=main.createService(); + service.setQName(new javax.xml.namespace.QName(contract.getNamespace(), + contract.getName()+"Service")); + + main.addService(service); + + // Define a port type per interface + java.util.Iterator<Interface> iter=contract.getInterfaces().iterator(); + + while (iter.hasNext()) { + Interface intf=iter.next(); + + javax.wsdl.PortType portType= + createPortType(ret, contract, intf, wsdlBinding); + + javax.wsdl.Binding binding= + createBinding(ret, contract, intf, portType, wsdlBinding); + + // Create service port for interface + javax.wsdl.Port port=main.createPort(); + + port.setName(intf.getName()+"Port"); + port.setBinding(binding); + + service.addPort(port); + + if (wsdlBinding != null) { + wsdlBinding.updatePort(main, port); + } + } + + } catch(Exception e) { + logger.error("Failed to generate WSDL", e); + } + + return(ret); + } + + /** + * This method returns the definition associated with the supplied target namespace. + * + * @param wsdls The list of current WSDL definitions + * @param contract The contract + * @param targetNamespace The target namespace + * @param wsdlBinding The WSDL binding to use, or null if no binding + * @return The WSDL definition for the target namespace, or null if unable to find or create + */ + protected javax.wsdl.Definition getDefinition(java.util.List<javax.wsdl.Definition> wsdls, + org.jboss.savara.contract.model.Contract contract, String targetNamespace, + WSDLBinding wsdlBinding) { + javax.wsdl.Definition ret=null; + + if (targetNamespace != null) { + for (int i=0; ret == null && i < wsdls.size(); i++) { + ret = wsdls.get(i); + + if (ret.getTargetNamespace() == null || + ret.getTargetNamespace().equals(targetNamespace) == false) { + ret = null; + } + } + + if (ret == null) { + ret = createDefinition(contract, targetNamespace); + + if (ret != null) { + + // Initialize definition using the WSDL binding + if (wsdlBinding != null) { + wsdlBinding.initDefinition(ret); + } + + wsdls.add(ret); + } + } + } + + return(ret); + } + + /** + * This method creates a new WSDL definition associated with the supplied + * target namespace. + * + * @param contract The contract + * @param targetNamespace The target namespace + * @return The WSDL definition + */ + protected javax.wsdl.Definition createDefinition(org.jboss.savara.contract.model.Contract contract, + String targetNamespace) { + javax.wsdl.Definition ret=null; + + try { + javax.wsdl.factory.WSDLFactory fact= + javax.wsdl.factory.WSDLFactory.newInstance(); + + ret = fact.newDefinition(); + + // Set details on the definition + if (contract.getName() != null) { + ret.setQName(new javax.xml.namespace.QName(contract.getName())); + } + ret.setTargetNamespace(targetNamespace); + + // Set up namespace mappings + java.util.Iterator<Namespace> iter=contract.getNamespaces().iterator(); + + while (iter.hasNext()) { + Namespace ns=iter.next(); + + ret.addNamespace(ns.getPrefix(), ns.getURI()); + } + + } catch(Exception e) { + logger.error("Failed to create WSDL definition for target namespace '"+targetNamespace+"'", e); + } + + return(ret); + } + + /** + * This method generates a port type, using the supplied WSDL definition, + * based on the information in the supplied interface definition. + * + * @param wsdls The list of current WSDL definitions + * @param contract The contract + * @param intf The interface model + * @return The WSDL port type + */ + public javax.wsdl.PortType createPortType(java.util.List<javax.wsdl.Definition> wsdls, + org.jboss.savara.contract.model.Contract contract, + org.jboss.savara.contract.model.Interface intf, + WSDLBinding wsdlBinding) { + javax.wsdl.PortType ret=null; + + if (intf != null) { + javax.wsdl.Definition defn=getDefinition(wsdls, contract, intf.getNamespace(), wsdlBinding); + + if (defn != null) { + ret = defn.createPortType(); + ret.setUndefined(false); + + if (intf.getName() != null) { + ret.setQName(new javax.xml.namespace.QName(intf.getNamespace(), intf.getName())); + } + + for (int i=0; i < intf.getMessageExchangePatterns().size(); i++) { + createOperation(wsdls, contract, ret, + intf.getMessageExchangePatterns().get(i), wsdlBinding); + } + + // Only add portType to definition if they have atleast one operation + if (ret != null && ret.getOperations().size() > 0) { + defn.addPortType(ret); + } + } + } + + return(ret); + } + + /** + * This method generates a port type binding, using the supplied WSDL definition, + * based on the information in the supplied interface definition. + * + * @param wsdls The list of current WSDL definitions + * @param contract The contract + * @param intf The interface model + * @param portType The port type + * @return The WSDL port type binding + */ + public javax.wsdl.Binding createBinding(java.util.List<javax.wsdl.Definition> wsdls, + org.jboss.savara.contract.model.Contract contract, + org.jboss.savara.contract.model.Interface intf, + javax.wsdl.PortType portType, + WSDLBinding wsdlBinding) { + javax.wsdl.Binding ret=null; + + if (intf != null) { + javax.wsdl.Definition defn=getDefinition(wsdls, contract, intf.getNamespace(), wsdlBinding); + + if (defn != null) { + ret = defn.createBinding(); + ret.setUndefined(false); + + // Check if WSDL binding details + if (wsdlBinding != null) { + wsdlBinding.updateBinding(defn, ret); + } + + if (intf.getName() != null) { + ret.setQName(new javax.xml.namespace.QName(intf.getNamespace(), + intf.getName()+BINDING_SUFFIX)); + } + + ret.setPortType(portType); + + for (int i=0; i < intf.getMessageExchangePatterns().size(); i++) { + createBindingOperation(wsdls, contract, ret, + intf.getMessageExchangePatterns().get(i), wsdlBinding); + } + + // Only add portType to definition if they have atleast one operation + if (ret != null && ret.getBindingOperations().size() > 0) { + defn.addBinding(ret); + } + } + } + + return(ret); + } + + /** + * This method generates an operation, using the supplied WSDL definition, + * based on the information in the supplied message exchange pattern. + * + * @param wsdls The list of current WSDL definitions + * @param contract The contract + * @param portType The port type + * @param mep The message exchange pattern + * @return The WSDL operation + */ + public javax.wsdl.Operation createOperation(java.util.List<javax.wsdl.Definition> wsdls, + org.jboss.savara.contract.model.Contract contract, javax.wsdl.PortType portType, + org.jboss.savara.contract.model.MessageExchangePattern mep, + WSDLBinding wsdlBinding) { + javax.wsdl.Operation ret=null; + + javax.wsdl.Definition defn=null; + + if (portType != null) { + defn = getDefinition(wsdls, contract, portType.getQName().getNamespaceURI(), wsdlBinding); + } + + if (defn != null && mep != null) { + ret = defn.createOperation(); + ret.setUndefined(false); + + ret.setName(mep.getOperation()); + + QName msgname=WSDLGeneratorUtil.getRequestMessageType(portType.getQName().getNamespaceURI(), + mep.getOperation()); + + javax.wsdl.Message mesg=getMessage(wsdls, contract, msgname, + mep.getTypes(), wsdlBinding); + + if (mesg != null) { + javax.wsdl.Input input=defn.createInput(); + input.setMessage(mesg); + ret.setInput(input); + } + + // Check if a request/response MEP + if (mep instanceof RequestResponseMEP) { + RequestResponseMEP rr=(RequestResponseMEP)mep; + + msgname=WSDLGeneratorUtil.getResponseMessageType(portType.getQName().getNamespaceURI(), + mep.getOperation()); + + javax.wsdl.Message om=getMessage(wsdls, contract, msgname, + rr.getResponseTypes(), wsdlBinding); + if (om != null) { + javax.wsdl.Output output=defn.createOutput(); + output.setMessage(om); + ret.setOutput(output); + } + + // Generate fault details + if (rr.getFaultDetails() != null) { + for (int i=0; i < rr.getFaultDetails().size(); i++) { + FaultDetails fd=rr.getFaultDetails().get(i); + + msgname = WSDLGeneratorUtil.getFaultMessageType(portType.getQName().getNamespaceURI(), + fd.getName()); + + javax.wsdl.Message fm=getMessage(wsdls, contract, msgname, + fd.getTypes(), wsdlBinding); + if (fm != null) { + javax.wsdl.Fault fault=defn.createFault(); + fault.setName(fd.getName()); + fault.setMessage(fm); + + ret.addFault(fault); + } + } + } + } + + portType.addOperation(ret); + } + + return(ret); + } + + /** + * This method generates a binding operation, using the supplied WSDL definition, + * based on the information in the supplied message exchange pattern. + * + * @param wsdls The list of current WSDL definitions + * @param contract The contract + * @param binding The port type binding + * @param mep The message exchange pattern + * @return The WSDL binding operation + */ + public javax.wsdl.BindingOperation createBindingOperation(java.util.List<javax.wsdl.Definition> wsdls, + org.jboss.savara.contract.model.Contract contract, javax.wsdl.Binding binding, + org.jboss.savara.contract.model.MessageExchangePattern mep, + WSDLBinding wsdlBinding) { + javax.wsdl.BindingOperation ret=null; + + javax.wsdl.Definition defn=null; + + if (binding != null) { + defn = getDefinition(wsdls, contract, binding.getQName().getNamespaceURI(), wsdlBinding); + } + + if (defn != null && mep != null) { + ret = defn.createBindingOperation(); + //ret.setUndefined(false); + + // Check if WSDL operation details + if (wsdlBinding != null) { + wsdlBinding.updateOperation(defn, mep, ret); + } + + ret.setName(mep.getOperation()); + + QName msgname=WSDLGeneratorUtil.getRequestMessageType(binding.getQName().getNamespaceURI(), + mep.getOperation()); + + javax.wsdl.Message mesg=getMessage(wsdls, contract,msgname, + mep.getTypes(), wsdlBinding); + + if (mesg != null) { + javax.wsdl.BindingInput input=defn.createBindingInput(); + + // Check if WSDL operation details + if (wsdlBinding != null) { + wsdlBinding.updateInput(defn, input); + } + + ret.setBindingInput(input); + } + + // Check if a request/response MEP + if (mep instanceof RequestResponseMEP) { + RequestResponseMEP rr=(RequestResponseMEP)mep; + + msgname=WSDLGeneratorUtil.getResponseMessageType(binding.getQName().getNamespaceURI(), + mep.getOperation()); + + javax.wsdl.Message om=getMessage(wsdls, contract, msgname, + rr.getResponseTypes(), wsdlBinding); + if (om != null) { + javax.wsdl.BindingOutput output=defn.createBindingOutput(); + + // Check if WSDL operation details + if (wsdlBinding != null) { + wsdlBinding.updateOutput(defn, output); + } + + ret.setBindingOutput(output); + } + + // Generate fault details + if (rr.getFaultDetails() != null) { + for (int i=0; i < rr.getFaultDetails().size(); i++) { + FaultDetails fd=rr.getFaultDetails().get(i); + + msgname = WSDLGeneratorUtil.getFaultMessageType(binding.getQName().getNamespaceURI(), + fd.getName()); + + javax.wsdl.Message fm=getMessage(wsdls, contract, msgname, + fd.getTypes(), wsdlBinding); + if (fm != null) { + javax.wsdl.BindingFault fault=defn.createBindingFault(); + fault.setName(fd.getName()); + + // Check if WSDL operation details + if (wsdlBinding != null) { + wsdlBinding.updateFault(defn, fault); + } + + ret.addBindingFault(fault); + } + } + } + } + + binding.addBindingOperation(ret); + } + + return(ret); + } + + /** + * This method returns a message, using the supplied WSDL definition, + * based on the information supplied in the list of type references. If + * a single type reference is supplied, this will be the message type, + * if multiple type references are supplied, then these will be considered + * the message parts.<p> + * <p> + * The returned message will be part of the supplied definition. If it + * does not exist prior to the call to this method, then it will be + * created and added to the definition upon returning the message. + * + * @param wsdls The list of current WSDL definitions + * @param contract The contract + * @param msgname The message name + * @param types The list of type references + * @return The WSDL message + */ + public javax.wsdl.Message getMessage(java.util.List<javax.wsdl.Definition> wsdls, + org.jboss.savara.contract.model.Contract contract, + javax.xml.namespace.QName msgname, + java.util.List<org.jboss.savara.contract.model.Type> types, + WSDLBinding wsdlBinding) { + javax.wsdl.Message ret=null; + + if (types == null || types.size() == 0) { + throw new UnsupportedOperationException("Expecting single type reference"); + } else if (types.size() > 1) { + throw new UnsupportedOperationException("Currently only supports single type reference"); + } else { + Type ref=types.get(0); + + java.util.Iterator<TypeDefinition> iter=ref.getTypeDefinitions().iterator(); + boolean f_done=false; + + while (f_done == false && iter.hasNext()) { + TypeDefinition td=iter.next(); + + if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem()) || + TypeDefinition.XSD_TYPE.equals(td.getTypeSystem())) { + javax.xml.namespace.QName qname= + new javax.xml.namespace.QName(td.getNamespace(),td.getName()); + javax.wsdl.Definition defn= + getDefinition(wsdls, contract, msgname.getNamespaceURI(), wsdlBinding); + + if (defn != null && qname != null && + (ret = defn.getMessage(msgname)) == null) { + ret = defn.createMessage(); + ret.setUndefined(false); + + ret.setQName(msgname); + + // Create single part for type or element + Part part=defn.createPart(); + part.setName("content"); + + if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem())) { + part.setElementName(qname); + } else { + part.setTypeName(qname); + } + + ret.addPart(part); + + defn.addMessage(ret); + + f_done = true; + } + } + } + } + + return(ret); + } +} Copied: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLGeneratorUtil.java (from rev 425, trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java) =================================================================== --- trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLGeneratorUtil.java (rev 0) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/WSDLGeneratorUtil.java 2010-11-17 20:40:33 UTC (rev 469) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.wsdl.generator; + +/** + * This class provides general utility functions for + * use when generating artefacts. + */ +public class WSDLGeneratorUtil { + + private static final String RESPONSE = "Response"; + private static final String FAULT = "Fault"; + private static final String REQUEST = "Request"; + + /** + * This method returns the request message type QName. + * + * @param intfNamespace The interface namespace + * @param op The operation name + * @return The request message type + */ + public static javax.xml.namespace.QName getRequestMessageType(String intfNamespace, String op) { + return(new javax.xml.namespace.QName(intfNamespace, op+REQUEST)); + } + + /** + * This method returns the response message type QName. + * + * @param intfNamespace The interface namespace + * @param op The operation name + * @return The response message type + */ + public static javax.xml.namespace.QName getResponseMessageType(String intfNamespace, String op) { + return(new javax.xml.namespace.QName(intfNamespace, op+RESPONSE)); + } + + /** + * This method returns the fault message type QName. + * + * @param intfNamespace The interface namespace + * @param faultName The fault name + * @return The fault message type + */ + public static javax.xml.namespace.QName getFaultMessageType(String intfNamespace, String faultName) { + return(new javax.xml.namespace.QName(intfNamespace, faultName+FAULT)); + } +} Copied: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap (from rev 425, trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap) Deleted: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPDocLitWSDLBinding.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPDocLitWSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,165 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator.soap; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.savara.tools.wsdl.generator.WSDLBinding; - -/** - * This interface is used to establish binding information on a - * WSDL definition. - * - */ -public class SOAPDocLitWSDLBinding implements WSDLBinding { - private static Log logger = LogFactory.getLog(SOAPDocLitWSDLBinding.class); - - /** - * This method returns the name of the WSDL binding implementation. - * - * @return The WSDL binding - */ - public String getName() { - return("SOAP DocLit"); - } - - /** - * This method initializes the WSDL definition for the binding. - * - * @param defn The definition - */ - public void initDefinition(javax.wsdl.Definition defn) { - defn.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); - } - - /** - * This method adds WSDL binding information to the port binding. - * - * @param defn The definition - * @param binding The port type - */ - public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding) { - try { - javax.wsdl.extensions.soap.SOAPBinding sb=(javax.wsdl.extensions.soap.SOAPBinding) - defn.getExtensionRegistry().createExtension(javax.wsdl.Binding.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "binding")); - sb.setStyle("document"); - sb.setTransportURI("http://schemas.xmlsoap.org/soap/http"); - binding.addExtensibilityElement(sb); - } catch(Exception e) { - logger.error("Failed to add SOAP binding", e); - } - } - - /** - * This method adds WSDL binding information to the operation. - * - * @param defn The definition - * @param mep The message exchange pattern - * @param operation The operation - */ - public void updateOperation(javax.wsdl.Definition defn, - org.jboss.savara.contract.model.MessageExchangePattern mep, - javax.wsdl.BindingOperation operation) { - try { - javax.wsdl.extensions.soap.SOAPOperation soap=(javax.wsdl.extensions.soap.SOAPOperation) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOperation.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "operation")); - soap.setSoapActionURI(defn.getTargetNamespace()+"/"+mep.getOperation()); - operation.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP operation", e); - } - } - - /** - * This method adds WSDL binding information to the input. - * - * @param defn The definition - * @param input The input - */ - public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input) { - try { - javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingInput.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); - soap.setUse("literal"); - input.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to input", e); - } - } - - /** - * This method adds WSDL binding information to the output. - * - * @param defn The definition - * @param output The output - */ - public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output) { - try { - javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOutput.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); - soap.setUse("literal"); - output.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to output", e); - } - } - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param fault The fault - */ - public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault) { - try { - javax.wsdl.extensions.soap.SOAPFault soap=(javax.wsdl.extensions.soap.SOAPFault) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingFault.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "fault")); - soap.setUse("literal"); - soap.setName(fault.getName()); - - fault.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to fault", e); - } - } - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param port The port - */ - public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port) { - try { - javax.wsdl.extensions.soap.SOAPAddress soap=(javax.wsdl.extensions.soap.SOAPAddress) - defn.getExtensionRegistry().createExtension(javax.wsdl.Port.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "address")); - soap.setLocationURI("http://localhost:8080/"+defn.getQName().getLocalPart()+"Service"); - - port.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP address to port", e); - } - } - -} Copied: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPDocLitWSDLBinding.java (from rev 434, trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java) =================================================================== --- trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPDocLitWSDLBinding.java (rev 0) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPDocLitWSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -0,0 +1,166 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.wsdl.generator.soap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.savara.wsdl.generator.WSDLBinding; + +/** + * This interface is used to establish binding information on a + * WSDL definition. + * + */ +public class SOAPDocLitWSDLBinding implements WSDLBinding { + private static Log logger = LogFactory.getLog(SOAPDocLitWSDLBinding.class); + + /** + * This method returns the name of the WSDL binding implementation. + * + * @return The WSDL binding + */ + public String getName() { + return("SOAP DocLit"); + } + + /** + * This method initializes the WSDL definition for the binding. + * + * @param defn The definition + */ + public void initDefinition(javax.wsdl.Definition defn) { + defn.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); + } + + /** + * This method adds WSDL binding information to the port binding. + * + * @param defn The definition + * @param binding The port type + */ + public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding) { + try { + javax.wsdl.extensions.soap.SOAPBinding sb=(javax.wsdl.extensions.soap.SOAPBinding) + defn.getExtensionRegistry().createExtension(javax.wsdl.Binding.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "binding")); + sb.setStyle("document"); + sb.setTransportURI("http://schemas.xmlsoap.org/soap/http"); + binding.addExtensibilityElement(sb); + } catch(Exception e) { + logger.error("Failed to add SOAP binding", e); + } + } + + /** + * This method adds WSDL binding information to the operation. + * + * @param defn The definition + * @param mep The message exchange pattern + * @param operation The operation + */ + public void updateOperation(javax.wsdl.Definition defn, + org.jboss.savara.contract.model.MessageExchangePattern mep, + javax.wsdl.BindingOperation operation) { + try { + javax.wsdl.extensions.soap.SOAPOperation soap=(javax.wsdl.extensions.soap.SOAPOperation) + defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOperation.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "operation")); + soap.setSoapActionURI(defn.getTargetNamespace()+"/"+mep.getOperation()); + operation.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP operation", e); + } + } + + /** + * This method adds WSDL binding information to the input. + * + * @param defn The definition + * @param input The input + */ + public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input) { + try { + javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) + defn.getExtensionRegistry().createExtension(javax.wsdl.BindingInput.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); + soap.setUse("literal"); + input.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP body to input", e); + } + } + + /** + * This method adds WSDL binding information to the output. + * + * @param defn The definition + * @param output The output + */ + public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output) { + try { + javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) + defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOutput.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); + soap.setUse("literal"); + output.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP body to output", e); + } + } + + /** + * This method adds WSDL binding information to the fault. + * + * @param defn The definition + * @param fault The fault + */ + public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault) { + try { + javax.wsdl.extensions.soap.SOAPFault soap=(javax.wsdl.extensions.soap.SOAPFault) + defn.getExtensionRegistry().createExtension(javax.wsdl.BindingFault.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "fault")); + soap.setUse("literal"); + soap.setName(fault.getName()); + + fault.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP body to fault", e); + } + } + + /** + * This method adds WSDL binding information to the fault. + * + * @param defn The definition + * @param port The port + */ + public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port) { + try { + javax.wsdl.extensions.soap.SOAPAddress soap=(javax.wsdl.extensions.soap.SOAPAddress) + defn.getExtensionRegistry().createExtension(javax.wsdl.Port.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "address")); + soap.setLocationURI("http://localhost:8080/"+defn.getQName().getLocalPart()+"Service/"+ + port.getName()); + + port.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP address to port", e); + } + } + +} Deleted: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPRPCWSDLBinding.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPRPCWSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,169 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator.soap; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.savara.tools.wsdl.generator.WSDLBinding; - -/** - * This interface is used to establish binding information on a - * WSDL definition. - * - */ -public class SOAPRPCWSDLBinding implements WSDLBinding { - private static Log logger = LogFactory.getLog(SOAPRPCWSDLBinding.class); - - /** - * This method returns the name of the WSDL binding implementation. - * - * @return The WSDL binding - */ - public String getName() { - return("SOAP RPC"); - } - - /** - * This method initializes the WSDL definition for the binding. - * - * @param defn The definition - */ - public void initDefinition(javax.wsdl.Definition defn) { - defn.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); - } - - /** - * This method adds WSDL binding information to the port binding. - * - * @param defn The definition - * @param binding The port type - */ - public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding) { - try { - javax.wsdl.extensions.soap.SOAPBinding sb=(javax.wsdl.extensions.soap.SOAPBinding) - defn.getExtensionRegistry().createExtension(javax.wsdl.Binding.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "binding")); - sb.setStyle("rpc"); - sb.setTransportURI("http://schemas.xmlsoap.org/soap/http"); - binding.addExtensibilityElement(sb); - } catch(Exception e) { - logger.error("Failed to add SOAP binding", e); - } - } - - /** - * This method adds WSDL binding information to the operation. - * - * @param defn The definition - * @param mep The message exchange pattern - * @param operation The operation - */ - public void updateOperation(javax.wsdl.Definition defn, - org.jboss.savara.contract.model.MessageExchangePattern mep, - javax.wsdl.BindingOperation operation) { - try { - javax.wsdl.extensions.soap.SOAPOperation soap=(javax.wsdl.extensions.soap.SOAPOperation) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOperation.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "operation")); - soap.setStyle("rpc"); - soap.setSoapActionURI(""); - operation.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP operation", e); - } - } - - /** - * This method adds WSDL binding information to the input. - * - * @param defn The definition - * @param input The input - */ - public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input) { - try { - javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingInput.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); - soap.setUse("literal"); - soap.setNamespaceURI(defn.getTargetNamespace()); - input.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to input", e); - } - } - - /** - * This method adds WSDL binding information to the output. - * - * @param defn The definition - * @param output The output - */ - public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output) { - try { - javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOutput.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); - soap.setUse("literal"); - soap.setNamespaceURI(defn.getTargetNamespace()); - output.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to output", e); - } - } - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param fault The fault - */ - public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault) { - try { - javax.wsdl.extensions.soap.SOAPFault soap=(javax.wsdl.extensions.soap.SOAPFault) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingFault.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "fault")); - soap.setUse("literal"); - soap.setNamespaceURI(defn.getTargetNamespace()); - soap.setName(fault.getName()); - - fault.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to fault", e); - } - } - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param port The port - */ - public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port) { - try { - javax.wsdl.extensions.soap.SOAPAddress soap=(javax.wsdl.extensions.soap.SOAPAddress) - defn.getExtensionRegistry().createExtension(javax.wsdl.Port.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "address")); - soap.setLocationURI("http://localhost:8080/"+defn.getQName().getLocalPart()+"Service"); - - port.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP address to port", e); - } - } - -} Copied: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPRPCWSDLBinding.java (from rev 434, trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java) =================================================================== --- trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPRPCWSDLBinding.java (rev 0) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/generator/soap/SOAPRPCWSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -0,0 +1,170 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.savara.wsdl.generator.soap; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.savara.wsdl.generator.WSDLBinding; + +/** + * This interface is used to establish binding information on a + * WSDL definition. + * + */ +public class SOAPRPCWSDLBinding implements WSDLBinding { + private static Log logger = LogFactory.getLog(SOAPRPCWSDLBinding.class); + + /** + * This method returns the name of the WSDL binding implementation. + * + * @return The WSDL binding + */ + public String getName() { + return("SOAP RPC"); + } + + /** + * This method initializes the WSDL definition for the binding. + * + * @param defn The definition + */ + public void initDefinition(javax.wsdl.Definition defn) { + defn.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); + } + + /** + * This method adds WSDL binding information to the port binding. + * + * @param defn The definition + * @param binding The port type + */ + public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding) { + try { + javax.wsdl.extensions.soap.SOAPBinding sb=(javax.wsdl.extensions.soap.SOAPBinding) + defn.getExtensionRegistry().createExtension(javax.wsdl.Binding.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "binding")); + sb.setStyle("rpc"); + sb.setTransportURI("http://schemas.xmlsoap.org/soap/http"); + binding.addExtensibilityElement(sb); + } catch(Exception e) { + logger.error("Failed to add SOAP binding", e); + } + } + + /** + * This method adds WSDL binding information to the operation. + * + * @param defn The definition + * @param mep The message exchange pattern + * @param operation The operation + */ + public void updateOperation(javax.wsdl.Definition defn, + org.jboss.savara.contract.model.MessageExchangePattern mep, + javax.wsdl.BindingOperation operation) { + try { + javax.wsdl.extensions.soap.SOAPOperation soap=(javax.wsdl.extensions.soap.SOAPOperation) + defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOperation.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "operation")); + soap.setStyle("rpc"); + soap.setSoapActionURI(""); + operation.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP operation", e); + } + } + + /** + * This method adds WSDL binding information to the input. + * + * @param defn The definition + * @param input The input + */ + public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input) { + try { + javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) + defn.getExtensionRegistry().createExtension(javax.wsdl.BindingInput.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); + soap.setUse("literal"); + soap.setNamespaceURI(defn.getTargetNamespace()); + input.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP body to input", e); + } + } + + /** + * This method adds WSDL binding information to the output. + * + * @param defn The definition + * @param output The output + */ + public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output) { + try { + javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) + defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOutput.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); + soap.setUse("literal"); + soap.setNamespaceURI(defn.getTargetNamespace()); + output.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP body to output", e); + } + } + + /** + * This method adds WSDL binding information to the fault. + * + * @param defn The definition + * @param fault The fault + */ + public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault) { + try { + javax.wsdl.extensions.soap.SOAPFault soap=(javax.wsdl.extensions.soap.SOAPFault) + defn.getExtensionRegistry().createExtension(javax.wsdl.BindingFault.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "fault")); + soap.setUse("literal"); + soap.setNamespaceURI(defn.getTargetNamespace()); + soap.setName(fault.getName()); + + fault.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP body to fault", e); + } + } + + /** + * This method adds WSDL binding information to the fault. + * + * @param defn The definition + * @param port The port + */ + public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port) { + try { + javax.wsdl.extensions.soap.SOAPAddress soap=(javax.wsdl.extensions.soap.SOAPAddress) + defn.getExtensionRegistry().createExtension(javax.wsdl.Port.class, + new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "address")); + soap.setLocationURI("http://localhost:8080/"+defn.getQName().getLocalPart()+"Service/"+ + port.getName()); + + port.addExtensibilityElement(soap); + } catch(Exception e) { + logger.error("Failed to add SOAP address to port", e); + } + } + +} Copied: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/osgi (from rev 425, trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/osgi) Modified: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/osgi/Activator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/osgi/Activator.java 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/osgi/Activator.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,73 +1,43 @@ -package org.jboss.savara.tools.wsdl.osgi; - -import org.apache.commons.logging.*; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.savara.tools.wsdl"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - /** - * This method logs an error against the plugin. - * - * @param mesg The error message - * @param t The optional exception - */ - public static void logError(String mesg, Throwable t) { - - if (getDefault() != null) { - Status status=new Status(IStatus.ERROR, - PLUGIN_ID, 0, mesg, t); - - getDefault().getLog().log(status); - } - - logger.error("LOG ERROR: "+mesg+ - (t == null ? "" : ": "+t), t); - } - - private static Log logger = LogFactory.getLog(Activator.class); -} +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.savara.wsdl.osgi; + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +public class Activator implements BundleActivator { + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + } + + /* + * (non-Javadoc) + * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + } + +} Copied: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/util (from rev 425, trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util) Modified: trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/util/XMLUtils.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/util/XMLUtils.java 2010-09-30 16:04:45 UTC (rev 425) +++ trunk/tools/bundles/org.jboss.savara.wsdl/src/java/org/jboss/savara/wsdl/util/XMLUtils.java 2010-11-17 20:40:33 UTC (rev 469) @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ -package org.jboss.savara.tools.wsdl.util; +package org.jboss.savara.wsdl.util; import java.io.ByteArrayOutputStream; Added: trunk/tools/bundles/pom.xml =================================================================== --- trunk/tools/bundles/pom.xml (rev 0) +++ trunk/tools/bundles/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.savara.tools</groupId> + <artifactId>bundles</artifactId> + <packaging>pom</packaging> + <version>1.2.0-SNAPSHOT</version> + <name>Savara::Tools::Bundles</name> + + <parent> + <groupId>org.jboss.savara</groupId> + <artifactId>tools</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + + <modules> + <module>org.jboss.savara.wsdl</module> + </modules> + +</project> + Modified: trunk/tools/features/org.jboss.savara.tools.feature/feature.xml =================================================================== --- trunk/tools/features/org.jboss.savara.tools.feature/feature.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/features/org.jboss.savara.tools.feature/feature.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ <feature id="org.jboss.savara.tools.feature" label="JBoss SAVARA Tools Feature" - version="1.1.0.qualifier" + version="1.2.0.qualifier" provider-name="www.jboss.org"> <description> Modified: trunk/tools/features/org.jboss.savara.tools.feature/pom.xml =================================================================== --- trunk/tools/features/org.jboss.savara.tools.feature/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/features/org.jboss.savara.tools.feature/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.feature</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <name>Savara::Tools::Features::SavaraTools</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>features</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/features/org.scribble.protocol.feature/feature.xml =================================================================== --- trunk/tools/features/org.scribble.protocol.feature/feature.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/features/org.scribble.protocol.feature/feature.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ <feature id="org.scribble.protocol.feature" label="Scribble Protocol Feature" - version="1.1.0.qualifier" + version="1.2.0.qualifier" provider-name="www.jboss.org"> <description> Modified: trunk/tools/features/org.scribble.protocol.feature/pom.xml =================================================================== --- trunk/tools/features/org.scribble.protocol.feature/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/features/org.scribble.protocol.feature/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.protocol.feature</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <name>Savara::Tools::Features::ScribbleProtocol</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>features</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/features/pom.xml =================================================================== --- trunk/tools/features/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/features/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>features</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Savara::Tools::Features</name> <parent> <groupId>org.jboss.savara</groupId> <artifactId>tools</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modules> Modified: trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.contract.model/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Contract Model Bundle-SymbolicName: org.jboss.savara.contract.model -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.contract.model.osgi.Activator Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/tools/plugins/org.jboss.savara.contract.model/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.contract.model/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.contract.model/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.contract.model</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ContractModel</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA pi4soa CDM Bundle-SymbolicName: org.jboss.savara.pi4soa.cdm -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.pi4soa.cdm.osgi.Activator Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.pi4soa.cdm/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.pi4soa.cdm</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::Pi4SOACDM</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <!-- Modified: trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.protocol.contract/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Protocol Contract Plugin Bundle-SymbolicName: org.jboss.savara.protocol.contract -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.protocol.contract.osgi.Activator Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/tools/plugins/org.jboss.savara.protocol.contract/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.protocol.contract/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.protocol.contract/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.protocol.contract</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ProtocolContract</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.tap.eclipse/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tap.eclipse/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tap.eclipse/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: SAVARA TAP Eclipse integration Bundle-SymbolicName: org.jboss.savara.tap.eclipse; singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tap.eclipse.Activator Bundle-Vendor: www.savara.org Service-Component: OSGI-INF/eclipse-resource-loader.xml Modified: trunk/tools/plugins/org.jboss.savara.tap.eclipse/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tap.eclipse/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tap.eclipse/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tap.eclipse</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ToolsTAPValidation</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.tap.model/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tap.model/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tap.model/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: SAVARA TAP Model Bundle-SymbolicName: org.jboss.savara.tap.model -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tap.model.osgi.Activator Bundle-Vendor: www.savara.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/tools/plugins/org.jboss.savara.tap.model/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tap.model/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tap.model/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tap.model</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ToolsTAPModel</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/tools/plugins/org.jboss.savara.tap.validation/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tap.validation/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tap.validation/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: SAVARA TAP Validation Bundle-SymbolicName: org.jboss.savara.tap.validation;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tap.validation.osgi.Activator Bundle-Vendor: www.savara.org Service-Component: OSGI-INF/bpel-cdm-relationship-validator.xml, Modified: trunk/tools/plugins/org.jboss.savara.tap.validation/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tap.validation/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tap.validation/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tap.validation</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ToolsTAPValidation</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.bpel/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Tools BPEL Plug-in Bundle-SymbolicName: org.jboss.savara.tools.bpel;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tools.bpel.osgi.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -22,7 +22,8 @@ org.eclipse.ui.ide, org.eclipse.jst.common.frameworks, org.eclipse.wst.common.frameworks, - org.eclipse.wst.common.project.facet.core + org.eclipse.wst.common.project.facet.core, + org.jboss.savara.wsdl Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: www.jboss.org Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpel/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.bpel/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.bpel</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ToolsBPEL</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-11-17 20:40:33 UTC (rev 469) @@ -29,12 +29,12 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResource; import org.jboss.savara.tools.bpel.generator.BuildSystem; import org.jboss.savara.tools.bpel.model.*; import org.jboss.savara.tools.bpel.model.component.PartnerLink; import org.jboss.savara.tools.bpel.util.XMLUtils; -import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; -import org.jboss.savara.tools.wsdl.generator.soap.*; +import org.jboss.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding; import org.jboss.savara.contract.model.Contract; import org.jboss.savara.contract.model.Interface; import org.jboss.savara.contract.model.Namespace; @@ -244,7 +244,7 @@ localcm.getModelName().getRole().getName()+".bpel"); IFile bpelFile=proj.getProject().getWorkspace().getRoot().getFile(bpelPath); - WSDLGeneratorUtil.createFolder(bpelFile); + createFolder(bpelFile); bpelFile.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor()); @@ -280,8 +280,8 @@ if (role.getAnnotations().containsKey(Contract.class.getName())) { javax.wsdl.xml.WSDLWriter writer= javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter(); - org.jboss.savara.tools.wsdl.generator.WSDLGenerator generator= - new org.jboss.savara.tools.wsdl.generator.WSDLGenerator(); + org.jboss.savara.wsdl.generator.WSDLGenerator generator= + new org.jboss.savara.wsdl.generator.WSDLGenerator(); Contract contract=(Contract)role.getAnnotations().get(Contract.class.getName()); // Generate BPEL folder @@ -290,7 +290,7 @@ IFolder wsdlFolder=proj.getProject().getWorkspace().getRoot().getFolder(bpelFolderPath); - WSDLGeneratorUtil.createFolder(wsdlFolder); + createFolder(wsdlFolder); // Generate definition java.util.List<javax.wsdl.Definition> defns=generator.generateDefinitions(contract, @@ -365,7 +365,7 @@ IFile wsdlFile=proj.getProject().getWorkspace().getRoot().getFile(wsdlPath); - WSDLGeneratorUtil.createFolder(wsdlFile); + createFolder(wsdlFile); if (wsdlFile.exists() == false) { wsdlFile.create(null, true, @@ -441,7 +441,7 @@ protected void copySchema(IFile srcXSDFile, IFile targetXSDFile, IPath bpelFolderPath) throws Exception { if (targetXSDFile.exists() == false) { - WSDLGeneratorUtil.createFolder(targetXSDFile.getParent()); + createFolder(targetXSDFile.getParent()); targetXSDFile.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor()); @@ -644,7 +644,7 @@ IFile wsdlFile=proj.getProject().getWorkspace().getRoot().getFile(wsdlPath); - WSDLGeneratorUtil.createFolder(wsdlFile); + createFolder(wsdlFile); wsdlFile.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor()); @@ -750,7 +750,7 @@ IFile wsdlFile=proj.getProject().getWorkspace().getRoot().getFile(wsdlPath); - WSDLGeneratorUtil.createFolder(wsdlFile); + createFolder(wsdlFile); wsdlFile.create(null, true, new org.eclipse.core.runtime.NullProgressMonitor()); @@ -824,6 +824,31 @@ return(project); } + /** + * This method checks whether the folder exists, + * and if not attempts to create it. + * + * @param res The current resource + */ + public static void createFolder(IResource res) { + if (res instanceof IFolder) { + IFolder folder=(IFolder)res; + + if (folder.exists() == false) { + createFolder(folder.getParent()); + + try { + folder.create(true, true, + new org.eclipse.core.runtime.NullProgressMonitor()); + } catch(Exception e) { + e.printStackTrace(); + } + } + } else if (res.getParent() != null) { + createFolder(res.getParent()); + } + } + public BuildSystem getBuildSystem() { return(m_buildSystem); } Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-11-17 20:40:33 UTC (rev 469) @@ -22,7 +22,7 @@ import org.jboss.savara.tools.bpel.model.*; import org.jboss.savara.tools.bpel.model.component.*; import org.jboss.savara.tools.bpel.model.util.*; -import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; +import org.jboss.savara.wsdl.generator.WSDLGeneratorUtil; import org.scribble.model.*; import org.scribble.model.change.*; import org.jboss.savara.contract.model.Contract; Modified: trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-11-17 20:40:33 UTC (rev 469) @@ -22,7 +22,7 @@ import org.jboss.savara.tools.bpel.model.*; import org.jboss.savara.tools.bpel.model.component.*; import org.jboss.savara.tools.bpel.model.util.InteractionUtil; -import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; +import org.jboss.savara.wsdl.generator.WSDLGeneratorUtil; import org.scribble.model.*; import org.scribble.model.change.*; import org.jboss.savara.contract.model.Contract; Modified: trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Tools BPMN Plug-in Bundle-SymbolicName: org.jboss.savara.tools.bpmn;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tools.bpmn.eclipse.Activator Bundle-Vendor: www.jboss.org Bundle-Localization: plugin Modified: trunk/tools/plugins/org.jboss.savara.tools.bpmn/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.bpmn/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.bpmn/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.bpmn</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ToolsBPMN</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Tools Monitor Plug-in Bundle-SymbolicName: org.jboss.savara.tools.monitor;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tools.monitor.eclipse.Activator Bundle-Vendor: www.jboss.org Require-Bundle: org.eclipse.ui, Modified: trunk/tools/plugins/org.jboss.savara.tools.monitor/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.monitor/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.monitor/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.monitor</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ToolsMonitor</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.tools.validator/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.validator/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.validator/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Tools Validator Plug-in Bundle-SymbolicName: org.jboss.savara.tools.validator;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tools.validator.osgi.Activator Bundle-Vendor: www.jboss.org Require-Bundle: org.eclipse.ui, Modified: trunk/tools/plugins/org.jboss.savara.tools.validator/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.validator/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.validator/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.validator</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ToolsValidator</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Tools WSDL Plug-in Bundle-SymbolicName: org.jboss.savara.tools.wsdl;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tools.wsdl.osgi.Activator Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: www.jboss.org @@ -15,7 +15,6 @@ org.eclipse.ui, org.scribble.eclipse;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.runtime, - org.scribble.conversation.model;bundle-version="[1.0.0,2.0.0)" -Export-Package: org.jboss.savara.tools.wsdl.generator, - org.jboss.savara.tools.wsdl.generator.soap + org.scribble.conversation.model;bundle-version="[1.0.0,2.0.0)", + org.jboss.savara.wsdl Bundle-ActivationPolicy: lazy Modified: trunk/tools/plugins/org.jboss.savara.tools.wsdl/pom.xml =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.wsdl</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ToolsWSDL</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/actions/GenerateAction.java 2010-11-17 20:40:33 UTC (rev 469) @@ -19,7 +19,6 @@ import org.apache.commons.logging.*; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; @@ -30,9 +29,8 @@ import org.eclipse.swt.widgets.MessageBox; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; -import org.jboss.savara.tools.wsdl.generator.WSDLGeneratorUtil; -import org.jboss.savara.tools.wsdl.generator.soap.*; import org.jboss.savara.tools.wsdl.util.XMLUtils; +import org.jboss.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; @@ -134,8 +132,8 @@ if (ref.getAnnotations().containsKey(Contract.class.getName())) { javax.wsdl.xml.WSDLWriter writer= javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter(); - org.jboss.savara.tools.wsdl.generator.WSDLGenerator generator= - new org.jboss.savara.tools.wsdl.generator.WSDLGenerator(); + org.jboss.savara.wsdl.generator.WSDLGenerator generator= + new org.jboss.savara.wsdl.generator.WSDLGenerator(); Contract contract=(Contract)ref.getAnnotations().get(Contract.class.getName()); // Generate WSDL folder Deleted: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator; - -/** - * This interface is used to establish binding information on a - * WSDL definition. - * - */ -public interface WSDLBinding { - - /** - * This method returns the name of the WSDL binding implementation. - * - * @return The WSDL binding - */ - public String getName(); - - /** - * This method initializes the WSDL definition for the binding. - * - * @param defn The definition - */ - public void initDefinition(javax.wsdl.Definition defn); - - /** - * This method adds WSDL binding information to the port binding. - * - * @param defn The definition - * @param binding The port type - */ - public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding); - - /** - * This method adds WSDL binding information to the operation. - * - * @param defn The definition - * @param mep The message exchange pattern - * @param operation The operation - */ - public void updateOperation(javax.wsdl.Definition defn, - org.jboss.savara.contract.model.MessageExchangePattern mep, - javax.wsdl.BindingOperation operation); - - /** - * This method adds WSDL binding information to the input. - * - * @param defn The definition - * @param input The input - */ - public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input); - - /** - * This method adds WSDL binding information to the output. - * - * @param defn The definition - * @param output The output - */ - public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output); - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param fault The fault - */ - public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault); - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param port The port - */ - public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port); - -} Deleted: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,535 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator; - -import javax.wsdl.Part; -import javax.xml.namespace.QName; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.savara.contract.model.FaultDetails; -import org.jboss.savara.contract.model.Interface; -import org.jboss.savara.contract.model.Namespace; -import org.jboss.savara.contract.model.RequestResponseMEP; -import org.jboss.savara.contract.model.Type; -import org.jboss.savara.contract.model.TypeDefinition; -import org.scribble.model.TypeReference; - -/** - * This class generates a WSDL definition from a Contract model. - * - */ -public class WSDLGenerator { - - public static final String BINDING_SUFFIX = "Binding"; - - private static Log logger = LogFactory.getLog(WSDLGenerator.class); - - public WSDLGenerator() { - } - - /** - * This method generates a WSDL definition from a Scribble contract model. - * - * @param contract The contract model - * @param wsdlBinding The WSDL binding to use, or null if no binding - * @return The WSDL definition - */ - public java.util.List<javax.wsdl.Definition> generateDefinitions(org.jboss.savara.contract.model.Contract contract, - WSDLBinding wsdlBinding) { - java.util.List<javax.wsdl.Definition> ret=new java.util.Vector<javax.wsdl.Definition>(); - - try { - // Create definition for contract's target namespace - javax.wsdl.Definition main=getDefinition(ret, contract, contract.getNamespace(), wsdlBinding); - - // If no definition, then return - if (main == null) { - return(ret); - } - - // Create service - javax.wsdl.Service service=main.createService(); - service.setQName(new javax.xml.namespace.QName(contract.getNamespace(), - contract.getName()+"Service")); - - main.addService(service); - - // Define a port type per interface - java.util.Iterator<Interface> iter=contract.getInterfaces().iterator(); - - while (iter.hasNext()) { - Interface intf=iter.next(); - - javax.wsdl.PortType portType= - createPortType(ret, contract, intf, wsdlBinding); - - javax.wsdl.Binding binding= - createBinding(ret, contract, intf, portType, wsdlBinding); - - // Create service port for interface - javax.wsdl.Port port=main.createPort(); - - port.setName(intf.getName()+"Port"); - port.setBinding(binding); - - service.addPort(port); - - if (wsdlBinding != null) { - wsdlBinding.updatePort(main, port); - } - } - - } catch(Exception e) { - logger.error("Failed to generate WSDL", e); - } - - return(ret); - } - - /** - * This method returns the definition associated with the supplied target namespace. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param targetNamespace The target namespace - * @param wsdlBinding The WSDL binding to use, or null if no binding - * @return The WSDL definition for the target namespace, or null if unable to find or create - */ - protected javax.wsdl.Definition getDefinition(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, String targetNamespace, - WSDLBinding wsdlBinding) { - javax.wsdl.Definition ret=null; - - if (targetNamespace != null) { - for (int i=0; ret == null && i < wsdls.size(); i++) { - ret = wsdls.get(i); - - if (ret.getTargetNamespace() == null || - ret.getTargetNamespace().equals(targetNamespace) == false) { - ret = null; - } - } - - if (ret == null) { - ret = createDefinition(contract, targetNamespace); - - if (ret != null) { - - // Initialize definition using the WSDL binding - if (wsdlBinding != null) { - wsdlBinding.initDefinition(ret); - } - - wsdls.add(ret); - } - } - } - - return(ret); - } - - /** - * This method creates a new WSDL definition associated with the supplied - * target namespace. - * - * @param contract The contract - * @param targetNamespace The target namespace - * @return The WSDL definition - */ - protected javax.wsdl.Definition createDefinition(org.jboss.savara.contract.model.Contract contract, - String targetNamespace) { - javax.wsdl.Definition ret=null; - - try { - javax.wsdl.factory.WSDLFactory fact= - javax.wsdl.factory.WSDLFactory.newInstance(); - - ret = fact.newDefinition(); - - // Set details on the definition - if (contract.getName() != null) { - ret.setQName(new javax.xml.namespace.QName(contract.getName())); - } - ret.setTargetNamespace(targetNamespace); - - // Set up namespace mappings - java.util.Iterator<Namespace> iter=contract.getNamespaces().iterator(); - - while (iter.hasNext()) { - Namespace ns=iter.next(); - - ret.addNamespace(ns.getPrefix(), ns.getURI()); - } - - } catch(Exception e) { - logger.error("Failed to create WSDL definition for target namespace '"+targetNamespace+"'", e); - } - - return(ret); - } - - /** - * This method generates a port type, using the supplied WSDL definition, - * based on the information in the supplied interface definition. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param intf The interface model - * @return The WSDL port type - */ - public javax.wsdl.PortType createPortType(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, - org.jboss.savara.contract.model.Interface intf, - WSDLBinding wsdlBinding) { - javax.wsdl.PortType ret=null; - - if (intf != null) { - javax.wsdl.Definition defn=getDefinition(wsdls, contract, intf.getNamespace(), wsdlBinding); - - if (defn != null) { - ret = defn.createPortType(); - ret.setUndefined(false); - - if (intf.getName() != null) { - ret.setQName(new javax.xml.namespace.QName(intf.getNamespace(), intf.getName())); - } - - for (int i=0; i < intf.getMessageExchangePatterns().size(); i++) { - createOperation(wsdls, contract, ret, - intf.getMessageExchangePatterns().get(i), wsdlBinding); - } - - // Only add portType to definition if they have atleast one operation - if (ret != null && ret.getOperations().size() > 0) { - defn.addPortType(ret); - } - } - } - - return(ret); - } - - /** - * This method generates a port type binding, using the supplied WSDL definition, - * based on the information in the supplied interface definition. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param intf The interface model - * @param portType The port type - * @return The WSDL port type binding - */ - public javax.wsdl.Binding createBinding(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, - org.jboss.savara.contract.model.Interface intf, - javax.wsdl.PortType portType, - WSDLBinding wsdlBinding) { - javax.wsdl.Binding ret=null; - - if (intf != null) { - javax.wsdl.Definition defn=getDefinition(wsdls, contract, intf.getNamespace(), wsdlBinding); - - if (defn != null) { - ret = defn.createBinding(); - ret.setUndefined(false); - - // Check if WSDL binding details - if (wsdlBinding != null) { - wsdlBinding.updateBinding(defn, ret); - } - - if (intf.getName() != null) { - ret.setQName(new javax.xml.namespace.QName(intf.getNamespace(), - intf.getName()+BINDING_SUFFIX)); - } - - ret.setPortType(portType); - - for (int i=0; i < intf.getMessageExchangePatterns().size(); i++) { - createBindingOperation(wsdls, contract, ret, - intf.getMessageExchangePatterns().get(i), wsdlBinding); - } - - // Only add portType to definition if they have atleast one operation - if (ret != null && ret.getBindingOperations().size() > 0) { - defn.addBinding(ret); - } - } - } - - return(ret); - } - - /** - * This method generates an operation, using the supplied WSDL definition, - * based on the information in the supplied message exchange pattern. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param portType The port type - * @param mep The message exchange pattern - * @return The WSDL operation - */ - public javax.wsdl.Operation createOperation(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, javax.wsdl.PortType portType, - org.jboss.savara.contract.model.MessageExchangePattern mep, - WSDLBinding wsdlBinding) { - javax.wsdl.Operation ret=null; - - javax.wsdl.Definition defn=null; - - if (portType != null) { - defn = getDefinition(wsdls, contract, portType.getQName().getNamespaceURI(), wsdlBinding); - } - - if (defn != null && mep != null) { - ret = defn.createOperation(); - ret.setUndefined(false); - - ret.setName(mep.getOperation()); - - QName msgname=WSDLGeneratorUtil.getRequestMessageType(portType.getQName().getNamespaceURI(), - mep.getOperation()); - - javax.wsdl.Message mesg=getMessage(wsdls, contract, msgname, - mep.getTypes(), wsdlBinding); - - if (mesg != null) { - javax.wsdl.Input input=defn.createInput(); - input.setMessage(mesg); - ret.setInput(input); - } - - // Check if a request/response MEP - if (mep instanceof RequestResponseMEP) { - RequestResponseMEP rr=(RequestResponseMEP)mep; - - msgname=WSDLGeneratorUtil.getResponseMessageType(portType.getQName().getNamespaceURI(), - mep.getOperation()); - - javax.wsdl.Message om=getMessage(wsdls, contract, msgname, - rr.getResponseTypes(), wsdlBinding); - if (om != null) { - javax.wsdl.Output output=defn.createOutput(); - output.setMessage(om); - ret.setOutput(output); - } - - // Generate fault details - if (rr.getFaultDetails() != null) { - for (int i=0; i < rr.getFaultDetails().size(); i++) { - FaultDetails fd=rr.getFaultDetails().get(i); - - msgname = WSDLGeneratorUtil.getFaultMessageType(portType.getQName().getNamespaceURI(), - fd.getName()); - - javax.wsdl.Message fm=getMessage(wsdls, contract, msgname, - fd.getTypes(), wsdlBinding); - if (fm != null) { - javax.wsdl.Fault fault=defn.createFault(); - fault.setName(fd.getName()); - fault.setMessage(fm); - - ret.addFault(fault); - } - } - } - } - - portType.addOperation(ret); - } - - return(ret); - } - - /** - * This method generates a binding operation, using the supplied WSDL definition, - * based on the information in the supplied message exchange pattern. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param binding The port type binding - * @param mep The message exchange pattern - * @return The WSDL binding operation - */ - public javax.wsdl.BindingOperation createBindingOperation(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, javax.wsdl.Binding binding, - org.jboss.savara.contract.model.MessageExchangePattern mep, - WSDLBinding wsdlBinding) { - javax.wsdl.BindingOperation ret=null; - - javax.wsdl.Definition defn=null; - - if (binding != null) { - defn = getDefinition(wsdls, contract, binding.getQName().getNamespaceURI(), wsdlBinding); - } - - if (defn != null && mep != null) { - ret = defn.createBindingOperation(); - //ret.setUndefined(false); - - // Check if WSDL operation details - if (wsdlBinding != null) { - wsdlBinding.updateOperation(defn, mep, ret); - } - - ret.setName(mep.getOperation()); - - QName msgname=WSDLGeneratorUtil.getRequestMessageType(binding.getQName().getNamespaceURI(), - mep.getOperation()); - - javax.wsdl.Message mesg=getMessage(wsdls, contract,msgname, - mep.getTypes(), wsdlBinding); - - if (mesg != null) { - javax.wsdl.BindingInput input=defn.createBindingInput(); - - // Check if WSDL operation details - if (wsdlBinding != null) { - wsdlBinding.updateInput(defn, input); - } - - ret.setBindingInput(input); - } - - // Check if a request/response MEP - if (mep instanceof RequestResponseMEP) { - RequestResponseMEP rr=(RequestResponseMEP)mep; - - msgname=WSDLGeneratorUtil.getResponseMessageType(binding.getQName().getNamespaceURI(), - mep.getOperation()); - - javax.wsdl.Message om=getMessage(wsdls, contract, msgname, - rr.getResponseTypes(), wsdlBinding); - if (om != null) { - javax.wsdl.BindingOutput output=defn.createBindingOutput(); - - // Check if WSDL operation details - if (wsdlBinding != null) { - wsdlBinding.updateOutput(defn, output); - } - - ret.setBindingOutput(output); - } - - // Generate fault details - if (rr.getFaultDetails() != null) { - for (int i=0; i < rr.getFaultDetails().size(); i++) { - FaultDetails fd=rr.getFaultDetails().get(i); - - msgname = WSDLGeneratorUtil.getFaultMessageType(binding.getQName().getNamespaceURI(), - fd.getName()); - - javax.wsdl.Message fm=getMessage(wsdls, contract, msgname, - fd.getTypes(), wsdlBinding); - if (fm != null) { - javax.wsdl.BindingFault fault=defn.createBindingFault(); - fault.setName(fd.getName()); - - // Check if WSDL operation details - if (wsdlBinding != null) { - wsdlBinding.updateFault(defn, fault); - } - - ret.addBindingFault(fault); - } - } - } - } - - binding.addBindingOperation(ret); - } - - return(ret); - } - - /** - * This method returns a message, using the supplied WSDL definition, - * based on the information supplied in the list of type references. If - * a single type reference is supplied, this will be the message type, - * if multiple type references are supplied, then these will be considered - * the message parts.<p> - * <p> - * The returned message will be part of the supplied definition. If it - * does not exist prior to the call to this method, then it will be - * created and added to the definition upon returning the message. - * - * @param wsdls The list of current WSDL definitions - * @param contract The contract - * @param msgname The message name - * @param types The list of type references - * @return The WSDL message - */ - public javax.wsdl.Message getMessage(java.util.List<javax.wsdl.Definition> wsdls, - org.jboss.savara.contract.model.Contract contract, - javax.xml.namespace.QName msgname, - java.util.List<org.jboss.savara.contract.model.Type> types, - WSDLBinding wsdlBinding) { - javax.wsdl.Message ret=null; - - if (types == null || types.size() == 0) { - throw new UnsupportedOperationException("Expecting single type reference"); - } else if (types.size() > 1) { - throw new UnsupportedOperationException("Currently only supports single type reference"); - } else { - Type ref=types.get(0); - - java.util.Iterator<TypeDefinition> iter=ref.getTypeDefinitions().iterator(); - boolean f_done=false; - - while (f_done == false && iter.hasNext()) { - TypeDefinition td=iter.next(); - - if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem()) || - TypeDefinition.XSD_TYPE.equals(td.getTypeSystem())) { - javax.xml.namespace.QName qname= - new javax.xml.namespace.QName(td.getNamespace(),td.getName()); - javax.wsdl.Definition defn= - getDefinition(wsdls, contract, msgname.getNamespaceURI(), wsdlBinding); - - if (defn != null && qname != null && - (ret = defn.getMessage(msgname)) == null) { - ret = defn.createMessage(); - ret.setUndefined(false); - - ret.setQName(msgname); - - // Create single part for type or element - Part part=defn.createPart(); - part.setName("content"); - - if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem())) { - part.setElementName(qname); - } else { - part.setTypeName(qname); - } - - ret.addPart(part); - - defn.addMessage(ret); - - f_done = true; - } - } - } - } - - return(ret); - } -} Deleted: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGeneratorUtil.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IResource; - -/** - * This class provides general utility functions for - * use when generating artefacts. - */ -public class WSDLGeneratorUtil { - - private static final String RESPONSE = "Response"; - private static final String FAULT = "Fault"; - private static final String REQUEST = "Request"; - - /** - * This method checks whether the folder exists, - * and if not attempts to create it. - * - * @param res The current resource - */ - public static void createFolder(IResource res) { - if (res instanceof IFolder) { - IFolder folder=(IFolder)res; - - if (folder.exists() == false) { - createFolder(folder.getParent()); - - try { - folder.create(true, true, - new org.eclipse.core.runtime.NullProgressMonitor()); - } catch(Exception e) { - e.printStackTrace(); - } - } - } else if (res.getParent() != null) { - createFolder(res.getParent()); - } - } - - /** - * This method returns the request message type QName. - * - * @param intfNamespace The interface namespace - * @param op The operation name - * @return The request message type - */ - public static javax.xml.namespace.QName getRequestMessageType(String intfNamespace, String op) { - return(new javax.xml.namespace.QName(intfNamespace, op+REQUEST)); - } - - /** - * This method returns the response message type QName. - * - * @param intfNamespace The interface namespace - * @param op The operation name - * @return The response message type - */ - public static javax.xml.namespace.QName getResponseMessageType(String intfNamespace, String op) { - return(new javax.xml.namespace.QName(intfNamespace, op+RESPONSE)); - } - - /** - * This method returns the fault message type QName. - * - * @param intfNamespace The interface namespace - * @param faultName The fault name - * @return The fault message type - */ - public static javax.xml.namespace.QName getFaultMessageType(String intfNamespace, String faultName) { - return(new javax.xml.namespace.QName(intfNamespace, faultName+FAULT)); - } -} Deleted: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPDocLitWSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,166 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator.soap; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.savara.tools.wsdl.generator.WSDLBinding; - -/** - * This interface is used to establish binding information on a - * WSDL definition. - * - */ -public class SOAPDocLitWSDLBinding implements WSDLBinding { - private static Log logger = LogFactory.getLog(SOAPDocLitWSDLBinding.class); - - /** - * This method returns the name of the WSDL binding implementation. - * - * @return The WSDL binding - */ - public String getName() { - return("SOAP DocLit"); - } - - /** - * This method initializes the WSDL definition for the binding. - * - * @param defn The definition - */ - public void initDefinition(javax.wsdl.Definition defn) { - defn.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); - } - - /** - * This method adds WSDL binding information to the port binding. - * - * @param defn The definition - * @param binding The port type - */ - public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding) { - try { - javax.wsdl.extensions.soap.SOAPBinding sb=(javax.wsdl.extensions.soap.SOAPBinding) - defn.getExtensionRegistry().createExtension(javax.wsdl.Binding.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "binding")); - sb.setStyle("document"); - sb.setTransportURI("http://schemas.xmlsoap.org/soap/http"); - binding.addExtensibilityElement(sb); - } catch(Exception e) { - logger.error("Failed to add SOAP binding", e); - } - } - - /** - * This method adds WSDL binding information to the operation. - * - * @param defn The definition - * @param mep The message exchange pattern - * @param operation The operation - */ - public void updateOperation(javax.wsdl.Definition defn, - org.jboss.savara.contract.model.MessageExchangePattern mep, - javax.wsdl.BindingOperation operation) { - try { - javax.wsdl.extensions.soap.SOAPOperation soap=(javax.wsdl.extensions.soap.SOAPOperation) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOperation.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "operation")); - soap.setSoapActionURI(defn.getTargetNamespace()+"/"+mep.getOperation()); - operation.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP operation", e); - } - } - - /** - * This method adds WSDL binding information to the input. - * - * @param defn The definition - * @param input The input - */ - public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input) { - try { - javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingInput.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); - soap.setUse("literal"); - input.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to input", e); - } - } - - /** - * This method adds WSDL binding information to the output. - * - * @param defn The definition - * @param output The output - */ - public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output) { - try { - javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOutput.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); - soap.setUse("literal"); - output.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to output", e); - } - } - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param fault The fault - */ - public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault) { - try { - javax.wsdl.extensions.soap.SOAPFault soap=(javax.wsdl.extensions.soap.SOAPFault) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingFault.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "fault")); - soap.setUse("literal"); - soap.setName(fault.getName()); - - fault.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to fault", e); - } - } - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param port The port - */ - public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port) { - try { - javax.wsdl.extensions.soap.SOAPAddress soap=(javax.wsdl.extensions.soap.SOAPAddress) - defn.getExtensionRegistry().createExtension(javax.wsdl.Port.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "address")); - soap.setLocationURI("http://localhost:8080/"+defn.getQName().getLocalPart()+"Service/"+ - port.getName()); - - port.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP address to port", e); - } - } - -} Deleted: trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java =================================================================== --- trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/soap/SOAPRPCWSDLBinding.java 2010-11-17 20:40:33 UTC (rev 469) @@ -1,170 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.savara.tools.wsdl.generator.soap; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.savara.tools.wsdl.generator.WSDLBinding; - -/** - * This interface is used to establish binding information on a - * WSDL definition. - * - */ -public class SOAPRPCWSDLBinding implements WSDLBinding { - private static Log logger = LogFactory.getLog(SOAPRPCWSDLBinding.class); - - /** - * This method returns the name of the WSDL binding implementation. - * - * @return The WSDL binding - */ - public String getName() { - return("SOAP RPC"); - } - - /** - * This method initializes the WSDL definition for the binding. - * - * @param defn The definition - */ - public void initDefinition(javax.wsdl.Definition defn) { - defn.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/"); - } - - /** - * This method adds WSDL binding information to the port binding. - * - * @param defn The definition - * @param binding The port type - */ - public void updateBinding(javax.wsdl.Definition defn, javax.wsdl.Binding binding) { - try { - javax.wsdl.extensions.soap.SOAPBinding sb=(javax.wsdl.extensions.soap.SOAPBinding) - defn.getExtensionRegistry().createExtension(javax.wsdl.Binding.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "binding")); - sb.setStyle("rpc"); - sb.setTransportURI("http://schemas.xmlsoap.org/soap/http"); - binding.addExtensibilityElement(sb); - } catch(Exception e) { - logger.error("Failed to add SOAP binding", e); - } - } - - /** - * This method adds WSDL binding information to the operation. - * - * @param defn The definition - * @param mep The message exchange pattern - * @param operation The operation - */ - public void updateOperation(javax.wsdl.Definition defn, - org.jboss.savara.contract.model.MessageExchangePattern mep, - javax.wsdl.BindingOperation operation) { - try { - javax.wsdl.extensions.soap.SOAPOperation soap=(javax.wsdl.extensions.soap.SOAPOperation) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOperation.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "operation")); - soap.setStyle("rpc"); - soap.setSoapActionURI(""); - operation.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP operation", e); - } - } - - /** - * This method adds WSDL binding information to the input. - * - * @param defn The definition - * @param input The input - */ - public void updateInput(javax.wsdl.Definition defn, javax.wsdl.BindingInput input) { - try { - javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingInput.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); - soap.setUse("literal"); - soap.setNamespaceURI(defn.getTargetNamespace()); - input.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to input", e); - } - } - - /** - * This method adds WSDL binding information to the output. - * - * @param defn The definition - * @param output The output - */ - public void updateOutput(javax.wsdl.Definition defn, javax.wsdl.BindingOutput output) { - try { - javax.wsdl.extensions.soap.SOAPBody soap=(javax.wsdl.extensions.soap.SOAPBody) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingOutput.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "body")); - soap.setUse("literal"); - soap.setNamespaceURI(defn.getTargetNamespace()); - output.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to output", e); - } - } - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param fault The fault - */ - public void updateFault(javax.wsdl.Definition defn, javax.wsdl.BindingFault fault) { - try { - javax.wsdl.extensions.soap.SOAPFault soap=(javax.wsdl.extensions.soap.SOAPFault) - defn.getExtensionRegistry().createExtension(javax.wsdl.BindingFault.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "fault")); - soap.setUse("literal"); - soap.setNamespaceURI(defn.getTargetNamespace()); - soap.setName(fault.getName()); - - fault.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP body to fault", e); - } - } - - /** - * This method adds WSDL binding information to the fault. - * - * @param defn The definition - * @param port The port - */ - public void updatePort(javax.wsdl.Definition defn, javax.wsdl.Port port) { - try { - javax.wsdl.extensions.soap.SOAPAddress soap=(javax.wsdl.extensions.soap.SOAPAddress) - defn.getExtensionRegistry().createExtension(javax.wsdl.Port.class, - new javax.xml.namespace.QName("http://schemas.xmlsoap.org/wsdl/soap/";, "address")); - soap.setLocationURI("http://localhost:8080/"+defn.getQName().getLocalPart()+"Service/"+ - port.getName()); - - port.addExtensibilityElement(soap); - } catch(Exception e) { - logger.error("Failed to add SOAP address to port", e); - } - } - -} Modified: trunk/tools/plugins/org.scribble.conformance/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.conformance/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conformance/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Conformance Plug-in Bundle-SymbolicName: org.scribble.conformance;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.conformance.osgi.Activator Bundle-Vendor: www.scribble.org Import-Package: org.osgi.framework;version="1.3.0" Modified: trunk/tools/plugins/org.scribble.conformance/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.conformance/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conformance/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.conformance</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleConformance</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.conversation.comparator/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.conversation.comparator/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.comparator/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Conversation Comparator Plug-in Bundle-SymbolicName: org.scribble.conversation.comparator;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.conversation.comparator.osgi.Activator Bundle-Vendor: www.scribble.org Import-Package: org.osgi.framework;version="1.3.0" Modified: trunk/tools/plugins/org.scribble.conversation.comparator/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.conversation.comparator/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.comparator/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.conversation.comparator</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleConversationComparator</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.conversation.export.text/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.conversation.export.text/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.export.text/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Conversation Export Text Plug-in Bundle-SymbolicName: org.scribble.conversation.export.text;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.conversation.export.text.osgi.Activator Bundle-Vendor: www.scribble.org Import-Package: org.osgi.framework;version="1.3.0" Modified: trunk/tools/plugins/org.scribble.conversation.export.text/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.conversation.export.text/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.export.text/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.conversation.export.text</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleConversationExportText</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.conversation.model/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.conversation.model/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.model/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Conversation Model Plug-in Bundle-SymbolicName: org.scribble.conversation.model;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.conversation.model.osgi.Activator Bundle-Vendor: www.scribble.org Import-Package: org.osgi.framework;version="1.3.0" Modified: trunk/tools/plugins/org.scribble.conversation.model/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.conversation.model/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.model/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.conversation.model</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleConversationModel</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.parser/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Conversation Parser Plug-in Bundle-SymbolicName: org.scribble.conversation.parser;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.conversation.parser.osgi.Activator Bundle-Vendor: www.scribble.org Import-Package: org.osgi.framework;version="1.3.0" Modified: trunk/tools/plugins/org.scribble.conversation.parser/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.conversation.parser/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.parser/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.conversation.parser</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleConversationParser</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.conversation.projector/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.conversation.projector/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.projector/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Conversation Projector Plug-in Bundle-SymbolicName: org.scribble.conversation.projector;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.conversation.projector.osgi.Activator Bundle-Vendor: www.scribble.org Import-Package: org.osgi.framework;version="1.3.0" Modified: trunk/tools/plugins/org.scribble.conversation.projector/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.conversation.projector/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.projector/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.conversation.projector</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleConversationProjector</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.conversation.validation/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.conversation.validation/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.validation/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Conversation Validation Plug-in Bundle-SymbolicName: org.scribble.conversation.validation;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.conversation.validation.osgi.Activator Bundle-Vendor: www.scribble.org Import-Package: org.osgi.framework;version="1.3.0" Modified: trunk/tools/plugins/org.scribble.conversation.validation/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.conversation.validation/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.conversation.validation/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.conversation.validation</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleConversationValidation</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.core/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.core/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.core/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Plug-in Bundle-SymbolicName: org.scribble.core;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.osgi.Activator Bundle-Vendor: www.scribble.org Bundle-ActivationPolicy: lazy Modified: trunk/tools/plugins/org.scribble.core/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.core/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.core/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.core</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleCore</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.eclipse/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.eclipse/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.eclipse/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Eclipse Support Plug-in Bundle-SymbolicName: org.scribble.eclipse;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.eclipse.osgi.Activator Bundle-Vendor: www.scribble.org Require-Bundle: org.eclipse.core.runtime, Modified: trunk/tools/plugins/org.scribble.eclipse/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.eclipse/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.eclipse/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.eclipse</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleEclipse</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.expression.xpath/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.expression.xpath/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.expression.xpath/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Expression Xpath Plug-in Bundle-SymbolicName: org.scribble.expression.xpath;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.expression.xpath.osgi.Activator Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: org.scribble.core;bundle-version="[1.0.0,2.0.0)", Modified: trunk/tools/plugins/org.scribble.expression.xpath/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.expression.xpath/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.expression.xpath/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.expression.xpath</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleExpressionXPath</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/org.scribble.lang.model/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/plugins/org.scribble.lang.model/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.lang.model/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Scribble Language Model Plug-in Bundle-SymbolicName: org.scribble.lang.model;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.scribble.lang.model.osgi.Activator Bundle-Vendor: www.scribble.org Import-Package: org.osgi.framework;version="1.3.0" Modified: trunk/tools/plugins/org.scribble.lang.model/pom.xml =================================================================== --- trunk/tools/plugins/org.scribble.lang.model/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/org.scribble.lang.model/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.scribble.lang.model</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <name>Savara::Tools::Plugins::ScribbleLangModel</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/plugins/pom.xml =================================================================== --- trunk/tools/plugins/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/plugins/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -5,13 +5,13 @@ <groupId>org.jboss.savara.tools</groupId> <artifactId>plugins</artifactId> <packaging>pom</packaging> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Savara::Tools::Plugins</name> <parent> <groupId>org.jboss.savara</groupId> <artifactId>tools</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modules> Modified: trunk/tools/pom.xml =================================================================== --- trunk/tools/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -5,7 +5,7 @@ <groupId>org.jboss.savara</groupId> <artifactId>tools</artifactId> <packaging>pom</packaging> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Savara::Tools</name> <!-- use JBoss Tools' trunk/build/parent/pom.xml - must be built locally first! @@ -23,7 +23,7 @@ <relativePath>parent-pom.xml</relativePath> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.parent.pom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> --> <properties> @@ -31,6 +31,7 @@ </properties> <modules> + <module>bundles</module> <module>plugins</module> <module>features</module> <module>tests</module> Modified: trunk/tools/site/pom.xml =================================================================== --- trunk/tools/site/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/site/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>site</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> <name>Savara::Tools::Site</name> <parent> <groupId>org.jboss.savara</groupId> <artifactId>tools</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/tests/org.jboss.savara.protocol.contract.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/tests/org.jboss.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/tests/org.jboss.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JBoss SAVARA Protocol Contract Tests Plugin Bundle-SymbolicName: org.jboss.savara.protocol.contract.tests -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.protocol.contract.tests.osgi.Activator Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/tools/tests/org.jboss.savara.protocol.contract.tests/pom.xml =================================================================== --- trunk/tools/tests/org.jboss.savara.protocol.contract.tests/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/tests/org.jboss.savara.protocol.contract.tests/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.protocol.contract.tests</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <name>Savara::Tools::Tests::ProtocolContract</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>tests</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Property changes on: trunk/tools/tests/org.jboss.savara.tools.bpel.tests ___________________________________________________________________ Name: svn:ignore - classes + classes target Modified: trunk/tools/tests/org.jboss.savara.tools.bpel.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/tests/org.jboss.savara.tools.bpel.tests/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/tests/org.jboss.savara.tools.bpel.tests/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Boss SAVARA Tools BPEL Tests Plug-in Bundle-SymbolicName: org.jboss.savara.tools.bpel.tests -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tools.bpel.tests.osgi.Activator Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/tools/tests/org.jboss.savara.tools.bpel.tests/pom.xml =================================================================== --- trunk/tools/tests/org.jboss.savara.tools.bpel.tests/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/tests/org.jboss.savara.tools.bpel.tests/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.bpel.tests</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <name>Savara::Tools::Tests::ToolsBPEL</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>tests</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/META-INF/MANIFEST.MF =================================================================== --- trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/META-INF/MANIFEST.MF 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/META-INF/MANIFEST.MF 2010-11-17 20:40:33 UTC (rev 469) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Boss SAVARA Tools WSDL Tests Plug-in Bundle-SymbolicName: org.jboss.savara.tools.wsdl.tests -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.jboss.savara.tools.wsdl.tests.osgi.Activator Bundle-Vendor: www.jboss.org Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -10,4 +10,5 @@ Require-Bundle: org.jboss.savara.contract.model, org.jboss.savara.tools.wsdl, org.junit, - org.scribble.core + org.scribble.core, + org.jboss.savara.wsdl Modified: trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/pom.xml =================================================================== --- trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.savara.tools</groupId> <artifactId>org.jboss.savara.tools.wsdl.tests</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <name>Savara::Tools::Tests::ToolsWSDL</name> <parent> <groupId>org.jboss.savara.tools</groupId> <artifactId>tests</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> </project> Modified: trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java =================================================================== --- trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/tests/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2010-11-17 20:40:33 UTC (rev 469) @@ -20,7 +20,7 @@ import javax.wsdl.Part; import javax.xml.namespace.QName; -import org.jboss.savara.tools.wsdl.generator.WSDLGenerator; +import org.jboss.savara.wsdl.generator.WSDLGenerator; import org.jboss.savara.contract.model.*; import junit.framework.TestCase; Modified: trunk/tools/tests/pom.xml =================================================================== --- trunk/tools/tests/pom.xml 2010-11-16 15:35:19 UTC (rev 468) +++ trunk/tools/tests/pom.xml 2010-11-17 20:40:33 UTC (rev 469) @@ -5,13 +5,13 @@ <groupId>org.jboss.savara.tools</groupId> <artifactId>tests</artifactId> <packaging>pom</packaging> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <name>Savara::Tools::Tests</name> <parent> <groupId>org.jboss.savara</groupId> <artifactId>tools</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> </parent> <modules>