JBoss Tools SVN: r31222 - in trunk/documentation/whatsnew/ws: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-05-11 15:34:19 -0400 (Wed, 11 May 2011)
New Revision: 31222
Added:
trunk/documentation/whatsnew/ws/images/wstester_3.3_nssupport.jpg
trunk/documentation/whatsnew/ws/ws-news-1.2.2.M1.html
Log:
JBIDE-8899 - Updates for WS Tester functionality in 3.3 M1 N&N
Added: trunk/documentation/whatsnew/ws/images/wstester_3.3_nssupport.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/wstester_3.3_nssupport.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/ws-news-1.2.2.M1.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.2.M1.html (rev 0)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.2.M1.html 2011-05-11 19:34:19 UTC (rev 31222)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>WS Tools 3.3.0 M1 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>WS tools 3.3.0 M1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../deltacloud/deltacloud-news-0.0.1.M2.html">Deltacloud Development Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Views</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Web Service Tester Updates</b></td>
+ <td valign="top">
+ <p>In M1 we've seriously improved support for testing WSDLs with embedded schemas and namespacing. Whereas before we were pretty namespace-unaware, as we assemble the new SOAP request, we now keep track of the various levels and changes in namespaces used by the embedded schemas.<small><a href="http://jira.jboss.org/browse/JBDS-1602">Related Jira</a></small></p>
+ <p>In addition, the tester now understands messages that define both a SOAP header and a body. If we encounter a header component to the request message, we assemble that the same way we do as the body and separate them out accordingly.<small><a href="http://jira.jboss.org/browse/JBIDE-8770">Related Jira</a></small></p>
+ <img src="./images/wstester_3.3_nssupport.jpg" />
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+
+ <hr/>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/ws/ws-news-1.2.2.M1.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31221 - in trunk/bpel: features/org.jboss.tools.bpel.tests.feature and 29 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-05-11 15:03:25 -0400 (Wed, 11 May 2011)
New Revision: 31221
Modified:
trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml
trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml
trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.properties
trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml
trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/PaletteFactory.java
trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml
trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/icons/wizban/newprj_bpel_wiz_banner.gif
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml
trunk/bpel/site/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8861
Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml
===================================================================
--- trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.tests.feature</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:=true
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.6.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/plugin.properties 2011-05-11 19:03:25 UTC (rev 31221)
@@ -26,5 +26,5 @@
# %%% END OF TRANSLATED PROPERTIES %%%
# ====================================================================
-pluginName = ODE Deploy Descriptor EMF Model
+pluginName =BPEL Deployment Descriptor EMF Model
providerName = JBoss by Red Hat
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.apache.ode.deploy.model</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.ui; singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.apache.ode.deploy.ui.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.properties 2011-05-11 19:03:25 UTC (rev 31221)
@@ -26,5 +26,5 @@
# %%% END OF TRANSLATED PROPERTIES %%%
# ====================================================================
-pluginName = ODE Deploy Descriptor UI Plug-in
+pluginName = BPEL Deployment Descriptor UI Plug-in
providerName = JBoss by Red Hat
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -10,7 +10,7 @@
filenames="bpel-deploy.xml,deploy.xml"
icon="icons/obj16/ode.gif"
id="org.eclipse.bpel.apache.ode.deploy.ui.editors.ODEDeployMultiPageEditor"
- name="ODE Deployment Descriptor Editor">
+ name="BPEL Deployment Descriptor Editor">
<contentTypeBinding
contentTypeId="org.eclipse.bpel.apache.ode.deploy.ui.content-type">
</contentTypeBinding>
@@ -20,7 +20,7 @@
<extension
point="org.eclipse.ui.newWizards">
<wizard
- name="Apache ODE Deployment Descriptor"
+ name="BPEL Deployment Descriptor"
icon="icons/obj16/ode.gif"
category="org.eclipse.bpel.wizards"
class="org.eclipse.bpel.apache.ode.deploy.ui.wizards.NewODEDeployWizard"
@@ -34,7 +34,7 @@
default-charset="UTF-8"
file-names="deploy.xml,bpel-deploy.xml"
id="org.eclipse.bpel.apache.ode.deploy.ui.content-type"
- name="ODE BPEL Deployment Descriptor"
+ name="BPEL Deployment Descriptor"
priority="normal">
</content-type>
</extension>
@@ -44,7 +44,7 @@
adaptable="true"
icon="icons/obj16/ode.gif"
id="org.eclipse.bpel.apache.ode.deploy.ui.icondecorator"
- label="ODE DD Resource Decorator"
+ label="BPEL Deployment Descriptor Resource Decorator"
lightweight="true"
location="TOP_LEFT"
state="true">
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.apache.ode.deploy.ui</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2011-05-11 19:03:25 UTC (rev 31221)
@@ -43,8 +43,8 @@
*/
public ODEDeployWizardPage(ISelection selection) {
super("ODEDeployDescriptorWizardPage");
- setTitle("Apache ODE Deployment Descriptor");
- setDescription("This wizard creates a new Apache ODE descriptor file (deploy.xml). Note that the file name cannot be changed.");
+ setTitle("BPEL Deployment Descriptor");
+ setDescription("This wizard creates a new BPEL deployment descriptor file (deploy.xml). Note that the file name cannot be changed.");
this.selection = selection;
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.runtime;singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/plugin.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -10,7 +10,7 @@
version="1.0"
class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntime">
<moduleType
- types="jbt.bpel.module"
+ types="bpel.module"
versions="1.1, 2.0"/>
</runtimeType>
</extension>
@@ -42,8 +42,9 @@
id="org.eclipse.jst.server.generic.image"
icon="icons/obj16/ode.gif"
typeIds="org.eclipse.bpel.apache.ode.runtime.st"/>
- </extension>
-
+ </extension>
+
+
<extension point="org.eclipse.jst.server.generic.core.genericpublisher">
<genericpublisher
class="org.eclipse.bpel.apache.ode.runtime.OdeBPELPublisher"
@@ -71,7 +72,7 @@
id="org.eclipse.bpel.apache.ode.runtime.rt"
version="2.0"/>
<facet
- id="jbt.bpel.facet.core"
+ id="bpel.facet.core"
version="2.0"/>
</supported>
</extension>
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.common.model; singleton:=true
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.6.0.qualifier
Bundle-Activator: org.eclipse.bpel.common.extension.model.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.common.model</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.common.ui; singleton:=true
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.6.0.qualifier
Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.common.ui</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.model; singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.model.BPELPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.model</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.ui; singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.properties 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.properties 2011-05-11 19:03:25 UTC (rev 31221)
@@ -50,11 +50,11 @@
COMPONENT_DESCRIPTION=Business Process
NEW_BPEL_CATEGORY=BPEL 2.0
-NEW_BPEL_FILE=New BPEL Process File
+NEW_BPEL_FILE=BPEL Process File
EXPORT_AS_IMAGE_TOOLTIP=Export BPEL as image...
EXPORT_AS_IMAGE_LABEL=Export as Image...
# ====================================================================
-
+
pluginName = BPEL Editor (Incubation)
providerName = JBoss by Red Hat
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -711,4 +711,29 @@
name="BPEL">
</perspective>
</extension>
+
+ <extension point="org.eclipse.ui.navigator.navigatorContent">
+ <commonWizard type="new" wizardId="org.jboss.tools.bpel.runtimes.wizards.newBPELProject" menuGroupId="org.eclipse.bpel.new.menuGroup">
+ <enablement>
+ <with variable="activeWorkbenchWindow.activePerspective">
+ <equals value="org.eclipse.bpel.ui.perspective"/>
+ </with>
+ </enablement>
+ </commonWizard>
+ <commonWizard type="new" wizardId="org.eclipse.bpel.ui.newFile" menuGroupId="org.eclipse.bpel.new.menuGroup">
+ <enablement>
+ <with variable="activeWorkbenchWindow.activePerspective">
+ <equals value="org.eclipse.bpel.ui.perspective"/>
+ </with>
+ </enablement>
+ </commonWizard>
+ <commonWizard type="new" wizardId="org.eclipse.bpel.apache.ode.deploy.ui.wizards.NewODEDeployWizard" menuGroupId="org.eclipse.bpel.new.menuGroup">
+ <enablement>
+ <with variable="activeWorkbenchWindow.activePerspective">
+ <equals value="org.eclipse.bpel.ui.perspective"/>
+ </with>
+ </enablement>
+ </commonWizard>
+ </extension>
+
</plugin>
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.ui</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java 2011-05-11 19:03:25 UTC (rev 31221)
@@ -653,7 +653,7 @@
// https://issues.jboss.org/browse/JBIDE-8075
// create the artifacts resource if it doesn't already exist
- if (!targetFile.exists()) {
+ if (targetFile!=null && !targetFile.exists()) {
// add the import if not already being imported by this process
AddImportCommand cmd = new AddImportCommand(bpelEditor.getProcess(), definition, null);
if (cmd.canDoExecute() && cmd.wouldCreateDuplicateImport() == false) {
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/PaletteFactory.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/PaletteFactory.java 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/palette/PaletteFactory.java 2011-05-11 19:03:25 UTC (rev 31221)
@@ -84,7 +84,7 @@
.getFactoryFor(bpelPackage.getValidate())));
palette.add(basicActionsCategory);
- PaletteCategory controlCategory = new PaletteCategory("Control2"); //$NON-NLS-1$
+ PaletteCategory controlCategory = new PaletteCategory("Controls"); //$NON-NLS-1$
controlCategory.setOrder(20);
controlCategory.setCategoryId("bpel.control");
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.validator;singleton:=true
-Bundle-Version: 0.6.0.qualifier
+Bundle-Version: 0.7.0.qualifier
Bundle-Activator: org.eclipse.bpel.validator.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.validator</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.wsil.model; singleton:=true
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.6.0.qualifier
Bundle-ClassPath: wsli-model.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.wsil.model</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.xpath10
-Bundle-Version: 0.5.0.qualifier
+Bundle-Version: 0.6.0.qualifier
Bundle-Localization: plugin
Bundle-ClassPath: .,
lib/antlr-runtime-3.0.1.jar
Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.xpath10</artifactId>
- <version>0.5.0-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.bpel.cheatsheet;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Activator: org.jboss.tools.bpel.cheatsheet.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.cheatsheet</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2011-05-11 19:03:25 UTC (rev 31221)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.bpel.runtimes;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.5.0.qualifier
Bundle-Activator: org.jboss.tools.bpel.runtimes.RuntimesPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/icons/wizban/newprj_bpel_wiz_banner.gif
===================================================================
(Binary files differ)
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-05-11 19:03:25 UTC (rev 31221)
@@ -12,8 +12,10 @@
pluginName = Eclipse BPEL Designer Runtimes
providerName = JBoss by Red Hat
-MODULE_TYPE_NAME=BPEL 2.0 Process
-MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
+OLD_MODULE_TYPE_NAME=JBoss BPEL 2.0 Process (SOA-P v5.1 and earlier)
+OLD_MODULE_TYPE_DESCRIPTION=Module representing a JBoss BPEL process for SOA-Platform version 5.1 and earlier.
+NEW_MODULE_TYPE_NAME=BPEL 2.0 Process
+NEW_MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
BPEL_CORE_FACET_LABEL=BPEL 2.0 Facet
BPEL_CORE_FACET_DESCRIPTION=Enables modeling and deployment of BPEL processes.
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -47,7 +47,8 @@
<extension point="org.eclipse.wst.server.core.moduleTypes">
<moduleType
id="jbt.bpel.module"
- name="%MODULE_TYPE_NAME">
+ name="%OLD_MODULE_TYPE_NAME"
+ description="%OLD_MODULE_TYPE_DESCRIPTION">
</moduleType>
</extension>
@@ -57,10 +58,29 @@
<extension point="org.eclipse.wst.server.ui.serverImages">
<image
id="org.jboss.tools.bpel.runtimes.jbt.bpel.module"
- typeIds="jbt.bpel.module"
+ typeIds="jbt.bpel.module,bpel.module"
icon="icons/obj16/bpelfacet.gif"/>
</extension>
+
+ <extension point="org.eclipse.wst.server.core.moduleTypes">
+ <moduleType
+ id="bpel.module"
+ name="%NEW_MODULE_TYPE_NAME"
+ description="%NEW_MODULE_TYPE_DESCRIPTION">
+ </moduleType>
+ </extension>
+
+<!-- The following is needed to make icons for deployable modules occur in -->
+<!-- the Add and Remove Projects wizard -->
+
+ <extension point="org.eclipse.wst.server.ui.serverImages">
+ <image
+ id="org.jboss.tools.bpel.runtimes.bpel.module"
+ typeIds="bpel.module"
+ icon="icons/obj16/bpelfacet.gif"/>
+ </extension>
+
<!--=========================================================================-->
<!-- BPEL Facet -->
<!--=========================================================================-->
@@ -185,7 +205,7 @@
id="org.jboss.tools.bpel.runtimes.module.moduleFactory">
<moduleType
versions="1.1, 2.0"
- types="jbt.bpel.module">
+ types="jbt.bpel.module,bpel.module">
</moduleType>
</moduleFactory>
</extension>
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.runtimes</artifactId>
- <version>0.4.0-SNAPSHOT</version>
+ <version>0.5.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
Modified: trunk/bpel/site/pom.xml
===================================================================
--- trunk/bpel/site/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
+++ trunk/bpel/site/pom.xml 2011-05-11 19:03:25 UTC (rev 31221)
@@ -9,6 +9,6 @@
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.site</artifactId>
<name>org.jboss.tools.bpel.site</name>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
\ No newline at end of file
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31220 - in branches/jbosstools-3.2.x/bpel: features/org.jboss.tools.bpel.tests.feature and 27 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2011-05-11 15:01:56 -0400 (Wed, 11 May 2011)
New Revision: 31220
Added:
branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/HelloWorld.xml
Modified:
branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.feature/pom.xml
branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.model/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.validator/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml
branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml
branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml
branches/jbosstools-3.2.x/bpel/site/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8861
Modified: branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.tests.feature</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:=true
-Bundle-Version: 0.5.1.qualifier
+Bundle-Version: 0.5.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.apache.ode.deploy.model</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.ui; singleton:=true
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
Bundle-Activator: org.eclipse.bpel.apache.ode.deploy.ui.Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.apache.ode.deploy.ui</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>0.6.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.apache.ode.runtime;singleton:=true
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.common.model; singleton:=true
-Bundle-Version: 0.5.1.qualifier
+Bundle-Version: 0.5.2.qualifier
Bundle-Activator: org.eclipse.bpel.common.extension.model.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.model/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.common.model</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.common.ui; singleton:=true
-Bundle-Version: 0.5.1.qualifier
+Bundle-Version: 0.5.2.qualifier
Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.common.ui</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.model; singleton:=true
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
Bundle-Activator: org.eclipse.bpel.model.BPELPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.model/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.model</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>0.6.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.ui; singleton:=true
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.ui</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>0.6.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/EditMessagePropertyDialog.java 2011-05-11 19:01:56 UTC (rev 31220)
@@ -653,7 +653,7 @@
// https://issues.jboss.org/browse/JBIDE-8075
// create the artifacts resource if it doesn't already exist
- if (!targetFile.exists()) {
+ if (targetFile!=null && !targetFile.exists()) {
// add the import if not already being imported by this process
AddImportCommand cmd = new AddImportCommand(bpelEditor.getProcess(), definition, null);
if (cmd.canDoExecute() && cmd.wouldCreateDuplicateImport() == false) {
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-05-11 19:01:56 UTC (rev 31220)
@@ -86,16 +86,16 @@
if (resource instanceof IContainer) {
IContainer container = (IContainer)resource;
// https://issues.jboss.org/browse/JBIDE-8591
+ setMessage(null);
if (!ModuleCoreNature.isFlexibleProject(resource.getProject())) {
setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING);
- return false;
+// return false;
}
if ( container.findMember(processName +".bpel") != null ) { //$NON-NLS-1$
setMessage(Messages.NewFileWizardPage1_12, WizardPage.ERROR);
return false;
}
- setMessage(null);
return true;
}
return false;
@@ -125,8 +125,8 @@
if (container==null)
return false;
- if (!ModuleCoreNature.isFlexibleProject(container.getProject()))
- return false;
+// if (!ModuleCoreNature.isFlexibleProject(container.getProject()))
+// return false;
if ( container.findMember(processName +".bpel") != null ) //$NON-NLS-1$
return false;
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.validator;singleton:=true
-Bundle-Version: 0.6.1.qualifier
+Bundle-Version: 0.6.2.qualifier
Bundle-Activator: org.eclipse.bpel.validator.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.validator/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.validator</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>0.6.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.wsil.model; singleton:=true
-Bundle-Version: 0.5.1.qualifier
+Bundle-Version: 0.5.2.qualifier
Bundle-ClassPath: wsli-model.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.wsil.model</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.xpath10/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.bpel.xpath10
-Bundle-Version: 0.5.1.qualifier
+Bundle-Version: 0.5.2.qualifier
Bundle-Localization: plugin
Bundle-ClassPath: .,
lib/antlr-runtime-3.0.1.jar
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.eclipse.bpel.xpath10</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.5.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.bpel.cheatsheet;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.2.qualifier
Bundle-Activator: org.jboss.tools.bpel.cheatsheet.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Added: branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/HelloWorld.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/HelloWorld.xml (rev 0)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/cheatsheets/HelloWorld.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cheatsheet title=""Hello World" Tutorial">
+ <intro>
+ <description>This cheatsheet will guide you through the creation,
+ deployment and execution of the classic "Hello World" BPEL
+ process.</description>
+ </intro>
+
+ <item dialog="true" skip="true" title="Create a BPEL Project">
+ <description>In order to associate a BPEL process and its related
+ artifacts (WSDL and XSD files) with an appropriate runtime, you must first
+ create a BPEL project. If you are interested in using the BPEL Designer
+ for modeling or documentation purposes only and do <b>not</b>
+ intend to deploy the process for execution, then you can skip this step; a
+ BPEL process file can actually be created in any type of
+ project.<br /><br />To create a BPEL Project, select "File > New >
+ Project... > BPEL 2.0 > BPEL Project" from the main
+ menu.<br /><br />On the first page of the New Project wizard, enter the
+ project name "HelloWorld" and click Finish.</description>
+
+ <command required="false"
+ serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.bpel.runtimes.wizards.newBPELProject)" />
+ </item>
+
+ <item dialog="true" skip="true" title="Create a BPEL Process file">
+ <description>Next select a target folder in your project where the BPEL
+ process file and its artifacts will be created. If you have created a BPEL
+ Project, it will contain a folder called "bpelContent" which is intended
+ to be used for containing all of your BPEL resources.<br /><br />From the
+ "File" main menu, or from the popup (right-click) menu of the Navigator or
+ Project Explorer views, select "New > New BPEL Process
+ File".<br /><br />On the first page of the New File wizard, enter the
+ process name "HelloWorld" and select a namespace for your process. A
+ namespace is simply a URI that declares the context of your business
+ process' variables, and other identifiers so that they do not collide with
+ identifiers in other web services that your process may eventually
+ use.<br /><br />Next, select a process template. The New File wizard
+ defines three types of templates: Asynchronous, Empty and Synchronous. For
+ this tutorial, select the "Synchronous Process" template and click
+ "Finish".</description>
+
+ <command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.bpel.ui.newFile)" />
+ </item>
+
+ <item skip="true" title="Edit the BPEL Process file">
+ <description>When the BPEL Designer opens it will display a skeleton of a
+ simple request-response process which consists of a Receive activity, an
+ empty activity labeled "FIX_ME-Add_Business_Logic_Here" and a Reply. The
+ arrows connecting these activities indicate the process flow from top to
+ bottom, or from left to right depending on your choice of
+ layout.<br /><br />At this time, if the Property View is not visible you
+ can open it from either the BPEL Designer's popup menu ("Show in
+ Properties") or from the main menu by clicking "Window > Show View >
+ Properties".<br /><br />Click on the "Fix Me" activity and select the
+ Details tab in the Property Sheet and select action 4 (Assign) which will
+ replace the empty activity with an Assign. This will also display the
+ Assign activity properties in the Details tab of the Property Sheet. You
+ may want to change the name of the "Fix Me" to something more appropriate,
+ for example "Build_Response_Message". You can do this using either the
+ in-line editor on the Design Canvas (select the Assign activity, then
+ click again to begin editing the text label) or using the Description tab
+ of the Property Sheet. When done, switch back to the Details tab of the
+ Property Sheet.<br /><br />The Assign Details tab consists of an
+ (initially empty) list of assignment operations, and two empty "From" and
+ "To" combo boxes. The assignment list has four buttons labeled "New"
+ "Delete", "Move Up" and "Move Down", which are used to manage the list of
+ assignment operations.<br /><br />Click the "New" button to add a new
+ assignment operation to the list. Notice that the "From" and "To" combo
+ boxes are now active and display "Variable". These allow you to select the
+ source and target items' categories ("Variable", "Expression", "Fixed
+ Value", etc.). Also notice that additional selection/data entry widgets
+ appear below the "From" and "To" combo boxes. These will change based on
+ the source and target item categories selected in the combo boxes, but
+ initially they show tree selection widgets for the input and output
+ variables that were automatically created by the New File
+ wizard.<br /><br />Select "Expression" in the "From" combo box; this will
+ display an XPath expression editor widget. Notice that BPEL allows you to
+ define which version of XPath you wish to use for each expression
+ although,only XPath 1.0 is supported at this time.<br /><br /> In the
+ XPath expression editor, enter the following:<br /><br />concat("Hello,
+ ".$input.payload/tns:input)<br /><br />As you type, the editor widget
+ provides a popup list of valid proposals; this can also be activated by
+ typing CTRL-Space.<br /><br />In the tree selection widget under the "To"
+ combo box, expand the "output" variable and navigate down to the "result"
+ string element. The assignment operation list should now show "Expression
+ to Variable"; click on this entry in the list. The action of changing
+ focus from the "To" tree selection widget to another widget, triggers
+ validation of the assignment operation and a popup dialog asking if you
+ want to initialize the ouput variable should appear; click "Yes" to do so
+ now.<br />The BPEL Designer will automatically insert another entry in the
+ assignment operations list labeled "Fixed Value to Variable". Select this
+ entry in the list and you will see an XML fragment that corresponds to the
+ structure of the output variable. A "Selection Failure Fault" will result
+ if the BPEL engine encounters a variable that has not been properly
+ initialized. <br /><br />This completes the "HelloWorld" process; select
+ "File > Save" to save the process and then close the
+ editor.</description>
+ </item>
+
+ <item skip="true" title="Create a Deployment Descriptor file">
+ <description>A Deployment Descriptor is simply a manifest of the BPEL
+ artifacts. It describes the services provided and their interfaces, to the
+ BPEL runtime engine. To create a Deployment Descriptor select the project
+ folder that contains your BPEL artifacts, then from either the "File" main
+ menu or the Navigator or Project Explorer popup menu select "New > BPEL
+ 2.0 > Apache ODE Deployment Descriptor". <br /><br />Finish the New
+ wizard and the Deployment Descriptor editor will open. <br /><br />In the
+ "Inbound Interfaces (Services)" section, click on the "Associated Port"
+ combo box and select the "HelloWorldPort". Leave all other settings as
+ they are and then save and close the editor.</description>
+ </item>
+
+ <item skip="true" title="Create a JBoss BPEL Server">
+ <description> These last steps assume that you have already installed
+ either:<br /><br />JBoss Application Server version 5.1.0 and RiftSaw 2.2,
+ the BPEL engine, or<br />JBoss Enterprise Application Platform 5.0 or
+ later.<br /><br /><b>CAUTION: make sure the server you intend to use for
+ testing is not a production environment!</b><br /><br />Open the Servers
+ View by selecting "Window > Show View > Servers" from the main
+ menu.<br /><br />From the Servers View popup menu or from the "File" main
+ menu, click "New > Server"<br /><br />Select either the "JBoss
+ Community > JBoss AS 5.1" or "JBoss Enterprise Middleware > JBoss
+ Enterprise Application Platform 5.x" server.<br /><br />Finish the New
+ Server Definition wizard but do not add the HelloWorld service on the last
+ page of the wizard.<br /><br />Start the server by selecting it in the
+ Servers View and clicking the "Run" menu button.</description>
+
+ <command required="false"
+ serialization="org.eclipse.ui.browser.openBrowser(url=http://www.jboss.org/riftsaw/,tool... Riftsaw BPEL Engine)" />
+ </item>
+
+ <item skip="true" title="Deploy the BPEL Process to the JBoss BPEL Server">
+ <description>Select the newly created server in the Servers View and from
+ the popup menu, click "Add and Remove..."<br /><br />In the Add and Remove
+ Wizard, select the HelloWorld process and click "Add".<br /><br />The
+ server should log some messages to the Console View indicating that the
+ BPEL process has been deployed successfully. If you see deployment error
+ messages then something is wrong with the BPEL process; if you see no
+ messages at all, then the Riftsaw engine was not installed
+ properly.</description>
+ </item>
+
+ <item skip="true" title="Test the BPEL Process">
+ <description>Assuming "HelloWorld" was successfully deployed, you can now
+ test your service. <br /><br />Select the "HelloWorldArtifacts.wsdl" file
+ in your BPEL project and from the popup menu select "Web Services >
+ Test with Web Services Explorer".<br /><br />In the Web Services Explorer
+ browser, navigate to the HelloWorld "process" operation in the "Navigator"
+ panel on the left, and then enter the word "world" in the "Actions" panel
+ on the right, then click "Go"<br /><br />The Riftsaw engine will log some
+ more messages to the Console View indicating that it has processed the
+ message, and you should see the response "Hello, world" in the "Status"
+ panel on the bottom-right.<br /><br />Congratulations! You have just
+ created your first BPEL process.</description>
+ </item>
+</cheatsheet>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/plugin.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -5,15 +5,15 @@
point="org.eclipse.ui.cheatsheets.cheatSheetContent">
<category
id="org.jboss.tools.bpel.cheatsheet"
- name="JBoss BPEL Tutorial">
+ name="JBoss BPEL Tutorials">
</category>
<cheatsheet
category="org.jboss.tools.bpel.cheatsheet"
- contentFile="$nl$/cheatsheets/bpel.xml"
+ contentFile="$nl$/cheatsheets/HelloWorld.xml"
id="org.jboss.tools.bpel.cheatsheet.bpel"
- name="JBoss BPEL Tutorial">
+ name=""HelloWorld" Tutorial">
<description>
- Learn how to use JBoss BPEL editor
+ Demonstrates how to create, deploy and run the classic "HelloWorld" BPEL process
</description>
</cheatsheet>
</extension>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.cheatsheet</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2011-05-11 19:01:56 UTC (rev 31220)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.bpel.runtimes;singleton:=true
-Bundle-Version: 0.4.1.qualifier
+Bundle-Version: 0.4.2.qualifier
Bundle-Activator: org.jboss.tools.bpel.runtimes.RuntimesPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2011-05-11 19:01:56 UTC (rev 31220)
@@ -12,8 +12,10 @@
pluginName = Eclipse BPEL Designer Runtimes
providerName = JBoss by Red Hat
-MODULE_TYPE_NAME=BPEL 2.0 Process
-MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
+OLD_MODULE_TYPE_NAME=JBoss BPEL 2.0 Process (SOA-P v5.1 and earlier)
+OLD_MODULE_TYPE_DESCRIPTION=Module representing a JBoss BPEL process for SOA-Platform version 5.1 and earlier.
+NEW_MODULE_TYPE_NAME=BPEL 2.0 Process
+NEW_MODULE_TYPE_DESCRIPTION=Module representing a BPEL process
BPEL_CORE_FACET_LABEL=BPEL 2.0 Facet
BPEL_CORE_FACET_DESCRIPTION=Enables modeling and deployment of BPEL processes.
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -47,7 +47,8 @@
<extension point="org.eclipse.wst.server.core.moduleTypes">
<moduleType
id="jbt.bpel.module"
- name="%MODULE_TYPE_NAME">
+ name="%OLD_MODULE_TYPE_NAME"
+ description="%OLD_MODULE_TYPE_DESCRIPTION">
</moduleType>
</extension>
@@ -57,10 +58,29 @@
<extension point="org.eclipse.wst.server.ui.serverImages">
<image
id="org.jboss.tools.bpel.runtimes.jbt.bpel.module"
- typeIds="jbt.bpel.module"
+ typeIds="jbt.bpel.module,bpel.module"
icon="icons/obj16/bpelfacet.gif"/>
</extension>
+
+ <extension point="org.eclipse.wst.server.core.moduleTypes">
+ <moduleType
+ id="bpel.module"
+ name="%NEW_MODULE_TYPE_NAME"
+ description="%NEW_MODULE_TYPE_DESCRIPTION">
+ </moduleType>
+ </extension>
+
+<!-- The following is needed to make icons for deployable modules occur in -->
+<!-- the Add and Remove Projects wizard -->
+
+ <extension point="org.eclipse.wst.server.ui.serverImages">
+ <image
+ id="org.jboss.tools.bpel.runtimes.bpel.module"
+ typeIds="bpel.module"
+ icon="icons/obj16/bpelfacet.gif"/>
+ </extension>
+
<!--=========================================================================-->
<!-- BPEL Facet -->
<!--=========================================================================-->
@@ -185,7 +205,7 @@
id="org.jboss.tools.bpel.runtimes.module.moduleFactory">
<moduleType
versions="1.1, 2.0"
- types="jbt.bpel.module">
+ types="jbt.bpel.module,bpel.module">
</moduleType>
</moduleFactory>
</extension>
Modified: branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.runtimes</artifactId>
- <version>0.4.1-SNAPSHOT</version>
+ <version>0.4.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/bpel/site/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/bpel/site/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
+++ branches/jbosstools-3.2.x/bpel/site/pom.xml 2011-05-11 19:01:56 UTC (rev 31220)
@@ -9,6 +9,6 @@
<groupId>org.jboss.tools.bpel</groupId>
<artifactId>org.jboss.tools.bpel.site</artifactId>
<name>org.jboss.tools.bpel.site</name>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
</project>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31219 - in trunk: vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-11 13:41:25 -0400 (Wed, 11 May 2011)
New Revision: 31219
Modified:
trunk/build/parent/pom.xml
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
trunk/xulrunner/plugins/pom.xml
Log:
remove carbon.macosx.x86 as it's not supported anymore and we've moved to XR 1.9.2
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-05-11 17:40:30 UTC (rev 31218)
+++ trunk/build/parent/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
@@ -69,11 +69,6 @@
<arch>x86</arch>
</environment>
<environment>
- <os>macosx</os>
- <ws>carbon</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
@@ -113,11 +108,6 @@
<arch>x86</arch>
</environment>
<environment>
- <os>macosx</os>
- <ws>carbon</ws>
- <arch>x86</arch>
- </environment>
- <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2011-05-11 17:40:30 UTC (rev 31218)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/META-INF/MANIFEST.MF 2011-05-11 17:41:25 UTC (rev 31219)
@@ -8,7 +8,6 @@
org.eclipse.core.runtime,
org.mozilla.xpcom,
org.jboss.tools.common,
- org.mozilla.xulrunner.carbon.macosx;resolution:=optional,
org.mozilla.xulrunner.cocoa.macosx;resolution:=optional,
org.mozilla.xulrunner.gtk.linux.x86;resolution:=optional,
org.mozilla.xulrunner.gtk.linux.x86_64;resolution:=optional,
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-05-11 17:40:30 UTC (rev 31218)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-05-11 17:41:25 UTC (rev 31219)
@@ -78,7 +78,6 @@
private static final Set<String> OFFICIALLY_SUPPORTED_PLATFORM_IDS = new HashSet<String>();
static {
Collections.addAll(OFFICIALLY_SUPPORTED_PLATFORM_IDS,
- "carbon.macosx.x86", //$NON-NLS-1$
"cocoa.macosx.x86", //$NON-NLS-1$
"gtk.linux.x86", //$NON-NLS-1$
"gtk.linux.x86_64", //$NON-NLS-1$
Modified: trunk/xulrunner/plugins/pom.xml
===================================================================
--- trunk/xulrunner/plugins/pom.xml 2011-05-11 17:40:30 UTC (rev 31218)
+++ trunk/xulrunner/plugins/pom.xml 2011-05-11 17:41:25 UTC (rev 31219)
@@ -18,4 +18,4 @@
<module>org.mozilla.xulrunner.gtk.linux.x86_64</module>
<module>org.mozilla.xulrunner.win32.win32.x86</module>
</modules>
-</project>
\ No newline at end of file
+</project>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31218 - in trunk/ws/tests/org.jboss.tools.ws.ui.test: resources/jbide8770 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-05-11 13:40:30 -0400 (Wed, 11 May 2011)
New Revision: 31218
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/
trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
Log:
OPEN - issue JBIDE-8927: WS Tester issues with JUnit tests after fixing JBDS-1602
https://issues.jboss.org/browse/JBIDE-8927
Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl 2011-05-11 17:40:30 UTC (rev 31218)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://www.example.org/ws/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:basic="http://www.example.org/ws/basic/"
+ xmlns:extra="http://www.example.org/ws/extra/" xmlns:square="http://www.example.org/ws/square/"
+ xmlns:common="http://www.example.org/ws/common/" name="example"
+ targetNamespace="http://www.example.org/ws/">
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://www.example.org/ws/common/"
+ xmlns:tns="http://www.example.org/ws/common/">
+ <xsd:element name="header" type="tns:headerType" />
+ <xsd:complexType name="headerType">
+ <xsd:sequence>
+ <xsd:element name="timestamp" type="xsd:dateTime" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ <xsd:schema targetNamespace="http://www.example.org/ws/square/"
+ xmlns:tns="http://www.example.org/ws/square/">
+ <xsd:element name="square" type="tns:squareType" />
+ <xsd:element name="squareResponse" type="tns:squareResponseType" />
+ <xsd:element name="storeResult" type="tns:storeResultType" />
+ <xsd:element name="storeHeader" type="tns:storeHeaderType" />
+ <xsd:complexType name="squareType">
+ <xsd:sequence>
+ <xsd:element name="a" type="xsd:int" />
+ <xsd:element name="b" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="squareResponseType">
+ <xsd:sequence>
+ <xsd:element name="out" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="storeResultType">
+ <xsd:sequence>
+ <xsd:element name="a" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="storeHeaderType">
+ <xsd:sequence>
+ <xsd:element name="id" type="xsd:string" />
+ <xsd:element name="timestamp" type="xsd:dateTime" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ <xsd:schema targetNamespace="http://www.example.org/ws/basic/"
+ xmlns:tns="http://www.example.org/ws/basic/">
+ <xsd:import namespace="http://www.example.org/ws/common/" />
+ <xsd:element name="operationRequest" type="tns:requestType" />
+ <xsd:element name="operationResponse" type="tns:responseType" />
+ <xsd:element name="invalidNumberFault" type="tns:faultType" />
+ <xsd:complexType name="requestType">
+ <xsd:sequence>
+ <xsd:element name="a" type="xsd:float" />
+ <xsd:element name="b" type="xsd:float" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="responseType">
+ <xsd:sequence>
+ <xsd:element name="out" type="xsd:float" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="faultType">
+ <xsd:sequence>
+ <xsd:element name="description" type="xsd:string" />
+ <xsd:element name="details" type="xsd:string" />
+ <xsd:element name="a" type="xsd:float" />
+ <xsd:element name="b" type="xsd:float" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ <xsd:schema targetNamespace="http://www.example.org/ws/extra/"
+ xmlns:tns="http://www.example.org/ws/extra/">
+ <xsd:import namespace="http://www.example.org/ws/common/" />
+ <xsd:element name="operationRequest" type="tns:requestType" />
+ <xsd:element name="operationResponse" type="tns:responseType" />
+ <xsd:element name="invalidNumberFault" type="tns:faultType" />
+ <xsd:complexType name="requestType">
+ <xsd:sequence>
+ <xsd:element name="a" type="xsd:double" />
+ <xsd:element name="b" type="xsd:double" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="responseType">
+ <xsd:sequence>
+ <xsd:element name="out" type="xsd:double" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="faultType">
+ <xsd:sequence>
+ <xsd:element name="description" type="xsd:string" />
+ <xsd:element name="details" type="xsd:string" />
+ <xsd:element name="a" type="xsd:double" />
+ <xsd:element name="b" type="xsd:double" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="storeHeader">
+ <wsdl:part name="storeHeader" element="square:storeHeader" />
+ </wsdl:message>
+ <wsdl:message name="minusOperationRequest">
+ <wsdl:part name="parameters" element="basic:operationRequest" />
+ <wsdl:part name="header" element="common:header" />
+ </wsdl:message>
+ <wsdl:message name="minusOperationResponse">
+ <wsdl:part name="parameters" element="basic:operationResponse" />
+ </wsdl:message>
+ <wsdl:message name="invalidNumberFaultBasic">
+ <wsdl:part name="parameters" element="basic:invalidNumberFault" />
+ </wsdl:message>
+ <wsdl:message name="invalidNumberFaultExtra">
+ <wsdl:part name="parameters" element="extra:invalidNumberFault" />
+ </wsdl:message>
+ <wsdl:portType name="minusPortType">
+ <wsdl:operation name="minusOperation">
+ <wsdl:input message="tns:minusOperationRequest" name="minusOperationRequest" />
+ <wsdl:output message="tns:minusOperationResponse" name="minusOperationResponse" />
+ <wsdl:fault message="tns:invalidNumberFaultBasic" name="invalidNumberFault" />
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="minusSOAP" type="tns:minusPortType">
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="minusOperation">
+ <soap:operation soapAction="http://www.example.org/ws/minusOperation" />
+ <wsdl:input>
+ <soap:header message="tns:storeHeader" part="storeHeader"
+ use="literal" />
+ <soap:body parts="parameters" use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="basic">
+ <wsdl:port name="minusPort" binding="tns:minusSOAP">
+ <soap:address location="http://www.example.org/" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2011-05-11 17:40:26 UTC (rev 31217)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2011-05-11 17:40:30 UTC (rev 31218)
@@ -100,39 +100,66 @@
Assert.assertTrue(s1.contains("<tns:gQuery>?</tns:gQuery>"));
String s2 = getSampleMessage("/jbide6593/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults");
- Assert.assertTrue(s2.contains("<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">"));
- Assert.assertTrue(s2.contains("<tns:gQuery>?</tns:gQuery>"));
-// Assert.assertEquals(s1, s2);
+// Assert.assertTrue(s2.contains("<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">"));
+// Assert.assertTrue(s2.contains("<tns:gQuery>?</tns:gQuery>"));
+ Assert.assertEquals(s1, s2);
}
@Test
public void testJBIDE6694() {
- /*STILL WORKING ON THIS ONE*/
-// String s1 = getSampleMessage("/jbide6694/ConverterPortType.wsdl", "ConverterPortType", "ConverterPortTypeImplPort", "ConverterPortTypeBinding", "convert");
-// Assert.assertTrue(s1.contains("<tns:ChangeUnit xmlns:tns=\"http://test.jboss.org/ns\">"));
-// Assert.assertTrue(s1.contains("<tns:value>?</tns:value>"));
-// Assert.assertTrue(s1.contains("<tns:fromUnit>?</tns:fromUnit>"));
-// Assert.assertTrue(s1.contains("<tns:toUnit>?</tns:toUnit>"));
-//
-// String s2 = getSampleMessage("/jbide6694/jbide6694.wsdl", "Converter", "ConverterPort", "ConverterBinding", "convert");
-// Assert.assertTrue(s2.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">"));
-// Assert.assertTrue(s2.contains("<value>?</value>"));
-// Assert.assertTrue(s2.contains("<fromUnit>?</fromUnit>"));
-// Assert.assertTrue(s2.contains("<toUnit>?</toUnit>"));
+ String s1 = getSampleMessage("/jbide6694/ConverterPortType.wsdl", "ConverterPortType", "ConverterPortTypeImplPort", "ConverterPortTypeBinding", "convert");
+ Assert.assertTrue(s1.contains("<tns:ChangeUnit xmlns:tns=\"http://test.jboss.org/ns\">"));
+ Assert.assertTrue(s1.contains("<tns:value>?</tns:value>"));
+ Assert.assertTrue(s1.contains("<tns:fromUnit>?</tns:fromUnit>"));
+ Assert.assertTrue(s1.contains("<tns:toUnit>?</tns:toUnit>"));
+
+ String s2 = getSampleMessage("/jbide6694/jbide6694.wsdl", "Converter", "ConverterPort", "ConverterBinding", "convert");
+ Assert.assertTrue(s2.contains("<tns:ChangeUnit xmlns:tns=\"http://test.jboss.org/ns\">"));
+ Assert.assertTrue(s2.contains("<tns:value>?</tns:value>"));
+ Assert.assertTrue(s2.contains("<tns:fromUnit>?</tns:fromUnit>"));
+ Assert.assertTrue(s2.contains("<tns:toUnit>?</tns:toUnit>"));
}
@Test
public void testJBIDE6865() {
- /*STILL WORKING ON THIS ONE*/
-// String s1 = getSampleMessage("/jbide6865/wsdl1.wsdl", "DirectFlight", "DirectFlightSoap", "FlightAwareDirectFlight:DirectFlightSoap", "AirportInfo");
-// Assert.assertTrue(s1.contains("<airportCode>?</airportCode>"));
+ String s1 = getSampleMessage("/jbide6865/wsdl1.wsdl", "DirectFlight", "DirectFlightSoap", "FlightAwareDirectFlight:DirectFlightSoap", "AirportInfo");
+ Assert.assertTrue(s1.contains("<airportCode>?</airportCode>"));
}
+
+ @Test
+ public void testJBDS1602() {
+ String s1 = getSampleMessage("/jbds1602/StockQuoteService.wsdl", "StockQuoteService", "StockQuoteServicePort", "tns:StockQuoteServiceBinding", "getStockQuoteBySymbol");
+ Assert.assertTrue(s1.contains("<stoc:getStockQuoteBySymbol xmlns:stoc=\"http://www.jboss.com/webservices/StockQuoteService\">"));
+ Assert.assertTrue(s1.contains("<arg0>?</arg0>"));
+ String s2 = getSampleMessage("/jbds1602/jb/SampleWS.wsdl", "SampleWSService", "SampleWSPort", "tns:SampleWSServiceSoapBinding", "echo");
+ Assert.assertTrue(s2.contains("<test:echo xmlns:test=\"http://test/\">"));
+ Assert.assertTrue(s2.contains("<test:arg0 xmlns:x=\"http://example.com/attr/x\" x:C=\"?\" xmlns:y=\"http://example.com/attr/y\" y:D=\"?\" >"));
+ Assert.assertTrue(s2.contains("<othe:OtherType xmlns:othe=\"http://example.com/attr/other\" othe:myid=\"?\" x:Y=\"?\" >"));
+ Assert.assertTrue(s2.contains("<b:description>?</b:description>"));
+ }
+
+ @Test
+ public void testJBIDE8770() {
+ String s1 = getSampleMessage("/jbide8770/parts.wsdl", "basic", "minusPort", "minusSOAP", "minusOperation");
+ Assert.assertTrue(s1.contains("<basi:operationRequest xmlns:basi=\"http://www.example.org/ws/basic/\">"));
+ Assert.assertTrue(s1.contains("<a>?</a>"));
+
+ String s2 = getSampleMessageHeader("/jbide8770/parts.wsdl", "basic", "minusPort", "minusSOAP", "minusOperation");
+ Assert.assertTrue(s2.contains("<squa:storeHeader xmlns:squa=\"http://www.example.org/ws/square/\">"));
+ Assert.assertTrue(s2.contains("<timestamp>?</timestamp>"));
+ }
+
private String getSampleMessage(String res, String service, String port, String binding, String operation) {
Definition def = readWSDL(res);
return SchemaUtils.getSampleSOAPInputMessage(def, service, port, binding, operation);
}
+ private String getSampleMessageHeader(String res, String service, String port, String binding, String operation) {
+ Definition def = readWSDL(res);
+ return SchemaUtils.getSampleSOAPMessageHeader(def, service, port, binding, operation);
+ }
+
private Definition readWSDL(String path) {
try {
URL url = SchemaUtils.class.getResource(path).toURI().toURL();
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31217 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-05-11 13:40:26 -0400 (Wed, 11 May 2011)
New Revision: 31217
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
Log:
OPEN - issue JBIDE-8927: WS Tester issues with JUnit tests after fixing JBDS-1602
https://issues.jboss.org/browse/JBIDE-8927
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2011-05-11 17:39:47 UTC (rev 31216)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2011-05-11 17:40:26 UTC (rev 31217)
@@ -671,7 +671,9 @@
buf.append(createXMLForJDOMElement2( jdomSchemaElement2, child ));
}
}
- } else {
+ } else if (part.getTypeName() != null && isTypeBaseXSDOrSimple(part.getTypeName().getNamespaceURI(), part.getTypeName().getLocalPart())) {
+ buf.append('<' + part.getName() + ">?</" + part.getName() + '>'); //$NON-NLS-1$
+ } else {
buf.append(createXMLForJDOMElement2( jdomSchemaElement, jdomElement ));
}
@@ -1075,6 +1077,14 @@
if (elemType != null && isTypeBaseXSDOrSimple(tns, elemType)) {
isSimpleType = true;
}
+
+ boolean hasEnums = false;
+ if (element.getName().equals("simpleType")) { //$NON-NLS-1$
+ String enums = getEnumerations(element);
+ if (enums != null && enums.trim().length() > 0) {
+ hasEnums = true;
+ }
+ }
boolean includeTNSInRoot = false;
if (rootIsQualified_ && !isQualified) {
@@ -1083,6 +1093,9 @@
tnsprefix = "tns"; //$NON-NLS-1$
} else if (isQualified) {
rootIsQualified_ = false;
+ if (tnsprefix == null) {
+ tnsprefix = "tns"; //$NON-NLS-1$
+ }
}
boolean isSequence = element.getName().equals("sequence"); //$NON-NLS-1$
@@ -1116,7 +1129,7 @@
}
- if (hasKids || isSimpleType)
+ if (hasKids || isSimpleType || hasEnums )
buf.append(">"); //$NON-NLS-1$
else
buf.append("/>");//$NON-NLS-1$
@@ -1144,9 +1157,9 @@
}
}
- if (!isSequence && ( hasKids || isSimpleType )) {
+ if (!isSequence && ( hasKids || isSimpleType || hasEnums )) {
// add ? for value
- if (!hasKids || isSimpleType)
+ if (!hasKids || isSimpleType || hasEnums )
buf.append('?');
// close tag
@@ -1162,6 +1175,22 @@
return buf.toString();
}
+ private static String getEnumerations ( org.jdom.Element element ) {
+ StringBuffer buf = new StringBuffer();
+ List<?> kids = element.getChildren();
+ for (Iterator<?> kidIter = kids.iterator(); kidIter.hasNext(); ) {
+ Element kid = (Element) kidIter.next();
+ if (kid.getChildren() != null && kid.getChildren().size() > 0) {
+ buf.append(getEnumerations(kid));
+ }
+ if (kid.getName().equals("enumeration")) { //$NON-NLS-1$
+ String value = kid.getAttributeValue("value"); //$NON-NLS-1$
+ buf.append(value + '|');
+ }
+ }
+ return buf.toString();
+ }
+
private static HashMap<String, String> getDefinitionNamespaces ( Definition wsdlDefinition) {
HashMap<String, String> namespaceMap = new HashMap<String, String>();
namespaceMap.put(SOAP_NS_URI, SOAP_PREFIX);
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31216 - in branches/jbosstools-3.2.x/ws: tests/org.jboss.tools.ws.ui.test/resources and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-05-11 13:39:47 -0400 (Wed, 11 May 2011)
New Revision: 31216
Added:
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl
Modified:
branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
Log:
OPEN - issue JBIDE-8927: WS Tester issues with JUnit tests after fixing JBDS-1602
https://issues.jboss.org/browse/JBIDE-8927
Modified: branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java
===================================================================
--- branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2011-05-11 16:55:52 UTC (rev 31215)
+++ branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/SchemaUtils.java 2011-05-11 17:39:47 UTC (rev 31216)
@@ -145,8 +145,8 @@
Vector<String> errorMessages = new Vector<String>();
definition_ = wsdlDefinition;
+ schemaList_ = new Vector<XSDSchema>();
-
if (definition_ != null)
{
wsdlUrl_ = wsdlDefinition.getDocumentBaseURI();
@@ -332,7 +332,6 @@
private final static void gatherSchemas(Definition definition, String definitionURL)
{
- schemaList_ = new Vector<XSDSchema>();
Types types = definition.getTypes();
if (types != null)
{
@@ -350,15 +349,14 @@
if (isW3SchemaElementType(schemaElement.getElementType()))
{
xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- if(!checkSchemaURI(definitionURL)){
- schemaList_.addElement(xsdSchema);
- gatherSchemaDirective(xsdSchema, definitionURL);
+ if (xsdSchema != null) {
+ xsdSchema.update();
+ xsdSchema.updateElement();
+ if(!checkSchemaURI(definitionURL)){
+ schemaList_.addElement(xsdSchema);
+ gatherSchemaDirective(xsdSchema, definitionURL);
+ }
}
- xsdSchema.update();
- xsdSchema.updateElement();
- //Add the Schema to the resource
- // boolean success = resource.getContents().add(xsdSchema);
- // System.out.println(success + "Added schema " + xsdSchema.getTargetNamespace() + " to wsdl resource " + uri.toString());
}
}
else if (obj instanceof UnknownExtensibilityElement)
@@ -400,19 +398,22 @@
if (schemaURI != null) {
schemaURI = normalize(schemaURI);
- if(schemaURI.equals(normalize(wsdlUrl_)))return false;
- Enumeration<String> e = schemaURI_.elements();
- while(e.hasMoreElements()){
- String uri = (String)e.nextElement();
- if(schemaURI.equals(uri)){
- found = true;
- break;
- }
+ if(schemaURI != null) {
+ if (schemaURI.equals(normalize(wsdlUrl_))) return false;
+ if (schemaURI_ == null) return false;
+ Enumeration<String> e = schemaURI_.elements();
+ while(e.hasMoreElements()){
+ String uri = (String)e.nextElement();
+ if(schemaURI.equals(uri)){
+ found = true;
+ break;
+ }
+ }
+
+ if (!found){
+ schemaURI_.addElement(schemaURI);
+ }
}
-
- if (!found){
- schemaURI_.addElement(schemaURI);
- }
}
return found;
@@ -624,6 +625,9 @@
WSDLPartsToXSDTypeMapper mapper = new WSDLPartsToXSDTypeMapper();
mapper.addSchemas(schemaList_);
XSDNamedComponent xsdComponent = mapper.getXSDTypeFromSchema(part);
+ if (xsdComponent == null) {
+ return "<error>Generating sample SOAP request</error>"; //$NON-NLS-1$
+ }
xsdComponent.updateElement(true);
XSDSchema schema = xsdComponent.getSchema();
@@ -667,7 +671,9 @@
buf.append(createXMLForJDOMElement2( jdomSchemaElement2, child ));
}
}
- } else {
+ } else if (part.getTypeName() != null && isTypeBaseXSDOrSimple(part.getTypeName().getNamespaceURI(), part.getTypeName().getLocalPart())) {
+ buf.append('<' + part.getName() + ">?</" + part.getName() + '>'); //$NON-NLS-1$
+ } else {
buf.append(createXMLForJDOMElement2( jdomSchemaElement, jdomElement ));
}
@@ -691,6 +697,10 @@
if (kidelement.getAttributeValue("name").equals(nstypename)) //$NON-NLS-1$
return kidelement;
}
+ if (kidelement.getName().equals("simpleType")) { //$NON-NLS-1$
+ if (kidelement.getAttributeValue("name").equals(nstypename)) //$NON-NLS-1$
+ return kidelement;
+ }
if (kidelement.getName().equals("attribute")) { //$NON-NLS-1$
if (kidelement.getAttributeValue("name").equals(nstypename)) //$NON-NLS-1$
return kidelement;
@@ -712,6 +722,10 @@
if (kidelement.getAttributeValue("name").equals(name)) //$NON-NLS-1$
return kidelement;
}
+ if (kidelement.getName().equals("simpleType")) { //$NON-NLS-1$
+ if (kidelement.getAttributeValue("name").equals(name)) //$NON-NLS-1$
+ return kidelement;
+ }
if (kidelement.getName().equals("attribute")) { //$NON-NLS-1$
if (kidelement.getAttributeValue("name").equals(name)) //$NON-NLS-1$
return kidelement;
@@ -993,8 +1007,28 @@
element2 = findJDOMElementInSchema(importXSDSchema, elemType);
if (element2 != null) {
element = element2;
+ } else {
+ element2 = findJDOMElementInSchemaByName(schemaElement, nstypename);
+ if (element2 != null) {
+ element = element2;
+ }
}
}
+ } else if (schemaElement != null) {
+ org.jdom.Element element2 = findJDOMTypeInSchema(schemaElement, elemType);
+ if (element2 != null) {
+ element = element2;
+ } else {
+ element2 = findJDOMElementInSchema(schemaElement, elemType);
+ if (element2 != null) {
+ element = element2;
+ } else {
+ element2 = findJDOMElementInSchemaByName(schemaElement, nstypename);
+ if (element2 != null) {
+ element = element2;
+ }
+ }
+ }
}
}
if (element.getAttribute("ref") != null) {//$NON-NLS-1$
@@ -1043,6 +1077,14 @@
if (elemType != null && isTypeBaseXSDOrSimple(tns, elemType)) {
isSimpleType = true;
}
+
+ boolean hasEnums = false;
+ if (element.getName().equals("simpleType")) { //$NON-NLS-1$
+ String enums = getEnumerations(element);
+ if (enums != null && enums.trim().length() > 0) {
+ hasEnums = true;
+ }
+ }
boolean includeTNSInRoot = false;
if (rootIsQualified_ && !isQualified) {
@@ -1051,6 +1093,9 @@
tnsprefix = "tns"; //$NON-NLS-1$
} else if (isQualified) {
rootIsQualified_ = false;
+ if (tnsprefix == null) {
+ tnsprefix = "tns"; //$NON-NLS-1$
+ }
}
boolean isSequence = element.getName().equals("sequence"); //$NON-NLS-1$
@@ -1084,7 +1129,7 @@
}
- if (hasKids || isSimpleType)
+ if (hasKids || isSimpleType || hasEnums )
buf.append(">"); //$NON-NLS-1$
else
buf.append("/>");//$NON-NLS-1$
@@ -1097,7 +1142,8 @@
List<?> kids = element.getChildren();
for (Iterator<?> kidIter = kids.iterator(); kidIter.hasNext(); ) {
Element kid = (Element) kidIter.next();
- if (kid.getName().equals("complexType") || kid.getName().equals("sequence")) {//$NON-NLS-1$//$NON-NLS-2$
+ if (kid.getName().equals("complexType") || kid.getName().equals("sequence") || //$NON-NLS-1$//$NON-NLS-2$
+ kid.getName().equals("simpleType") || kid.getName().equals("restriction")) { //$NON-NLS-1$ //$NON-NLS-2$
List<?> innerkids = kid.getChildren();
for (Iterator<?> kidIter2 = innerkids.iterator(); kidIter2.hasNext(); ) {
Element innerkid = (Element) kidIter2.next();
@@ -1111,9 +1157,9 @@
}
}
- if (!isSequence && ( hasKids || isSimpleType )) {
+ if (!isSequence && ( hasKids || isSimpleType || hasEnums )) {
// add ? for value
- if (!hasKids || isSimpleType)
+ if (!hasKids || isSimpleType || hasEnums )
buf.append('?');
// close tag
@@ -1129,6 +1175,22 @@
return buf.toString();
}
+ private static String getEnumerations ( org.jdom.Element element ) {
+ StringBuffer buf = new StringBuffer();
+ List<?> kids = element.getChildren();
+ for (Iterator<?> kidIter = kids.iterator(); kidIter.hasNext(); ) {
+ Element kid = (Element) kidIter.next();
+ if (kid.getChildren() != null && kid.getChildren().size() > 0) {
+ buf.append(getEnumerations(kid));
+ }
+ if (kid.getName().equals("enumeration")) { //$NON-NLS-1$
+ String value = kid.getAttributeValue("value"); //$NON-NLS-1$
+ buf.append(value + '|');
+ }
+ }
+ return buf.toString();
+ }
+
private static HashMap<String, String> getDefinitionNamespaces ( Definition wsdlDefinition) {
HashMap<String, String> namespaceMap = new HashMap<String, String>();
namespaceMap.put(SOAP_NS_URI, SOAP_PREFIX);
@@ -1182,7 +1244,7 @@
DOMBuilder domBuilder = new DOMBuilder();
schema.updateElement(true);
org.jdom.Element importXSDSchema = domBuilder.build(schema.getElement());
- if (type.indexOf(':') > -1) {
+ if (type != null && type.indexOf(':') > -1) {
String typename = type.substring(type.indexOf(':') + 1, type.length());
org.jdom.Element element = findJDOMTypeInSchemaByNameAttr(importXSDSchema, typename);
if (element != null) {
@@ -1195,7 +1257,7 @@
// typically the type starts with a namespace prefix, so
// we want to compare the end of the string with the actual
// type name
- if (type.endsWith(STRING_TYPE_NAME) ||
+ if (type != null && type.endsWith(STRING_TYPE_NAME) ||
type.endsWith(BOOLEAN_TYPE_NAME) ||
type.endsWith(DECIMAL_TYPE_NAME) ||
type.endsWith(INT_TYPE_NAME) ||
@@ -1217,7 +1279,7 @@
type.endsWith(PRECISION_DECIMAL_TYPE_NAME)
) {
return true;
- } else if (type.contains(SIMPLE_TYPE_NAME)) {
+ } else if (type != null && type.contains(SIMPLE_TYPE_NAME)) {
return true;
}
return false;
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,57 @@
+<definitions name="Converter" targetNamespace="http://test.jboss.org/ns" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.jboss.org/ns" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <types>
+ <xs:schema elementFormDefault="qualified" targetNamespace="http://test.jboss.org/ns" version="1.0" xmlns:tns="http://test.jboss.org/ns" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="ChangeUnit">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="value" type="xs:double"/>
+ <xs:element name="fromUnit" type="tns:Units"/>
+ <xs:element name="toUnit" type="tns:Units"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ChangeUnitResponse">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ChangeUnitResult" type="xs:double"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:simpleType name="Units">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="kilometer"/>
+ <xs:enumeration value="meter"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:schema>
+ </types>
+ <message name="ConverterPortType_convertResponse">
+ <part element="tns:ChangeUnitResponse" name="parameters"/>
+ </message>
+ <message name="ConverterPortType_convert">
+ <part element="tns:ChangeUnit" name="parameters"/>
+ </message>
+ <portType name="ConverterPortType">
+ <operation name="convert" parameterOrder="parameters">
+ <input message="tns:ConverterPortType_convert"/>
+ <output message="tns:ConverterPortType_convertResponse"/>
+ </operation>
+ </portType>
+ <binding name="ConverterPortTypeBinding" type="tns:ConverterPortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="convert">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="Converter">
+ <port binding="tns:ConverterPortTypeBinding" name="ConverterPortTypeImplPort">
+ <soap:address location="http://localhost:8080/SimpleWSWAR/ConverterPortType"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/ConverterPortType.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,47 @@
+<definitions name="StockQuoteService" targetNamespace="http://www.jboss.com/webservices/StockQuoteService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.jboss.com/webservices/StockQuoteService" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <types>
+ <xs:schema targetNamespace="http://www.jboss.com/webservices/StockQuoteService" version="1.0" xmlns:tns="http://www.jboss.com/webservices/StockQuoteService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="getStockQuoteBySymbol" type="tns:getStockQuoteBySymbol"/>
+ <xs:element name="getStockQuoteBySymbolResponse" type="tns:getStockQuoteBySymbolResponse"/>
+ <xs:complexType name="getStockQuoteBySymbol">
+ <xs:sequence>
+ <xs:element minOccurs="0" name="arg0" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="getStockQuoteBySymbolResponse">
+ <xs:sequence>
+ <xs:element name="return" type="xs:float"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name="StockQuoteService_getStockQuoteBySymbol">
+ <part element="tns:getStockQuoteBySymbol" name="getStockQuoteBySymbol"/>
+ </message>
+ <message name="StockQuoteService_getStockQuoteBySymbolResponse">
+ <part element="tns:getStockQuoteBySymbolResponse" name="getStockQuoteBySymbolResponse"/>
+ </message>
+ <portType name="StockQuoteService">
+ <operation name="getStockQuoteBySymbol" parameterOrder="getStockQuoteBySymbol">
+ <input message="tns:StockQuoteService_getStockQuoteBySymbol"/>
+ <output message="tns:StockQuoteService_getStockQuoteBySymbolResponse"/>
+ </operation>
+ </portType>
+ <binding name="StockQuoteServiceBinding" type="tns:StockQuoteService">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="getStockQuoteBySymbol">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="StockQuoteService">
+ <port binding="tns:StockQuoteServiceBinding" name="StockQuoteServicePort">
+ <soap:address location="http://localhost:8080/SimpleWSWAR/StockQuoteService"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/StockQuoteService.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://test/" name="SampleWSService">
+<types>
+<xsd:schema>
+<xsd:import namespace="http://test/" schemaLocation="SampleWSService.xsd_1.xsd" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/ws/other" schemaLocation="SampleWSService.xsd_2.xsd" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/ws/b" schemaLocation="SampleWSService.xsd_3.xsd" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/ws/a" schemaLocation="SampleWSService.xsd_4.xsd" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/ws" schemaLocation="SampleWSService.xsd_5.xsd" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/attr/y" schemaLocation="SampleWSService.xsd_6.xsd" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/attr/x" schemaLocation="SampleWSService.xsd_7.xsd" />
+</xsd:schema>
+<xsd:schema>
+<xsd:import namespace="http://example.com/attr/other" schemaLocation="SampleWSService.xsd_8.xsd" />
+</xsd:schema>
+</types>
+<message name="echo">
+<part name="parameters" element="tns:echo" />
+</message>
+<message name="echoResponse">
+<part name="parameters" element="tns:echoResponse" />
+</message>
+<portType name="SampleWS">
+<operation name="echo">
+<input wsam:Action="http://test/SampleWS/echoRequest" message="tns:echo" />
+<output wsam:Action="http://test/SampleWS/echoResponse" message="tns:echoResponse" />
+</operation>
+</portType>
+<binding name="SampleWSPortBinding" type="tns:SampleWS">
+<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+<operation name="echo">
+<soap:operation soapAction="" />
+<input>
+<soap:body use="literal" />
+</input>
+<output>
+<soap:body use="literal" />
+</output>
+</operation>
+</binding>
+<service name="SampleWSService">
+<port name="SampleWSPort" binding="tns:SampleWSPortBinding">
+<soap:address location="http://localhost:8080/A/SampleWSService" />
+</port>
+</service>
+</definitions>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:tns="http://test/" xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://test/">
+
+<xs:import namespace="http://example.com/ws" schemaLocation="SampleWSService.xsd_5.xsd" />
+
+<xs:element name="echo" type="tns:echo" />
+
+<xs:element name="echoResponse" type="tns:echoResponse" />
+
+<xs:complexType name="echo">
+<xs:sequence>
+<xs:element name="arg0" type="ns1:someType" />
+</xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="echoResponse">
+<xs:sequence>
+<xs:element name="return" type="ns1:someType" minOccurs="0" />
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_1.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/other">
+
+<xs:import namespace="http://example.com/ws" schemaLocation="SampleWSService.xsd_5.xsd" />
+
+<xs:element name="OtherType" type="ns1:otherType" />
+</xs:schema>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_2.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/b">
+
+<xs:element name="B" type="xs:int" />
+
+<xs:element name="description" type="xs:string" />
+</xs:schema>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_3.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/ws/a">
+
+<xs:element name="A" type="xs:int" />
+</xs:schema>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_4.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:tns="http://example.com/ws" xmlns:ns6="http://example.com/attr/other" xmlns:ns5="http://example.com/ws/other" xmlns:ns4="http://example.com/attr/y" xmlns:ns3="http://example.com/attr/x" xmlns:ns2="http://example.com/ws/b" xmlns:ns1="http://example.com/ws/a" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" version="1.0" targetNamespace="http://example.com/ws">
+
+<xs:import namespace="http://example.com/ws/a" schemaLocation="SampleWSService.xsd_4.xsd" />
+
+<xs:import namespace="http://example.com/ws/b" schemaLocation="SampleWSService.xsd_3.xsd" />
+
+<xs:import namespace="http://example.com/attr/x" schemaLocation="SampleWSService.xsd_7.xsd" />
+
+<xs:import namespace="http://example.com/attr/y" schemaLocation="SampleWSService.xsd_6.xsd" />
+
+<xs:import namespace="http://example.com/ws/other" schemaLocation="SampleWSService.xsd_2.xsd" />
+
+<xs:import namespace="http://example.com/attr/other" schemaLocation="SampleWSService.xsd_8.xsd" />
+
+<xs:element name="SomeType" type="tns:someType" />
+
+<xs:complexType name="someType">
+<xs:sequence>
+<xs:element ref="ns1:A" />
+<xs:element ref="ns2:B" />
+<xs:element ref="ns5:OtherType" />
+</xs:sequence>
+<xs:attribute ref="ns3:C" use="required" />
+<xs:attribute ref="ns4:D" use="required" />
+</xs:complexType>
+
+<xs:complexType name="otherType">
+<xs:sequence>
+<xs:element ref="ns2:description" />
+</xs:sequence>
+<xs:attribute ref="ns6:myid" />
+<xs:attribute ref="ns3:Y" use="required" />
+</xs:complexType>
+</xs:schema>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_5.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/y">
+
+<xs:attribute name="D" type="xs:int" />
+</xs:schema>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_6.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/x">
+
+<xs:attribute name="C" type="xs:int" />
+
+<xs:attribute name="Y" type="xs:int" />
+</xs:schema>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_7.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?><!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.2.1-hudson-28-. --><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://example.com/attr/other">
+
+<xs:attribute name="myid" type="xs:string" />
+</xs:schema>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/SampleWSService.xsd_8.xsd
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
+ <S:Body>
+ <ns8:echo
+ xmlns:ns2="http://example.com/ws/b"
+ xmlns:ns3="http://example.com/attr/other"
+ xmlns:ns4="http://example.com/attr/x"
+ xmlns:ns5="http://example.com/ws/other"
+ xmlns:ns6="http://example.com/attr/y"
+ xmlns:ns7="http://example.com/ws/a"
+ xmlns:ns8="http://test/"
+ xmlns:ns9="http://example.com/ws">
+ <arg0 ns6:D="4" ns4:C="3">
+ <ns7:A>1</ns7:A>
+ <ns2:B>2</ns2:B>
+ <ns5:OtherType ns4:Y="5" ns3:myid="myID">
+ <ns2:description>aDescription</ns2:description>
+ </ns5:OtherType>
+ </arg0>
+ </ns8:echo>
+ </S:Body>
+</S:Envelope>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/gf/msg_in.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="SampleWSService" targetNamespace="http://test/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <wsdl:types>
+<xs:schema elementFormDefault="qualified" targetNamespace="http://test/" version="1.0" xmlns:ns1="http://example.com/ws" xmlns:tns="http://test/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:import namespace="http://example.com/ws"/>
+<xs:element name="echo" type="tns:echo"/>
+<xs:element name="echoResponse" type="tns:echoResponse"/>
+<xs:complexType name="echo">
+<xs:sequence>
+<xs:element minOccurs="0" name="arg0" type="ns1:someType"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="echoResponse">
+<xs:sequence>
+<xs:element minOccurs="0" name="return" type="ns1:someType"/>
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/ws/other" version="1.0" xmlns:ns1="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:import namespace="http://example.com/ws"/>
+<xs:element name="OtherType" type="ns1:otherType"/>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/ws/b" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="B" type="xs:int"/>
+<xs:element name="description" type="xs:string"/>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/ws/a" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:element name="A" type="xs:int"/>
+</xs:schema>
+<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com/ws" version="1.0" xmlns:ns1="http://example.com/ws/a" xmlns:ns2="http://example.com/ws/b" xmlns:ns3="http://example.com/attr/x" xmlns:ns4="http://example.com/attr/y" xmlns:ns5="http://example.com/ws/other" xmlns:ns6="http://example.com/attr/other" xmlns:tns="http://example.com/ws" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:import namespace="http://example.com/ws/a"/>
+<xs:import namespace="http://example.com/ws/b"/>
+<xs:import namespace="http://example.com/attr/x"/>
+<xs:import namespace="http://example.com/attr/y"/>
+<xs:import namespace="http://example.com/ws/other"/>
+<xs:import namespace="http://example.com/attr/other"/>
+<xs:element name="SomeType" type="tns:someType"/>
+<xs:complexType name="someType">
+<xs:sequence>
+<xs:element ref="ns1:A"/>
+<xs:element ref="ns2:B"/>
+<xs:element minOccurs="0" ref="ns5:OtherType"/>
+</xs:sequence>
+<xs:attribute ref="ns3:C" use="required"/>
+<xs:attribute ref="ns4:D" use="required"/>
+</xs:complexType>
+<xs:complexType name="otherType">
+<xs:sequence>
+<xs:element minOccurs="0" ref="ns2:description"/>
+</xs:sequence>
+<xs:attribute ref="ns6:myid"/>
+<xs:attribute ref="ns3:Y" use="required"/>
+</xs:complexType>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/attr/y" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:attribute name="D" type="xs:int"/>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/attr/x" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:attribute name="C" type="xs:int"/>
+<xs:attribute name="Y" type="xs:int"/>
+</xs:schema>
+<xs:schema targetNamespace="http://example.com/attr/other" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:attribute name="myid" type="xs:string"/>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="echoResponse">
+ <wsdl:part element="tns:echoResponse" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="echo">
+ <wsdl:part element="tns:echo" name="parameters">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="SampleWS">
+ <wsdl:operation name="echo">
+ <wsdl:input message="tns:echo" name="echo">
+ </wsdl:input>
+ <wsdl:output message="tns:echoResponse" name="echoResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SampleWSServiceSoapBinding" type="tns:SampleWS">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="echo">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="echo">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="echoResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SampleWSService">
+ <wsdl:port binding="tns:SampleWSServiceSoapBinding" name="SampleWSPort">
+ <soap:address location="http://localhost:8080/ws/SampleWS"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/SampleWS.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+ <soap:Body>
+ <ns7:echo xmlns:ns1="http://example.com/ws/a" xmlns:ns2="http://example.com/ws/b"
+ xmlns:ns3="http://example.com/attr/other" xmlns:ns4="http://example.com/attr/x"
+ xmlns:ns5="http://example.com/ws/other" xmlns:ns6="http://example.com/attr/y"
+ xmlns:ns7="http://test/" xmlns:ns8="http://example.com/ws">
+ <ns7:arg0 ns4:C="3" ns6:D="4">
+ <ns1:A>1</ns1:A>
+ <ns2:B>2</ns2:B>
+ <ns5:OtherType ns3:myid="myID" ns4:Y="5">
+ <ns2:description>aDescription</ns2:description>
+ </ns5:OtherType>
+ </ns7:arg0>
+ </ns7:echo>
+ </soap:Body>
+</soap:Envelope>
\ No newline at end of file
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbds1602/jb/msg_in.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl (rev 0)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl 2011-05-11 17:39:47 UTC (rev 31216)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:tns="http://www.example.org/ws/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:basic="http://www.example.org/ws/basic/"
+ xmlns:extra="http://www.example.org/ws/extra/" xmlns:square="http://www.example.org/ws/square/"
+ xmlns:common="http://www.example.org/ws/common/" name="example"
+ targetNamespace="http://www.example.org/ws/">
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://www.example.org/ws/common/"
+ xmlns:tns="http://www.example.org/ws/common/">
+ <xsd:element name="header" type="tns:headerType" />
+ <xsd:complexType name="headerType">
+ <xsd:sequence>
+ <xsd:element name="timestamp" type="xsd:dateTime" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ <xsd:schema targetNamespace="http://www.example.org/ws/square/"
+ xmlns:tns="http://www.example.org/ws/square/">
+ <xsd:element name="square" type="tns:squareType" />
+ <xsd:element name="squareResponse" type="tns:squareResponseType" />
+ <xsd:element name="storeResult" type="tns:storeResultType" />
+ <xsd:element name="storeHeader" type="tns:storeHeaderType" />
+ <xsd:complexType name="squareType">
+ <xsd:sequence>
+ <xsd:element name="a" type="xsd:int" />
+ <xsd:element name="b" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="squareResponseType">
+ <xsd:sequence>
+ <xsd:element name="out" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="storeResultType">
+ <xsd:sequence>
+ <xsd:element name="a" type="xsd:int" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="storeHeaderType">
+ <xsd:sequence>
+ <xsd:element name="id" type="xsd:string" />
+ <xsd:element name="timestamp" type="xsd:dateTime" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ <xsd:schema targetNamespace="http://www.example.org/ws/basic/"
+ xmlns:tns="http://www.example.org/ws/basic/">
+ <xsd:import namespace="http://www.example.org/ws/common/" />
+ <xsd:element name="operationRequest" type="tns:requestType" />
+ <xsd:element name="operationResponse" type="tns:responseType" />
+ <xsd:element name="invalidNumberFault" type="tns:faultType" />
+ <xsd:complexType name="requestType">
+ <xsd:sequence>
+ <xsd:element name="a" type="xsd:float" />
+ <xsd:element name="b" type="xsd:float" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="responseType">
+ <xsd:sequence>
+ <xsd:element name="out" type="xsd:float" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="faultType">
+ <xsd:sequence>
+ <xsd:element name="description" type="xsd:string" />
+ <xsd:element name="details" type="xsd:string" />
+ <xsd:element name="a" type="xsd:float" />
+ <xsd:element name="b" type="xsd:float" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ <xsd:schema targetNamespace="http://www.example.org/ws/extra/"
+ xmlns:tns="http://www.example.org/ws/extra/">
+ <xsd:import namespace="http://www.example.org/ws/common/" />
+ <xsd:element name="operationRequest" type="tns:requestType" />
+ <xsd:element name="operationResponse" type="tns:responseType" />
+ <xsd:element name="invalidNumberFault" type="tns:faultType" />
+ <xsd:complexType name="requestType">
+ <xsd:sequence>
+ <xsd:element name="a" type="xsd:double" />
+ <xsd:element name="b" type="xsd:double" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="responseType">
+ <xsd:sequence>
+ <xsd:element name="out" type="xsd:double" />
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="faultType">
+ <xsd:sequence>
+ <xsd:element name="description" type="xsd:string" />
+ <xsd:element name="details" type="xsd:string" />
+ <xsd:element name="a" type="xsd:double" />
+ <xsd:element name="b" type="xsd:double" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="storeHeader">
+ <wsdl:part name="storeHeader" element="square:storeHeader" />
+ </wsdl:message>
+ <wsdl:message name="minusOperationRequest">
+ <wsdl:part name="parameters" element="basic:operationRequest" />
+ <wsdl:part name="header" element="common:header" />
+ </wsdl:message>
+ <wsdl:message name="minusOperationResponse">
+ <wsdl:part name="parameters" element="basic:operationResponse" />
+ </wsdl:message>
+ <wsdl:message name="invalidNumberFaultBasic">
+ <wsdl:part name="parameters" element="basic:invalidNumberFault" />
+ </wsdl:message>
+ <wsdl:message name="invalidNumberFaultExtra">
+ <wsdl:part name="parameters" element="extra:invalidNumberFault" />
+ </wsdl:message>
+ <wsdl:portType name="minusPortType">
+ <wsdl:operation name="minusOperation">
+ <wsdl:input message="tns:minusOperationRequest" name="minusOperationRequest" />
+ <wsdl:output message="tns:minusOperationResponse" name="minusOperationResponse" />
+ <wsdl:fault message="tns:invalidNumberFaultBasic" name="invalidNumberFault" />
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="minusSOAP" type="tns:minusPortType">
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="minusOperation">
+ <soap:operation soapAction="http://www.example.org/ws/minusOperation" />
+ <wsdl:input>
+ <soap:header message="tns:storeHeader" part="storeHeader"
+ use="literal" />
+ <soap:body parts="parameters" use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="basic">
+ <wsdl:port name="minusPort" binding="tns:minusSOAP">
+ <soap:address location="http://www.example.org/" />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Property changes on: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide8770/parts.wsdl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java
===================================================================
--- branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2011-05-11 16:55:52 UTC (rev 31215)
+++ branches/jbosstools-3.2.x/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2011-05-11 17:39:47 UTC (rev 31216)
@@ -17,6 +17,7 @@
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
+import org.jboss.tools.ws.ui.utils.SchemaUtils;
import org.jboss.tools.ws.ui.utils.TesterWSDLUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -68,48 +69,53 @@
@Test
public void testJBIDE6497() {
String s1 = getSampleMessage("/jbide6497/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults");
- Assert.assertTrue("was: '" + s1, s1.contains("<GetSearchResults xmlns = \"http://www.ecubicle.net/webservices\">"));
- Assert.assertTrue("was: '" + s1, s1.contains("<gQuery>?</gQuery>"));
+ Assert.assertTrue("was: '" + s1, s1.contains("<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">"));
+ Assert.assertTrue("was: '" + s1, s1.contains("<tns:gQuery>?</tns:gQuery>"));
s1 = getSampleMessage("/jbide6593/original.wsdl", "EchoService", "EchoPort", "EchoPortBinding", "echo");
- Assert.assertTrue("was: '" + s1, s1.contains("<p><age>?</age>"));
+ Assert.assertTrue("was: '" + s1, s1.contains("<ns:p>\n<age>?</age>"));
Assert.assertTrue("was: '" + s1, s1.contains("<male>?</male>"));
Assert.assertTrue("was: '" + s1, s1.contains("<tax>?</tax>"));
- Assert.assertTrue("was: '" + s1, s1.contains("<echo xmlns = \"http://test.jboss.org/ns\">"));
+ Assert.assertTrue("was: '" + s1, s1.contains("<ns:echo xmlns:ns=\"http://test.jboss.org/ns\">"));
}
@Test
public void testJBIDE6558() {
String s1 = getSampleMessage("/jbide6558/x.wsdl", "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello");
- Assert.assertTrue(s1.contains("xmlns = \"http://webservices.samples.jboss.org/\""));
- Assert.assertTrue(s1.contains("<arg0>?</arg0>"));
+ Assert.assertTrue(s1.contains("xmlns:tns=\"http://webservices.samples.jboss.org/\""));
+ Assert.assertTrue(s1.contains("<tns:arg0>?</tns:arg0>"));
String s2 = getSampleMessage("/jbide6558/y.wsdl", "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello");
- Assert.assertEquals(s1, s2);
+ Assert.assertTrue(s2.contains("xmlns:webs=\"http://webservices.samples.jboss.org/\""));
+ Assert.assertTrue(s2.contains("<arg0>?</arg0>"));
+ // won't be equal due to the namespacing
+ //Assert.assertEquals(s1, s2);
}
@Test
public void testJBIDE6593() {
String s1 = getSampleMessage("/jbide6497/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults");
- Assert.assertTrue(s1.contains("<GetSearchResults xmlns = \"http://www.ecubicle.net/webservices\">"));
- Assert.assertTrue(s1.contains("<gQuery>?</gQuery>"));
+ Assert.assertTrue(s1.contains("<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">"));
+ Assert.assertTrue(s1.contains("<tns:gQuery>?</tns:gQuery>"));
String s2 = getSampleMessage("/jbide6593/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults");
+// Assert.assertTrue(s2.contains("<tns:GetSearchResults xmlns:tns=\"http://www.ecubicle.net/webservices\">"));
+// Assert.assertTrue(s2.contains("<tns:gQuery>?</tns:gQuery>"));
Assert.assertEquals(s1, s2);
}
@Test
public void testJBIDE6694() {
String s1 = getSampleMessage("/jbide6694/ConverterPortType.wsdl", "ConverterPortType", "ConverterPortTypeImplPort", "ConverterPortTypeBinding", "convert");
- Assert.assertTrue(s1.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">"));
- Assert.assertTrue(s1.contains("<value>?</value>"));
- Assert.assertTrue(s1.contains("<fromUnit>?</fromUnit>"));
- Assert.assertTrue(s1.contains("<toUnit>?</toUnit>"));
+ Assert.assertTrue(s1.contains("<tns:ChangeUnit xmlns:tns=\"http://test.jboss.org/ns\">"));
+ Assert.assertTrue(s1.contains("<tns:value>?</tns:value>"));
+ Assert.assertTrue(s1.contains("<tns:fromUnit>?</tns:fromUnit>"));
+ Assert.assertTrue(s1.contains("<tns:toUnit>?</tns:toUnit>"));
String s2 = getSampleMessage("/jbide6694/jbide6694.wsdl", "Converter", "ConverterPort", "ConverterBinding", "convert");
- Assert.assertTrue(s2.contains("<ChangeUnit xmlns = \"http://test.jboss.org/ns\">"));
- Assert.assertTrue(s2.contains("<value>?</value>"));
- Assert.assertTrue(s2.contains("<fromUnit>?</fromUnit>"));
- Assert.assertTrue(s2.contains("<toUnit>?</toUnit>"));
+ Assert.assertTrue(s2.contains("<tns:ChangeUnit xmlns:tns=\"http://test.jboss.org/ns\">"));
+ Assert.assertTrue(s2.contains("<tns:value>?</tns:value>"));
+ Assert.assertTrue(s2.contains("<tns:fromUnit>?</tns:fromUnit>"));
+ Assert.assertTrue(s2.contains("<tns:toUnit>?</tns:toUnit>"));
}
@Test
@@ -117,16 +123,45 @@
String s1 = getSampleMessage("/jbide6865/wsdl1.wsdl", "DirectFlight", "DirectFlightSoap", "FlightAwareDirectFlight:DirectFlightSoap", "AirportInfo");
Assert.assertTrue(s1.contains("<airportCode>?</airportCode>"));
}
+
+ @Test
+ public void testJBDS1602() {
+ String s1 = getSampleMessage("/jbds1602/StockQuoteService.wsdl", "StockQuoteService", "StockQuoteServicePort", "tns:StockQuoteServiceBinding", "getStockQuoteBySymbol");
+ Assert.assertTrue(s1.contains("<stoc:getStockQuoteBySymbol xmlns:stoc=\"http://www.jboss.com/webservices/StockQuoteService\">"));
+ Assert.assertTrue(s1.contains("<arg0>?</arg0>"));
+ String s2 = getSampleMessage("/jbds1602/jb/SampleWS.wsdl", "SampleWSService", "SampleWSPort", "tns:SampleWSServiceSoapBinding", "echo");
+ Assert.assertTrue(s2.contains("<test:echo xmlns:test=\"http://test/\">"));
+ Assert.assertTrue(s2.contains("<test:arg0 xmlns:x=\"http://example.com/attr/x\" x:C=\"?\" xmlns:y=\"http://example.com/attr/y\" y:D=\"?\" >"));
+ Assert.assertTrue(s2.contains("<othe:OtherType xmlns:othe=\"http://example.com/attr/other\" othe:myid=\"?\" x:Y=\"?\" >"));
+ Assert.assertTrue(s2.contains("<b:description>?</b:description>"));
+ }
+
+ @Test
+ public void testJBIDE8770() {
+ String s1 = getSampleMessage("/jbide8770/parts.wsdl", "basic", "minusPort", "minusSOAP", "minusOperation");
+ Assert.assertTrue(s1.contains("<basi:operationRequest xmlns:basi=\"http://www.example.org/ws/basic/\">"));
+ Assert.assertTrue(s1.contains("<a>?</a>"));
+
+ String s2 = getSampleMessageHeader("/jbide8770/parts.wsdl", "basic", "minusPort", "minusSOAP", "minusOperation");
+ Assert.assertTrue(s2.contains("<squa:storeHeader xmlns:squa=\"http://www.example.org/ws/square/\">"));
+ Assert.assertTrue(s2.contains("<timestamp>?</timestamp>"));
+ }
+
private String getSampleMessage(String res, String service, String port, String binding, String operation) {
Definition def = readWSDL(res);
- return TesterWSDLUtils.getSampleSOAPInputMessage(def, service, port, binding, operation);
+ return SchemaUtils.getSampleSOAPInputMessage(def, service, port, binding, operation);
}
+ private String getSampleMessageHeader(String res, String service, String port, String binding, String operation) {
+ Definition def = readWSDL(res);
+ return SchemaUtils.getSampleSOAPMessageHeader(def, service, port, binding, operation);
+ }
+
private Definition readWSDL(String path) {
try {
- URL url = TesterWSDLUtilsTest.class.getResource(path).toURI().toURL();
- return TesterWSDLUtils.readWSDLURL(url);
+ URL url = SchemaUtils.class.getResource(path).toURI().toURL();
+ return SchemaUtils.readWSDLURL(url);
} catch (MalformedURLException e) {
e.printStackTrace();
Assert.fail(e.getMessage());
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31215 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-11 12:55:52 -0400 (Wed, 11 May 2011)
New Revision: 31215
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
replace file:// with file:/// to solve '[WARNING] Failed to access p2 repository local.composite (file://home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/), will try to use local cache. Reason: org.eclipse.equinox.p2.core.ProvisionException: URI has an authority component'
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-05-11 16:55:34 UTC (rev 31214)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-05-11 16:55:52 UTC (rev 31215)
@@ -33,20 +33,20 @@
<!-- 1a. URL of latest JBT target platform site -->
<jbosstools-target-platform-repo>http://download.jboss.org/jbosstools/updates/target-platform/latest/</jbosstools-target-platform-repo>
- <!-- 1b. or, use -Dtarget.platform.site=file://home/$user/trunk/build/target-platform/REPO/ -->
+ <!-- 1b. or, use -Dtarget.platform.site=file:///home/$user/trunk/build/target-platform/REPO/ -->
<!-- Set this to a path on your own machine, or use remote URL like http://download.jboss.org/jbosstools/updates/target-platform/latest/
Can also generate a local.target file which will always point to your local
repo w/o having to edit here. See local.target profile below for more information. -->
- <target.platform.site>file://home/hudson/static_build_env/jbds/target-platform/e362-wtp323.target/</target.platform.site>
+ <target.platform.site>file:///home/hudson/static_build_env/jbds/target-platform/e362-wtp323.target/</target.platform.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) -->
<jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2_stabl...</jbosstools-nightly-staging-composite>
- <!-- 2b., or, use -Plocal.composite -Dlocal.composite=file://path/to/mirror/of/composite/staging/site/ -->
- <local.composite>file://home/hudson/static_build_env/jbds/builds/staging/_composite_/3.2_stable_branch/</local.composite>
+ <!-- 2b., or, use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.2_stable_branch/</local.composite>
- <!-- 3. optionally, use -Plocal.requirements -Dlocal.requirements=file://path/to/mirror/of/composite/requirements/site -->
- <local.requirements>file://qa/services/http/binaries/RHDS/updates/helios/</local.requirements>
+ <!-- 3. optionally, use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
+ <local.requirements>file:///qa/services/http/binaries/RHDS/updates/helios/</local.requirements>
<!-- 4. published aggregate update site goes here, for consumption by QE and downstream JBDS builds -->
<jbosstools.update.site>http://download.jboss.org/jbosstools/updates/nightly/3.2_stable_branch/</jbosstools.update.site>
@@ -330,7 +330,7 @@
</profile>
<!-- Time saver: to build everything from scratch from a single local repo
- on Hudson cluster or on local machine. Use -Dtarget.platform.site=file://path/to/your/own/repo -->
+ on Hudson cluster or on local machine. Use -Dtarget.platform.site=file:///path/to/your/own/repo -->
<profile>
<id>helios-local-target</id>
<activation>
@@ -352,7 +352,7 @@
</profile>
<!-- if you have a local repo mirror of the unified.site, you can use this
- profile with the -Dtarget.platform.site=file://path/to/repo to resolve dependencies
+ profile with the -Dtarget.platform.site=file:///path/to/repo to resolve dependencies
without needing to use a local.target file -->
<profile>
<id>local.site</id>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31214 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-11 12:55:34 -0400 (Wed, 11 May 2011)
New Revision: 31214
Modified:
trunk/build/parent/pom.xml
Log:
replace file:// with file:/// to solve '[WARNING] Failed to access p2 repository local.composite (file://home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/), will try to use local cache. Reason: org.eclipse.equinox.p2.core.ProvisionException: URI has an authority component'
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2011-05-11 16:42:21 UTC (rev 31213)
+++ trunk/build/parent/pom.xml 2011-05-11 16:55:34 UTC (rev 31214)
@@ -31,17 +31,17 @@
<!-- 1a. URL of latest JBT target platform site -->
<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo/l...</jbosstools-target-site>
- <!-- 1b. or, use -Plocal.site -Dlocal.site=file://home/$user/trunk/build/target-platform/REPO/ -->
- <local.site>file://home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37M6-wtp33M6.target/</local.site>
+ <!-- 1b. or, use -Plocal.site -Dlocal.site=file:///home/$user/trunk/build/target-platform/REPO/ -->
+ <local.site>file:///home/hudson/static_build_env/jbds/target-platform_3.3.indigo/e37M6-wtp33M6.target/</local.site>
<!-- 2a. URL of latest JBT nightly staging composite site (all the components in once place) -->
<jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/</jbosstools-nightly-staging-composite>
- <!-- 2b., or, use -Plocal.composite -Dlocal.composite=file://path/to/mirror/of/composite/staging/site/ -->
- <local.composite>file://home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
+ <!-- 2b., or, use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
- <!-- 3. optionally, use -Plocal.requirements -Dlocal.requirements=file://path/to/mirror/of/composite/requirements/site -->
- <local.requirements>file://qa/services/http/binaries/RHDS/updates/indigo/</local.requirements>
+ <!-- 3. optionally, use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
+ <local.requirements>file:///qa/services/http/binaries/RHDS/updates/indigo/</local.requirements>
<!-- 4. published aggregate update site goes here, for consumption by QE and downstream JBDS builds -->
<jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/3.3.indigo/</jbosstools-nightly>
@@ -411,7 +411,7 @@
</profile>
<!-- if you have a local repo mirror of the unified.site, you can use this
- profile with the -Dlocal.site=file://path/to/repo to resolve dependencies
+ profile with the -Dlocal.site=file:///path/to/repo to resolve dependencies
without needing to use a local.site file -->
<profile>
<id>local.site</id>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31213 - in trunk/download.jboss.org/jbosstools/updates: indigo/M7 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-11 12:42:21 -0400 (Wed, 11 May 2011)
New Revision: 31213
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6-...
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
Log:
add missing org.eclipse.mylyn.versions.feature.group to mylyn site; split M6 and M7 versions
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-05-11 16:21:41 UTC (rev 31212)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-05-11 16:42:21 UTC (rev 31213)
@@ -21,6 +21,7 @@
<child location='../../requirements/emf/2.7M6/'/>
<child location='../../requirements/webtools/3.3M6/'/>
<child location='../../requirements/m2eclipse/0.13.0.201103291237/'/>
+<child location='../../requirements/mylyn/3.6-I20110415-0655/'/>
<child location='../../requirements/ecf/3.5/'/>
<child location='../../requirements/egit/0.11/'/>
@@ -28,7 +29,6 @@
<child location='../../requirements/gwt/201102111811/'/>
<child location='../../requirements/jslint/1.5/'/>
-<child location='../../requirements/mylyn/3.6/'/>
<child location='../../requirements/orbit/S20110124210048/'/>
<child location='../../requirements/pmd/3.2.6/'/>
<child location='../../requirements/springide/2.6.0.201103160035/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-05-11 16:21:41 UTC (rev 31212)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-05-11 16:42:21 UTC (rev 31213)
@@ -21,6 +21,7 @@
<child location='../../requirements/emf/2.7M6/'/>
<child location='../../requirements/webtools/3.3M6/'/>
<child location='../../requirements/m2eclipse/0.13.0.201103291237/'/>
+<child location='../../requirements/mylyn/3.6-I20110415-0655/'/>
<child location='../../requirements/ecf/3.5/'/>
<child location='../../requirements/egit/0.11/'/>
@@ -28,7 +29,6 @@
<child location='../../requirements/gwt/201102111811/'/>
<child location='../../requirements/jslint/1.5/'/>
-<child location='../../requirements/mylyn/3.6/'/>
<child location='../../requirements/orbit/S20110124210048/'/>
<child location='../../requirements/pmd/3.2.6/'/>
<child location='../../requirements/springide/2.6.0.201103160035/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-11 16:21:41 UTC (rev 31212)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-05-11 16:42:21 UTC (rev 31213)
@@ -21,6 +21,7 @@
<child location='../../requirements/emf/2.7M7/'/>
<child location='../../requirements/webtools/3.3M7/'/>
<child location='../../requirements/m2eclipse/0.13.0.201105091504/'/>
+<child location='../../requirements/mylyn/3.6-I20110504-0744/'/>
<child location='../../requirements/ecf/3.5/'/>
<child location='../../requirements/egit/0.11/'/>
@@ -28,7 +29,6 @@
<child location='../../requirements/gwt/201102111811/'/>
<child location='../../requirements/jslint/1.5/'/>
-<child location='../../requirements/mylyn/3.6/'/>
<child location='../../requirements/orbit/S20110124210048/'/>
<child location='../../requirements/pmd/3.2.6/'/>
<child location='../../requirements/springide/2.6.0.201103160035/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-11 16:21:41 UTC (rev 31212)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-05-11 16:42:21 UTC (rev 31213)
@@ -21,6 +21,7 @@
<child location='../../requirements/emf/2.7M7/'/>
<child location='../../requirements/webtools/3.3M7/'/>
<child location='../../requirements/m2eclipse/0.13.0.201105091504/'/>
+<child location='../../requirements/mylyn/3.6-I20110504-0744/'/>
<child location='../../requirements/ecf/3.5/'/>
<child location='../../requirements/egit/0.11/'/>
@@ -28,7 +29,6 @@
<child location='../../requirements/gwt/201102111811/'/>
<child location='../../requirements/jslint/1.5/'/>
-<child location='../../requirements/mylyn/3.6/'/>
<child location='../../requirements/orbit/S20110124210048/'/>
<child location='../../requirements/pmd/3.2.6/'/>
<child location='../../requirements/springide/2.6.0.201103160035/'/>
Copied: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6-... (from rev 31212, trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6-... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build-3.6-... 2011-05-11 16:42:21 UTC (rev 31213)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="mirror">
+ <!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
+
+ -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
+ -consoleLog -nosplash -data /tmp
+ -application org.eclipse.ant.core.antRunner
+ -f "/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml"
+
+ or, run headless on qa01 server, where Eclipse is installed into ~/eclipse:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ ${JAVA_HOME}/bin/java -cp ~/eclipse/plugins/org.eclipse.equinox.launcher_*.jar \
+ <iu id="org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner \
+ -f ~/RHDS/updates/requirements/mylyn/build.xml -Ddestination=/tmp/mylyn-repo
+ -->
+ <target name="mirror">
+ <!-- core mylyn, if not on Indigo site; includes Bugzilla -->
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
+ <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/I20110415-0655/" />
+ <!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
+ <!--<property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.6/" /> -->
+ <property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.5/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/mylyn/3.6/" />
+ <property name="compress" value="true" />
+
+ <p2.mirror>
+ <repository location="file:${destination}/3.6-I20110415-0655" name="mylyn plugins for Eclipse 3.6 - 3.7" />
+ <source>
+ <repository location="${URL1}" />
+ <repository location="${URL2}" />
+ </source>
+
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" />
+
+ <iu id="org.eclipse.mylyn_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.commons.feature.group" />
+ <iu id="org.eclipse.mylyn.context_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.wikitext_feature.feature.group" />
+
+ <iu id="org.eclipse.mylyn.ide_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.java_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.pde_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.team_feature.feature.group" />
+
+ <iu id="org.eclipse.mylyn.bugzilla_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.jira_feature.feature.group" />
+ <iu id="org.eclipse.mylyn.git.feature.group" />
+ <iu id="org.eclipse.mylyn.cvs.feature.group" />
+ <iu id="org.eclipse.mylyn.versions.feature.group" />
+
+ <iu id="com.atlassian.connector.eclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.jira.feature.group" />
+ <!-- these last two are described as "obsolete" on the update site -->
+ <iu id="com.atlassian.connector.eclipse.subclipse.feature.group" />
+ <iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
+ </p2.mirror>
+
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6-I20110415-0655/" artifactRepository="file:${destination}/3.6-I20110415-0655/" publishartifacts="true" source="${destination}/3.6-I20110415-0655/" compress="${compress}" />
+ </target>
+</project>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2011-05-11 16:21:41 UTC (rev 31212)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/mylyn/build.xml 2011-05-11 16:42:21 UTC (rev 31213)
@@ -17,7 +17,8 @@
-->
<target name="mirror">
<!-- core mylyn, if not on Indigo site; includes Bugzilla -->
- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" />
+ <!-- <property name="URL1" value="http://download.eclipse.org/mylyn/snapshots/weekly/" /> -->
+ <property name="URL1" value="http://download.eclipse.org/mylyn/archive/3.6.0/I20110504-0744/" />
<!-- JIRA connector; note that Subclipse connector is on Subclipse req site, ../subclipse/ -->
<!--<property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/e3.6/" /> -->
<property name="URL2" value="http://update.atlassian.com/atlassian-eclipse-plugin/weekly/e3.5/" />
@@ -25,7 +26,7 @@
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/3.6/" name="mylyn plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/3.6-I20110504-0744" name="mylyn plugins for Eclipse 3.6 - 3.7" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -47,6 +48,7 @@
<iu id="org.eclipse.mylyn.jira_feature.feature.group" />
<iu id="org.eclipse.mylyn.git.feature.group" />
<iu id="org.eclipse.mylyn.cvs.feature.group" />
+ <iu id="org.eclipse.mylyn.versions.feature.group" />
<iu id="com.atlassian.connector.eclipse.feature.group" />
<iu id="com.atlassian.connector.eclipse.cvs.feature.group" />
@@ -56,6 +58,6 @@
<iu id="com.atlassian.connector.eclipse.subversive.feature.group" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6/" artifactRepository="file:${destination}/3.6/" publishartifacts="true" source="${destination}/3.6/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.6-I20110504-0744/" artifactRepository="file:${destination}/3.6-I20110504-0744/" publishartifacts="true" source="${destination}/3.6-I20110504-0744/" compress="${compress}" />
</target>
</project>
14 years, 11 months
- 1
- 0