diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.axis2/META-INF/MANIFEST.MF b/app-server/org.wso2.developerstudio.eclipse.artifact.axis2/META-INF/MANIFEST.MF index 55ba6275cd..25e7f02944 100644 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.axis2/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.axis2/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Axis2 Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.axis2;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.axis2.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, @@ -14,8 +14,8 @@ Bundle-ActivationPolicy: lazy Import-Package: javax.wsdl;version="[1.6.2.wso2v1,1.7.0)", org.apache.axiom.om, org.apache.axiom.om.impl.builder, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.project, org.eclipse.core.resources, org.eclipse.emf.common.ui.dialogs, org.eclipse.jdt.core, diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.axis2/pom.xml b/app-server/org.wso2.developerstudio.eclipse.artifact.axis2/pom.xml index 82d7de26d2..8ca9ed0a77 100644 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.axis2/pom.xml +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.axis2/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.axis2 diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.axis2serviceclient/META-INF/MANIFEST.MF b/app-server/org.wso2.developerstudio.eclipse.artifact.axis2serviceclient/META-INF/MANIFEST.MF index 1c4c7477e7..55375f3373 100755 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.axis2serviceclient/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.axis2serviceclient/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Axis2serviceclient Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.axis2serviceclient;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.axis2serviceclient.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.axis2serviceclient/pom.xml b/app-server/org.wso2.developerstudio.eclipse.artifact.axis2serviceclient/pom.xml index 6f43350862..fe7d58f7a3 100755 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.axis2serviceclient/pom.xml +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.axis2serviceclient/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.axis2serviceclient diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.jaxrs/META-INF/MANIFEST.MF b/app-server/org.wso2.developerstudio.eclipse.artifact.jaxrs/META-INF/MANIFEST.MF index 4fe2a9e42e..568c37667f 100755 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.jaxrs/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.jaxrs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.wso2.developerstudio.eclipse.artifact.jaxrs Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.jaxrs;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.jaxrs.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, @@ -10,10 +10,10 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: org.apache.axiom.om, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.model.io.xpp3;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.model.io.xpp3, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.internal.ui.dialogs, diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.jaxrs/pom.xml b/app-server/org.wso2.developerstudio.eclipse.artifact.jaxrs/pom.xml index ef16336d22..ea28fd8ce9 100755 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.jaxrs/pom.xml +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.jaxrs/pom.xml @@ -21,11 +21,11 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.jaxrs - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio Jax-RS Artifact diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.jaxws/META-INF/MANIFEST.MF b/app-server/org.wso2.developerstudio.eclipse.artifact.jaxws/META-INF/MANIFEST.MF index 9bcc68ed74..5473b541d1 100644 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.jaxws/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.jaxws/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JAX-WS Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.jaxws;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.jaxws.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -12,10 +12,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: javax.wsdl;version="[1.6.2.wso2v1,1.7.0)", org.apache.axiom.om, org.apache.axiom.om.impl.builder, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.model.io.xpp3;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.model.io.xpp3, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.internal.ui.dialogs, diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.jaxws/pom.xml b/app-server/org.wso2.developerstudio.eclipse.artifact.jaxws/pom.xml index db172e9b87..37adb4df9e 100644 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.jaxws/pom.xml +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.jaxws/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.jaxws diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.webapp/META-INF/MANIFEST.MF b/app-server/org.wso2.developerstudio.eclipse.artifact.webapp/META-INF/MANIFEST.MF index 291b3bd618..bd4ba7810e 100644 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.webapp/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.webapp/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WebApp Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.webapp;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.webapp.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime @@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, org.apache.maven.model, - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.project, org.eclipse.core.resources, org.eclipse.emf.common.notify.impl, org.eclipse.emf.ecore.impl, diff --git a/app-server/org.wso2.developerstudio.eclipse.artifact.webapp/pom.xml b/app-server/org.wso2.developerstudio.eclipse.artifact.webapp/pom.xml index 14cccb9b49..50f4d56fd6 100644 --- a/app-server/org.wso2.developerstudio.eclipse.artifact.webapp/pom.xml +++ b/app-server/org.wso2.developerstudio.eclipse.artifact.webapp/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.webapp diff --git a/app-server/org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver/META-INF/MANIFEST.MF b/app-server/org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver/META-INF/MANIFEST.MF index c90dd8904a..4df0324942 100644 --- a/app-server/org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Axis2 RPC Message Receiver Class Plugin Bundle-SymbolicName: org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/app-server/org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver/pom.xml b/app-server/org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver/pom.xml index d05a85ebfc..b8e2f016a7 100644 --- a/app-server/org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver/pom.xml +++ b/app-server/org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver diff --git a/app-server/org.wso2.wsf.ide.consumption.core/META-INF/MANIFEST.MF b/app-server/org.wso2.wsf.ide.consumption.core/META-INF/MANIFEST.MF index f37a3dc9f8..37ee9b15e1 100644 --- a/app-server/org.wso2.wsf.ide.consumption.core/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.wsf.ide.consumption.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Consumption Core Bundle-SymbolicName: org.wso2.wsf.ide.consumption.core;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.wsf.ide.consumption.core.plugin.WebServiceWSASConsumptionCorePlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/app-server/org.wso2.wsf.ide.consumption.core/pom.xml b/app-server/org.wso2.wsf.ide.consumption.core/pom.xml index 65f34f6c27..01a996d253 100644 --- a/app-server/org.wso2.wsf.ide.consumption.core/pom.xml +++ b/app-server/org.wso2.wsf.ide.consumption.core/pom.xml @@ -25,10 +25,10 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.wsf.ide.consumption.core eclipse-plugin Carbon App Server Consumption Core diff --git a/app-server/org.wso2.wsf.ide.consumption.ui/META-INF/MANIFEST.MF b/app-server/org.wso2.wsf.ide.consumption.ui/META-INF/MANIFEST.MF index ac632d48e5..8947fa2436 100644 --- a/app-server/org.wso2.wsf.ide.consumption.ui/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.wsf.ide.consumption.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Consumption UI Bundle-SymbolicName: org.wso2.wsf.ide.consumption.ui;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.wsf.ide.consumption.ui.plugin.WebServiceWSASConsumptionUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/app-server/org.wso2.wsf.ide.consumption.ui/pom.xml b/app-server/org.wso2.wsf.ide.consumption.ui/pom.xml index 5fc7c04c60..03430e696f 100644 --- a/app-server/org.wso2.wsf.ide.consumption.ui/pom.xml +++ b/app-server/org.wso2.wsf.ide.consumption.ui/pom.xml @@ -25,10 +25,10 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.wsf.ide.consumption.ui eclipse-plugin Carbon App Server Consumption UI diff --git a/app-server/org.wso2.wsf.ide.core/META-INF/MANIFEST.MF b/app-server/org.wso2.wsf.ide.core/META-INF/MANIFEST.MF index a9daf0b04a..d1efaf7a7a 100644 --- a/app-server/org.wso2.wsf.ide.core/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.wsf.ide.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Core Bundle-SymbolicName: org.wso2.wsf.ide.core;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.wsf.ide.core.plugin.WebServiceWSASCorePlugin Bundle-Vendor: WSO2 Bundle-Localization: plugin diff --git a/app-server/org.wso2.wsf.ide.core/pom.xml b/app-server/org.wso2.wsf.ide.core/pom.xml index 5b50da2102..8bf3ce2a0e 100644 --- a/app-server/org.wso2.wsf.ide.core/pom.xml +++ b/app-server/org.wso2.wsf.ide.core/pom.xml @@ -25,10 +25,10 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.wsf.ide.core eclipse-plugin Carbon App Server Tools Core diff --git a/app-server/org.wso2.wsf.ide.creation.core/META-INF/MANIFEST.MF b/app-server/org.wso2.wsf.ide.creation.core/META-INF/MANIFEST.MF index e126b09583..612efda79f 100644 --- a/app-server/org.wso2.wsf.ide.creation.core/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.wsf.ide.creation.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Creation Core Bundle-SymbolicName: org.wso2.wsf.ide.creation.core;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Localization: plugin Bundle-Activator: org.wso2.wsf.ide.creation.core.plugin.WebServiceWSASCreationCorePlugin Require-Bundle: org.eclipse.core.runtime, diff --git a/app-server/org.wso2.wsf.ide.creation.core/pom.xml b/app-server/org.wso2.wsf.ide.creation.core/pom.xml index ad15c9a2f2..9370dddc05 100644 --- a/app-server/org.wso2.wsf.ide.creation.core/pom.xml +++ b/app-server/org.wso2.wsf.ide.creation.core/pom.xml @@ -25,10 +25,10 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.wsf.ide.creation.core eclipse-plugin Carbon App Server Creation Core diff --git a/app-server/org.wso2.wsf.ide.creation.ui/META-INF/MANIFEST.MF b/app-server/org.wso2.wsf.ide.creation.ui/META-INF/MANIFEST.MF index 6ffc079ab5..06242ec610 100644 --- a/app-server/org.wso2.wsf.ide.creation.ui/META-INF/MANIFEST.MF +++ b/app-server/org.wso2.wsf.ide.creation.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Creation UI Bundle-SymbolicName: org.wso2.wsf.ide.creation.ui;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.wsf.ide.creation.ui.plugin.WebServiceWSASCreationUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/app-server/org.wso2.wsf.ide.creation.ui/pom.xml b/app-server/org.wso2.wsf.ide.creation.ui/pom.xml index 88ac7c94eb..28e53935ac 100644 --- a/app-server/org.wso2.wsf.ide.creation.ui/pom.xml +++ b/app-server/org.wso2.wsf.ide.creation.ui/pom.xml @@ -25,10 +25,10 @@ org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.wsf.ide.creation.ui eclipse-plugin Carbon App Server Creation UI diff --git a/app-server/pom.xml b/app-server/pom.xml index df200eb201..833fa537ba 100644 --- a/app-server/pom.xml +++ b/app-server/pom.xml @@ -4,11 +4,11 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio carbon-appserver-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 pom WSO2 App Server Eclipse Tools Parent diff --git a/appfactory/org.wso2.developerstudio.appfactory.core/META-INF/MANIFEST.MF b/appfactory/org.wso2.developerstudio.appfactory.core/META-INF/MANIFEST.MF index f56902e793..266ca34acb 100755 --- a/appfactory/org.wso2.developerstudio.appfactory.core/META-INF/MANIFEST.MF +++ b/appfactory/org.wso2.developerstudio.appfactory.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AppFactory Tools Core Bundle-SymbolicName: org.wso2.developerstudio.appfactory.core;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.appfactory.core.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.core.runtime diff --git a/appfactory/org.wso2.developerstudio.appfactory.core/pom.xml b/appfactory/org.wso2.developerstudio.appfactory.core/pom.xml index 12195b1684..73fc1efc35 100755 --- a/appfactory/org.wso2.developerstudio.appfactory.core/pom.xml +++ b/appfactory/org.wso2.developerstudio.appfactory.core/pom.xml @@ -11,7 +11,7 @@ org.wso2.developerstudio appfactory-tool-parent - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 org.wso2.developerstudio.appfactory.core diff --git a/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/client/HttpsJaggeryClient.java b/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/client/HttpsJaggeryClient.java index 8b7e1bde9c..3628d90224 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/client/HttpsJaggeryClient.java +++ b/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/client/HttpsJaggeryClient.java @@ -52,12 +52,72 @@ public class HttpsJaggeryClient { private static IDeveloperStudioLog log=Logger.getLog(Activator.PLUGIN_ID); private static HttpClient client; + private static String cookie; public static String httpPostLogin(String urlStr, Map params){ client = new DefaultHttpClient(); client = HttpsJaggeryClient.wrapClient(client,urlStr); - return httpPost(urlStr,params); + + HttpPost post = new HttpPost(urlStr); + String respond = ""; + HttpResponse response=null; + + try + { + List nameValuePairs = new ArrayList(1); + Set keySet = params.keySet(); + + for (String key : keySet) { + nameValuePairs.add(new BasicNameValuePair(key, params.get(key))); + } + post.setEntity(new UrlEncodedFormEntity(nameValuePairs)); + response = client.execute(post); + + if(200==response.getStatusLine().getStatusCode()) + { + cookie = response.getFirstHeader("Set-Cookie").getValue().split(";")[0]; + HttpEntity entityGetAppsOfUser = response.getEntity(); + BufferedReader rd = new BufferedReader(new InputStreamReader(entityGetAppsOfUser.getContent())); + StringBuilder sb = new StringBuilder(); + String line =""; + + while ((line = rd.readLine()) != null) { + sb.append(line); + } + respond = sb.toString(); + + if("false".equals(respond)){ + Authenticator.getInstance().setErrorcode(ErrorType.INVALID); + } + EntityUtils.consume(entityGetAppsOfUser); + + if (entityGetAppsOfUser != null) { + entityGetAppsOfUser.getContent().close(); + } + } + else + { + Authenticator.getInstance().setErrorcode(ErrorType.FAILD); + Authenticator.getInstance().setErrormsg(response.getStatusLine().getReasonPhrase()); + log.error("("+response.getStatusLine().getStatusCode()+")"+ + ":"+response.getStatusLine().getReasonPhrase()); + return "false"; + } + + } + catch(Exception e) + { + Authenticator.getInstance().setErrorcode(ErrorType.ERROR); + log.error("Connection failure",e); + return "false"; + } + finally + { + client.getConnectionManager().closeExpiredConnections(); + } + + return respond; } public static String httpPost(String urlStr, Map params){ @@ -74,7 +134,11 @@ public static String httpPost(String urlStr, Map params){ for (String key : keySet) { nameValuePairs.add(new BasicNameValuePair(key, params.get(key))); } + post.setEntity(new UrlEncodedFormEntity(nameValuePairs)); + if(cookie!=null){ + post.setHeader("Cookie", cookie); + } response = client.execute(post); if(200==response.getStatusLine().getStatusCode()){ HttpEntity entityGetAppsOfUser = response.getEntity(); diff --git a/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/jag/api/JagApiProperties.java b/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/jag/api/JagApiProperties.java index 4d37f13810..d19709287d 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/jag/api/JagApiProperties.java +++ b/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/jag/api/JagApiProperties.java @@ -43,7 +43,7 @@ public class JagApiProperties { public static final String App_BUILD_ACTION ="createArtifact"; public static final String App_USERS_ROLES_ACTION ="getUsersOfApplication"; public static final String App_DB_INFO_ACTION = "getDbUserTemplateInfoForStages"; - public static final String App_DS_INFO_ACTION = "getDataSourceInfoUrl"; + public static final String App_DS_INFO_ACTION = "getDatasources"; public static String getDomain() { return domain; diff --git a/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/model/AppListModel.java b/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/model/AppListModel.java index 04b073a17f..33655dbe5d 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/model/AppListModel.java +++ b/appfactory/org.wso2.developerstudio.appfactory.core/src/org/wso2/developerstudio/appfactory/core/model/AppListModel.java @@ -139,80 +139,40 @@ public boolean setDSInfomation(ApplicationInfo applicationInfo) { Map params; params = new HashMap(); params.put("action", JagApiProperties.App_DS_INFO_ACTION); - params.put("stage", "Development"); + params.put("applicationKey", applicationInfo.getKey()); + respond = HttpsJaggeryClient.httpPost( JagApiProperties.getAppDsInfoUrl(), params); - if ("false".equals(respond)) { + + if ("false".equals(respond)) + { return false; - } else { - RssClient.getDBinfo("reloadAllDataSources", respond); - String dsinfo = RssClient.getDBinfo("getAllDataSources", respond); - if (dsinfo == null) { - return false; - } - try { - List dsModels = new ArrayList(); - InputStream is = new ByteArrayInputStream(dsinfo.getBytes()); - SOAPMessage msg = MessageFactory.newInstance().createMessage(null, is); - SOAPBody soapBody = msg.getSOAPBody(); - - SOAPElement allDataSources = (SOAPElement) soapBody.getFirstChild(); - @SuppressWarnings("unchecked") - Iterator dsList = allDataSources.getChildElements(); - while (dsList.hasNext()) { - SOAPElement element = dsList.next(); - SOAPElement isactive = (SOAPElement) element.getLastChild().getLastChild(); - if ("ACTIVE".equalsIgnoreCase(isactive.getValue())) { - try { - DataSource dsModel = new DataSource(); - //SOAPElement reInfo = (SOAPElement) element; - SOAPElement dsMetaInfo = (SOAPElement)element.getFirstChild(); - SOAPElement dsName = (SOAPElement) dsMetaInfo - .getElementsByTagNameNS( "http://services.core.ndatasource.carbon.wso2.org/xsd", - "name").item(0); - dsModel.setName(dsName.getValue()); - SOAPElement dsDefinition = (SOAPElement) dsMetaInfo.getFirstChild(); - SOAPElement dsType = (SOAPElement) dsDefinition - .getElementsByTagNameNS( - "http://services.core.ndatasource.carbon.wso2.org/xsd", - "type").item(0); - dsModel.setType(dsType.getValue()); - SOAPElement dsXMLConfiguration = (SOAPElement) dsDefinition - .getFirstChild(); - Map dbconfig = new HashMap(); - String xmlSource = dsXMLConfiguration.getValue(); - - DocumentBuilderFactory factory = DocumentBuilderFactory - .newInstance(); - DocumentBuilder builder = factory - .newDocumentBuilder(); - Document doc = builder.parse(new InputSource( - new StringReader(xmlSource))); - Node firstChild = doc.getFirstChild(); - NodeList childNodes = firstChild.getChildNodes(); - for (int temp = 0; temp < childNodes.getLength(); temp++) { - Node nNode = childNodes.item(temp); - Element eElement = (Element) nNode; - dbconfig.put(eElement.getNodeName(), - eElement.getTextContent()); - } - dsModel.setConfig(dbconfig); - dsModels.add(dsModel); - } catch (Exception e) { - log.error("DataSource Response msg processing error",e); - } - - } - } - - applicationInfo.setDatasources(dsModels); - } catch (IOException e) { - return false; + } + else + { + List dataSources = new ArrayList(); + + JsonElement element = new JsonParser().parse(respond); + JsonObject object = element.getAsJsonObject(); + + for (Map.Entry entry : object.entrySet()) + { + DataSource source = new DataSource(); + source.setName(entry.getKey()); + + JsonObject objDev = entry.getValue().getAsJsonObject().getAsJsonObject("environments").getAsJsonObject("Development"); - } catch (SOAPException e) { - return false; + Map configs = new HashMap(); + configs.put("url", objDev.get("url").getAsString()); + configs.put("username", objDev.get("username").getAsString()); + + source.setConfig(configs); + dataSources.add(source); } + + applicationInfo.setDatasources(dataSources); } + return true; } diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/META-INF/MANIFEST.MF b/appfactory/org.wso2.developerstudio.appfactory.ui/META-INF/MANIFEST.MF index a15ba68239..d6e42bfa26 100755 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/META-INF/MANIFEST.MF +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: AppFactory Tools UI Bundle-SymbolicName: org.wso2.developerstudio.appfactory.ui;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.appfactory.ui.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, @@ -16,7 +16,8 @@ Import-Package: com.google.gson;version="2.1.0", javax.inject;version="1.0.0", org.apache.http;version="4.1.0.wso2v1", org.apache.http.util;version="4.1.4", - org.apache.maven.project;version="2.2.1", + org.apache.maven.project, + org.apache.maven.shared.invoker, org.eclipse.core.resources, org.eclipse.datatools.connectivity, org.eclipse.e4.core.contexts, diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/pom.xml b/appfactory/org.wso2.developerstudio.appfactory.ui/pom.xml index 4c3598d621..6a11ed6c48 100755 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/pom.xml +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/pom.xml @@ -11,10 +11,17 @@ org.wso2.developerstudio appfactory-tool-parent - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 org.wso2.developerstudio.appfactory.ui eclipse-plugin Developer Studio AppFactory Tools + + + org.apache.maven.shared + maven-invoker + 2.1.1 + + diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/perspective/AppFactoryPerspectiveFactory.java b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/perspective/AppFactoryPerspectiveFactory.java index 413f230268..6f7e98bbc1 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/perspective/AppFactoryPerspectiveFactory.java +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/perspective/AppFactoryPerspectiveFactory.java @@ -50,30 +50,12 @@ public class AppFactoryPerspectiveFactory implements IPerspectiveFactory { public void createInitialLayout(IPageLayout appfacLayout) { try { - if(Authenticator.getInstance().isFromDashboad()){/*Request come form dash-board*/ - Authenticator.getInstance().setFromDashboad(false); - initAfViewsloadingProcess(appfacLayout); - }else{ - if(Authenticator.getInstance().isLoaded()){/*Request come from Perspective selector*/ - initAfViewsloadingProcess(appfacLayout); - }else{ - Authenticator.getInstance().setCredentials(null);/*Should be a new Login attempts*/ - LoginAction loginAction = new LoginAction(); - loginAction.login(false,false); - if(Authenticator.getInstance().getCredentials()!=null){ - initAfViewsloadingProcess(appfacLayout); - }else{ - addGostView(appfacLayout); - } - } - } + initAfViewsloadingProcess(appfacLayout); } catch (Exception e) { log.error("Perspective loading issue", e); //$NON-NLS-1$ } } - - private void initAfViewsloadingProcess(IPageLayout appfacLayout) throws InvocationTargetException, InterruptedException { ProgressMonitorDialog progressMonitorDialog = new ProgressMonitorDialog( diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/perspective/ShowAppFactoryPerspective.java b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/perspective/ShowAppFactoryPerspective.java index 6a711738c1..e846785e9a 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/perspective/ShowAppFactoryPerspective.java +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/perspective/ShowAppFactoryPerspective.java @@ -15,8 +15,15 @@ */ package org.wso2.developerstudio.appfactory.ui.perspective; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.IEditorReference; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; import org.wso2.developerstudio.appfactory.core.Activator; import org.wso2.developerstudio.appfactory.ui.actions.LoginAction; import org.wso2.developerstudio.eclipse.logging.core.IDeveloperStudioLog; @@ -24,12 +31,17 @@ import org.wso2.developerstudio.eclipse.platform.core.utils.SWTResourceManager; public class ShowAppFactoryPerspective extends Action{ -private static IDeveloperStudioLog log = Logger.getLog(Activator.PLUGIN_ID); + + + static final String DASHBOARD_VIEW_ID = "org.wso2.developerstudio.eclipse.dashboard"; + + private static IDeveloperStudioLog log = Logger.getLog(Activator.PLUGIN_ID); public void run() { try { - LoginAction loginAction = new LoginAction(); - loginAction.login(true,true); + hideDashboards(); + IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + PlatformUI.getWorkbench().showPerspective("org.wso2.developerstudio.appfactory.ui.perspective", window); } catch (Exception e) { @@ -47,4 +59,24 @@ public ImageDescriptor getImageDescriptor() { public String getDescription() { return "Switch to AppFactory perspective"; } + + private void hideDashboards(){ + try { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + List openEditors = new ArrayList(); + IEditorReference[] editorReferences = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().getEditorReferences(); + for (IEditorReference iEditorReference : editorReferences) { + if (DASHBOARD_VIEW_ID.equals(iEditorReference.getId())) { + openEditors.add(iEditorReference); + } + } + if (openEditors.size() > 0) { + page.closeEditors(openEditors.toArray(new IEditorReference[] {}), false); + } + } catch (Exception e) { + /* safe to ignore */ + } + } } diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/Messages.java b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/Messages.java index 6c70a9fc96..1c9f7ff6ed 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/Messages.java +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/Messages.java @@ -76,6 +76,10 @@ public class Messages extends NLS { public static String AppfactoryApplicationListView_updateApplicationView_monitor_text_1; public static String AppfactoryApplicationListView_updateApplicationView_monitor_text_2; public static String AppfactoryApplicationListView_updateApplicationView_monitor_text_3; + public static String AppfactoryApplicationListView_executeMavenCommands_text; + public static String AppfactoryApplicationListView_executeMavenCommands_text2; + public static String AppfactoryApplicationListView_executeMavenCommands_errorlog_text; + public static String AppfactoryApplicationListView_executeMavenCommands_errorlog_text2; public static String AppfactoryConsoleView_Console_Title; public static String AppFactoryPerspectiveFactory_LoadAppFacPerfectiveJob_monitor_op_text1; public static String AppFactoryPerspectiveFactory_LoadAppFacPerfectiveJob_monitor_op_text2; diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/messages.properties b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/messages.properties index 2a104ebcb1..26e1e39032 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/messages.properties +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/utils/messages.properties @@ -70,6 +70,10 @@ AppfactoryApplicationListView_updateApplicationView_monitor_text_0=Connecting to AppfactoryApplicationListView_updateApplicationView_monitor_text_1=Getting Applications AppfactoryApplicationListView_updateApplicationView_monitor_text_2=Loading applications into appList view AppfactoryApplicationListView_updateApplicationView_monitor_text_3=Data fetching failed \!\! +AppfactoryApplicationListView_executeMavenCommands_text=Maven - Resolving project dependencies +AppfactoryApplicationListView_executeMavenCommands_text2=Maven - Generating eclipse project files +AppfactoryApplicationListView_executeMavenCommands_errorlog_text=Maven Error while resolving project dependencies +AppfactoryApplicationListView_executeMavenCommands_errorlog_text2=Maven Error while Generating eclipse project files AppfactoryConsoleView_Console_Title=AppFactory Console AppFactoryPerspectiveFactory_LoadAppFacPerfectiveJob_monitor_op_text1=Loading the Perspective AppFactoryPerspectiveFactory_LoadAppFacPerfectiveJob_monitor_op_text2=Connecting to the AppFactory Url diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/AppfactoryApplicationDetailsView.java b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/AppfactoryApplicationDetailsView.java index 9aa4cfe7f1..69de5a81a1 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/AppfactoryApplicationDetailsView.java +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/AppfactoryApplicationDetailsView.java @@ -151,6 +151,23 @@ public void updateView(ApplicationInfo applicationInfo) { // Updating the data sources details updateDataSources(applicationInfo); } + + /** + * Clear details view. + */ + public void clear(){ + + // Clear Application Info Tab + removeChildControls(appTypeComposite); + removeChildControls(repoTypeComposite); + removeChildControls(appOwnerComposite); + removeChildControls(descriptionComposite); + + currentStatusTable.removeAll(); + dataSourcesTable.removeAll(); + teamDetailsTable.removeAll(); + + } private void removeChildControls(Composite composite) { Control[] children = composite.getChildren(); diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/AppfactoryApplicationListView.java b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/AppfactoryApplicationListView.java index 98857d9bdc..7909f11ba8 100755 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/AppfactoryApplicationListView.java +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/AppfactoryApplicationListView.java @@ -24,14 +24,23 @@ import java.lang.reflect.Type; import java.sql.Timestamp; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; +import org.apache.maven.shared.invoker.DefaultInvocationRequest; +import org.apache.maven.shared.invoker.DefaultInvoker; +import org.apache.maven.shared.invoker.InvocationRequest; +import org.apache.maven.shared.invoker.InvocationResult; +import org.apache.maven.shared.invoker.Invoker; +import org.apache.maven.shared.invoker.MavenInvocationException; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; @@ -41,6 +50,8 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.e4.core.contexts.EclipseContextFactory; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -112,11 +123,20 @@ public class AppfactoryApplicationListView extends ViewPart { public static final String FORKED_REPO_SUFFIX = "_forked"; public static final String MAIN_REPO_SUFFIX = "_main"; + + private static final String MAVEN_CMD_INSTALL = "install"; + + private static final String MAVEN_CMD_CLEAN = "clean"; + + private static final String MAVEN_CMD_ECLIPSE = "eclipse:eclipse"; + private static IDeveloperStudioLog log=Logger.getLog(Activator.PLUGIN_ID); private static AppfactoryApplicationDetailsView appDetailView; + @Inject UISynchronize uISync; + private TreeViewer viewer; //private Composite parent; private AppListModel model; @@ -184,12 +204,25 @@ public void selectionChanged(SelectionChangedEvent event) { final IStructuredSelection selection = (IStructuredSelection) viewer .getSelection(); Object selectedNode = selection.getFirstElement(); + ApplicationInfo appInfo = null; + if (selectedNode instanceof ApplicationInfo) { - ApplicationInfo appInfo = (ApplicationInfo) selection - .getFirstElement(); - if (!appInfo.getappVersionList().isEmpty()) { - appDetailView.updateView(appInfo); - } + appInfo = (ApplicationInfo) selection + .getFirstElement(); + } + else if(selectedNode instanceof AppVersionGroup) + { + appInfo = ((AppVersionGroup)selection.getFirstElement()).getApplication(); + } + else if(selectedNode instanceof AppVersionInfo) + { + appInfo = ((AppVersionInfo)selection.getFirstElement()).getVersionGroup().getApplication(); + } + + if (!appInfo.getappVersionList().isEmpty()) { + appDetailView.updateView(appInfo); + }else{ + appDetailView.clear(); } } catch (Throwable e) { /*safe to ignore*/ @@ -270,8 +303,7 @@ public void menuAboutToShow(final IMenuManager manager) { }); menuMgr.setRemoveAllWhenShown(true); - viewer.getControl().setMenu(menu); - ShowLoginDialog(); + viewer.getControl().setMenu(menu); updateApplicationView(); } @@ -583,158 +615,157 @@ public void run() { job.schedule(); } + + private void updateUI(final ApplicationInfo appInfo){ + + Display.getDefault().asyncExec(new Runnable() { + public void run() { + viewer.refresh(); + appDetailView.updateView(appInfo); + } + }); + + } + private void getAppVersions(final ApplicationInfo appInfo){ + Job job = new Job(Messages.AppfactoryApplicationListView_getAppVersions_job_title) { - @Override + @Override protected IStatus run(final IProgressMonitor monitor) { monitor.beginTask(Messages.AppfactoryApplicationListView_getAppVersions_monitor_text_1, 100); - UISynchronize uiSynchronize = new UISynchronize() { - @Override - public void syncExec(Runnable runnable) { - } - - @Override - public void asyncExec(Runnable runnable) { - appInfo.setLableState(1); - broker.send("Appversionupdate", model); //$NON-NLS-1$ - if(getVersionInfo(appInfo, monitor)){ - getForkedVersionsInfo(appInfo, monitor); - getTeamInfo(appInfo, monitor); - //getDbInfo(appInfo, monitor);/*currently not supporting*/ - getDSInfo(appInfo, monitor); - appInfo.setLableState(2); - }else{ - appInfo.setLableState(0); - } - } - private boolean getVersionInfo( - final ApplicationInfo appInfo, - final IProgressMonitor monitor) { - monitor.subTask(Messages.AppfactoryApplicationListView_getVersionInfo_monitor_text_2); - monitor.worked(20); - boolean result = model.setversionInfo(appInfo); - if(!result){ - boolean reLogin = Authenticator.getInstance().reLogin(); - if(reLogin){ - result = model.setversionInfo(appInfo); - } - } - if(result){ - monitor.subTask(Messages.AppfactoryApplicationListView_getVersionInfo_monitor_text_3); - monitor.worked(30); - broker.send("Appversionupdate", model); //$NON-NLS-1$ - monitor.worked(32); - return true; - }else{ - - return false; - } + appInfo.setLableState(1); + broker.send("Appversionupdate", model); //$NON-NLS-1$ + if(getVersionInfo(appInfo, monitor)){ + getForkedVersionsInfo(appInfo, monitor); + getTeamInfo(appInfo, monitor); + //getDbInfo(appInfo, monitor);/*currently not supporting*/ + getDSInfo(appInfo, monitor); + appInfo.setLableState(2); + + }else{ + appInfo.setLableState(0); + } + updateUI(appInfo); + + return Status.OK_STATUS; + } + + private boolean getVersionInfo( + final ApplicationInfo appInfo, + final IProgressMonitor monitor) { + monitor.subTask(Messages.AppfactoryApplicationListView_getVersionInfo_monitor_text_2); + monitor.worked(20); + boolean result = model.setversionInfo(appInfo); + if(!result){ + boolean reLogin = Authenticator.getInstance().reLogin(); + if(reLogin){ + result = model.setversionInfo(appInfo); } - - private boolean getForkedVersionsInfo( - final ApplicationInfo appInfo, - final IProgressMonitor monitor) { - monitor.subTask(Messages.AppfactoryApplicationListView_getForkedAppVersions_monitor_text_1); - monitor.worked(38); - boolean result = model.setForkedRepoInfo(appInfo); - if(!result){ - boolean reLogin = Authenticator.getInstance().reLogin(); - if(reLogin){ - result = model.setForkedRepoInfo(appInfo); - } - } - if(result){ - monitor.subTask(Messages.AppfactoryApplicationListView_getVersionInfo_monitor_text_3); - monitor.worked(42); - broker.send("Appversionupdate", model); //$NON-NLS-1$ - monitor.worked(50); - return true; - }else{ + } + if(result){ + monitor.subTask(Messages.AppfactoryApplicationListView_getVersionInfo_monitor_text_3); + monitor.worked(30); + broker.send("Appversionupdate", model); //$NON-NLS-1$ + monitor.worked(32); + return true; + }else{ - return false; - } - } - - private boolean getTeamInfo(final ApplicationInfo appInfo, - final IProgressMonitor monitor) { - monitor.subTask(Messages.AppfactoryApplicationListView_getTeamInfo_monitor_text_1); - monitor.worked(60); - boolean result = model.setRoleInfomation(appInfo); - if(!result){ - boolean reLogin = Authenticator.getInstance().reLogin(); - if(reLogin){ - result = model.setRoleInfomation(appInfo); - } - } - if(result){ - monitor.subTask(Messages.AppfactoryApplicationListView_getTeamInfo_monitor_text_2); - monitor.worked(60); - broker.send("Appversionupdate", model); //$NON-NLS-1$ - monitor.worked(90); - return true; - }else{ - return false; - } + return false; + } + } + + private boolean getForkedVersionsInfo( + final ApplicationInfo appInfo, + final IProgressMonitor monitor) { + monitor.subTask(Messages.AppfactoryApplicationListView_getForkedAppVersions_monitor_text_1); + monitor.worked(38); + boolean result = model.setForkedRepoInfo(appInfo); + if(!result){ + boolean reLogin = Authenticator.getInstance().reLogin(); + if(reLogin){ + result = model.setForkedRepoInfo(appInfo); } - /*Currently not supporting*/ - @SuppressWarnings("unused") - private boolean getDbInfo(final ApplicationInfo appInfo, - final IProgressMonitor monitor) { - monitor.subTask(Messages.AppfactoryApplicationListView_getDbInfo_monitor_text_1); - monitor.worked(60); - boolean result = model.setDBInfomation(appInfo); - if(!result){ - boolean reLogin = Authenticator.getInstance().reLogin(); - if(reLogin){ - result = model.setDBInfomation(appInfo); - } - } - if(result){ - monitor.subTask(Messages.AppfactoryApplicationListView_getDbInfo_monitor_text_2); - monitor.worked(60); - broker.send("Appversionupdate", model); //$NON-NLS-1$ - monitor.worked(90); - return true; - }else{ - return false; - } + } + if(result){ + monitor.subTask(Messages.AppfactoryApplicationListView_getVersionInfo_monitor_text_3); + monitor.worked(42); + broker.send("Appversionupdate", model); //$NON-NLS-1$ + monitor.worked(50); + return true; + }else{ + + return false; + } + } + + private boolean getTeamInfo(final ApplicationInfo appInfo, + final IProgressMonitor monitor) { + monitor.subTask(Messages.AppfactoryApplicationListView_getTeamInfo_monitor_text_1); + monitor.worked(60); + boolean result = model.setRoleInfomation(appInfo); + if(!result){ + boolean reLogin = Authenticator.getInstance().reLogin(); + if(reLogin){ + result = model.setRoleInfomation(appInfo); } - - private boolean getDSInfo(final ApplicationInfo appInfo, - final IProgressMonitor monitor) { - monitor.subTask(Messages.AppfactoryApplicationListView_getDSInfo_monitor_text_2); - monitor.worked(60); - boolean result = model.setDSInfomation(appInfo); - if(!result){ - boolean reLogin = Authenticator.getInstance().reLogin(); - if(reLogin){ - result = model.setDBInfomation(appInfo); - } - } - if(result){ - monitor.subTask(Messages.AppfactoryApplicationListView_getDSInfo_monitor_text_3); - monitor.worked(60); - broker.send("Appversionupdate", model); //$NON-NLS-1$ - monitor.worked(90); - return true; - }else{ - return false; - } + } + if(result){ + monitor.subTask(Messages.AppfactoryApplicationListView_getTeamInfo_monitor_text_2); + monitor.worked(60); + broker.send("Appversionupdate", model); //$NON-NLS-1$ + monitor.worked(90); + return true; + }else{ + return false; + } + } + /*Currently not supporting*/ + @SuppressWarnings("unused") + private boolean getDbInfo(final ApplicationInfo appInfo, + final IProgressMonitor monitor) { + monitor.subTask(Messages.AppfactoryApplicationListView_getDbInfo_monitor_text_1); + monitor.worked(60); + boolean result = model.setDBInfomation(appInfo); + if(!result){ + boolean reLogin = Authenticator.getInstance().reLogin(); + if(reLogin){ + result = model.setDBInfomation(appInfo); } - - - - }; - uiSynchronize.asyncExec(new Runnable() { - @Override - public void run() { - + } + if(result){ + monitor.subTask(Messages.AppfactoryApplicationListView_getDbInfo_monitor_text_2); + monitor.worked(60); + broker.send("Appversionupdate", model); //$NON-NLS-1$ + monitor.worked(90); + return true; + }else{ + return false; + } + } + + private boolean getDSInfo(final ApplicationInfo appInfo, + final IProgressMonitor monitor) { + monitor.subTask(Messages.AppfactoryApplicationListView_getDSInfo_monitor_text_2); + monitor.worked(60); + boolean result = model.setDSInfomation(appInfo); + if(!result){ + boolean reLogin = Authenticator.getInstance().reLogin(); + if(reLogin){ + result = model.setDSInfomation(appInfo); } - }); - - return Status.OK_STATUS; - } + } + if(result){ + monitor.subTask(Messages.AppfactoryApplicationListView_getDSInfo_monitor_text_3); + monitor.worked(60); + broker.send("Appversionupdate", model); //$NON-NLS-1$ + monitor.worked(90); + return true; + }else{ + return false; + } + } + }; job.schedule(); } @@ -1250,6 +1281,14 @@ public void run(IProgressMonitor monitor) { monitor.subTask(operationText); monitor.worked(10); + File pomFile = new File(appInfo.getLocalRepo() + File.separator + "pom.xml"); + + if(pomFile.exists()) + { + executeMavenCommands(pomFile, monitor); + } + + IProjectDescription description = ResourcesPlugin .getWorkspace() .loadProjectDescription(new Path(appInfo.getLocalRepo() + File.separator + ".project")); @@ -1261,7 +1300,8 @@ public void run(IProgressMonitor monitor) { String name = description.getName(); name += (appInfo.isAForkedRepo()) ? FORKED_REPO_SUFFIX : MAIN_REPO_SUFFIX; description.setName(name); - + + final IProject project = ResourcesPlugin.getWorkspace() .getRoot().getProject(description.getName()); if(!project.exists()){ @@ -1297,12 +1337,19 @@ public AppCheckoutAndImportJobJob(AppVersionInfo appInfo) { @Override public void run(IProgressMonitor monitor) { String operationText=Messages.AppfactoryApplicationListView_AppCheckoutAndImportJob_opMSG_1; - monitor.beginTask(operationText, 100); + monitor.beginTask(operationText, 10); try{ checkout(appInfo, monitor); operationText=Messages.AppfactoryApplicationListView_AppCheckoutAndImportJob_opMSG_2; monitor.subTask(operationText); - monitor.worked(10); + monitor.worked(20); + + File pomFile = new File(appInfo.getLocalRepo() + File.separator + "pom.xml"); + + if(pomFile.exists()) + { + executeMavenCommands(pomFile, monitor); + } IProjectDescription description = ResourcesPlugin .getWorkspace() @@ -1310,7 +1357,7 @@ public void run(IProgressMonitor monitor) { operationText=Messages.AppfactoryApplicationListView_AppCheckoutAndImportJob_opMSG_3; monitor.subTask(operationText); - monitor.worked(10); + monitor.worked(30); String name = description.getName(); name += (appInfo.isAForkedRepo()) ? FORKED_REPO_SUFFIX : MAIN_REPO_SUFFIX; @@ -1332,7 +1379,7 @@ public void run(IProgressMonitor monitor) { }catch(Throwable e){ operationText=Messages.AppfactoryApplicationListView_AppCheckoutAndImportJob_Faild; monitor.subTask(operationText); - monitor.worked(10); + monitor.worked(80); log.error("importing failed", e); //$NON-NLS-1$ } @@ -1340,5 +1387,70 @@ public void run(IProgressMonitor monitor) { monitor.done(); } } + + public boolean executeMavenCommands(File pomFile, IProgressMonitor monitor){ + + monitor.worked(40); + + try { + String operationText = Messages.AppfactoryApplicationListView_executeMavenCommands_text; + monitor.subTask(operationText); + printInfoLog(operationText); + + InvocationResult result = mavenInstall(pomFile, monitor); + + if(result.getExitCode()!=0){ + + printErrorLog(Messages.AppfactoryApplicationListView_executeMavenCommands_errorlog_text); + } + + monitor.worked(60); + } catch (MavenInvocationException e) { + + } + + try { + + String operationText = Messages.AppfactoryApplicationListView_executeMavenCommands_text2; + monitor.subTask(operationText); + printInfoLog(operationText); + + InvocationResult result = mavenEclipse(pomFile, monitor); + + if(result.getExitCode()!=0){ + + printErrorLog(Messages.AppfactoryApplicationListView_executeMavenCommands_errorlog_text2); + } + + } catch (MavenInvocationException e) { + + } + + return true; + } + + private InvocationResult mavenInstall(File pomFile, IProgressMonitor monitor) throws MavenInvocationException{ + + InvocationRequest request = new DefaultInvocationRequest(); + request.setPomFile( pomFile ); + request.setGoals(Collections.singletonList( MAVEN_CMD_INSTALL) ); + Invoker invoker = new DefaultInvoker(); + InvocationResult result = invoker.execute( request ); + + request.setGoals(Collections.singletonList( MAVEN_CMD_CLEAN )); + invoker.execute(request); + + return result; + } + + private static InvocationResult mavenEclipse(File pomFile, IProgressMonitor monitor) throws MavenInvocationException{ + + InvocationRequest request = new DefaultInvocationRequest(); + request.setPomFile( pomFile ); + request.setGoals( Collections.singletonList( MAVEN_CMD_ECLIPSE ) ); + Invoker invoker = new DefaultInvoker(); + + return invoker.execute( request ); + } } diff --git a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/PasswordDialog.java b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/PasswordDialog.java index 1fc763c5f7..f66db7d818 100644 --- a/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/PasswordDialog.java +++ b/appfactory/org.wso2.developerstudio.appfactory.ui/src/org/wso2/developerstudio/appfactory/ui/views/PasswordDialog.java @@ -284,9 +284,6 @@ private boolean login() { val = Authenticator.getInstance().Authenticate(JagApiProperties.getLoginUrl(), credentials); if(val && isfromDashboad()){ Authenticator.getInstance().setFromDashboad(isfromDashboad()); - hideDashboards(); - IWorkbenchWindow window=PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - PlatformUI.getWorkbench().showPerspective("org.wso2.developerstudio.appfactory.ui.perspective", window); } resetCredintials(val, oldCredentials, oldServerURL); } catch (Exception e) { diff --git a/appfactory/pom.xml b/appfactory/pom.xml index 72d6e3ccf6..b5211e855d 100755 --- a/appfactory/pom.xml +++ b/appfactory/pom.xml @@ -4,11 +4,11 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio appfactory-tool-parent - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 pom WSO2 AppFactory Eclipse Tools Parent diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF b/bps/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF index 105d8ac87b..234d598492 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model; singleton:=true +Bundle-SymbolicName: org.eclipse.bpel.apache.ode.deploy.model;singleton:=true Bundle-Version: 1.0.3.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName @@ -10,7 +10,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.bpel.apache.ode.deploy.model.dd, org.eclipse.bpel.apache.ode.deploy.model.dd.impl, org.eclipse.bpel.apache.ode.deploy.model.dd.util -Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.emf.ecore;visibility:=reexport, + org.eclipse.emf.ecore.xmi;visibility:=reexport;bundle-version="[2.4.0,3.0.0)", javax.wsdl;bundle-version="[1.5.0,1.6.2]", org.eclipse.bpel.model;bundle-version="1.0.1", org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.ecore b/bps/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.ecore index e85a59fb21..9f312772e7 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.ecore +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.ecore @@ -1,8 +1,6 @@ - +
@@ -197,6 +195,14 @@ + + +
+
+
+ + @@ -334,6 +340,7 @@
+ @@ -373,5 +380,70 @@
+ + +
+
+
+ + + + + +
+
+ + + +
+
+
+ + + + + +
+
+ + + +
+
+ + + + +
+
+ + + + + +
+
+ + + +
+
+ + + + +
+
+ + + + +
+
+ + diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.genmodel b/bps/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.genmodel index 458553f45a..0a48928b4d 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.genmodel +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/model/odeDeploymentDescriptor.genmodel @@ -1,6 +1,5 @@ - + @@ -65,6 +65,7 @@ + @@ -73,6 +74,19 @@ + + + + + + + + + + + + + diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/pom.xml b/bps/org.eclipse.bpel.apache.ode.deploy.model/pom.xml index c68776cbef..3ec3755d04 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/pom.xml +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.apache.ode.deploy.model diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ProcessType.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ProcessType.java index a5d2e3a948..2bb377e233 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ProcessType.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ProcessType.java @@ -38,6 +38,7 @@ *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType#getFileName File Name}
  • *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType#getName Name}
  • *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType#getModel Model}
  • + *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType#getBamServerProfiles Bam Server Profiles}
  • * *

    * @@ -454,4 +455,31 @@ public interface ProcessType extends EObject { */ void setModel(org.eclipse.bpel.model.Process value); + /** + * Returns the value of the 'Bam Server Profiles' containment reference. + * + *

    + * If the meaning of the 'Bam Server Profiles' containment reference isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Bam Server Profiles' containment reference. + * @see #setBamServerProfiles(TBamServerProfiles) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getProcessType_BamServerProfiles() + * @model containment="true" + * extendedMetaData="kind='element' name='bamServerProfiles' namespace='##targetNamespace'" + * @generated + */ + TBamServerProfiles getBamServerProfiles(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType#getBamServerProfiles Bam Server Profiles}' containment reference. + * + * + * @param value the new value of the 'Bam Server Profiles' containment reference. + * @see #getBamServerProfiles() + * @generated + */ + void setBamServerProfiles(TBamServerProfiles value); + } // ProcessType diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TBamServerProfiles.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TBamServerProfiles.java new file mode 100644 index 0000000000..dc9656833b --- /dev/null +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TBamServerProfiles.java @@ -0,0 +1,60 @@ +/** + * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation + */ +package org.eclipse.bpel.apache.ode.deploy.model.dd; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'TBam Server Profiles'. + * + * + *

    + * The following features are supported: + *

      + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles#getProfile Profile}
    • + *
    + *

    + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTBamServerProfiles() + * @model extendedMetaData="name='tBamServerProfiles' kind='elementOnly'" + * @generated + */ +public interface TBamServerProfiles extends EObject { + + /** + * Returns the value of the 'Profile' containment reference. + * + *

    + * If the meaning of the 'Profile' containment reference isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Profile' containment reference. + * @see #setProfile(TProfile) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTBamServerProfiles_Profile() + * @model containment="true" + * extendedMetaData="kind='element' name='profile' namespace='##targetNamespace'" + * @generated + */ + TProfile getProfile(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles#getProfile Profile}' containment reference. + * + * + * @param value the new value of the 'Profile' containment reference. + * @see #getProfile() + * @generated + */ + void setProfile(TProfile value); + +} // TBamServerProfiles diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TEndPoint.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TEndPoint.java new file mode 100644 index 0000000000..6bdeaee594 --- /dev/null +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TEndPoint.java @@ -0,0 +1,115 @@ +/** + * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation + */ +package org.eclipse.bpel.apache.ode.deploy.model.dd; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'TEnd Point'. + * + * + *

    + * The following features are supported: + *

      + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getXmlns Xmlns}
    • + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getEndpointReference Endpoint Reference}
    • + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getServiceDescriptionReference Service Description Reference}
    • + *
    + *

    + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTEndPoint() + * @model extendedMetaData="name='tEndPoint' kind='elementOnly'" + * @generated + */ +public interface TEndPoint extends EObject { + /** + * Returns the value of the 'Xmlns' attribute. + * + *

    + * If the meaning of the 'Xmlns' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Xmlns' attribute. + * @see #setXmlns(String) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTEndPoint_Xmlns() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='xmlns'" + * @generated + */ + String getXmlns(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getXmlns Xmlns}' attribute. + * + * + * @param value the new value of the 'Xmlns' attribute. + * @see #getXmlns() + * @generated + */ + void setXmlns(String value); + + /** + * Returns the value of the 'Endpoint Reference' attribute. + * + *

    + * If the meaning of the 'Endpoint Reference' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Endpoint Reference' attribute. + * @see #setEndpointReference(String) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTEndPoint_EndpointReference() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='endpointReference'" + * @generated + */ + String getEndpointReference(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getEndpointReference Endpoint Reference}' attribute. + * + * + * @param value the new value of the 'Endpoint Reference' attribute. + * @see #getEndpointReference() + * @generated + */ + void setEndpointReference(String value); + + /** + * Returns the value of the 'Service Description Reference' attribute. + * + *

    + * If the meaning of the 'Service Description Reference' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Service Description Reference' attribute. + * @see #setServiceDescriptionReference(String) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTEndPoint_ServiceDescriptionReference() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='serviceDescriptionReference'" + * @generated + */ + String getServiceDescriptionReference(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getServiceDescriptionReference Service Description Reference}' attribute. + * + * + * @param value the new value of the 'Service Description Reference' attribute. + * @see #getServiceDescriptionReference() + * @generated + */ + void setServiceDescriptionReference(String value); + +} // TEndPoint diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProfile.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProfile.java new file mode 100644 index 0000000000..6626774ad6 --- /dev/null +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProfile.java @@ -0,0 +1,88 @@ +/** + * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation + */ +package org.eclipse.bpel.apache.ode.deploy.model.dd; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.util.FeatureMap; + +/** + * + * A representation of the model object 'TProfile'. + * + * + *

    + * The following features are supported: + *

      + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile#getName Name}
    • + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile#getLocation Location}
    • + *
    + *

    + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTProfile() + * @model extendedMetaData="name='tProfile' kind='elementOnly'" + * @generated + */ +public interface TProfile extends EObject { + /** + * Returns the value of the 'Name' attribute. + * + *

    + * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTProfile_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='name'" + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile#getName Name}' attribute. + * + * + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + + /** + * Returns the value of the 'Location' attribute. + * + *

    + * If the meaning of the 'Location' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Location' attribute. + * @see #setLocation(String) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTProfile_Location() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='location'" + * @generated + */ + String getLocation(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile#getLocation Location}' attribute. + * + * + * @param value the new value of the 'Location' attribute. + * @see #getLocation() + * @generated + */ + void setLocation(String value); + +} // TProfile diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProvide.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProvide.java index 43f835b244..e783e5cdaf 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProvide.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TProvide.java @@ -12,6 +12,7 @@ package org.eclipse.bpel.apache.ode.deploy.model.dd; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.util.FeatureMap; /** * @@ -23,6 +24,7 @@ *
      *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProvide#getService Service}
    • *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProvide#getPartnerLink Partner Link}
    • + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProvide#getCorrelationFilter Correlation Filter}
    • *
    *

    * @@ -85,4 +87,30 @@ public interface TProvide extends EObject { */ void setPartnerLink(String value); + /** + * Returns the value of the 'Correlation Filter' attribute. + * + *

    + * If the meaning of the 'Correlation Filter' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Correlation Filter' attribute. + * @see #setCorrelationFilter(String) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTProvide_CorrelationFilter() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * @generated + */ + String getCorrelationFilter(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProvide#getCorrelationFilter Correlation Filter}' attribute. + * + * + * @param value the new value of the 'Correlation Filter' attribute. + * @see #getCorrelationFilter() + * @generated + */ + void setCorrelationFilter(String value); + } // TProvide diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TService.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TService.java index 3f09cd5511..05229a2043 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TService.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/TService.java @@ -28,6 +28,7 @@ *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TService#getAny Any}
  • *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TService#getName Name}
  • *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TService#getPort Port}
  • + *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.TService#getEndpoint Endpoint}
  • * *

    * @@ -107,4 +108,31 @@ public interface TService extends EObject { */ void setPort(String value); + /** + * Returns the value of the 'Endpoint' containment reference. + * + *

    + * If the meaning of the 'Endpoint' containment reference isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Endpoint' containment reference. + * @see #setEndpoint(TEndPoint) + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage#getTService_Endpoint() + * @model containment="true" + * extendedMetaData="kind='element' name='endpoint' namespace='##targetNamespace'" + * @generated + */ + TEndPoint getEndpoint(); + + /** + * Sets the value of the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TService#getEndpoint Endpoint}' containment reference. + * + * + * @param value the new value of the 'Endpoint' containment reference. + * @see #getEndpoint() + * @generated + */ + void setEndpoint(TEndPoint value); + } // TService diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddFactory.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddFactory.java index 504ef9ab3f..f2ac59b77e 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddFactory.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddFactory.java @@ -147,6 +147,33 @@ public interface ddFactory extends EFactory { */ TService createTService(); + /** + * Returns a new object of class 'TBam Server Profiles'. + * + * + * @return a new object of class 'TBam Server Profiles'. + * @generated + */ + TBamServerProfiles createTBamServerProfiles(); + + /** + * Returns a new object of class 'TProfile'. + * + * + * @return a new object of class 'TProfile'. + * @generated + */ + TProfile createTProfile(); + + /** + * Returns a new object of class 'TEnd Point'. + * + * + * @return a new object of class 'TEnd Point'. + * @generated + */ + TEndPoint createTEndPoint(); + /** * Returns the package supported by this factory. * diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddPackage.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddPackage.java index 7d3acce706..53d47a4b35 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddPackage.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/ddPackage.java @@ -304,6 +304,15 @@ public interface ddPackage extends EPackage { */ int PROCESS_TYPE__MODEL = 12; + /** + * The feature id for the 'Bam Server Profiles' containment reference. + * + * + * @generated + * @ordered + */ + int PROCESS_TYPE__BAM_SERVER_PROFILES = 13; + /** * The number of structural features of the 'Process Type' class. * @@ -311,7 +320,7 @@ public interface ddPackage extends EPackage { * @generated * @ordered */ - int PROCESS_TYPE_FEATURE_COUNT = 13; + int PROCESS_TYPE_FEATURE_COUNT = 14; /** * The meta object id for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.PropertyTypeImpl Property Type}' class. @@ -554,6 +563,15 @@ public interface ddPackage extends EPackage { */ int TPROVIDE__PARTNER_LINK = 1; + /** + * The feature id for the 'Correlation Filter' attribute. + * + * + * @generated + * @ordered + */ + int TPROVIDE__CORRELATION_FILTER = 2; + /** * The number of structural features of the 'TProvide' class. * @@ -561,7 +579,7 @@ public interface ddPackage extends EPackage { * @generated * @ordered */ - int TPROVIDE_FEATURE_COUNT = 2; + int TPROVIDE_FEATURE_COUNT = 3; /** * The meta object id for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TScopeEventsImpl TScope Events}' class. @@ -637,6 +655,15 @@ public interface ddPackage extends EPackage { */ int TSERVICE__PORT = 2; + /** + * The feature id for the 'Endpoint' containment reference. + * + * + * @generated + * @ordered + */ + int TSERVICE__ENDPOINT = 3; + /** * The number of structural features of the 'TService' class. * @@ -644,7 +671,118 @@ public interface ddPackage extends EPackage { * @generated * @ordered */ - int TSERVICE_FEATURE_COUNT = 3; + int TSERVICE_FEATURE_COUNT = 4; + + /** + * The meta object id for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TBamServerProfilesImpl TBam Server Profiles}' class. + * + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TBamServerProfilesImpl + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ddPackageImpl#getTBamServerProfiles() + * @generated + */ + int TBAM_SERVER_PROFILES = 13; + + /** + * The feature id for the 'Profile' containment reference. + * + * + * @generated + * @ordered + */ + int TBAM_SERVER_PROFILES__PROFILE = 0; + + /** + * The number of structural features of the 'TBam Server Profiles' class. + * + * + * @generated + * @ordered + */ + int TBAM_SERVER_PROFILES_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProfileImpl TProfile}' class. + * + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProfileImpl + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ddPackageImpl#getTProfile() + * @generated + */ + int TPROFILE = 14; + + /** + * The feature id for the 'Name' attribute. + * + * + * @generated + * @ordered + */ + int TPROFILE__NAME = 0; + + /** + * The feature id for the 'Location' attribute. + * + * + * @generated + * @ordered + */ + int TPROFILE__LOCATION = 1; + + /** + * The number of structural features of the 'TProfile' class. + * + * + * @generated + * @ordered + */ + int TPROFILE_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TEndPointImpl TEnd Point}' class. + * + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TEndPointImpl + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ddPackageImpl#getTEndPoint() + * @generated + */ + int TEND_POINT = 15; + + /** + * The feature id for the 'Xmlns' attribute. + * + * + * @generated + * @ordered + */ + int TEND_POINT__XMLNS = 0; + + /** + * The feature id for the 'Endpoint Reference' attribute. + * + * + * @generated + * @ordered + */ + int TEND_POINT__ENDPOINT_REFERENCE = 1; + + /** + * The feature id for the 'Service Description Reference' attribute. + * + * + * @generated + * @ordered + */ + int TEND_POINT__SERVICE_DESCRIPTION_REFERENCE = 2; + + /** + * The number of structural features of the 'TEnd Point' class. + * + * + * @generated + * @ordered + */ + int TEND_POINT_FEATURE_COUNT = 3; /** * The meta object id for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.GenerateType Generate Type}' enum. @@ -654,7 +792,7 @@ public interface ddPackage extends EPackage { * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ddPackageImpl#getGenerateType() * @generated */ - int GENERATE_TYPE = 13; + int GENERATE_TYPE = 16; /** * The meta object id for the 'Generate Type Object' data type. @@ -664,7 +802,7 @@ public interface ddPackage extends EPackage { * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ddPackageImpl#getGenerateTypeObject() * @generated */ - int GENERATE_TYPE_OBJECT = 14; + int GENERATE_TYPE_OBJECT = 17; /** @@ -916,6 +1054,17 @@ public interface ddPackage extends EPackage { */ EReference getProcessType_Model(); + /** + * Returns the meta object for the containment reference '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType#getBamServerProfiles Bam Server Profiles}'. + * + * + * @return the meta object for the containment reference 'Bam Server Profiles'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType#getBamServerProfiles() + * @see #getProcessType() + * @generated + */ + EReference getProcessType_BamServerProfiles(); + /** * Returns the meta object for class '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.PropertyType Property Type}'. * @@ -1118,6 +1267,17 @@ public interface ddPackage extends EPackage { */ EAttribute getTProvide_PartnerLink(); + /** + * Returns the meta object for the attribute '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProvide#getCorrelationFilter Correlation Filter}'. + * + * + * @return the meta object for the attribute 'Correlation Filter'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TProvide#getCorrelationFilter() + * @see #getTProvide() + * @generated + */ + EAttribute getTProvide_CorrelationFilter(); + /** * Returns the meta object for class '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TScopeEvents TScope Events}'. * @@ -1182,6 +1342,113 @@ public interface ddPackage extends EPackage { */ EAttribute getTService_Port(); + /** + * Returns the meta object for the containment reference '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TService#getEndpoint Endpoint}'. + * + * + * @return the meta object for the containment reference 'Endpoint'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TService#getEndpoint() + * @see #getTService() + * @generated + */ + EReference getTService_Endpoint(); + + /** + * Returns the meta object for class '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles TBam Server Profiles}'. + * + * + * @return the meta object for class 'TBam Server Profiles'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles + * @generated + */ + EClass getTBamServerProfiles(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles#getProfile Profile}'. + * + * + * @return the meta object for the containment reference 'Profile'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles#getProfile() + * @see #getTBamServerProfiles() + * @generated + */ + EReference getTBamServerProfiles_Profile(); + + /** + * Returns the meta object for class '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile TProfile}'. + * + * + * @return the meta object for class 'TProfile'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile + * @generated + */ + EClass getTProfile(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile#getName Name}'. + * + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile#getName() + * @see #getTProfile() + * @generated + */ + EAttribute getTProfile_Name(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile#getLocation Location}'. + * + * + * @return the meta object for the attribute 'Location'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile#getLocation() + * @see #getTProfile() + * @generated + */ + EAttribute getTProfile_Location(); + + /** + * Returns the meta object for class '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint TEnd Point}'. + * + * + * @return the meta object for class 'TEnd Point'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint + * @generated + */ + EClass getTEndPoint(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getXmlns Xmlns}'. + * + * + * @return the meta object for the attribute 'Xmlns'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getXmlns() + * @see #getTEndPoint() + * @generated + */ + EAttribute getTEndPoint_Xmlns(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getEndpointReference Endpoint Reference}'. + * + * + * @return the meta object for the attribute 'Endpoint Reference'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getEndpointReference() + * @see #getTEndPoint() + * @generated + */ + EAttribute getTEndPoint_EndpointReference(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getServiceDescriptionReference Service Description Reference}'. + * + * + * @return the meta object for the attribute 'Service Description Reference'. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint#getServiceDescriptionReference() + * @see #getTEndPoint() + * @generated + */ + EAttribute getTEndPoint_ServiceDescriptionReference(); + /** * Returns the meta object for enum '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.GenerateType Generate Type}'. * @@ -1418,6 +1685,14 @@ interface Literals { */ EReference PROCESS_TYPE__MODEL = eINSTANCE.getProcessType_Model(); + /** + * The meta object literal for the 'Bam Server Profiles' containment reference feature. + * + * + * @generated + */ + EReference PROCESS_TYPE__BAM_SERVER_PROFILES = eINSTANCE.getProcessType_BamServerProfiles(); + /** * The meta object literal for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.PropertyTypeImpl Property Type}' class. * @@ -1584,6 +1859,14 @@ interface Literals { */ EAttribute TPROVIDE__PARTNER_LINK = eINSTANCE.getTProvide_PartnerLink(); + /** + * The meta object literal for the 'Correlation Filter' attribute feature. + * + * + * @generated + */ + EAttribute TPROVIDE__CORRELATION_FILTER = eINSTANCE.getTProvide_CorrelationFilter(); + /** * The meta object literal for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TScopeEventsImpl TScope Events}' class. * @@ -1636,6 +1919,92 @@ interface Literals { */ EAttribute TSERVICE__PORT = eINSTANCE.getTService_Port(); + /** + * The meta object literal for the 'Endpoint' containment reference feature. + * + * + * @generated + */ + EReference TSERVICE__ENDPOINT = eINSTANCE.getTService_Endpoint(); + + /** + * The meta object literal for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TBamServerProfilesImpl TBam Server Profiles}' class. + * + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TBamServerProfilesImpl + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ddPackageImpl#getTBamServerProfiles() + * @generated + */ + EClass TBAM_SERVER_PROFILES = eINSTANCE.getTBamServerProfiles(); + + /** + * The meta object literal for the 'Profile' containment reference feature. + * + * + * @generated + */ + EReference TBAM_SERVER_PROFILES__PROFILE = eINSTANCE.getTBamServerProfiles_Profile(); + + /** + * The meta object literal for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProfileImpl TProfile}' class. + * + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProfileImpl + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ddPackageImpl#getTProfile() + * @generated + */ + EClass TPROFILE = eINSTANCE.getTProfile(); + + /** + * The meta object literal for the 'Name' attribute feature. + * + * + * @generated + */ + EAttribute TPROFILE__NAME = eINSTANCE.getTProfile_Name(); + + /** + * The meta object literal for the 'Location' attribute feature. + * + * + * @generated + */ + EAttribute TPROFILE__LOCATION = eINSTANCE.getTProfile_Location(); + + /** + * The meta object literal for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TEndPointImpl TEnd Point}' class. + * + * + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TEndPointImpl + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ddPackageImpl#getTEndPoint() + * @generated + */ + EClass TEND_POINT = eINSTANCE.getTEndPoint(); + + /** + * The meta object literal for the 'Xmlns' attribute feature. + * + * + * @generated + */ + EAttribute TEND_POINT__XMLNS = eINSTANCE.getTEndPoint_Xmlns(); + + /** + * The meta object literal for the 'Endpoint Reference' attribute feature. + * + * + * @generated + */ + EAttribute TEND_POINT__ENDPOINT_REFERENCE = eINSTANCE.getTEndPoint_EndpointReference(); + + /** + * The meta object literal for the 'Service Description Reference' attribute feature. + * + * + * @generated + */ + EAttribute TEND_POINT__SERVICE_DESCRIPTION_REFERENCE = eINSTANCE.getTEndPoint_ServiceDescriptionReference(); + /** * The meta object literal for the '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.GenerateType Generate Type}' enum. * diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ProcessTypeImpl.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ProcessTypeImpl.java index a1760516b5..ae94ce6159 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ProcessTypeImpl.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ProcessTypeImpl.java @@ -18,6 +18,7 @@ import org.eclipse.bpel.apache.ode.deploy.model.dd.MexInterceptorsType; import org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType; import org.eclipse.bpel.apache.ode.deploy.model.dd.PropertyType; +import org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles; import org.eclipse.bpel.apache.ode.deploy.model.dd.TInvoke; import org.eclipse.bpel.apache.ode.deploy.model.dd.TProcessEvents; import org.eclipse.bpel.apache.ode.deploy.model.dd.TProvide; @@ -57,6 +58,7 @@ *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ProcessTypeImpl#getFileName File Name}
  • *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ProcessTypeImpl#getName Name}
  • *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ProcessTypeImpl#getModel Model}
  • + *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.ProcessTypeImpl#getBamServerProfiles Bam Server Profiles}
  • * *

    * @@ -290,6 +292,16 @@ public class ProcessTypeImpl extends EObjectImpl implements ProcessType { */ protected org.eclipse.bpel.model.Process model; + /** + * The cached value of the '{@link #getBamServerProfiles() Bam Server Profiles}' containment reference. + * + * + * @see #getBamServerProfiles() + * @generated + * @ordered + */ + protected TBamServerProfiles bamServerProfiles; + /** * * @@ -691,6 +703,49 @@ public void setModel(org.eclipse.bpel.model.Process newModel) { eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.PROCESS_TYPE__MODEL, oldModel, model)); } + /** + * + * + * @generated + */ + public TBamServerProfiles getBamServerProfiles() { + return bamServerProfiles; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetBamServerProfiles(TBamServerProfiles newBamServerProfiles, NotificationChain msgs) { + TBamServerProfiles oldBamServerProfiles = bamServerProfiles; + bamServerProfiles = newBamServerProfiles; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES, oldBamServerProfiles, newBamServerProfiles); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setBamServerProfiles(TBamServerProfiles newBamServerProfiles) { + if (newBamServerProfiles != bamServerProfiles) { + NotificationChain msgs = null; + if (bamServerProfiles != null) + msgs = ((InternalEObject)bamServerProfiles).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES, null, msgs); + if (newBamServerProfiles != null) + msgs = ((InternalEObject)newBamServerProfiles).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES, null, msgs); + msgs = basicSetBamServerProfiles(newBamServerProfiles, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES, newBamServerProfiles, newBamServerProfiles)); + } + /** * * @@ -709,6 +764,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, return ((InternalEList)getInvoke()).basicRemove(otherEnd, msgs); case ddPackage.PROCESS_TYPE__MEX_INTERCEPTORS: return basicSetMexInterceptors(null, msgs); + case ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES: + return basicSetBamServerProfiles(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -748,6 +805,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { case ddPackage.PROCESS_TYPE__MODEL: if (resolve) return getModel(); return basicGetModel(); + case ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES: + return getBamServerProfiles(); } return super.eGet(featureID, resolve, coreType); } @@ -803,6 +862,9 @@ public void eSet(int featureID, Object newValue) { case ddPackage.PROCESS_TYPE__MODEL: setModel((org.eclipse.bpel.model.Process)newValue); return; + case ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES: + setBamServerProfiles((TBamServerProfiles)newValue); + return; } super.eSet(featureID, newValue); } @@ -854,6 +916,9 @@ public void eUnset(int featureID) { case ddPackage.PROCESS_TYPE__MODEL: setModel((org.eclipse.bpel.model.Process)null); return; + case ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES: + setBamServerProfiles((TBamServerProfiles)null); + return; } super.eUnset(featureID); } @@ -892,6 +957,8 @@ public boolean eIsSet(int featureID) { return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case ddPackage.PROCESS_TYPE__MODEL: return model != null; + case ddPackage.PROCESS_TYPE__BAM_SERVER_PROFILES: + return bamServerProfiles != null; } return super.eIsSet(featureID); } diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TBamServerProfilesImpl.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TBamServerProfilesImpl.java new file mode 100644 index 0000000000..539610c9f2 --- /dev/null +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TBamServerProfilesImpl.java @@ -0,0 +1,183 @@ +/** + * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation + */ +package org.eclipse.bpel.apache.ode.deploy.model.dd.impl; + +import org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles; +import org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile; +import org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +/** + * + * An implementation of the model object 'TBam Server Profiles'. + * + *

    + * The following features are implemented: + *

      + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TBamServerProfilesImpl#getProfile Profile}
    • + *
    + *

    + * + * @generated + */ +public class TBamServerProfilesImpl extends EObjectImpl implements TBamServerProfiles { + /** + * The cached value of the '{@link #getProfile() Profile}' containment reference. + * + * + * @see #getProfile() + * @generated + * @ordered + */ + protected TProfile profile; + + /** + * + * + * @generated + */ + protected TBamServerProfilesImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return ddPackage.Literals.TBAM_SERVER_PROFILES; + } + + /** + * + * + * @generated + */ + public TProfile getProfile() { + return profile; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetProfile(TProfile newProfile, NotificationChain msgs) { + TProfile oldProfile = profile; + profile = newProfile; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ddPackage.TBAM_SERVER_PROFILES__PROFILE, oldProfile, newProfile); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setProfile(TProfile newProfile) { + if (newProfile != profile) { + NotificationChain msgs = null; + if (profile != null) + msgs = ((InternalEObject)profile).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ddPackage.TBAM_SERVER_PROFILES__PROFILE, null, msgs); + if (newProfile != null) + msgs = ((InternalEObject)newProfile).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ddPackage.TBAM_SERVER_PROFILES__PROFILE, null, msgs); + msgs = basicSetProfile(newProfile, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TBAM_SERVER_PROFILES__PROFILE, newProfile, newProfile)); + } + + /** + * + * + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case ddPackage.TBAM_SERVER_PROFILES__PROFILE: + return basicSetProfile(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case ddPackage.TBAM_SERVER_PROFILES__PROFILE: + return getProfile(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case ddPackage.TBAM_SERVER_PROFILES__PROFILE: + setProfile((TProfile)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case ddPackage.TBAM_SERVER_PROFILES__PROFILE: + setProfile((TProfile)null); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case ddPackage.TBAM_SERVER_PROFILES__PROFILE: + return profile != null; + } + return super.eIsSet(featureID); + } + +} //TBamServerProfilesImpl diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TEndPointImpl.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TEndPointImpl.java new file mode 100644 index 0000000000..9511181401 --- /dev/null +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TEndPointImpl.java @@ -0,0 +1,279 @@ +/** + * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation + */ +package org.eclipse.bpel.apache.ode.deploy.model.dd.impl; + +import org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint; +import org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +/** + * + * An implementation of the model object 'TEnd Point'. + * + *

    + * The following features are implemented: + *

      + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TEndPointImpl#getXmlns Xmlns}
    • + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TEndPointImpl#getEndpointReference Endpoint Reference}
    • + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TEndPointImpl#getServiceDescriptionReference Service Description Reference}
    • + *
    + *

    + * + * @generated + */ +public class TEndPointImpl extends EObjectImpl implements TEndPoint { + /** + * The default value of the '{@link #getXmlns() Xmlns}' attribute. + * + * + * @see #getXmlns() + * @generated + * @ordered + */ + protected static final String XMLNS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getXmlns() Xmlns}' attribute. + * + * + * @see #getXmlns() + * @generated + * @ordered + */ + protected String xmlns = XMLNS_EDEFAULT; + + /** + * The default value of the '{@link #getEndpointReference() Endpoint Reference}' attribute. + * + * + * @see #getEndpointReference() + * @generated + * @ordered + */ + protected static final String ENDPOINT_REFERENCE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getEndpointReference() Endpoint Reference}' attribute. + * + * + * @see #getEndpointReference() + * @generated + * @ordered + */ + protected String endpointReference = ENDPOINT_REFERENCE_EDEFAULT; + + /** + * The default value of the '{@link #getServiceDescriptionReference() Service Description Reference}' attribute. + * + * + * @see #getServiceDescriptionReference() + * @generated + * @ordered + */ + protected static final String SERVICE_DESCRIPTION_REFERENCE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getServiceDescriptionReference() Service Description Reference}' attribute. + * + * + * @see #getServiceDescriptionReference() + * @generated + * @ordered + */ + protected String serviceDescriptionReference = SERVICE_DESCRIPTION_REFERENCE_EDEFAULT; + + /** + * + * + * @generated + */ + protected TEndPointImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return ddPackage.Literals.TEND_POINT; + } + + /** + * + * + * @generated + */ + public String getXmlns() { + return xmlns; + } + + /** + * + * + * @generated + */ + public void setXmlns(String newXmlns) { + String oldXmlns = xmlns; + xmlns = newXmlns; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TEND_POINT__XMLNS, oldXmlns, xmlns)); + } + + /** + * + * + * @generated + */ + public String getEndpointReference() { + return endpointReference; + } + + /** + * + * + * @generated + */ + public void setEndpointReference(String newEndpointReference) { + String oldEndpointReference = endpointReference; + endpointReference = newEndpointReference; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TEND_POINT__ENDPOINT_REFERENCE, oldEndpointReference, endpointReference)); + } + + /** + * + * + * @generated + */ + public String getServiceDescriptionReference() { + return serviceDescriptionReference; + } + + /** + * + * + * @generated + */ + public void setServiceDescriptionReference(String newServiceDescriptionReference) { + String oldServiceDescriptionReference = serviceDescriptionReference; + serviceDescriptionReference = newServiceDescriptionReference; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TEND_POINT__SERVICE_DESCRIPTION_REFERENCE, oldServiceDescriptionReference, serviceDescriptionReference)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case ddPackage.TEND_POINT__XMLNS: + return getXmlns(); + case ddPackage.TEND_POINT__ENDPOINT_REFERENCE: + return getEndpointReference(); + case ddPackage.TEND_POINT__SERVICE_DESCRIPTION_REFERENCE: + return getServiceDescriptionReference(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case ddPackage.TEND_POINT__XMLNS: + setXmlns((String)newValue); + return; + case ddPackage.TEND_POINT__ENDPOINT_REFERENCE: + setEndpointReference((String)newValue); + return; + case ddPackage.TEND_POINT__SERVICE_DESCRIPTION_REFERENCE: + setServiceDescriptionReference((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case ddPackage.TEND_POINT__XMLNS: + setXmlns(XMLNS_EDEFAULT); + return; + case ddPackage.TEND_POINT__ENDPOINT_REFERENCE: + setEndpointReference(ENDPOINT_REFERENCE_EDEFAULT); + return; + case ddPackage.TEND_POINT__SERVICE_DESCRIPTION_REFERENCE: + setServiceDescriptionReference(SERVICE_DESCRIPTION_REFERENCE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case ddPackage.TEND_POINT__XMLNS: + return XMLNS_EDEFAULT == null ? xmlns != null : !XMLNS_EDEFAULT.equals(xmlns); + case ddPackage.TEND_POINT__ENDPOINT_REFERENCE: + return ENDPOINT_REFERENCE_EDEFAULT == null ? endpointReference != null : !ENDPOINT_REFERENCE_EDEFAULT.equals(endpointReference); + case ddPackage.TEND_POINT__SERVICE_DESCRIPTION_REFERENCE: + return SERVICE_DESCRIPTION_REFERENCE_EDEFAULT == null ? serviceDescriptionReference != null : !SERVICE_DESCRIPTION_REFERENCE_EDEFAULT.equals(serviceDescriptionReference); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (xmlns: "); + result.append(xmlns); + result.append(", endpointReference: "); + result.append(endpointReference); + result.append(", serviceDescriptionReference: "); + result.append(serviceDescriptionReference); + result.append(')'); + return result.toString(); + } + +} //TEndPointImpl diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProfileImpl.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProfileImpl.java new file mode 100644 index 0000000000..761d551239 --- /dev/null +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProfileImpl.java @@ -0,0 +1,225 @@ +/** + * Copyright (c) 2008 IBM Corporation, University of Stuttgart (IAAS) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation, University of Stuttgart (IAAS) - initial API and implementation + */ +package org.eclipse.bpel.apache.ode.deploy.model.dd.impl; + +import org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile; +import org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +/** + * + * An implementation of the model object 'TProfile'. + * + *

    + * The following features are implemented: + *

      + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProfileImpl#getName Name}
    • + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProfileImpl#getLocation Location}
    • + *
    + *

    + * + * @generated + */ +public class TProfileImpl extends EObjectImpl implements TProfile { + /** + * The default value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + * + * + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getLocation() Location}' attribute. + * + * + * @see #getLocation() + * @generated + * @ordered + */ + protected static final String LOCATION_EDEFAULT = null; + + /** + * The cached value of the '{@link #getLocation() Location}' attribute. + * + * + * @see #getLocation() + * @generated + * @ordered + */ + protected String location = LOCATION_EDEFAULT; + + /** + * + * + * @generated + */ + protected TProfileImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return ddPackage.Literals.TPROFILE; + } + + /** + * + * + * @generated + */ + public String getName() { + return name; + } + + /** + * + * + * @generated + */ + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TPROFILE__NAME, oldName, name)); + } + + /** + * + * + * @generated + */ + public String getLocation() { + return location; + } + + /** + * + * + * @generated + */ + public void setLocation(String newLocation) { + String oldLocation = location; + location = newLocation; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TPROFILE__LOCATION, oldLocation, location)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case ddPackage.TPROFILE__NAME: + return getName(); + case ddPackage.TPROFILE__LOCATION: + return getLocation(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case ddPackage.TPROFILE__NAME: + setName((String)newValue); + return; + case ddPackage.TPROFILE__LOCATION: + setLocation((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case ddPackage.TPROFILE__NAME: + setName(NAME_EDEFAULT); + return; + case ddPackage.TPROFILE__LOCATION: + setLocation(LOCATION_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case ddPackage.TPROFILE__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case ddPackage.TPROFILE__LOCATION: + return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(", location: "); + result.append(location); + result.append(')'); + return result.toString(); + } + +} //TProfileImpl diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProvideImpl.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProvideImpl.java index b89ae0b80c..51b6730e30 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProvideImpl.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TProvideImpl.java @@ -23,6 +23,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; +import org.eclipse.emf.ecore.util.BasicFeatureMap; +import org.eclipse.emf.ecore.util.FeatureMap; +import org.eclipse.emf.ecore.util.InternalEList; /** * @@ -33,6 +36,7 @@ *
      *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProvideImpl#getService Service}
    • *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProvideImpl#getPartnerLink Partner Link}
    • + *
    • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TProvideImpl#getCorrelationFilter Correlation Filter}
    • *
    *

    * @@ -69,6 +73,26 @@ public class TProvideImpl extends EObjectImpl implements TProvide { */ protected String partnerLink = PARTNER_LINK_EDEFAULT; + /** + * The default value of the '{@link #getCorrelationFilter() Correlation Filter}' attribute. + * + * + * @see #getCorrelationFilter() + * @generated + * @ordered + */ + protected static final String CORRELATION_FILTER_EDEFAULT = null; + + /** + * The cached value of the '{@link #getCorrelationFilter() Correlation Filter}' attribute. + * + * + * @see #getCorrelationFilter() + * @generated + * @ordered + */ + protected String correlationFilter = CORRELATION_FILTER_EDEFAULT; + /** * * @@ -152,6 +176,27 @@ public void setPartnerLink(String newPartnerLink) { eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TPROVIDE__PARTNER_LINK, oldPartnerLink, partnerLink)); } + /** + * + * + * @generated + */ + public String getCorrelationFilter() { + return correlationFilter; + } + + /** + * + * + * @generated + */ + public void setCorrelationFilter(String newCorrelationFilter) { + String oldCorrelationFilter = correlationFilter; + correlationFilter = newCorrelationFilter; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TPROVIDE__CORRELATION_FILTER, oldCorrelationFilter, correlationFilter)); + } + /** * * @@ -178,6 +223,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { return getService(); case ddPackage.TPROVIDE__PARTNER_LINK: return getPartnerLink(); + case ddPackage.TPROVIDE__CORRELATION_FILTER: + return getCorrelationFilter(); } return super.eGet(featureID, resolve, coreType); } @@ -196,6 +243,9 @@ public void eSet(int featureID, Object newValue) { case ddPackage.TPROVIDE__PARTNER_LINK: setPartnerLink((String)newValue); return; + case ddPackage.TPROVIDE__CORRELATION_FILTER: + setCorrelationFilter((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -214,6 +264,9 @@ public void eUnset(int featureID) { case ddPackage.TPROVIDE__PARTNER_LINK: setPartnerLink(PARTNER_LINK_EDEFAULT); return; + case ddPackage.TPROVIDE__CORRELATION_FILTER: + setCorrelationFilter(CORRELATION_FILTER_EDEFAULT); + return; } super.eUnset(featureID); } @@ -230,6 +283,8 @@ public boolean eIsSet(int featureID) { return service != null; case ddPackage.TPROVIDE__PARTNER_LINK: return PARTNER_LINK_EDEFAULT == null ? partnerLink != null : !PARTNER_LINK_EDEFAULT.equals(partnerLink); + case ddPackage.TPROVIDE__CORRELATION_FILTER: + return CORRELATION_FILTER_EDEFAULT == null ? correlationFilter != null : !CORRELATION_FILTER_EDEFAULT.equals(correlationFilter); } return super.eIsSet(featureID); } @@ -246,6 +301,8 @@ public String toString() { StringBuffer result = new StringBuffer(super.toString()); result.append(" (partnerLink: "); result.append(partnerLink); + result.append(", correlationFilter: "); + result.append(correlationFilter); result.append(')'); return result.toString(); } diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TServiceImpl.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TServiceImpl.java index 8aa31cbe24..9e0da1b50c 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TServiceImpl.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/TServiceImpl.java @@ -13,6 +13,7 @@ import javax.xml.namespace.QName; +import org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint; import org.eclipse.bpel.apache.ode.deploy.model.dd.TService; import org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage; @@ -39,6 +40,7 @@ *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TServiceImpl#getAny Any}
  • *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TServiceImpl#getName Name}
  • *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TServiceImpl#getPort Port}
  • + *
  • {@link org.eclipse.bpel.apache.ode.deploy.model.dd.impl.TServiceImpl#getEndpoint Endpoint}
  • * *

    * @@ -95,6 +97,16 @@ public class TServiceImpl extends EObjectImpl implements TService { */ protected String port = PORT_EDEFAULT; + /** + * The cached value of the '{@link #getEndpoint() Endpoint}' containment reference. + * + * + * @see #getEndpoint() + * @generated + * @ordered + */ + protected TEndPoint endpoint; + /** * * @@ -168,6 +180,49 @@ public void setPort(String newPort) { eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TSERVICE__PORT, oldPort, port)); } + /** + * + * + * @generated + */ + public TEndPoint getEndpoint() { + return endpoint; + } + + /** + * + * + * @generated + */ + public NotificationChain basicSetEndpoint(TEndPoint newEndpoint, NotificationChain msgs) { + TEndPoint oldEndpoint = endpoint; + endpoint = newEndpoint; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ddPackage.TSERVICE__ENDPOINT, oldEndpoint, newEndpoint); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * + * + * @generated + */ + public void setEndpoint(TEndPoint newEndpoint) { + if (newEndpoint != endpoint) { + NotificationChain msgs = null; + if (endpoint != null) + msgs = ((InternalEObject)endpoint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ddPackage.TSERVICE__ENDPOINT, null, msgs); + if (newEndpoint != null) + msgs = ((InternalEObject)newEndpoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ddPackage.TSERVICE__ENDPOINT, null, msgs); + msgs = basicSetEndpoint(newEndpoint, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, ddPackage.TSERVICE__ENDPOINT, newEndpoint, newEndpoint)); + } + /** * * @@ -178,6 +233,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, switch (featureID) { case ddPackage.TSERVICE__ANY: return ((InternalEList)getAny()).basicRemove(otherEnd, msgs); + case ddPackage.TSERVICE__ENDPOINT: + return basicSetEndpoint(null, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -197,6 +254,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { return getName(); case ddPackage.TSERVICE__PORT: return getPort(); + case ddPackage.TSERVICE__ENDPOINT: + return getEndpoint(); } return super.eGet(featureID, resolve, coreType); } @@ -218,6 +277,9 @@ public void eSet(int featureID, Object newValue) { case ddPackage.TSERVICE__PORT: setPort((String)newValue); return; + case ddPackage.TSERVICE__ENDPOINT: + setEndpoint((TEndPoint)newValue); + return; } super.eSet(featureID, newValue); } @@ -239,6 +301,9 @@ public void eUnset(int featureID) { case ddPackage.TSERVICE__PORT: setPort(PORT_EDEFAULT); return; + case ddPackage.TSERVICE__ENDPOINT: + setEndpoint((TEndPoint)null); + return; } super.eUnset(featureID); } @@ -257,6 +322,8 @@ public boolean eIsSet(int featureID) { return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case ddPackage.TSERVICE__PORT: return PORT_EDEFAULT == null ? port != null : !PORT_EDEFAULT.equals(port); + case ddPackage.TSERVICE__ENDPOINT: + return endpoint != null; } return super.eIsSet(featureID); } diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddFactoryImpl.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddFactoryImpl.java index b1b703e89c..090c1c1a6d 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddFactoryImpl.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddFactoryImpl.java @@ -37,7 +37,7 @@ public class ddFactoryImpl extends EFactoryImpl implements ddFactory { */ public static ddFactory init() { try { - ddFactory theddFactory = (ddFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.apache.org/ode/schemas/dd/2007/03"); + ddFactory theddFactory = (ddFactory)EPackage.Registry.INSTANCE.getEFactory(ddPackage.eNS_URI); if (theddFactory != null) { return theddFactory; } @@ -79,6 +79,9 @@ public EObject create(EClass eClass) { case ddPackage.TPROVIDE: return createTProvide(); case ddPackage.TSCOPE_EVENTS: return createTScopeEvents(); case ddPackage.TSERVICE: return createTService(); + case ddPackage.TBAM_SERVER_PROFILES: return createTBamServerProfiles(); + case ddPackage.TPROFILE: return createTProfile(); + case ddPackage.TEND_POINT: return createTEndPoint(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -248,6 +251,36 @@ public TService createTService() { return tService; } + /** + * + * + * @generated + */ + public TBamServerProfiles createTBamServerProfiles() { + TBamServerProfilesImpl tBamServerProfiles = new TBamServerProfilesImpl(); + return tBamServerProfiles; + } + + /** + * + * + * @generated + */ + public TProfile createTProfile() { + TProfileImpl tProfile = new TProfileImpl(); + return tProfile; + } + + /** + * + * + * @generated + */ + public TEndPoint createTEndPoint() { + TEndPointImpl tEndPoint = new TEndPointImpl(); + return tEndPoint; + } + /** * * diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddPackageImpl.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddPackageImpl.java index dda9e007e0..85218cd7e4 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddPackageImpl.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/impl/ddPackageImpl.java @@ -17,11 +17,14 @@ import org.eclipse.bpel.apache.ode.deploy.model.dd.MexInterceptorsType; import org.eclipse.bpel.apache.ode.deploy.model.dd.ProcessType; import org.eclipse.bpel.apache.ode.deploy.model.dd.PropertyType; +import org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles; import org.eclipse.bpel.apache.ode.deploy.model.dd.TDeployment; import org.eclipse.bpel.apache.ode.deploy.model.dd.TEnableEventList; +import org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint; import org.eclipse.bpel.apache.ode.deploy.model.dd.TInvoke; import org.eclipse.bpel.apache.ode.deploy.model.dd.TMexInterceptor; import org.eclipse.bpel.apache.ode.deploy.model.dd.TProcessEvents; +import org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile; import org.eclipse.bpel.apache.ode.deploy.model.dd.TProvide; import org.eclipse.bpel.apache.ode.deploy.model.dd.TScopeEvents; import org.eclipse.bpel.apache.ode.deploy.model.dd.TService; @@ -143,6 +146,27 @@ public class ddPackageImpl extends EPackageImpl implements ddPackage { */ private EClass tServiceEClass = null; + /** + * + * + * @generated + */ + private EClass tBamServerProfilesEClass = null; + + /** + * + * + * @generated + */ + private EClass tProfileEClass = null; + + /** + * + * + * @generated + */ + private EClass tEndPointEClass = null; + /** * * @@ -431,6 +455,15 @@ public EReference getProcessType_Model() { return (EReference)processTypeEClass.getEStructuralFeatures().get(12); } + /** + * + * + * @generated + */ + public EReference getProcessType_BamServerProfiles() { + return (EReference)processTypeEClass.getEStructuralFeatures().get(13); + } + /** * * @@ -602,6 +635,15 @@ public EAttribute getTProvide_PartnerLink() { return (EAttribute)tProvideEClass.getEStructuralFeatures().get(1); } + /** + * + * + * @generated + */ + public EAttribute getTProvide_CorrelationFilter() { + return (EAttribute)tProvideEClass.getEStructuralFeatures().get(2); + } + /** * * @@ -656,6 +698,96 @@ public EAttribute getTService_Port() { return (EAttribute)tServiceEClass.getEStructuralFeatures().get(2); } + /** + * + * + * @generated + */ + public EReference getTService_Endpoint() { + return (EReference)tServiceEClass.getEStructuralFeatures().get(3); + } + + /** + * + * + * @generated + */ + public EClass getTBamServerProfiles() { + return tBamServerProfilesEClass; + } + + /** + * + * + * @generated + */ + public EReference getTBamServerProfiles_Profile() { + return (EReference)tBamServerProfilesEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EClass getTProfile() { + return tProfileEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getTProfile_Name() { + return (EAttribute)tProfileEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EAttribute getTProfile_Location() { + return (EAttribute)tProfileEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EClass getTEndPoint() { + return tEndPointEClass; + } + + /** + * + * + * @generated + */ + public EAttribute getTEndPoint_Xmlns() { + return (EAttribute)tEndPointEClass.getEStructuralFeatures().get(0); + } + + /** + * + * + * @generated + */ + public EAttribute getTEndPoint_EndpointReference() { + return (EAttribute)tEndPointEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ + public EAttribute getTEndPoint_ServiceDescriptionReference() { + return (EAttribute)tEndPointEClass.getEStructuralFeatures().get(2); + } + /** * * @@ -728,6 +860,7 @@ public void createPackageContents() { createEAttribute(processTypeEClass, PROCESS_TYPE__FILE_NAME); createEAttribute(processTypeEClass, PROCESS_TYPE__NAME); createEReference(processTypeEClass, PROCESS_TYPE__MODEL); + createEReference(processTypeEClass, PROCESS_TYPE__BAM_SERVER_PROFILES); propertyTypeEClass = createEClass(PROPERTY_TYPE); createEAttribute(propertyTypeEClass, PROPERTY_TYPE__ANY); @@ -754,6 +887,7 @@ public void createPackageContents() { tProvideEClass = createEClass(TPROVIDE); createEReference(tProvideEClass, TPROVIDE__SERVICE); createEAttribute(tProvideEClass, TPROVIDE__PARTNER_LINK); + createEAttribute(tProvideEClass, TPROVIDE__CORRELATION_FILTER); tScopeEventsEClass = createEClass(TSCOPE_EVENTS); createEAttribute(tScopeEventsEClass, TSCOPE_EVENTS__NAME); @@ -762,6 +896,19 @@ public void createPackageContents() { createEAttribute(tServiceEClass, TSERVICE__ANY); createEAttribute(tServiceEClass, TSERVICE__NAME); createEAttribute(tServiceEClass, TSERVICE__PORT); + createEReference(tServiceEClass, TSERVICE__ENDPOINT); + + tBamServerProfilesEClass = createEClass(TBAM_SERVER_PROFILES); + createEReference(tBamServerProfilesEClass, TBAM_SERVER_PROFILES__PROFILE); + + tProfileEClass = createEClass(TPROFILE); + createEAttribute(tProfileEClass, TPROFILE__NAME); + createEAttribute(tProfileEClass, TPROFILE__LOCATION); + + tEndPointEClass = createEClass(TEND_POINT); + createEAttribute(tEndPointEClass, TEND_POINT__XMLNS); + createEAttribute(tEndPointEClass, TEND_POINT__ENDPOINT_REFERENCE); + createEAttribute(tEndPointEClass, TEND_POINT__SERVICE_DESCRIPTION_REFERENCE); // Create enums generateTypeEEnum = createEEnum(GENERATE_TYPE); @@ -832,6 +979,7 @@ public void initializePackageContents() { initEAttribute(getProcessType_FileName(), theXMLTypePackage.getString(), "fileName", null, 0, 1, ProcessType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getProcessType_Name(), theXMLTypePackage.getQName(), "name", null, 1, 1, ProcessType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getProcessType_Model(), theBPELPackage.getProcess(), null, "model", null, 0, 1, ProcessType.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getProcessType_BamServerProfiles(), this.getTBamServerProfiles(), null, "bamServerProfiles", null, 0, 1, ProcessType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(propertyTypeEClass, PropertyType.class, "PropertyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPropertyType_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -858,6 +1006,7 @@ public void initializePackageContents() { initEClass(tProvideEClass, TProvide.class, "TProvide", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getTProvide_Service(), this.getTService(), null, "service", null, 1, 1, TProvide.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTProvide_PartnerLink(), theXMLTypePackage.getString(), "partnerLink", null, 1, 1, TProvide.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTProvide_CorrelationFilter(), theXMLTypePackage.getString(), "correlationFilter", null, 0, 1, TProvide.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(tScopeEventsEClass, TScopeEvents.class, "TScopeEvents", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getTScopeEvents_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, TScopeEvents.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -866,6 +1015,19 @@ public void initializePackageContents() { initEAttribute(getTService_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, TService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTService_Name(), theXMLTypePackage.getQName(), "name", null, 1, 1, TService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getTService_Port(), theXMLTypePackage.getNCName(), "port", null, 1, 1, TService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTService_Endpoint(), this.getTEndPoint(), null, "endpoint", null, 0, 1, TService.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(tBamServerProfilesEClass, TBamServerProfiles.class, "TBamServerProfiles", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getTBamServerProfiles_Profile(), this.getTProfile(), null, "profile", null, 0, 1, TBamServerProfiles.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(tProfileEClass, TProfile.class, "TProfile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getTProfile_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, TProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTProfile_Location(), theXMLTypePackage.getString(), "location", null, 0, 1, TProfile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(tEndPointEClass, TEndPoint.class, "TEndPoint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getTEndPoint_Xmlns(), theXMLTypePackage.getString(), "xmlns", null, 0, 1, TEndPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTEndPoint_EndpointReference(), theXMLTypePackage.getString(), "endpointReference", null, 0, 1, TEndPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTEndPoint_ServiceDescriptionReference(), theXMLTypePackage.getString(), "serviceDescriptionReference", null, 0, 1, TEndPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals initEEnum(generateTypeEEnum, GenerateType.class, "GenerateType"); @@ -1069,6 +1231,14 @@ protected void createExtendedMetaDataAnnotations() { "kind", "attribute", "name", "name" }); + addAnnotation + (getProcessType_BamServerProfiles(), + source, + new String[] { + "kind", "element", + "name", "bamServerProfiles", + "namespace", "##targetNamespace" + }); addAnnotation (propertyTypeEClass, source, @@ -1254,6 +1424,78 @@ protected void createExtendedMetaDataAnnotations() { new String[] { "kind", "attribute", "name", "port" + }); + addAnnotation + (getTService_Endpoint(), + source, + new String[] { + "kind", "element", + "name", "endpoint", + "namespace", "##targetNamespace" + }); + addAnnotation + (tBamServerProfilesEClass, + source, + new String[] { + "name", "tBamServerProfiles", + "kind", "elementOnly" + }); + addAnnotation + (getTBamServerProfiles_Profile(), + source, + new String[] { + "kind", "element", + "name", "profile", + "namespace", "##targetNamespace" + }); + addAnnotation + (tProfileEClass, + source, + new String[] { + "name", "tProfile", + "kind", "elementOnly" + }); + addAnnotation + (getTProfile_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name" + }); + addAnnotation + (getTProfile_Location(), + source, + new String[] { + "kind", "attribute", + "name", "location" + }); + addAnnotation + (tEndPointEClass, + source, + new String[] { + "name", "tEndPoint", + "kind", "elementOnly" + }); + addAnnotation + (getTEndPoint_Xmlns(), + source, + new String[] { + "kind", "attribute", + "name", "xmlns" + }); + addAnnotation + (getTEndPoint_EndpointReference(), + source, + new String[] { + "kind", "attribute", + "name", "endpointReference" + }); + addAnnotation + (getTEndPoint_ServiceDescriptionReference(), + source, + new String[] { + "kind", "attribute", + "name", "serviceDescriptionReference" }); } diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddAdapterFactory.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddAdapterFactory.java index c25ed0ac31..9a753a29df 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddAdapterFactory.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddAdapterFactory.java @@ -129,6 +129,18 @@ public Adapter caseTService(TService object) { return createTServiceAdapter(); } @Override + public Adapter caseTBamServerProfiles(TBamServerProfiles object) { + return createTBamServerProfilesAdapter(); + } + @Override + public Adapter caseTProfile(TProfile object) { + return createTProfileAdapter(); + } + @Override + public Adapter caseTEndPoint(TEndPoint object) { + return createTEndPointAdapter(); + } + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); } @@ -330,6 +342,48 @@ public Adapter createTServiceAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles TBam Server Profiles}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TBamServerProfiles + * @generated + */ + public Adapter createTBamServerProfilesAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile TProfile}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TProfile + * @generated + */ + public Adapter createTProfileAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint TEnd Point}'. + * + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.bpel.apache.ode.deploy.model.dd.TEndPoint + * @generated + */ + public Adapter createTEndPointAdapter() { + return null; + } + /** * Creates a new adapter for the default case. * diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddSwitch.java b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddSwitch.java index 5971a5d625..57beea43b7 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddSwitch.java +++ b/bps/org.eclipse.bpel.apache.ode.deploy.model/src/org/eclipse/bpel/apache/ode/deploy/model/dd/util/ddSwitch.java @@ -17,6 +17,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.util.Switch; /** * @@ -31,7 +33,7 @@ * @see org.eclipse.bpel.apache.ode.deploy.model.dd.ddPackage * @generated */ -public class ddSwitch { +public class ddSwitch extends Switch { /** * The cached model package * @@ -53,34 +55,16 @@ public ddSwitch() { } /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * Checks whether this is a switch for the given package. * * - * @return the first non-null result returned by a caseXXX call. + * @parameter ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - public T doSwitch(EObject theEObject) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. - * - * - * @return the first non-null result returned by a caseXXX call. - * @generated - */ - protected T doSwitch(EClass theEClass, EObject theEObject) { - if (theEClass.eContainer() == modelPackage) { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else { - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } + @Override + protected boolean isSwitchFor(EPackage ePackage) { + return ePackage == modelPackage; } /** @@ -90,6 +74,7 @@ protected T doSwitch(EClass theEClass, EObject theEObject) { * @return the first non-null result returned by a caseXXX call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) { case ddPackage.BINDING_TYPE: { @@ -172,6 +157,24 @@ protected T doSwitch(int classifierID, EObject theEObject) { if (result == null) result = defaultCase(theEObject); return result; } + case ddPackage.TBAM_SERVER_PROFILES: { + TBamServerProfiles tBamServerProfiles = (TBamServerProfiles)theEObject; + T result = caseTBamServerProfiles(tBamServerProfiles); + if (result == null) result = defaultCase(theEObject); + return result; + } + case ddPackage.TPROFILE: { + TProfile tProfile = (TProfile)theEObject; + T result = caseTProfile(tProfile); + if (result == null) result = defaultCase(theEObject); + return result; + } + case ddPackage.TEND_POINT: { + TEndPoint tEndPoint = (TEndPoint)theEObject; + T result = caseTEndPoint(tEndPoint); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -371,6 +374,51 @@ public T caseTService(TService object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'TBam Server Profiles'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'TBam Server Profiles'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseTBamServerProfiles(TBamServerProfiles object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'TProfile'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'TProfile'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseTProfile(TProfile object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'TEnd Point'. + * + * This implementation returns null; + * returning a non-null result will terminate the switch. + * + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'TEnd Point'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseTEndPoint(TEndPoint object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'EObject'. * @@ -382,6 +430,7 @@ public T caseTService(TService object) { * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; } diff --git a/bps/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml b/bps/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml index bbdcf56ed2..5cc96e39c0 100644 --- a/bps/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml +++ b/bps/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.apache.ode.deploy.ui diff --git a/bps/org.eclipse.bpel.apache.ode.runtime/pom.xml b/bps/org.eclipse.bpel.apache.ode.runtime/pom.xml index 073a9a632e..22afb67ab4 100644 --- a/bps/org.eclipse.bpel.apache.ode.runtime/pom.xml +++ b/bps/org.eclipse.bpel.apache.ode.runtime/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.apache.ode.runtime diff --git a/bps/org.eclipse.bpel.cheatsheet/pom.xml b/bps/org.eclipse.bpel.cheatsheet/pom.xml index b85e772f2e..fe8124c093 100644 --- a/bps/org.eclipse.bpel.cheatsheet/pom.xml +++ b/bps/org.eclipse.bpel.cheatsheet/pom.xml @@ -4,7 +4,7 @@ org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.cheatsheet diff --git a/bps/org.eclipse.bpel.common.model/pom.xml b/bps/org.eclipse.bpel.common.model/pom.xml index 0f60dcd52f..729c6ce5ab 100644 --- a/bps/org.eclipse.bpel.common.model/pom.xml +++ b/bps/org.eclipse.bpel.common.model/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.common.model diff --git a/bps/org.eclipse.bpel.common.ui.noEmbeddedEditors/pom.xml b/bps/org.eclipse.bpel.common.ui.noEmbeddedEditors/pom.xml index 2692a373b0..51986406f4 100644 --- a/bps/org.eclipse.bpel.common.ui.noEmbeddedEditors/pom.xml +++ b/bps/org.eclipse.bpel.common.ui.noEmbeddedEditors/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.common.ui diff --git a/bps/org.eclipse.bpel.common.wsdl/pom.xml b/bps/org.eclipse.bpel.common.wsdl/pom.xml index d126899c76..8e31ba43b4 100644 --- a/bps/org.eclipse.bpel.common.wsdl/pom.xml +++ b/bps/org.eclipse.bpel.common.wsdl/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.common.wsdl diff --git a/bps/org.eclipse.bpel.help/pom.xml b/bps/org.eclipse.bpel.help/pom.xml index 6388e646ca..d51ee2a76f 100644 --- a/bps/org.eclipse.bpel.help/pom.xml +++ b/bps/org.eclipse.bpel.help/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.help diff --git a/bps/org.eclipse.bpel.model/pom.xml b/bps/org.eclipse.bpel.model/pom.xml index 168a7c97eb..a818c72786 100644 --- a/bps/org.eclipse.bpel.model/pom.xml +++ b/bps/org.eclipse.bpel.model/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.model diff --git a/bps/org.eclipse.bpel.runtimes/pom.xml b/bps/org.eclipse.bpel.runtimes/pom.xml index 809789301f..b12a83b41e 100644 --- a/bps/org.eclipse.bpel.runtimes/pom.xml +++ b/bps/org.eclipse.bpel.runtimes/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.runtimes diff --git a/bps/org.eclipse.bpel.ui.noEmbeddedEditors/pom.xml b/bps/org.eclipse.bpel.ui.noEmbeddedEditors/pom.xml index 16a333437c..7691885c24 100644 --- a/bps/org.eclipse.bpel.ui.noEmbeddedEditors/pom.xml +++ b/bps/org.eclipse.bpel.ui.noEmbeddedEditors/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.ui diff --git a/bps/org.eclipse.bpel.validator/pom.xml b/bps/org.eclipse.bpel.validator/pom.xml index db27017101..6ca096bc87 100644 --- a/bps/org.eclipse.bpel.validator/pom.xml +++ b/bps/org.eclipse.bpel.validator/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpel.plugins org.eclipse.bpel.validator diff --git a/bps/org.eclipse.bpel.wsil.model/pom.xml b/bps/org.eclipse.bpel.wsil.model/pom.xml index eb6f1786c1..53658dca2b 100644 --- a/bps/org.eclipse.bpel.wsil.model/pom.xml +++ b/bps/org.eclipse.bpel.wsil.model/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpelins org.eclipse.bpel.wsil.model diff --git a/bps/org.eclipse.bpel.xpath10/pom.xml b/bps/org.eclipse.bpel.xpath10/pom.xml index 2b758b6a18..d2a49cc906 100644 --- a/bps/org.eclipse.bpel.xpath10/pom.xml +++ b/bps/org.eclipse.bpel.xpath10/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 org.eclipse.bpelins org.eclipse.bpel.xpath10 diff --git a/bps/org.wso2.bpel.ide.export/META-INF/MANIFEST.MF b/bps/org.wso2.bpel.ide.export/META-INF/MANIFEST.MF index 5e47e74152..25a12b2927 100644 --- a/bps/org.wso2.bpel.ide.export/META-INF/MANIFEST.MF +++ b/bps/org.wso2.bpel.ide.export/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WSO2 BPEL Plug-in Bundle-SymbolicName: org.wso2.wsf.ide.bpel.export;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.wsf.ide.bpel.export.WSO2BPELPlugin Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/bps/org.wso2.bpel.ide.export/pom.xml b/bps/org.wso2.bpel.ide.export/pom.xml index 560f24368c..237deaf373 100644 --- a/bps/org.wso2.bpel.ide.export/pom.xml +++ b/bps/org.wso2.bpel.ide.export/pom.xml @@ -21,13 +21,13 @@ org.wso2.developerstudio carbon-bps-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.wsf.ide.bpel.export eclipse-plugin BPEL Export - 2.0.0-SNAPSHOT + 2.0.0 diff --git a/brs/org.wso2.developerstudio.eclipse.artifact.brs/META-INF/MANIFEST.MF b/brs/org.wso2.developerstudio.eclipse.artifact.brs/META-INF/MANIFEST.MF index 0ca337ff36..92fa7999a6 100644 --- a/brs/org.wso2.developerstudio.eclipse.artifact.brs/META-INF/MANIFEST.MF +++ b/brs/org.wso2.developerstudio.eclipse.artifact.brs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Businessruleservice Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.brs;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.brs.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -13,10 +13,10 @@ Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, org.apache.axis2.description.java2wsdl, org.apache.commons.lang, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.project, org.apache.xml.serialize, - org.codehaus.plexus.util.xml;version="2.0.1", + org.codehaus.plexus.util.xml, org.eclipse.core.filesystem, org.eclipse.core.resources, org.eclipse.emf.common.notify, diff --git a/brs/org.wso2.developerstudio.eclipse.artifact.brs/pom.xml b/brs/org.wso2.developerstudio.eclipse.artifact.brs/pom.xml index 290c4aa22a..6848dff28f 100644 --- a/brs/org.wso2.developerstudio.eclipse.artifact.brs/pom.xml +++ b/brs/org.wso2.developerstudio.eclipse.artifact.brs/pom.xml @@ -20,11 +20,11 @@ org.wso2.developerstudio brs-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.brs - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio BRS Artifact diff --git a/brs/pom.xml b/brs/pom.xml index 0a983e8b8f..dc9a3c7757 100644 --- a/brs/pom.xml +++ b/brs/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio brs-tool-parent diff --git a/capp/org.wso2.developerstudio.eclipse.capp.core/META-INF/MANIFEST.MF b/capp/org.wso2.developerstudio.eclipse.capp.core/META-INF/MANIFEST.MF index 3b31162bdb..826311033d 100644 --- a/capp/org.wso2.developerstudio.eclipse.capp.core/META-INF/MANIFEST.MF +++ b/capp/org.wso2.developerstudio.eclipse.capp.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.wso2.developerstudio.eclipse.capp.core;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.capp.core.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime diff --git a/capp/org.wso2.developerstudio.eclipse.capp.core/pom.xml b/capp/org.wso2.developerstudio.eclipse.capp.core/pom.xml index 9c2cd5a78c..f1ac8dfff2 100644 --- a/capp/org.wso2.developerstudio.eclipse.capp.core/pom.xml +++ b/capp/org.wso2.developerstudio.eclipse.capp.core/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio carbon-application-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.capp.core diff --git a/capp/org.wso2.developerstudio.eclipse.capp.maven/META-INF/MANIFEST.MF b/capp/org.wso2.developerstudio.eclipse.capp.maven/META-INF/MANIFEST.MF index 70ca7c0000..c1b59239cc 100644 --- a/capp/org.wso2.developerstudio.eclipse.capp.maven/META-INF/MANIFEST.MF +++ b/capp/org.wso2.developerstudio.eclipse.capp.maven/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CApp Maven Bundle-SymbolicName: org.wso2.developerstudio.eclipse.capp.maven;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.capp.maven.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.core.resources Bundle-ActivationPolicy: lazy -Import-Package: org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", +Import-Package: org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.wso2.developerstudio.eclipse.capp.core.artifacts.manager, org.wso2.developerstudio.eclipse.logging.core, org.wso2.developerstudio.eclipse.maven, diff --git a/capp/org.wso2.developerstudio.eclipse.capp.maven/pom.xml b/capp/org.wso2.developerstudio.eclipse.capp.maven/pom.xml index b254e9172b..e24760c64a 100644 --- a/capp/org.wso2.developerstudio.eclipse.capp.maven/pom.xml +++ b/capp/org.wso2.developerstudio.eclipse.capp.maven/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio carbon-application-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.capp.maven diff --git a/capp/org.wso2.developerstudio.eclipse.capp.maven/src/org/wso2/developerstudio/eclipse/capp/maven/utils/messages.properties b/capp/org.wso2.developerstudio.eclipse.capp.maven/src/org/wso2/developerstudio/eclipse/capp/maven/utils/messages.properties index 4e440e66f6..9c15341368 100644 --- a/capp/org.wso2.developerstudio.eclipse.capp.maven/src/org/wso2/developerstudio/eclipse/capp/maven/utils/messages.properties +++ b/capp/org.wso2.developerstudio.eclipse.capp.maven/src/org/wso2/developerstudio/eclipse/capp/maven/utils/messages.properties @@ -1,34 +1,34 @@ -MAVEN_CAR_VERSION=2.0.8 -MAVEN_ENDPOINT_VERSION=2.0.8 -MAVEN_LOCAL_ENTRY_VERSION=2.0.8 -MAVEN_PROXY_SERVICE_VERSION=2.0.8 -MAVEN_REG_FILTERS_VERSION=2.0.8 -MAVEN_SEQUENCE_VERSION=2.0.8 +MAVEN_CAR_VERSION=2.0.9 +MAVEN_ENDPOINT_VERSION=2.0.9 +MAVEN_LOCAL_ENTRY_VERSION=2.0.9 +MAVEN_PROXY_SERVICE_VERSION=2.0.9 +MAVEN_REG_FILTERS_VERSION=2.0.9 +MAVEN_SEQUENCE_VERSION=2.0.9 MAVEN_REGISTRY_RESOURCE_VERSION=2.0.5 -MAVEN_SYNAPSE_MEDIATOR_PLUGIN_VERSION=2.0.8 -MAVEN_LIBRARY_PLUGIN_VERSION=2.0.8 -MAVEN_REGISTRY_HANDLER_PLUGIN_VERSION=2.0.8 -MAVEN_AXIS2_PLUGIN_VERSION=2.0.8 -MAVEN_WAR_PLUGIN_VERSION=2.0.8 -MAVEN_CARBON_UI_PLUGIN_VERSION=2.0.8 -MAVEN_DATASERVICE_PLUGIN_VERSION=2.0.8 -MAVEN_BPEL_PLUGIN_VERSION=2.0.8 -MAVEN_DS_VALIDATOR_PLUGIN_VERSION=2.0.8 -MAVEN_GADGET_PLUGIN_VERSION=2.0.8 -MAVEN_JAXWS_PLUGIN_VERSION=2.0.8 -MAVEN_SYNAPSE_VERSION=2.0.8 -WSO2_ESB_ENDPOINT_VERSION=2.0.8 -WSO2_ESB_LOCAL_ENTRY_VERSION=2.0.8 -WSO2_ESB_PROXY_VERSION=2.0.8 -WSO2_ESB_SEQUENCE_VERSION=2.0.8 -WSO2_ESB_SYNAPSE_VERSION=2.0.8 -WSO2_ESB_API_VERSION=2.0.8 -WSO2_ESB_TASK_VERSION=2.0.8 -WSO2_ESB_TEMPLATE_VERSION=2.0.8 -WSO2_GENERAL_PROJECT_VERSION=2.0.8 -WSO2_QOS_PROJECT_VERSION=1.0.3 -MAVEN_CEP_VERSION=1.0.7 -MAVEN_CAR_DEPLOY_VERSION=1.0.8 +MAVEN_SYNAPSE_MEDIATOR_PLUGIN_VERSION=2.0.9 +MAVEN_LIBRARY_PLUGIN_VERSION=2.0.9 +MAVEN_REGISTRY_HANDLER_PLUGIN_VERSION=2.0.9 +MAVEN_AXIS2_PLUGIN_VERSION=2.0.9 +MAVEN_WAR_PLUGIN_VERSION=2.0.9 +MAVEN_CARBON_UI_PLUGIN_VERSION=2.0.9 +MAVEN_DATASERVICE_PLUGIN_VERSION=2.0.9 +MAVEN_BPEL_PLUGIN_VERSION=2.0.9 +MAVEN_DS_VALIDATOR_PLUGIN_VERSION=2.0.9 +MAVEN_GADGET_PLUGIN_VERSION=2.0.9 +MAVEN_JAXWS_PLUGIN_VERSION=2.0.9 +MAVEN_SYNAPSE_VERSION=2.0.9 +WSO2_ESB_ENDPOINT_VERSION=2.0.9 +WSO2_ESB_LOCAL_ENTRY_VERSION=2.0.9 +WSO2_ESB_PROXY_VERSION=2.0.9 +WSO2_ESB_SEQUENCE_VERSION=2.0.9 +WSO2_ESB_SYNAPSE_VERSION=2.0.9 +WSO2_ESB_API_VERSION=2.0.9 +WSO2_ESB_TASK_VERSION=2.0.9 +WSO2_ESB_TEMPLATE_VERSION=2.0.9 +WSO2_GENERAL_PROJECT_VERSION=2.0.9 +WSO2_QOS_PROJECT_VERSION=1.0.4 +MAVEN_CEP_VERSION=1.0.8 +MAVEN_CAR_DEPLOY_VERSION=1.0.9 MAVEN_BRS_VERSION=1.0.1 -WSO2_ESB_MESSAGE_STORE_PLUGIN_VERSION=1.0.4 -WSO2_ESB_MESSAGE_PROCESSOR_PLUGIN_VERSION=1.0.4 +WSO2_ESB_MESSAGE_STORE_PLUGIN_VERSION=1.0.5 +WSO2_ESB_MESSAGE_PROCESSOR_PLUGIN_VERSION=1.0.5 diff --git a/capp/org.wso2.developerstudio.eclipse.capp.server/META-INF/MANIFEST.MF b/capp/org.wso2.developerstudio.eclipse.capp.server/META-INF/MANIFEST.MF index 47ee92622f..75e1428d4b 100644 --- a/capp/org.wso2.developerstudio.eclipse.capp.server/META-INF/MANIFEST.MF +++ b/capp/org.wso2.developerstudio.eclipse.capp.server/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbon Application Deployment Monitor Bundle-SymbolicName: org.wso2.developerstudio.eclipse.capp.server -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.capp.server.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/capp/pom.xml b/capp/pom.xml index a55134cd16..a1c91523cb 100644 --- a/capp/pom.xml +++ b/capp/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio carbon-application-parent @@ -120,21 +120,21 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 3.2.0 - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 1.2.0 0.5.0.wso2v1 - 4.0.0-SNAPSHOT + 3.7.0 diff --git a/carbon/org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle/META-INF/MANIFEST.MF b/carbon/org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle/META-INF/MANIFEST.MF index 4e9c5149e5..fbffb2a0c3 100644 --- a/carbon/org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle/META-INF/MANIFEST.MF +++ b/carbon/org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CarbonUI Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.ui, org.wso2.developerstudio.eclipse.platform.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", +Import-Package: org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.pde.internal.ui.wizards.plugin, diff --git a/carbon/org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle/pom.xml b/carbon/org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle/pom.xml index f4cbf0740a..642f3b0f75 100644 --- a/carbon/org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle/pom.xml +++ b/carbon/org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.carbon.ui.bundle diff --git a/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle/META-INF/MANIFEST.MF b/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle/META-INF/MANIFEST.MF index 47a38d6138..64886bc797 100644 --- a/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle/META-INF/MANIFEST.MF +++ b/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbon UI Bundle Project Plugin Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbon.uibundle;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbon.uibundle.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle/pom.xml b/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle/pom.xml index 22bd11a4a1..93ded7c04f 100644 --- a/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle/pom.xml +++ b/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbon.uibundle diff --git a/carbon/pom.xml b/carbon/pom.xml index 5129a2781e..c5f117aa96 100644 --- a/carbon/pom.xml +++ b/carbon/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio carbon-tool-parent @@ -40,9 +40,9 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 diff --git a/cep/org.wso2.developerstudio.eclipse.artifact.cep/META-INF/MANIFEST.MF b/cep/org.wso2.developerstudio.eclipse.artifact.cep/META-INF/MANIFEST.MF index e96b51f02a..d619ccaa0f 100755 --- a/cep/org.wso2.developerstudio.eclipse.artifact.cep/META-INF/MANIFEST.MF +++ b/cep/org.wso2.developerstudio.eclipse.artifact.cep/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CEP Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.cep;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.cep.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -12,10 +12,10 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.project, org.apache.xml.serialize, - org.codehaus.plexus.util.xml;version="2.0.1", + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jface.text, diff --git a/cep/org.wso2.developerstudio.eclipse.artifact.cep/pom.xml b/cep/org.wso2.developerstudio.eclipse.artifact.cep/pom.xml index 679391eee3..ac8744f805 100755 --- a/cep/org.wso2.developerstudio.eclipse.artifact.cep/pom.xml +++ b/cep/org.wso2.developerstudio.eclipse.artifact.cep/pom.xml @@ -20,11 +20,11 @@ org.wso2.developerstudio cep-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.cep - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio CEP Artifact diff --git a/cep/pom.xml b/cep/pom.xml index 6da9f2a81b..53006fb683 100644 --- a/cep/pom.xml +++ b/cep/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio cep-tool-parent diff --git a/common/org.wso2.developerstudio.eclipse.artifact.qos/META-INF/MANIFEST.MF b/common/org.wso2.developerstudio.eclipse.artifact.qos/META-INF/MANIFEST.MF index b224ce8e0c..7e7c9f3716 100644 --- a/common/org.wso2.developerstudio.eclipse.artifact.qos/META-INF/MANIFEST.MF +++ b/common/org.wso2.developerstudio.eclipse.artifact.qos/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: QoSProject Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.qos;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.qos.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -14,12 +14,12 @@ Import-Package: javax.wsdl, org.apache.commons.io;version="2.0.0.wso2v1", org.apache.commons.lang;version="2.6.0.wso2v1", org.apache.commons.validator.routines, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.project, org.apache.woden, org.apache.woden.wsdl20, org.apache.woden.wsdl20.xml, - org.codehaus.plexus.util.xml;version="2.0.1", + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.core.dom, diff --git a/common/org.wso2.developerstudio.eclipse.artifact.qos/plugin.xml b/common/org.wso2.developerstudio.eclipse.artifact.qos/plugin.xml index f876ff2ad8..957d65faa3 100644 --- a/common/org.wso2.developerstudio.eclipse.artifact.qos/plugin.xml +++ b/common/org.wso2.developerstudio.eclipse.artifact.qos/plugin.xml @@ -38,7 +38,7 @@ commandId="org.wso2.developerstudio.eclipse.qos.QoSDashboard"> - + diff --git a/common/org.wso2.developerstudio.eclipse.artifact.qos/pom.xml b/common/org.wso2.developerstudio.eclipse.artifact.qos/pom.xml index d0bf7ee159..b8ad62af9b 100644 --- a/common/org.wso2.developerstudio.eclipse.artifact.qos/pom.xml +++ b/common/org.wso2.developerstudio.eclipse.artifact.qos/pom.xml @@ -20,12 +20,12 @@ org.wso2.eclipse wso2-eclipse-common - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio org.wso2.developerstudio.eclipse.artifact.qos - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio QoS Project diff --git a/common/org.wso2.developerstudio.eclipse.general.project/META-INF/MANIFEST.MF b/common/org.wso2.developerstudio.eclipse.general.project/META-INF/MANIFEST.MF index e0757cb6ac..8cce8f656d 100644 --- a/common/org.wso2.developerstudio.eclipse.general.project/META-INF/MANIFEST.MF +++ b/common/org.wso2.developerstudio.eclipse.general.project/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GeneralProject Bundle-SymbolicName: org.wso2.developerstudio.eclipse.general.project;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.general.project.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Import-Package: org.apache.axiom.om, org.apache.commons.io;version="2.0.0.wso2v1", - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jface.text, diff --git a/common/org.wso2.developerstudio.eclipse.general.project/pom.xml b/common/org.wso2.developerstudio.eclipse.general.project/pom.xml index d79a13bc2c..d5403a38c1 100644 --- a/common/org.wso2.developerstudio.eclipse.general.project/pom.xml +++ b/common/org.wso2.developerstudio.eclipse.general.project/pom.xml @@ -20,7 +20,7 @@ org.wso2.eclipse wso2-eclipse-common - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.general.project diff --git a/common/org.wso2.developerstudio.eclipse.general.project/src/org/wso2/developerstudio/eclipse/general/project/nature/GeneralProjectNature.java b/common/org.wso2.developerstudio.eclipse.general.project/src/org/wso2/developerstudio/eclipse/general/project/nature/GeneralProjectNature.java index 09591dcef3..54cdb1f5ff 100644 --- a/common/org.wso2.developerstudio.eclipse.general.project/src/org/wso2/developerstudio/eclipse/general/project/nature/GeneralProjectNature.java +++ b/common/org.wso2.developerstudio.eclipse.general.project/src/org/wso2/developerstudio/eclipse/general/project/nature/GeneralProjectNature.java @@ -38,27 +38,50 @@ private void updatePom() { //Adding maven exec plugin entry Plugin plugin = MavenUtils.createPluginEntry(mavenProject, "org.codehaus.mojo", "exec-maven-plugin", "1.2", true); - PluginExecution pluginExecution = new PluginExecution(); - pluginExecution.addGoal("exec"); - pluginExecution.setPhase("install"); - - Xpp3Dom configurationNode = MavenUtils.createMainConfigurationNode(); - Xpp3Dom executableNode = MavenUtils.createXpp3Node(configurationNode, "executable"); - executableNode.setValue("mvn"); - Xpp3Dom workingDirectoryNode = MavenUtils.createXpp3Node(configurationNode, "workingDirectory"); - workingDirectoryNode.setValue("${project.build.directory}"); - Xpp3Dom argumentsNode = MavenUtils.createXpp3Node(configurationNode, "arguments"); - Xpp3Dom cleanArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); - cleanArgumentNode.setValue("clean"); - Xpp3Dom installArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); - installArgumentNode.setValue("install"); - Xpp3Dom testSkipArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); - testSkipArgumentNode.setValue("-Dmaven.test.skip=${maven.test.skip}"); - - pluginExecution.setConfiguration(configurationNode); - - plugin.addExecution(pluginExecution); - + { + PluginExecution pluginExecution = new PluginExecution(); + pluginExecution.setId("install"); + pluginExecution.addGoal("exec"); + pluginExecution.setPhase("install"); + + Xpp3Dom configurationNode = MavenUtils.createMainConfigurationNode(); + Xpp3Dom executableNode = MavenUtils.createXpp3Node(configurationNode, "executable"); + executableNode.setValue("mvn"); + Xpp3Dom workingDirectoryNode = MavenUtils.createXpp3Node(configurationNode, "workingDirectory"); + workingDirectoryNode.setValue("${project.build.directory}"); + Xpp3Dom argumentsNode = MavenUtils.createXpp3Node(configurationNode, "arguments"); + Xpp3Dom cleanArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + cleanArgumentNode.setValue("clean"); + Xpp3Dom installArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + installArgumentNode.setValue("install"); + Xpp3Dom testSkipArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + testSkipArgumentNode.setValue("-Dmaven.test.skip=${maven.test.skip}"); + + pluginExecution.setConfiguration(configurationNode); + + plugin.addExecution(pluginExecution); + } + { + PluginExecution pluginExecution = new PluginExecution(); + pluginExecution.setId("deploy"); + pluginExecution.addGoal("exec"); + pluginExecution.setPhase("deploy"); + + Xpp3Dom configurationNode = MavenUtils.createMainConfigurationNode(); + Xpp3Dom executableNode = MavenUtils.createXpp3Node(configurationNode, "executable"); + executableNode.setValue("mvn"); + Xpp3Dom workingDirectoryNode = MavenUtils.createXpp3Node(configurationNode, "workingDirectory"); + workingDirectoryNode.setValue("${project.build.directory}"); + Xpp3Dom argumentsNode = MavenUtils.createXpp3Node(configurationNode, "arguments"); + Xpp3Dom deployArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + deployArgumentNode.setValue("deploy"); + Xpp3Dom testSkipArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + testSkipArgumentNode.setValue("-Dmaven.test.skip=${maven.test.skip}"); + + pluginExecution.setConfiguration(configurationNode); + + plugin.addExecution(pluginExecution); + } MavenUtils.saveMavenProject(mavenProject, mavenProjectPomLocation); } catch (Exception e) { diff --git a/common/org.wso2.developerstudio.eclipse.libraries/META-INF/MANIFEST.MF b/common/org.wso2.developerstudio.eclipse.libraries/META-INF/MANIFEST.MF index ff2df8d727..3355f4aa99 100755 --- a/common/org.wso2.developerstudio.eclipse.libraries/META-INF/MANIFEST.MF +++ b/common/org.wso2.developerstudio.eclipse.libraries/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Libraries Bundle-SymbolicName: org.wso2.developerstudio.eclipse.libraries;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-ActivationPolicy: lazy Export-Package: com.damnhandy.uri.template, com.google.gson;version="2.1.0", diff --git a/common/org.wso2.developerstudio.eclipse.libraries/pom.xml b/common/org.wso2.developerstudio.eclipse.libraries/pom.xml index f00d69330b..f0ca87317d 100644 --- a/common/org.wso2.developerstudio.eclipse.libraries/pom.xml +++ b/common/org.wso2.developerstudio.eclipse.libraries/pom.xml @@ -26,7 +26,7 @@ org.wso2.eclipse wso2-eclipse-common - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio.eclipse.libraries eclipse-plugin diff --git a/common/org.wso2.developerstudio.eclipse.logging/META-INF/MANIFEST.MF b/common/org.wso2.developerstudio.eclipse.logging/META-INF/MANIFEST.MF index 68317a0c20..3c38699855 100644 --- a/common/org.wso2.developerstudio.eclipse.logging/META-INF/MANIFEST.MF +++ b/common/org.wso2.developerstudio.eclipse.logging/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Developer Studio Logging Framework Bundle-SymbolicName: org.wso2.developerstudio.eclipse.logging -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.logging.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.core.runtime diff --git a/common/org.wso2.developerstudio.eclipse.logging/pom.xml b/common/org.wso2.developerstudio.eclipse.logging/pom.xml index 6ee0af9606..1718e21ea7 100644 --- a/common/org.wso2.developerstudio.eclipse.logging/pom.xml +++ b/common/org.wso2.developerstudio.eclipse.logging/pom.xml @@ -26,7 +26,7 @@ org.wso2.eclipse wso2-eclipse-common - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio.eclipse.logging eclipse-plugin diff --git a/common/org.wso2.developerstudio.eclipse.maven/META-INF/MANIFEST.MF b/common/org.wso2.developerstudio.eclipse.maven/META-INF/MANIFEST.MF index 0a5b31d9d1..86afa3540b 100755 --- a/common/org.wso2.developerstudio.eclipse.maven/META-INF/MANIFEST.MF +++ b/common/org.wso2.developerstudio.eclipse.maven/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Maven Invoker Bundle-SymbolicName: org.wso2.developerstudio.eclipse.maven;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.maven.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: junit.framework, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.model.io.xpp3;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.apache.maven.shared.invoker;version="[2.0.11,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.model.io.xpp3, + org.apache.maven.project, + org.apache.maven.shared.invoker, + org.codehaus.plexus.util.xml, org.eclipse.core.commands, org.eclipse.core.expressions, org.eclipse.core.resources, diff --git a/common/org.wso2.developerstudio.eclipse.maven/pom.xml b/common/org.wso2.developerstudio.eclipse.maven/pom.xml index 31e5e234d2..bb4c596450 100755 --- a/common/org.wso2.developerstudio.eclipse.maven/pom.xml +++ b/common/org.wso2.developerstudio.eclipse.maven/pom.xml @@ -21,7 +21,7 @@ org.wso2.eclipse wso2-eclipse-common - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio.eclipse.maven eclipse-plugin diff --git a/common/org.wso2.developerstudio.eclipse.maven/src/main/java/org/wso2/developerstudio/eclipse/maven/util/WSO2MavenPluginVersions.java b/common/org.wso2.developerstudio.eclipse.maven/src/main/java/org/wso2/developerstudio/eclipse/maven/util/WSO2MavenPluginVersions.java index a62c366ea7..56b762e94a 100644 --- a/common/org.wso2.developerstudio.eclipse.maven/src/main/java/org/wso2/developerstudio/eclipse/maven/util/WSO2MavenPluginVersions.java +++ b/common/org.wso2.developerstudio.eclipse.maven/src/main/java/org/wso2/developerstudio/eclipse/maven/util/WSO2MavenPluginVersions.java @@ -28,45 +28,45 @@ public class WSO2MavenPluginVersions { private static final Map PLUGIN_VERSIONS = new HashMap(); static { - PLUGIN_VERSIONS.put("maven-axis2-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-bpel-plugin", "2.0.8"); + PLUGIN_VERSIONS.put("maven-axis2-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-bpel-plugin", "2.0.9"); - PLUGIN_VERSIONS.put("maven-carbon-ui-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-cep-plugin", "1.0.7"); - PLUGIN_VERSIONS.put("maven-dataservice-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-ds-validator-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-endpoint-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-gadget-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-jaxws-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-library-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-localentry-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-proxy-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-registry-filter-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-registry-handler-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-registry-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-sequence-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-stratos-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-synapse-mediator-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-synapse-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("maven-war-plugin", "2.0.8"); + PLUGIN_VERSIONS.put("maven-carbon-ui-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-cep-plugin", "1.0.8"); + PLUGIN_VERSIONS.put("maven-dataservice-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-ds-validator-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-endpoint-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-gadget-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-jaxws-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-library-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-localentry-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-proxy-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-registry-filter-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-registry-handler-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-registry-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-sequence-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-stratos-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-synapse-mediator-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-synapse-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("maven-war-plugin", "2.0.9"); - PLUGIN_VERSIONS.put("wso2-esb-api-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("wso2-esb-endpoint-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("wso2-esb-localentry-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("wso2-esb-proxy-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("wso2-esb-sequence-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("wso2-esb-synapse-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("wso2-esb-task-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("wso2-esb-template-plugin", "2.0.8"); - PLUGIN_VERSIONS.put("wso2-esb-messageprocessor-plugin", "1.0.4"); - PLUGIN_VERSIONS.put("wso2-esb-messagestore-plugin", "1.0.4"); + PLUGIN_VERSIONS.put("wso2-esb-api-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("wso2-esb-endpoint-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("wso2-esb-localentry-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("wso2-esb-proxy-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("wso2-esb-sequence-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("wso2-esb-synapse-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("wso2-esb-task-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("wso2-esb-template-plugin", "2.0.9"); + PLUGIN_VERSIONS.put("wso2-esb-messageprocessor-plugin", "1.0.5"); + PLUGIN_VERSIONS.put("wso2-esb-messagestore-plugin", "1.0.5"); - PLUGIN_VERSIONS.put("wso2-general-project-plugin", "2.0.8"); + PLUGIN_VERSIONS.put("wso2-general-project-plugin", "2.0.9"); - PLUGIN_VERSIONS.put("maven-qos-plugin", "1.0.3"); + PLUGIN_VERSIONS.put("maven-qos-plugin", "1.0.4"); - PLUGIN_VERSIONS.put("maven-car-deploy-plugin", "1.0.8"); - PLUGIN_VERSIONS.put("maven-car-plugin", "2.0.8"); + PLUGIN_VERSIONS.put("maven-car-deploy-plugin", "1.0.9"); + PLUGIN_VERSIONS.put("maven-car-plugin", "2.0.9"); } private WSO2MavenPluginVersions(){ diff --git a/common/org.wso2.developerstudio.eclipse.security.ui/META-INF/MANIFEST.MF b/common/org.wso2.developerstudio.eclipse.security.ui/META-INF/MANIFEST.MF index 5ce2815fec..5ccf005916 100644 --- a/common/org.wso2.developerstudio.eclipse.security.ui/META-INF/MANIFEST.MF +++ b/common/org.wso2.developerstudio.eclipse.security.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WSO2 Developer Studio Security UI Bundle-SymbolicName: org.wso2.developerstudio.eclipse.security.ui;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.security.ui.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, diff --git a/common/org.wso2.developerstudio.eclipse.security.ui/pom.xml b/common/org.wso2.developerstudio.eclipse.security.ui/pom.xml index 9f2a658b9b..3b675c2093 100644 --- a/common/org.wso2.developerstudio.eclipse.security.ui/pom.xml +++ b/common/org.wso2.developerstudio.eclipse.security.ui/pom.xml @@ -25,11 +25,11 @@ org.wso2.eclipse wso2-eclipse-common - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.security.ui - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio Security UI diff --git a/common/org.wso2.developerstudio.eclipse.ui/META-INF/MANIFEST.MF b/common/org.wso2.developerstudio.eclipse.ui/META-INF/MANIFEST.MF index ef0816b096..9da99da1da 100644 --- a/common/org.wso2.developerstudio.eclipse.ui/META-INF/MANIFEST.MF +++ b/common/org.wso2.developerstudio.eclipse.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Developer Studio UI Bundle-SymbolicName: org.wso2.developerstudio.eclipse.ui -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.ui.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/common/org.wso2.developerstudio.eclipse.ui/pom.xml b/common/org.wso2.developerstudio.eclipse.ui/pom.xml index 26cc60f816..7f8b2246fe 100644 --- a/common/org.wso2.developerstudio.eclipse.ui/pom.xml +++ b/common/org.wso2.developerstudio.eclipse.ui/pom.xml @@ -26,7 +26,7 @@ org.wso2.eclipse wso2-eclipse-common - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio.eclipse.ui eclipse-plugin diff --git a/common/org.wso2.developerstudio.eclipse.utils/META-INF/MANIFEST.MF b/common/org.wso2.developerstudio.eclipse.utils/META-INF/MANIFEST.MF index a8e11cc3c4..00ca370c15 100644 --- a/common/org.wso2.developerstudio.eclipse.utils/META-INF/MANIFEST.MF +++ b/common/org.wso2.developerstudio.eclipse.utils/META-INF/MANIFEST.MF @@ -2,18 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Developer Studio Utilty Plugin Bundle-SymbolicName: org.wso2.developerstudio.eclipse.utils -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.utils.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.core.runtime, org.eclipse.jface Bundle-ActivationPolicy: lazy Export-Package: org.apache.commons.io, - org.apache.maven.model;version="2.2.1", - org.apache.maven.model.io.xpp3;version="2.2.1", - org.apache.maven.project;version="2.2.1", - org.apache.maven.shared.invoker;version="2.0.11", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.shared.invoker, org.wso2.developerstudio.eclipse.utils, org.wso2.developerstudio.eclipse.utils.archive, org.wso2.developerstudio.eclipse.utils.constants, diff --git a/common/org.wso2.developerstudio.eclipse.utils/pom.xml b/common/org.wso2.developerstudio.eclipse.utils/pom.xml index 9cfd51f94c..bfd35f1538 100644 --- a/common/org.wso2.developerstudio.eclipse.utils/pom.xml +++ b/common/org.wso2.developerstudio.eclipse.utils/pom.xml @@ -26,7 +26,7 @@ org.wso2.eclipse wso2-eclipse-common - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio.eclipse.utils eclipse-plugin diff --git a/common/org.wso2.developerstudio.eclipse.utils/src/org/wso2/developerstudio/eclipse/utils/file/FileUtils.java b/common/org.wso2.developerstudio.eclipse.utils/src/org/wso2/developerstudio/eclipse/utils/file/FileUtils.java index d04bec0117..062262598e 100644 --- a/common/org.wso2.developerstudio.eclipse.utils/src/org/wso2/developerstudio/eclipse/utils/file/FileUtils.java +++ b/common/org.wso2.developerstudio.eclipse.utils/src/org/wso2/developerstudio/eclipse/utils/file/FileUtils.java @@ -218,6 +218,21 @@ public static void copyDirectoryContents(File srcDir, File dstDir) throws IOExce } } + public static void copyDirectoryContentsWithoutDotSettingsDir(File srcDir, File dstDir) throws IOException { + File[] listFiles = srcDir.listFiles(); + if (listFiles != null) { + for (File srcFile : listFiles) { + if (srcFile.isDirectory()) { + if (!srcFile.getName().equals(".settings")) { + copyDirectory(srcFile, new File(dstDir, srcFile.getName())); + } + } else { + copy(srcFile, new File(dstDir, srcFile.getName())); + } + } + } + } + //Copies src file to dst file. // If the dst file does not exist, it is created public static void copy(File src, File dst) throws IOException { diff --git a/common/org.wso2.developerstudio.eclipse.utils/src/org/wso2/developerstudio/eclipse/utils/jdt/JavaLibraryUtil.java b/common/org.wso2.developerstudio.eclipse.utils/src/org/wso2/developerstudio/eclipse/utils/jdt/JavaLibraryUtil.java index 7ffc282942..e18f53affd 100644 --- a/common/org.wso2.developerstudio.eclipse.utils/src/org/wso2/developerstudio/eclipse/utils/jdt/JavaLibraryUtil.java +++ b/common/org.wso2.developerstudio.eclipse.utils/src/org/wso2/developerstudio/eclipse/utils/jdt/JavaLibraryUtil.java @@ -112,7 +112,7 @@ public static Map getDependencyInfoMap( File pomFile = pomFiles[0]; MavenProject mavenProject = getMavenProject(pomFile); // JavaLibraryBean bean = new - // JavaLibraryBean("/media/dev/wso2products/3.2.0/wso2greg-4.0.0-SNAPSHOT/lib", + // JavaLibraryBean("/media/dev/wso2products/3.2.0/wso2greg-3.7.0/lib", // "org.wso2.sample", "test.sample", "1.0.0"); JavaLibraryBean bean = new JavaLibraryBean(libraryFile, mavenProject.getGroupId(), diff --git a/common/pom.xml b/common/pom.xml index a525ef405c..72e90857d0 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 wso2-eclipse-common 4.0.0 @@ -41,7 +41,7 @@ org.wso2.developerstudio.eclipse.general.project org.wso2.developerstudio.eclipse.security.ui - org.wso2.developerstudio.eclipse.artifact.qos + diff --git a/core/org.wso2.developerstudio.eclipse.bpel.core/META-INF/MANIFEST.MF b/core/org.wso2.developerstudio.eclipse.bpel.core/META-INF/MANIFEST.MF index 8d9dff6550..93ee5befda 100644 --- a/core/org.wso2.developerstudio.eclipse.bpel.core/META-INF/MANIFEST.MF +++ b/core/org.wso2.developerstudio.eclipse.bpel.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Core Bundle-SymbolicName: org.wso2.developerstudio.eclipse.bpel.core -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.eclipse.developerstudio.eclipse.bpel.core.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime diff --git a/core/org.wso2.developerstudio.eclipse.bpel.core/pom.xml b/core/org.wso2.developerstudio.eclipse.bpel.core/pom.xml index be0848af63..2157d3b479 100644 --- a/core/org.wso2.developerstudio.eclipse.bpel.core/pom.xml +++ b/core/org.wso2.developerstudio.eclipse.bpel.core/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-tools-core-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.bpel.core diff --git a/core/org.wso2.developerstudio.eclipse.esb.core/META-INF/MANIFEST.MF b/core/org.wso2.developerstudio.eclipse.esb.core/META-INF/MANIFEST.MF index 6892f88247..8e823b2791 100644 --- a/core/org.wso2.developerstudio.eclipse.esb.core/META-INF/MANIFEST.MF +++ b/core/org.wso2.developerstudio.eclipse.esb.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ESB Core Bundle-SymbolicName: org.wso2.developerstudio.eclipse.esb.core;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.esb.core.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime diff --git a/core/org.wso2.developerstudio.eclipse.esb.core/pom.xml b/core/org.wso2.developerstudio.eclipse.esb.core/pom.xml index 32fedb791d..dffe547388 100644 --- a/core/org.wso2.developerstudio.eclipse.esb.core/pom.xml +++ b/core/org.wso2.developerstudio.eclipse.esb.core/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-tools-core-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.esb.core diff --git a/core/org.wso2.developerstudio.eclipse.esb.core/src/org/wso2/developerstudio/eclipse/esb/core/utils/SynapseUtils.java b/core/org.wso2.developerstudio.eclipse.esb.core/src/org/wso2/developerstudio/eclipse/esb/core/utils/SynapseUtils.java index 4badb978f3..18156e32f9 100755 --- a/core/org.wso2.developerstudio.eclipse.esb.core/src/org/wso2/developerstudio/eclipse/esb/core/utils/SynapseUtils.java +++ b/core/org.wso2.developerstudio.eclipse.esb.core/src/org/wso2/developerstudio/eclipse/esb/core/utils/SynapseUtils.java @@ -70,40 +70,33 @@ public static List synapseConfigFolderContentProcessing( List editorList = new ArrayList(); File rootDir = new File(synapseConfigFolderPath + "/" + ADDITIONAL_FOLDERS); + if(!rootDir.exists()){ - throw new Exception("Please provide a valid synapse-configs directory"); + //throw new Exception("Please provide a valid synapse-configs directory"); + rootDir = new File(synapseConfigFolderPath); } File[] dirs = rootDir.listFiles(); int dirCount = dirs.length; for (int i = 0; i < dirCount; ++i) { String name=dirs[i].getName(); if(name.equals("api")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/api", SynapseEntryType.API); + processFiles(editorList, rootDir + "/api", SynapseEntryType.API); }else if(name.equals("endpoints")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/endpoints",SynapseEntryType.END_POINT); + processFiles(editorList, rootDir + "/endpoints",SynapseEntryType.END_POINT); }else if(name.equals("local-entries")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/local-entries",SynapseEntryType.LOCAL_ENTRY); + processFiles(editorList, rootDir + "/local-entries",SynapseEntryType.LOCAL_ENTRY); }else if(name.equals("proxy-services")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/proxy-services",SynapseEntryType.PROXY_SERVICE); + processFiles(editorList, rootDir + "/proxy-services",SynapseEntryType.PROXY_SERVICE); }else if(name.equals("sequences")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/sequences",SynapseEntryType.SEQUENCE); + processFiles(editorList, rootDir + "/sequences",SynapseEntryType.SEQUENCE); }else if(name.equals("tasks")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/tasks", SynapseEntryType.TASK); + processFiles(editorList, rootDir + "/tasks", SynapseEntryType.TASK); }else if(name.equals("templates")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/templates",SynapseEntryType.TEMPLATE); + processFiles(editorList, rootDir + "/templates",SynapseEntryType.TEMPLATE); } else if(name.equals("message-stores")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/message-stores",SynapseEntryType.MESSAGE_STORE); + processFiles(editorList,rootDir + "/message-stores",SynapseEntryType.MESSAGE_STORE); } else if(name.equals("message-processors")){ - processFiles(editorList, synapseConfigFolderPath + "/" - + ADDITIONAL_FOLDERS + "/message-processors",SynapseEntryType.MESSAGE_PROCESSOR); + processFiles(editorList, rootDir + "/message-processors",SynapseEntryType.MESSAGE_PROCESSOR); } } return editorList; diff --git a/core/org.wso2.developerstudio.eclipse.greg.core/META-INF/MANIFEST.MF b/core/org.wso2.developerstudio.eclipse.greg.core/META-INF/MANIFEST.MF index befbcc3d9f..5fa7d9e07b 100644 --- a/core/org.wso2.developerstudio.eclipse.greg.core/META-INF/MANIFEST.MF +++ b/core/org.wso2.developerstudio.eclipse.greg.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Governance Registry Core Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.core;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.core.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/core/org.wso2.developerstudio.eclipse.greg.core/pom.xml b/core/org.wso2.developerstudio.eclipse.greg.core/pom.xml index e14674d8c6..de9f22ae9d 100644 --- a/core/org.wso2.developerstudio.eclipse.greg.core/pom.xml +++ b/core/org.wso2.developerstudio.eclipse.greg.core/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-tools-core-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.core diff --git a/core/org.wso2.developerstudio.eclipse.platform.core/META-INF/MANIFEST.MF b/core/org.wso2.developerstudio.eclipse.platform.core/META-INF/MANIFEST.MF index e333766725..2152fa1e18 100644 --- a/core/org.wso2.developerstudio.eclipse.platform.core/META-INF/MANIFEST.MF +++ b/core/org.wso2.developerstudio.eclipse.platform.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Platform Core Bundle-SymbolicName: org.wso2.developerstudio.eclipse.platform.core;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.platform.core.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -32,8 +32,8 @@ Import-Package: javax.wsdl;version="[1.6.2.wso2v1,1.7.0)", org.apache.axis.utils, org.apache.axis2.util, org.apache.commons.io;version="[2.0.0.wso2v1,2.0.1)", - org.apache.maven.model;version="2.2.1", - org.apache.maven.project;version="2.2.1", + org.apache.maven.model, + org.apache.maven.project, org.eclipse.core.internal.propertytester, org.eclipse.core.resources, org.eclipse.jdt.core, diff --git a/core/org.wso2.developerstudio.eclipse.platform.core/pom.xml b/core/org.wso2.developerstudio.eclipse.platform.core/pom.xml index d2ebe3ccf9..e4e1d10094 100644 --- a/core/org.wso2.developerstudio.eclipse.platform.core/pom.xml +++ b/core/org.wso2.developerstudio.eclipse.platform.core/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-tools-core-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.platform.core diff --git a/core/org.wso2.developerstudio.eclipse.platform.ui/META-INF/MANIFEST.MF b/core/org.wso2.developerstudio.eclipse.platform.ui/META-INF/MANIFEST.MF index fb53287996..04bd190021 100644 --- a/core/org.wso2.developerstudio.eclipse.platform.ui/META-INF/MANIFEST.MF +++ b/core/org.wso2.developerstudio.eclipse.platform.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Platform UI Bundle-SymbolicName: org.wso2.developerstudio.eclipse.platform.ui;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.platform.ui.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -15,8 +15,8 @@ Import-Package: org.apache.axis2.client, org.apache.commons.httpclient.protocol;version="3.1.0.wso2v1", org.apache.commons.ssl;version="[0.3.9,0.4.0)", org.apache.commons.validator.routines, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.project, org.eclipse.core.expressions, org.eclipse.core.resources, org.eclipse.emf.common.ui.dialogs, diff --git a/core/org.wso2.developerstudio.eclipse.platform.ui/pom.xml b/core/org.wso2.developerstudio.eclipse.platform.ui/pom.xml index 8ebd3b7a4c..e2a4aadf3f 100644 --- a/core/org.wso2.developerstudio.eclipse.platform.ui/pom.xml +++ b/core/org.wso2.developerstudio.eclipse.platform.ui/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-tools-core-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.platform.ui diff --git a/core/org.wso2.developerstudio.eclipse.samples/META-INF/MANIFEST.MF b/core/org.wso2.developerstudio.eclipse.samples/META-INF/MANIFEST.MF index 5718c2e47e..92488d3a35 100644 --- a/core/org.wso2.developerstudio.eclipse.samples/META-INF/MANIFEST.MF +++ b/core/org.wso2.developerstudio.eclipse.samples/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Samples Bundle-SymbolicName: org.wso2.developerstudio.eclipse.samples;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.samples.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/core/org.wso2.developerstudio.eclipse.samples/pom.xml b/core/org.wso2.developerstudio.eclipse.samples/pom.xml index dbc4f40d83..17618d5bc4 100644 --- a/core/org.wso2.developerstudio.eclipse.samples/pom.xml +++ b/core/org.wso2.developerstudio.eclipse.samples/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-tools-core-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.samples diff --git a/core/pom.xml b/core/pom.xml index 695dc51542..a49578e29a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio wso2-tools-core-parent @@ -61,12 +61,12 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 diff --git a/data-mapper/org.wso2.developerstudio.visualdatamapper.diagram/META-INF/MANIFEST.MF b/data-mapper/org.wso2.developerstudio.visualdatamapper.diagram/META-INF/MANIFEST.MF index 7c69924981..51f04bed81 100644 --- a/data-mapper/org.wso2.developerstudio.visualdatamapper.diagram/META-INF/MANIFEST.MF +++ b/data-mapper/org.wso2.developerstudio.visualdatamapper.diagram/META-INF/MANIFEST.MF @@ -51,8 +51,8 @@ Import-Package: org.apache.avro, org.apache.avro.util, org.apache.commons.io;version="2.0.0.wso2v1", org.apache.commons.lang;version="2.6.0.wso2v1", - org.apache.maven.model;version="2.2.1", - org.apache.maven.project;version="2.2.1", + org.apache.maven.model, + org.apache.maven.project, org.codehaus.jackson, org.codehaus.jackson.annotate, org.codehaus.jackson.format, @@ -77,7 +77,7 @@ Import-Package: org.apache.avro, org.codehaus.jackson.sym, org.codehaus.jackson.type, org.codehaus.jackson.util, - org.codehaus.plexus.util.xml;version="2.0.1", + org.codehaus.plexus.util.xml, org.eclipse.core.filesystem, org.eclipse.wst.sse.core, org.eclipse.wst.sse.core.internal.provisional, diff --git a/data-mapper/org.wso2.developerstudio.visualdatamapper.diagram/pom.xml b/data-mapper/org.wso2.developerstudio.visualdatamapper.diagram/pom.xml index 5321d2a396..3615b06496 100644 --- a/data-mapper/org.wso2.developerstudio.visualdatamapper.diagram/pom.xml +++ b/data-mapper/org.wso2.developerstudio.visualdatamapper.diagram/pom.xml @@ -20,12 +20,12 @@ org.wso2.developerstudio datamapper-tool-parent - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 org.wso2.developerstudio.visualdatamapper.diagram eclipse-plugin - 2.0.0-SNAPSHOT + 2.0.0 Developer Studio Visual Datamapper diff --git a/dependencies/maven-axis2-plugin/pom.xml b/dependencies/maven-axis2-plugin/pom.xml index 7b27e703e0..1a4f54365a 100644 --- a/dependencies/maven-axis2-plugin/pom.xml +++ b/dependencies/maven-axis2-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven maven-axis2-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Axis2 Plugin @@ -103,7 +103,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.apache.axis2.wso2 diff --git a/dependencies/maven-bpel-plugin/pom.xml b/dependencies/maven-bpel-plugin/pom.xml index 7d3aae7acb..4698ed5f6e 100644 --- a/dependencies/maven-bpel-plugin/pom.xml +++ b/dependencies/maven-bpel-plugin/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.wso2.maven maven-bpel-plugin - 2.0.8 + 2.0.9 maven-plugin Maven BPEL Plugin @@ -141,7 +141,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/maven-car-deploy-plugin/pom.xml b/dependencies/maven-car-deploy-plugin/pom.xml index 6bc499e089..6a521d5874 100644 --- a/dependencies/maven-car-deploy-plugin/pom.xml +++ b/dependencies/maven-car-deploy-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven maven-car-deploy-plugin - 1.0.8 + 1.0.9 maven-plugin Maven CAR Deploy Plugin @@ -249,7 +249,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/maven-car-plugin/pom.xml b/dependencies/maven-car-plugin/pom.xml index 506b9d29c4..dcc1c11f5c 100644 --- a/dependencies/maven-car-plugin/pom.xml +++ b/dependencies/maven-car-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-car-plugin - 2.0.8 + 2.0.9 maven-plugin Maven CAR Plugin @@ -167,7 +167,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/maven-carbon-ui-plugin/pom.xml b/dependencies/maven-carbon-ui-plugin/pom.xml index ef488c6c7a..c2a75584e0 100755 --- a/dependencies/maven-carbon-ui-plugin/pom.xml +++ b/dependencies/maven-carbon-ui-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-carbon-ui-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Carbon UI Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-cep-plugin/pom.xml b/dependencies/maven-cep-plugin/pom.xml index b890be76b7..40afe5c34b 100755 --- a/dependencies/maven-cep-plugin/pom.xml +++ b/dependencies/maven-cep-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-cep-plugin - 1.0.7 + 1.0.8 maven-plugin Maven CEP Plugin @@ -140,7 +140,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-dataservice-plugin/pom.xml b/dependencies/maven-dataservice-plugin/pom.xml index 2f09fcd8be..1bcc3a8a5f 100644 --- a/dependencies/maven-dataservice-plugin/pom.xml +++ b/dependencies/maven-dataservice-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-dataservice-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Dataservice Plugin @@ -140,7 +140,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-ds-validator-plugin/pom.xml b/dependencies/maven-ds-validator-plugin/pom.xml index 36b5f13e63..e5c56ec4f0 100644 --- a/dependencies/maven-ds-validator-plugin/pom.xml +++ b/dependencies/maven-ds-validator-plugin/pom.xml @@ -4,7 +4,7 @@ org.wso2.maven maven-ds-validator-plugin - 2.0.8 + 2.0.9 maven-plugin Maven DataServices Validator Plugin @@ -18,7 +18,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.apache.felix diff --git a/dependencies/maven-endpoint-plugin/pom.xml b/dependencies/maven-endpoint-plugin/pom.xml index f22c88d074..7737b1a4fe 100755 --- a/dependencies/maven-endpoint-plugin/pom.xml +++ b/dependencies/maven-endpoint-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-endpoint-plugin - 2.0.8 + 2.0.9 maven-plugin Maven ESB Endpoint Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-gadget-plugin/pom.xml b/dependencies/maven-gadget-plugin/pom.xml index 6e795a22f8..223f6167d9 100644 --- a/dependencies/maven-gadget-plugin/pom.xml +++ b/dependencies/maven-gadget-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-gadget-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Gadget Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-jaxws-plugin/pom.xml b/dependencies/maven-jaxws-plugin/pom.xml index 9e01f6f8be..a4d569d98e 100755 --- a/dependencies/maven-jaxws-plugin/pom.xml +++ b/dependencies/maven-jaxws-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-jaxws-plugin - 2.0.8 + 2.0.9 maven-plugin Maven JAX-WS Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-library-plugin/pom.xml b/dependencies/maven-library-plugin/pom.xml index 2b18b47db5..20403e4cbe 100644 --- a/dependencies/maven-library-plugin/pom.xml +++ b/dependencies/maven-library-plugin/pom.xml @@ -4,7 +4,7 @@ org.wso2.maven maven-library-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Library Plugin @@ -48,7 +48,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.apache.felix diff --git a/dependencies/maven-localentry-plugin/pom.xml b/dependencies/maven-localentry-plugin/pom.xml index 4d93af7b18..a292cf6278 100755 --- a/dependencies/maven-localentry-plugin/pom.xml +++ b/dependencies/maven-localentry-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-localentry-plugin - 2.0.8 + 2.0.9 maven-plugin Maven ESB Local Entry Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-proxy-plugin/pom.xml b/dependencies/maven-proxy-plugin/pom.xml index 528949f387..bbca8a7c72 100644 --- a/dependencies/maven-proxy-plugin/pom.xml +++ b/dependencies/maven-proxy-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven maven-proxy-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Proxy Plugin @@ -109,7 +109,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-qos-plugin/pom.xml b/dependencies/maven-qos-plugin/pom.xml index 1fe2ea8e07..44d18ae3f4 100644 --- a/dependencies/maven-qos-plugin/pom.xml +++ b/dependencies/maven-qos-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-qos-plugin - 1.0.3 + 1.0.4 maven-plugin Maven Dataservice Plugin @@ -140,7 +140,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-registry-filter-plugin/pom.xml b/dependencies/maven-registry-filter-plugin/pom.xml index ae8215a5e7..d1048c6abc 100644 --- a/dependencies/maven-registry-filter-plugin/pom.xml +++ b/dependencies/maven-registry-filter-plugin/pom.xml @@ -4,7 +4,7 @@ org.wso2.maven maven-registry-filter-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Registry Filter Plugin @@ -48,7 +48,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.apache.felix diff --git a/dependencies/maven-registry-handler-plugin/pom.xml b/dependencies/maven-registry-handler-plugin/pom.xml index a6d6672f86..c9d6ae0188 100644 --- a/dependencies/maven-registry-handler-plugin/pom.xml +++ b/dependencies/maven-registry-handler-plugin/pom.xml @@ -4,7 +4,7 @@ org.wso2.maven maven-registry-handler-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Registry Handler Plugin @@ -48,7 +48,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.apache.felix diff --git a/dependencies/maven-registry-plugin/pom.xml b/dependencies/maven-registry-plugin/pom.xml index 1bb764e0f0..b5e979deee 100644 --- a/dependencies/maven-registry-plugin/pom.xml +++ b/dependencies/maven-registry-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.wso2.maven maven-registry-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Registry Plugin @@ -134,7 +134,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-sequence-plugin/pom.xml b/dependencies/maven-sequence-plugin/pom.xml index e0c241c9c2..25440fbb30 100755 --- a/dependencies/maven-sequence-plugin/pom.xml +++ b/dependencies/maven-sequence-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-sequence-plugin - 2.0.8 + 2.0.9 maven-plugin Maven ESB Sequence Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-stratos-plugin/pom.xml b/dependencies/maven-stratos-plugin/pom.xml index 7163621e7f..023724ceba 100644 --- a/dependencies/maven-stratos-plugin/pom.xml +++ b/dependencies/maven-stratos-plugin/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.wso2.maven maven-stratos-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Stratos Plugin @@ -141,7 +141,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.apache.axis2.wso2 diff --git a/dependencies/maven-synapse-mediator-plugin/pom.xml b/dependencies/maven-synapse-mediator-plugin/pom.xml index 5bf2aca1d7..ea8a2f21b8 100644 --- a/dependencies/maven-synapse-mediator-plugin/pom.xml +++ b/dependencies/maven-synapse-mediator-plugin/pom.xml @@ -4,7 +4,7 @@ org.wso2.maven maven-synapse-mediator-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Synapse Mediator Plugin @@ -18,7 +18,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.apache.felix diff --git a/dependencies/maven-synapse-plugin/pom.xml b/dependencies/maven-synapse-plugin/pom.xml index b609413592..10edfa7847 100755 --- a/dependencies/maven-synapse-plugin/pom.xml +++ b/dependencies/maven-synapse-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-synapse-plugin - 2.0.8 + 2.0.9 maven-plugin Maven ESB Synapse Configuration Plugin @@ -151,7 +151,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/maven-war-plugin/pom.xml b/dependencies/maven-war-plugin/pom.xml index bd10ca6488..218c356d8a 100644 --- a/dependencies/maven-war-plugin/pom.xml +++ b/dependencies/maven-war-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven maven-war-plugin - 2.0.8 + 2.0.9 maven-plugin Maven WAR Plugin @@ -145,7 +145,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 diff --git a/dependencies/org.wso2.maven.capp/pom.xml b/dependencies/org.wso2.maven.capp/pom.xml index 31e1943ced..3c5b9ccb85 100755 --- a/dependencies/org.wso2.maven.capp/pom.xml +++ b/dependencies/org.wso2.maven.capp/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 jar CApp Maven diff --git a/dependencies/org.wso2.maven.capp/src/main/java/org/wso2/maven/capp/mojo/AbstractPOMGenMojo.java b/dependencies/org.wso2.maven.capp/src/main/java/org/wso2/maven/capp/mojo/AbstractPOMGenMojo.java index 3992452011..50e7a0360b 100644 --- a/dependencies/org.wso2.maven.capp/src/main/java/org/wso2/maven/capp/mojo/AbstractPOMGenMojo.java +++ b/dependencies/org.wso2.maven.capp/src/main/java/org/wso2/maven/capp/mojo/AbstractPOMGenMojo.java @@ -27,6 +27,7 @@ import java.util.regex.Pattern; import org.apache.maven.model.Dependency; +import org.apache.maven.model.Parent; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -126,6 +127,7 @@ protected void processArtifacts(List artifacts) // workspace project. MavenProject artifactMavenProject = createMavenProjectForCappArtifact( artifact, artifacts, projectLocation); + artifactMavenProject.setDistributionManagement(project.getDistributionManagement()); if(getLog().isDebugEnabled()){ getLog().debug(new Time(System.currentTimeMillis())+" Maven Project generation completed"); @@ -274,6 +276,8 @@ private MavenProject getMavenModuleProject() throws MojoExecutionException{ mavenModuleProject = CAppMavenUtils.createMavenProject(groupId, getProject().getArtifactId() + "_module", getProject() .getVersion(), "pom"); + + mavenModuleProject.getModel().setDistributionManagement(project.getDistributionManagement()); CAppMavenUtils.saveMavenProject(mavenModuleProject, getModuleProject()); } mavenModuleProject=CAppMavenUtils.getMavenProject(getModuleProject()); diff --git a/dependencies/org.wso2.maven.capp/src/main/java/org/wso2/maven/capp/utils/WSO2MavenPluginConstantants.java b/dependencies/org.wso2.maven.capp/src/main/java/org/wso2/maven/capp/utils/WSO2MavenPluginConstantants.java index 7d3601770b..73e84ebdc3 100644 --- a/dependencies/org.wso2.maven.capp/src/main/java/org/wso2/maven/capp/utils/WSO2MavenPluginConstantants.java +++ b/dependencies/org.wso2.maven.capp/src/main/java/org/wso2/maven/capp/utils/WSO2MavenPluginConstantants.java @@ -1,32 +1,32 @@ package org.wso2.maven.capp.utils; public class WSO2MavenPluginConstantants { - public static final String MAVEN_SYNAPSE_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_AXIS2_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_DATA_SERVICE_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_ENDPOINT_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_GADGET_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_JAXWS_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_CARBON_UI_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_LOCALENTRY_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_PROXY_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_SEQUENCE_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_WAR_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_BPEL_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_REGISTRY_PLUGIN_VERSION="2.0.8"; - public static final String MAVEN_CAR_PLUGIN_VERSION="2.0.8"; - public static final String WSO2_ESB_ENDPOINT_VERSION = "2.0.8"; - public static final String WSO2_ESB_LOCAL_ENTRY_VERSION = "2.0.8"; - public static final String WSO2_ESB_PROXY_VERSION = "2.0.8"; - public static final String WSO2_ESB_SEQUENCE_VERSION = "2.0.8"; - public static final String WSO2_ESB_SYNAPSE_VERSION = "2.0.8"; - public static final String WSO2_ESB_API_VERSION = "2.0.8"; - public static final String WSO2_ESB_TASK_VERSION = "2.0.8"; - public static final String WSO2_ESB_TEMPLATE_VERSION = "2.0.8"; - public static final String WSO2_QOS_VERSION = "1.0.3"; - public static final String WSO2_GENERAL_PROJECT_VERSION = "2.0.8"; - public static final String MAVEN_CEP_PLUGIN_VERSION="1.0.7"; - public static final String MAVEN_CAR_DEPLOY_PLUGIN_VERSION="1.0.8"; - public static final String WSO2_ESB_MESSAGE_STORE_PLUGIN_VERSION = "1.0.4"; - public static final String WSO2_ESB_MESSAGE_PROCESSOR_PLUGIN_VERSION = "1.0.4"; + public static final String MAVEN_SYNAPSE_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_AXIS2_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_DATA_SERVICE_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_ENDPOINT_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_GADGET_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_JAXWS_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_CARBON_UI_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_LOCALENTRY_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_PROXY_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_SEQUENCE_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_WAR_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_BPEL_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_REGISTRY_PLUGIN_VERSION="2.0.9"; + public static final String MAVEN_CAR_PLUGIN_VERSION="2.0.9"; + public static final String WSO2_ESB_ENDPOINT_VERSION = "2.0.9"; + public static final String WSO2_ESB_LOCAL_ENTRY_VERSION = "2.0.9"; + public static final String WSO2_ESB_PROXY_VERSION = "2.0.9"; + public static final String WSO2_ESB_SEQUENCE_VERSION = "2.0.9"; + public static final String WSO2_ESB_SYNAPSE_VERSION = "2.0.9"; + public static final String WSO2_ESB_API_VERSION = "2.0.9"; + public static final String WSO2_ESB_TASK_VERSION = "2.0.9"; + public static final String WSO2_ESB_TEMPLATE_VERSION = "2.0.9"; + public static final String WSO2_QOS_VERSION = "1.0.4"; + public static final String WSO2_GENERAL_PROJECT_VERSION = "2.0.9"; + public static final String MAVEN_CEP_PLUGIN_VERSION="1.0.8"; + public static final String MAVEN_CAR_DEPLOY_PLUGIN_VERSION="1.0.9"; + public static final String WSO2_ESB_MESSAGE_STORE_PLUGIN_VERSION = "1.0.5"; + public static final String WSO2_ESB_MESSAGE_PROCESSOR_PLUGIN_VERSION = "1.0.5"; } diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 896527a776..65234cd5b7 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-dependencies-parent pom - 4.0.0-SNAPSHOT + 3.7.0 WSO2 Eclipse Dependencies diff --git a/dependencies/wso2-esb-api-plugin/pom.xml b/dependencies/wso2-esb-api-plugin/pom.xml index f53837b52a..7356dea44d 100644 --- a/dependencies/wso2-esb-api-plugin/pom.xml +++ b/dependencies/wso2-esb-api-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven wso2-esb-api-plugin - 2.0.8 + 2.0.9 maven-plugin Maven API Plugin @@ -109,7 +109,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-api-plugin/src/main/java/org/wso2/maven/api/RESTAPIPOMGenMojo.java b/dependencies/wso2-esb-api-plugin/src/main/java/org/wso2/maven/api/RESTAPIPOMGenMojo.java index 74dacaf441..5782d9ca49 100644 --- a/dependencies/wso2-esb-api-plugin/src/main/java/org/wso2/maven/api/RESTAPIPOMGenMojo.java +++ b/dependencies/wso2-esb-api-plugin/src/main/java/org/wso2/maven/api/RESTAPIPOMGenMojo.java @@ -113,7 +113,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); artifact.setType(esbArtifact.getType()); artifact.setServerRole(esbArtifact.getServerRole()); artifact.setFile(esbArtifact.getFile()); diff --git a/dependencies/wso2-esb-endpoint-plugin/pom.xml b/dependencies/wso2-esb-endpoint-plugin/pom.xml index ee79fda149..f5b2021fa4 100755 --- a/dependencies/wso2-esb-endpoint-plugin/pom.xml +++ b/dependencies/wso2-esb-endpoint-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven wso2-esb-endpoint-plugin - 2.0.8 + 2.0.9 maven-plugin Maven ESB Endpoint Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-endpoint-plugin/src/main/java/org/wso2/maven/plugin/endpoint/EndpointPOMGenMojo.java b/dependencies/wso2-esb-endpoint-plugin/src/main/java/org/wso2/maven/plugin/endpoint/EndpointPOMGenMojo.java index 4ec8885c8d..fbeea4f13b 100644 --- a/dependencies/wso2-esb-endpoint-plugin/src/main/java/org/wso2/maven/plugin/endpoint/EndpointPOMGenMojo.java +++ b/dependencies/wso2-esb-endpoint-plugin/src/main/java/org/wso2/maven/plugin/endpoint/EndpointPOMGenMojo.java @@ -119,7 +119,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); artifact.setType(esbArtifact.getType()); artifact.setServerRole(esbArtifact.getServerRole()); artifact.setFile(esbArtifact.getFile()); diff --git a/dependencies/wso2-esb-localentry-plugin/pom.xml b/dependencies/wso2-esb-localentry-plugin/pom.xml index af3879eb2a..6bfd806690 100755 --- a/dependencies/wso2-esb-localentry-plugin/pom.xml +++ b/dependencies/wso2-esb-localentry-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven wso2-esb-localentry-plugin - 2.0.8 + 2.0.9 maven-plugin Maven ESB Local Entry Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-localentry-plugin/src/main/java/org/wso2/maven/plugin/localentry/LocalEntryPOMGenMojo.java b/dependencies/wso2-esb-localentry-plugin/src/main/java/org/wso2/maven/plugin/localentry/LocalEntryPOMGenMojo.java index 24f48209dd..c2c8d82b5b 100644 --- a/dependencies/wso2-esb-localentry-plugin/src/main/java/org/wso2/maven/plugin/localentry/LocalEntryPOMGenMojo.java +++ b/dependencies/wso2-esb-localentry-plugin/src/main/java/org/wso2/maven/plugin/localentry/LocalEntryPOMGenMojo.java @@ -106,7 +106,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); artifact.setType(esbArtifact.getType()); artifact.setServerRole(esbArtifact.getServerRole()); artifact.setFile(esbArtifact.getFile()); diff --git a/dependencies/wso2-esb-messageprocessor-plugin/pom.xml b/dependencies/wso2-esb-messageprocessor-plugin/pom.xml index 29b61c688c..9ab2f2e294 100755 --- a/dependencies/wso2-esb-messageprocessor-plugin/pom.xml +++ b/dependencies/wso2-esb-messageprocessor-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven wso2-esb-messageprocessor-plugin - 1.0.4 + 1.0.5 maven-plugin Maven MessageProcessor Plugin @@ -109,7 +109,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-messageprocessor-plugin/src/main/java/org/wso2/maven/messageprocessor/MessageProcessorPOMGenMojo.java b/dependencies/wso2-esb-messageprocessor-plugin/src/main/java/org/wso2/maven/messageprocessor/MessageProcessorPOMGenMojo.java index d946da6807..02b3a60da2 100755 --- a/dependencies/wso2-esb-messageprocessor-plugin/src/main/java/org/wso2/maven/messageprocessor/MessageProcessorPOMGenMojo.java +++ b/dependencies/wso2-esb-messageprocessor-plugin/src/main/java/org/wso2/maven/messageprocessor/MessageProcessorPOMGenMojo.java @@ -110,7 +110,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); artifact.setType(esbArtifact.getType()); artifact.setServerRole(esbArtifact.getServerRole()); artifact.setFile(esbArtifact.getFile()); diff --git a/dependencies/wso2-esb-messagestore-plugin/pom.xml b/dependencies/wso2-esb-messagestore-plugin/pom.xml index 2ca53fc330..ae37abd118 100755 --- a/dependencies/wso2-esb-messagestore-plugin/pom.xml +++ b/dependencies/wso2-esb-messagestore-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven wso2-esb-messagestore-plugin - 1.0.4 + 1.0.5 maven-plugin Maven MessageStore Plugin @@ -109,7 +109,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-messagestore-plugin/src/main/java/org/wso2/maven/messagestore/SynapseMessageStorePOMGenMojo.java b/dependencies/wso2-esb-messagestore-plugin/src/main/java/org/wso2/maven/messagestore/SynapseMessageStorePOMGenMojo.java index 8988d98563..a55c29ef02 100755 --- a/dependencies/wso2-esb-messagestore-plugin/src/main/java/org/wso2/maven/messagestore/SynapseMessageStorePOMGenMojo.java +++ b/dependencies/wso2-esb-messagestore-plugin/src/main/java/org/wso2/maven/messagestore/SynapseMessageStorePOMGenMojo.java @@ -110,7 +110,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); artifact.setType(esbArtifact.getType()); artifact.setServerRole(esbArtifact.getServerRole()); artifact.setFile(esbArtifact.getFile()); diff --git a/dependencies/wso2-esb-proxy-plugin/pom.xml b/dependencies/wso2-esb-proxy-plugin/pom.xml index 18d55d1316..dd389e3881 100644 --- a/dependencies/wso2-esb-proxy-plugin/pom.xml +++ b/dependencies/wso2-esb-proxy-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven wso2-esb-proxy-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Proxy Plugin @@ -109,7 +109,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-proxy-plugin/src/main/java/org/wso2/maven/proxy/ProxyServicePOMGenMojo.java b/dependencies/wso2-esb-proxy-plugin/src/main/java/org/wso2/maven/proxy/ProxyServicePOMGenMojo.java index 358d353c60..7f898ae82b 100644 --- a/dependencies/wso2-esb-proxy-plugin/src/main/java/org/wso2/maven/proxy/ProxyServicePOMGenMojo.java +++ b/dependencies/wso2-esb-proxy-plugin/src/main/java/org/wso2/maven/proxy/ProxyServicePOMGenMojo.java @@ -113,7 +113,8 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + // artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); artifact.setType(esbArtifact.getType()); artifact.setServerRole(esbArtifact.getServerRole()); artifact.setFile(esbArtifact.getFile()); diff --git a/dependencies/wso2-esb-sequence-plugin/pom.xml b/dependencies/wso2-esb-sequence-plugin/pom.xml index 610249ea04..54f5a3997a 100755 --- a/dependencies/wso2-esb-sequence-plugin/pom.xml +++ b/dependencies/wso2-esb-sequence-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven wso2-esb-sequence-plugin - 2.0.8 + 2.0.9 maven-plugin Maven ESB Sequence Plugin @@ -146,7 +146,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-sequence-plugin/src/main/java/org/wso2/maven/plugin/sequence/SequencePOMGenMojo.java b/dependencies/wso2-esb-sequence-plugin/src/main/java/org/wso2/maven/plugin/sequence/SequencePOMGenMojo.java index e971d6842a..41611e5e9a 100644 --- a/dependencies/wso2-esb-sequence-plugin/src/main/java/org/wso2/maven/plugin/sequence/SequencePOMGenMojo.java +++ b/dependencies/wso2-esb-sequence-plugin/src/main/java/org/wso2/maven/plugin/sequence/SequencePOMGenMojo.java @@ -112,7 +112,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); artifact.setType(esbArtifact.getType()); artifact.setServerRole(esbArtifact.getServerRole()); artifact.setFile(esbArtifact.getFile()); diff --git a/dependencies/wso2-esb-synapse-plugin/pom.xml b/dependencies/wso2-esb-synapse-plugin/pom.xml index b0b01971ca..eef2c60480 100755 --- a/dependencies/wso2-esb-synapse-plugin/pom.xml +++ b/dependencies/wso2-esb-synapse-plugin/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.wso2.maven wso2-esb-synapse-plugin - 2.0.8 + 2.0.9 maven-plugin WSO2 ESB Synapse Configuration Plugin @@ -151,7 +151,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-task-plugin/pom.xml b/dependencies/wso2-esb-task-plugin/pom.xml index 95b867420b..c7d17b5367 100644 --- a/dependencies/wso2-esb-task-plugin/pom.xml +++ b/dependencies/wso2-esb-task-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven wso2-esb-task-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Task Plugin @@ -109,7 +109,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-task-plugin/src/main/java/org/wso2/maven/task/SynapseTaskPOMGenMojo.java b/dependencies/wso2-esb-task-plugin/src/main/java/org/wso2/maven/task/SynapseTaskPOMGenMojo.java index 3e8d78e411..5cd62597dd 100644 --- a/dependencies/wso2-esb-task-plugin/src/main/java/org/wso2/maven/task/SynapseTaskPOMGenMojo.java +++ b/dependencies/wso2-esb-task-plugin/src/main/java/org/wso2/maven/task/SynapseTaskPOMGenMojo.java @@ -110,7 +110,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); artifact.setType(esbArtifact.getType()); artifact.setServerRole(esbArtifact.getServerRole()); artifact.setFile(esbArtifact.getFile()); diff --git a/dependencies/wso2-esb-template-plugin/pom.xml b/dependencies/wso2-esb-template-plugin/pom.xml index 852a58630f..85db03df6f 100644 --- a/dependencies/wso2-esb-template-plugin/pom.xml +++ b/dependencies/wso2-esb-template-plugin/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.wso2.maven wso2-esb-template-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Template Plugin @@ -109,7 +109,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-esb-template-plugin/src/main/java/org/wso2/maven/template/ESBTemplatePOMGenMojo.java b/dependencies/wso2-esb-template-plugin/src/main/java/org/wso2/maven/template/ESBTemplatePOMGenMojo.java index d91926de96..e396eea543 100644 --- a/dependencies/wso2-esb-template-plugin/src/main/java/org/wso2/maven/template/ESBTemplatePOMGenMojo.java +++ b/dependencies/wso2-esb-template-plugin/src/main/java/org/wso2/maven/template/ESBTemplatePOMGenMojo.java @@ -113,7 +113,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (ESBArtifact esbArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(esbArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(esbArtifact.getVersion()); if(("synapse/sequenceTemplate".equals(esbArtifact.getType()))||("synapse/endpointTemplate".equals(esbArtifact.getType()))){ artifact.setType("synapse/template"); }else{ diff --git a/dependencies/wso2-general-project-plugin/pom.xml b/dependencies/wso2-general-project-plugin/pom.xml index ecefa44935..9d5fb16e8b 100644 --- a/dependencies/wso2-general-project-plugin/pom.xml +++ b/dependencies/wso2-general-project-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.wso2.maven wso2-general-project-plugin - 2.0.8 + 2.0.9 maven-plugin Maven Registry Plugin @@ -134,7 +134,7 @@ org.wso2.maven org.wso2.maven.capp - 2.0.8 + 2.0.9 org.wso2.maven diff --git a/dependencies/wso2-general-project-plugin/src/main/java/org/wso2/maven/registry/RegistryResourcePOMGenMojo.java b/dependencies/wso2-general-project-plugin/src/main/java/org/wso2/maven/registry/RegistryResourcePOMGenMojo.java index aa15c43fa7..292c21c9ae 100644 --- a/dependencies/wso2-general-project-plugin/src/main/java/org/wso2/maven/registry/RegistryResourcePOMGenMojo.java +++ b/dependencies/wso2-general-project-plugin/src/main/java/org/wso2/maven/registry/RegistryResourcePOMGenMojo.java @@ -123,7 +123,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { for (RegistryArtifact registryArtifact : artifacts) { Artifact artifact=new Artifact(); artifact.setName(registryArtifact.getName()); - artifact.setVersion(this.getProject().getVersion()); + artifact.setVersion(registryArtifact.getVersion()); artifact.setType(registryArtifact.getType()); artifact.setServerRole(registryArtifact.getServerRole()); artifact.setFile("registry-info.xml"); diff --git a/distribution/org.wso2.developerstudio.eclipse.distribution.project/META-INF/MANIFEST.MF b/distribution/org.wso2.developerstudio.eclipse.distribution.project/META-INF/MANIFEST.MF index 76210f334c..5728b5c23f 100644 --- a/distribution/org.wso2.developerstudio.eclipse.distribution.project/META-INF/MANIFEST.MF +++ b/distribution/org.wso2.developerstudio.eclipse.distribution.project/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: DistributionProject Bundle-SymbolicName: org.wso2.developerstudio.eclipse.distribution.project;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.distribution.project.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy Import-Package: org.apache.axiom.om, org.apache.commons.io;version="[2.0.0.wso2v1,2.0.1)", - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jface.text, @@ -23,6 +23,7 @@ Import-Package: org.apache.axiom.om, org.eclipse.ui.forms.widgets, org.eclipse.ui.internal.ide, org.eclipse.ui.internal.wizards.datatransfer, + org.eclipse.ui.navigator, org.eclipse.ui.part, org.eclipse.ui.texteditor, org.eclipse.ui.wizards.datatransfer, diff --git a/distribution/org.wso2.developerstudio.eclipse.distribution.project/plugin.xml b/distribution/org.wso2.developerstudio.eclipse.distribution.project/plugin.xml index 7417440484..5bbc07dbdf 100644 --- a/distribution/org.wso2.developerstudio.eclipse.distribution.project/plugin.xml +++ b/distribution/org.wso2.developerstudio.eclipse.distribution.project/plugin.xml @@ -57,6 +57,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/distribution/org.wso2.developerstudio.eclipse.distribution.project/pom.xml b/distribution/org.wso2.developerstudio.eclipse.distribution.project/pom.xml index 8ba22b2008..8db54c7bfb 100644 --- a/distribution/org.wso2.developerstudio.eclipse.distribution.project/pom.xml +++ b/distribution/org.wso2.developerstudio.eclipse.distribution.project/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio carbon-distribution-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.distribution.project diff --git a/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/provider/NavigatorActionProvider.java b/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/provider/NavigatorActionProvider.java new file mode 100755 index 0000000000..80329a9aca --- /dev/null +++ b/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/provider/NavigatorActionProvider.java @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2012, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.wso2.developerstudio.eclipse.distribution.project.provider; + + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.content.IContentDescription; +import org.eclipse.core.runtime.content.IContentType; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.TreeSelection; +import org.eclipse.ui.IActionBars; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.ICommonActionConstants; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.part.FileEditorInput; +import org.wso2.developerstudio.eclipse.distribution.project.Activator; +import org.wso2.developerstudio.eclipse.logging.core.IDeveloperStudioLog; +import org.wso2.developerstudio.eclipse.logging.core.Logger; + + +public class NavigatorActionProvider extends CommonActionProvider { + + private static IDeveloperStudioLog log = Logger.getLog(Activator.PLUGIN_ID); + private OpenEditorAction openEditorAction; + String compositeAppNatureId = "org.wso2.developerstudio.eclipse.distribution.project.nature"; + + @Override + public void fillActionBars(IActionBars actionBars) { + IStructuredSelection selection = (IStructuredSelection) getContext().getSelection(); + if (selection instanceof TreeSelection) { + TreeSelection treeSelection = (TreeSelection) selection; + Object firstElement = treeSelection.getFirstElement(); + if (firstElement instanceof IFile) { + IFile file = (IFile) firstElement; + + try { + if (file.getProject().getDescription().hasNature(compositeAppNatureId)) { + openEditorAction.setSelection(file); + actionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openEditorAction); + } + + } catch (CoreException e) { + /* ignore */ + } + } + } + } + + @Override + public void init(ICommonActionExtensionSite aSite) { + super.init(aSite); + openEditorAction = new OpenEditorAction(); + } + + private static class OpenEditorAction extends Action { + + private static final String DEVS_DISTRIBUTION_PROJECT_EDITOR = "org.wso2.developerstudio.eclipse.distribution.project.editor.DistProjectEditor"; + private IFile selection; + + @Override + public void run() { + IFile fileTobeOpen = null; + String diagramFilePath = selection.getFullPath().toOSString(); + + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + + try { + if (selection.getWorkspace().getRoot().getFile(new Path(diagramFilePath)).exists()) { + fileTobeOpen = selection.getWorkspace().getRoot().getFile(new Path(diagramFilePath)); + page.openEditor(new FileEditorInput(fileTobeOpen),DEVS_DISTRIBUTION_PROJECT_EDITOR); + } + }catch (Exception e) { + log.error("Can't open " + fileTobeOpen, e); + } + } + + public void setSelection(IFile selection) { + this.selection = selection; + } + } +} diff --git a/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/publisher/CAppProjectPublisher.java b/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/publisher/CAppProjectPublisher.java index a46f39eb97..4fe77aa6e8 100644 --- a/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/publisher/CAppProjectPublisher.java +++ b/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/publisher/CAppProjectPublisher.java @@ -154,18 +154,19 @@ public void unpublish(IProject project, IServer server, File serverHome, File de URL serverURL = CarbonServerManager.getServerURL(server); ICredentials serverCredentials = CarbonServerManager.getServerCredentials(server); - CAppDeployer cappDeployer = new CAppDeployer(); +// CAppDeployer cappDeployer = new CAppDeployer(); // Artifact superArtifact = CAppEnvironment.getcAppManager().getSuperArtifact(project); - CarExportHandler handler=new CarExportHandler(); - List exportArtifact = handler.exportArtifact(project); - File carFile = ((IFile)exportArtifact.get(0)).getLocation().toFile(); - String serverCarbonVersion = CarbonServerManager.getServerCarbonVersion(server); - String cappName=null; - if(serverCarbonVersion==null || "4.0.0".equals(serverCarbonVersion)){ - cappName = project.getName(); - }else{ - cappName = carFile.getName().substring(0, carFile.getName().length()-4); - } +// CarExportHandler handler=new CarExportHandler(); +// List exportArtifact = handler.exportArtifact(project); +// File carFile = ((IFile)exportArtifact.get(0)).getLocation().toFile(); + String cappName = project.getName(); + +// String serverCarbonVersion = CarbonServerManager.getServerCarbonVersion(server); +// if(serverCarbonVersion==null || "4.0.0".equals(serverCarbonVersion)){ +// cappName = project.getName(); +// }else{ +// cappName = carFile.getName().substring(0, carFile.getName().length()-4); +// } CAppDeployer.unDeployCAR(serverURL.toString(), serverCredentials.getUsername(), serverCredentials.getPassword(), diff --git a/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/publisher/CAppProjectRemotePublisher.java b/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/publisher/CAppProjectRemotePublisher.java index e754183006..cd5a111e63 100644 --- a/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/publisher/CAppProjectRemotePublisher.java +++ b/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/publisher/CAppProjectRemotePublisher.java @@ -51,15 +51,18 @@ public void unpublish(IProject project, IServer server, File serverHome, File deployLocation) throws Exception { URL serverURL = CarbonServerManager.getServerURL(server); ICredentials serverCredentials = CarbonServerManager.getServerCredentials(server); - CAppDeployer cappDeployer = new CAppDeployer(); -// Artifact superArtifact = CAppEnvironment.getcAppManager().getSuperArtifact(project); + + String cappName = project.getName(); + + /*CAppDeployer cappDeployer = new CAppDeployer(); + Artifact superArtifact = CAppEnvironment.getcAppManager().getSuperArtifact(project); CarExportHandler handler=new CarExportHandler(); List exportArtifact = handler.exportArtifact(project); - File carFile = ((IFile)exportArtifact.get(0)).getLocation().toFile(); + File carFile = ((IFile)exportArtifact.get(0)).getLocation().toFile();*/ CAppDeployer.unDeployCAR(serverURL.toString(), serverCredentials.getUsername(), serverCredentials.getPassword(), - carFile.getName().substring(0, carFile.getName().length()-4)); + cappName); } diff --git a/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/validator/ProjectList.java b/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/validator/ProjectList.java index 2be6e8e29c..2b67c13132 100644 --- a/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/validator/ProjectList.java +++ b/distribution/org.wso2.developerstudio.eclipse.distribution.project/src/org/wso2/developerstudio/eclipse/distribution/project/validator/ProjectList.java @@ -91,8 +91,8 @@ public List getListData(String modelProperty,ProjectDataModel model) { } else{ dependency.setGroupId(mavenProject.getGroupId()); } - // dependency.setVersion(artifact.getVersion()); - dependency.setVersion(mavenProject.getModel().getVersion()); //referring parent version + dependency.setVersion(artifact.getVersion()); + // dependency.setVersion(mavenProject.getModel().getVersion()); //referring parent version dependency.setType(ArtifactTypeMapping.getType(artifact.getType())); DependencyData dependencyData = new DependencyData(); diff --git a/distribution/org.wso2.developerstudio.eclipse.distributionproject.module/META-INF/MANIFEST.MF b/distribution/org.wso2.developerstudio.eclipse.distributionproject.module/META-INF/MANIFEST.MF index 405f203d5e..7b9c71f765 100755 --- a/distribution/org.wso2.developerstudio.eclipse.distributionproject.module/META-INF/MANIFEST.MF +++ b/distribution/org.wso2.developerstudio.eclipse.distributionproject.module/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Module Bundle-SymbolicName: org.wso2.developerstudio.eclipse.distributionproject.module;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.distributionproject.module.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.apache.maven.project;version="[2.2.1,3.0.0)", +Import-Package: org.apache.maven.project, org.eclipse.core.expressions, org.eclipse.core.resources, org.eclipse.wst.common.componentcore.datamodel, diff --git a/distribution/org.wso2.developerstudio.eclipse.distributionproject.module/pom.xml b/distribution/org.wso2.developerstudio.eclipse.distributionproject.module/pom.xml index 7b58785a5f..0ca356b032 100755 --- a/distribution/org.wso2.developerstudio.eclipse.distributionproject.module/pom.xml +++ b/distribution/org.wso2.developerstudio.eclipse.distributionproject.module/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio carbon-distribution-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.distributionproject.module diff --git a/distribution/pom.xml b/distribution/pom.xml index 1d8222ad00..4d0bfaca75 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio carbon-distribution-parent @@ -40,9 +40,9 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 diff --git a/docs/pom.xml b/docs/pom.xml index 7e10d36d92..1b4b3cd3d7 100755 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 Developer-Studio diff --git a/docs/src/main/resources/samples/shopping-cart/portal/.classpath b/docs/src/main/resources/samples/shopping-cart/portal/.classpath index 3fc081fef7..e5d6774085 100644 --- a/docs/src/main/resources/samples/shopping-cart/portal/.classpath +++ b/docs/src/main/resources/samples/shopping-cart/portal/.classpath @@ -32,13 +32,13 @@ - + - - - - + + + + diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/META-INF/MANIFEST.MF index ab96316370..499b0c5523 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Endpoint Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.endpoint;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.endpoint.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -14,9 +14,9 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.commons.lang, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.jdt.core, org.eclipse.jface.text, org.eclipse.jface.text.source, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/pom.xml index ae88f01c7f..62ca9c3429 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.endpoint diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/src/org/wso2/developerstudio/eclipse/artifact/endpoint/ui/wizard/EndpointProjectCreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/src/org/wso2/developerstudio/eclipse/artifact/endpoint/ui/wizard/EndpointProjectCreationWizard.java index 73841ccf46..48eb79101c 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/src/org/wso2/developerstudio/eclipse/artifact/endpoint/ui/wizard/EndpointProjectCreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.endpoint/src/org/wso2/developerstudio/eclipse/artifact/endpoint/ui/wizard/EndpointProjectCreationWizard.java @@ -235,9 +235,10 @@ private void createDynamicEndpointArtifact(IContainer location,EndpointModel mod addGeneralProjectPlugin(project); File pomLocation = project.getFile("pom.xml").getLocation().toFile(); String groupId = getMavenGroupId(pomLocation) + ".resource"; - MavenProject mavenProject = MavenUtils.getMavenProject(pomLocation); - String version = mavenProject.getVersion(); - + MavenProject mavenProject = MavenUtils.getMavenProject(pomLocation); + String version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); + String registryPath = model.getDynamicEpRegistryPath() .replaceAll("^conf:", "/_system/config") .replaceAll("^gov:", "/_system/governance") @@ -251,8 +252,7 @@ private void createDynamicEndpointArtifact(IContainer location,EndpointModel mod if(!registryPath.startsWith("/_system/governance")){ registryPath = "/_system/governance/".concat(registryPath); } - } - + } String templateContent = ""; String template = ""; RegistryResourceInfoDoc regResInfoDoc = new RegistryResourceInfoDoc(); @@ -302,7 +302,7 @@ private void createDynamicEndpointArtifact(IContainer location,EndpointModel mod RegistryArtifact artifact = new RegistryArtifact(); artifact.setName(epModel.getEpName()); - artifact.setVersion(version); + artifact.setVersion("1.0.0"); artifact.setType("registry/resource"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setGroupId(groupId); diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.localentry/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.localentry/META-INF/MANIFEST.MF index 5ca929a166..84486446af 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.localentry/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.localentry/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Local Entry Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.localentry;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.localentry.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -11,9 +11,9 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.jdt.core, org.eclipse.ui.ide, org.wso2.developerstudio.eclipse.capp.maven.utils, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.localentry/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.localentry/pom.xml index d9612574e1..b763d1c5ec 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.localentry/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.localentry/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.localentry diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.localentry/src/org/wso2/developerstudio/eclipse/artifact/localentry/ui/wizard/LocalEntryProjectCreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.localentry/src/org/wso2/developerstudio/eclipse/artifact/localentry/ui/wizard/LocalEntryProjectCreationWizard.java index d0218e6537..cfbb0d5490 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.localentry/src/org/wso2/developerstudio/eclipse/artifact/localentry/ui/wizard/LocalEntryProjectCreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.localentry/src/org/wso2/developerstudio/eclipse/artifact/localentry/ui/wizard/LocalEntryProjectCreationWizard.java @@ -67,6 +67,8 @@ public class LocalEntryProjectCreationWizard extends AbstractWSO2ProjectCreation private ESBProjectArtifact esbProjectArtifact; private List fileLst = new ArrayList(); private IProject esbProject; + private String version = "1.0.0"; + public LocalEntryProjectCreationWizard() { this.localEntryModel = new LocalEntryModel(); @@ -89,7 +91,7 @@ public boolean createLocalEntryArtifact(LocalEntryModel localEntryModel) throws boolean isNewArtifact =true; IContainer location = esbProject.getFolder("src" + File.separator + "main" + File.separator + "synapse-config" + File.separator + "local-entries"); - + updatePom(); esbProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); File pomLocation = esbProject.getFile("pom.xml").getLocation().toFile(); @@ -119,7 +121,7 @@ public boolean createLocalEntryArtifact(LocalEntryModel localEntryModel) throws ESBArtifact artifact = new ESBArtifact(); artifact.setName(localEntryModel.getLocalENtryName()); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); artifact.setType("synapse/local-entry"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setGroupId(groupId); @@ -162,7 +164,8 @@ public boolean performFinish() { public void updatePom() throws Exception{ File mavenProjectPomLocation = esbProject.getFile("pom.xml").getLocation().toFile(); MavenProject mavenProject = MavenUtils.getMavenProject(mavenProjectPomLocation); - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-esb-localentry-plugin", MavenConstants.WSO2_ESB_LOCAL_ENTRY_VERSION); @@ -259,7 +262,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewArtifact,Strin if(isNewArtifact){ ESBArtifact artifact=new ESBArtifact(); artifact.setName(key); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); artifact.setType("synapse/local-entry"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setGroupId(groupId); @@ -276,7 +279,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewArtifact,Strin if(isNewArtifact){ ESBArtifact artifact=new ESBArtifact(); artifact.setName(key); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); artifact.setType("synapse/local-entry"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setFile(groupId); diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.mediator/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.mediator/META-INF/MANIFEST.MF index 981f16722c..1d077ed778 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.mediator/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.mediator/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Mediator Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.mediator;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.mediator.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.wso2.developerstudio.eclipse.platform.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", +Import-Package: org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.ui, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.mediator/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.mediator/pom.xml index b789a000a9..3ed859ec4c 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.mediator/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.mediator/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.mediator diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/META-INF/MANIFEST.MF index 8b769f2749..a3a786a071 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Messageprocessor Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.messageprocessor;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.messageprocessor.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.axiom.om, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.project, org.apache.synapse.config.xml, - org.codehaus.plexus.util.xml;version="2.0.1", + org.codehaus.plexus.util.xml, org.wso2.developerstudio.eclipse.capp.maven.utils, org.wso2.developerstudio.eclipse.esb.core.utils, org.wso2.developerstudio.eclipse.esb.project.artifact, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/icons/message-processor.gif b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/icons/message-processor.gif old mode 100755 new mode 100644 diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/icons/message-processor.png b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/icons/message-processor.png new file mode 100755 index 0000000000..336dd6f7c3 Binary files /dev/null and b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/icons/message-processor.png differ diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/pom.xml index 1b67e74d18..6552726cd0 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/pom.xml @@ -19,11 +19,11 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.messageprocessor - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio Message Processor Artifact \ No newline at end of file diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/src/org/wso2/developerstudio/eclipse/artifact/messageprocessor/Activator.java b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/src/org/wso2/developerstudio/eclipse/artifact/messageprocessor/Activator.java index 283c48f761..ab370e1e80 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/src/org/wso2/developerstudio/eclipse/artifact/messageprocessor/Activator.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/src/org/wso2/developerstudio/eclipse/artifact/messageprocessor/Activator.java @@ -26,7 +26,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.wso2.developerstudio.eclipse.artifact.messageprocesso"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "org.wso2.developerstudio.eclipse.artifact.messageprocessor"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/src/org/wso2/developerstudio/eclipse/artifact/messageprocessor/wizard/MessageProcessorCreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/src/org/wso2/developerstudio/eclipse/artifact/messageprocessor/wizard/MessageProcessorCreationWizard.java index fef7290efd..c230aa5940 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/src/org/wso2/developerstudio/eclipse/artifact/messageprocessor/wizard/MessageProcessorCreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.messageprocessor/src/org/wso2/developerstudio/eclipse/artifact/messageprocessor/wizard/MessageProcessorCreationWizard.java @@ -26,7 +26,9 @@ import java.util.Map.Entry; import java.util.Set; import java.util.regex.Pattern; + import javax.xml.namespace.QName; + import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.commons.lang.StringUtils; @@ -50,6 +52,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.wso2.developerstudio.eclipse.artifact.messageprocessor.Activator; import org.wso2.developerstudio.eclipse.artifact.messageprocessor.model.MessageProcessorModel; +import org.wso2.developerstudio.eclipse.artifact.messageprocessor.util.MessageProcessorImageUtils; import org.wso2.developerstudio.eclipse.capp.maven.utils.MavenConstants; import org.wso2.developerstudio.eclipse.esb.project.artifact.ESBArtifact; import org.wso2.developerstudio.eclipse.esb.project.artifact.ESBProjectArtifact; @@ -72,11 +75,13 @@ public class MessageProcessorCreationWizard extends AbstractWSO2ProjectCreationW private IFile artifactFile; private List fileLst = new ArrayList(); + private String version = "1.0.0"; + public MessageProcessorCreationWizard() { messageProcessorModel = new MessageProcessorModel(); setModel(messageProcessorModel); setWindowTitle("New Message processor"); - // setDefaultPageImageDescriptor(MessageProcessorImageUtils.getInstance().getImageDescriptor("icons/message-store.png")); + setDefaultPageImageDescriptor(MessageProcessorImageUtils.getInstance().getImageDescriptor("message-processor.png")); } @Override @@ -112,7 +117,7 @@ public boolean performFinish() { .getMessageProcessorName() + ".xml")).replaceAll( Pattern.quote(File.separator), "/"); esbProjectArtifact.addESBArtifact(createArtifact( - messageProcessorModel.getMessageProcessorName(), groupId, "1.0.0", + messageProcessorModel.getMessageProcessorName(), groupId, version, relativePath)); esbProjectArtifact.toFile(); } else { @@ -166,7 +171,8 @@ private ESBArtifact createArtifact(String name, String groupId, String version, public void updatePom() throws Exception { File mavenProjectPomLocation = esbProject.getFile("pom.xml").getLocation().toFile(); MavenProject mavenProject = MavenUtils.getMavenProject(mavenProjectPomLocation); - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-esb-messageprocessor-plugin", MavenConstants.WSO2_ESB_MESSAGE_STORE_PLUGIN_VERSION); @@ -383,7 +389,7 @@ public void copyImportFile(IContainer importLocation, boolean isNewAritfact, Str String relativePath = FileUtils.getRelativePath(importLocation.getProject() .getLocation().toFile(), new File( importLocation.getLocation().toFile(), name + ".xml")); - esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, "1.0.0", + esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, version, relativePath)); } } @@ -397,7 +403,7 @@ public void copyImportFile(IContainer importLocation, boolean isNewAritfact, Str String relativePath = FileUtils.getRelativePath(importLocation.getProject() .getLocation().toFile(), new File(importLocation.getLocation().toFile(), name + ".xml")); - esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, "1.0.0", + esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, version, relativePath)); } } diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/META-INF/MANIFEST.MF index e82bdfb548..30858733ca 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ESB Messagestore Artifact Wizard Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.messagestore;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.messagestore.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, @@ -11,13 +11,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: org.apache.axiom.om, org.apache.commons.lang;version="2.6.0.wso2v1", - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.project, org.apache.synapse, org.apache.synapse.config.xml, org.apache.synapse.message.store, org.apache.synapse.message.store.impl.memory, - org.codehaus.plexus.util.xml;version="2.0.1", + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.ui.ide, org.wso2.developerstudio.eclipse.capp.maven.utils, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/pom.xml index ebb647b30b..d5269ff289 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/pom.xml @@ -19,11 +19,11 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.messagestore - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio Message Store Artifact diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/src/org/wso2/developerstudio/eclipse/artifact/messagestore/ui/wizard/MessageStoreCreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/src/org/wso2/developerstudio/eclipse/artifact/messagestore/ui/wizard/MessageStoreCreationWizard.java index eeb0096c9f..885cbe307e 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/src/org/wso2/developerstudio/eclipse/artifact/messagestore/ui/wizard/MessageStoreCreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/src/org/wso2/developerstudio/eclipse/artifact/messagestore/ui/wizard/MessageStoreCreationWizard.java @@ -78,6 +78,8 @@ public class MessageStoreCreationWizard extends AbstractWSO2ProjectCreationWizar private IProject esbProject; private IFile artifactFile; private List fileLst = new ArrayList(); + + private String version = "1.0.0"; public MessageStoreCreationWizard() { messageStoreModel = new MessageStoreModel(); @@ -124,7 +126,7 @@ public boolean performFinish() { new File(location.getLocation().toFile(), messageStoreModel.getStoreName() + ".xml")) .replaceAll(Pattern.quote(File.separator), "/"); esbProjectArtifact.addESBArtifact(createArtifact(messageStoreModel.getStoreName(), groupId, - "1.0.0", relativePath)); + version, relativePath)); esbProjectArtifact.toFile(); } esbProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); @@ -232,7 +234,8 @@ public void updatePom() throws Exception { .getLocation().toFile(); MavenProject mavenProject = MavenUtils .getMavenProject(mavenProjectPomLocation); - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-esb-messagestore-plugin", MavenConstants.WSO2_ESB_MESSAGE_STORE_PLUGIN_VERSION); @@ -311,7 +314,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri .getLocation().toFile(), new File(importLocation.getLocation().toFile(), name + ".xml")); esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, - "1.0.0", relativePath)); + version, relativePath)); } } @@ -325,7 +328,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri .getLocation().toFile(), new File(importLocation.getLocation().toFile(), name + ".xml")); esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, - "1.0.0", relativePath)); + version, relativePath)); } } try { diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/src/org/wso2/developerstudio/eclipse/artifact/messagestore/validator/MessageStoreFieldController.java b/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/src/org/wso2/developerstudio/eclipse/artifact/messagestore/validator/MessageStoreFieldController.java index 92a8c75b86..509e107d74 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/src/org/wso2/developerstudio/eclipse/artifact/messagestore/validator/MessageStoreFieldController.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.messagestore/src/org/wso2/developerstudio/eclipse/artifact/messagestore/validator/MessageStoreFieldController.java @@ -53,7 +53,7 @@ public void validate(String key, Object value, } } else if (key.equals(FIELD_JMS_PROVIDER_URL)) { if(jms){ - CommonFieldValidator.validateRequiredField(value,"JMS Provide url cannot be empty"); + CommonFieldValidator.isValidUrl(value.toString(),"JMS Provide url cannot be empty"); } } else if (key.equals(FIELD_JMS_TIMEOUT)) { if(jms){ diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/META-INF/MANIFEST.MF index 4776e5077f..e5b0676060 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Proxy Service Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.proxyservice;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.proxyservice.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -12,9 +12,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, org.apache.commons.lang, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.emf.common.notify, org.eclipse.emf.ecore, org.eclipse.jdt.core, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/pom.xml index a074ae6384..9fdab105fd 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.proxyservice diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/src/org/wso2/developerstudio/eclipse/artifact/proxyservice/ui/wizard/ProxyServiceProjectCreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/src/org/wso2/developerstudio/eclipse/artifact/proxyservice/ui/wizard/ProxyServiceProjectCreationWizard.java index cfdbc73a39..27d0048cb9 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/src/org/wso2/developerstudio/eclipse/artifact/proxyservice/ui/wizard/ProxyServiceProjectCreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.proxyservice/src/org/wso2/developerstudio/eclipse/artifact/proxyservice/ui/wizard/ProxyServiceProjectCreationWizard.java @@ -67,6 +67,8 @@ public class ProxyServiceProjectCreationWizard extends AbstractWSO2ProjectCreati private List fileLst = new ArrayList(); private IProject esbProject; + private String version = "1.0.0"; + public ProxyServiceProjectCreationWizard() { this.psModel = new ProxyServiceModel(); setModel(this.psModel); @@ -147,7 +149,7 @@ public boolean performFinish() { new File(location.getLocation().toFile(), proxyServiceModel .getProxyServiceName() + ".xml")).replaceAll(Pattern.quote(File.separator), "/"); esbProjectArtifact.addESBArtifact(createArtifact( - proxyServiceModel.getProxyServiceName(), groupId, "1.0.0", relativePath)); + proxyServiceModel.getProxyServiceName(), groupId, version, relativePath)); } esbProjectArtifact.toFile(); @@ -169,7 +171,8 @@ public boolean performFinish() { public void updatePom() throws Exception{ File mavenProjectPomLocation = esbProject.getFile("pom.xml").getLocation().toFile(); MavenProject mavenProject = MavenUtils.getMavenProject(mavenProjectPomLocation); - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-esb-proxy-plugin", MavenConstants.WSO2_ESB_PROXY_VERSION); @@ -226,7 +229,7 @@ public void copyImportFile(IContainer location,boolean isNewArtifact,String grou if(isNewArtifact){ relativePath = FileUtils.getRelativePath(location.getProject().getLocation() .toFile(), new File(location.getLocation().toFile(), name + ".xml")); - esbProjectArtifact.addESBArtifact(createArtifact(name,groupId,"1.0.0",relativePath) ); + esbProjectArtifact.addESBArtifact(createArtifact(name,groupId,version,relativePath) ); } } } @@ -240,7 +243,7 @@ public void copyImportFile(IContainer location,boolean isNewArtifact,String grou if(isNewArtifact){ relativePath = FileUtils.getRelativePath(location.getProject().getLocation() .toFile(), new File(location.getLocation().toFile(), name + ".xml")); - esbProjectArtifact.addESBArtifact(createArtifact(name,groupId,"1.0.0",relativePath) ); + esbProjectArtifact.addESBArtifact(createArtifact(name,groupId,version,relativePath) ); } } } diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.sequence/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.sequence/META-INF/MANIFEST.MF index 4e7de287b1..a9c01f066d 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.sequence/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.sequence/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Sequence Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.sequence;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.sequence.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -11,9 +11,9 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.expressions, org.eclipse.jdt.core, org.eclipse.ui.ide, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.sequence/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.sequence/pom.xml index 6dea71e51e..5eb1737c1d 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.sequence/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.sequence/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.sequence diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.sequence/src/org/wso2/developerstudio/eclipse/artifact/sequence/ui/wizard/SequenceProjectCreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.sequence/src/org/wso2/developerstudio/eclipse/artifact/sequence/ui/wizard/SequenceProjectCreationWizard.java index 1d18afec35..5beee23349 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.sequence/src/org/wso2/developerstudio/eclipse/artifact/sequence/ui/wizard/SequenceProjectCreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.sequence/src/org/wso2/developerstudio/eclipse/artifact/sequence/ui/wizard/SequenceProjectCreationWizard.java @@ -18,13 +18,16 @@ import static org.wso2.developerstudio.eclipse.platform.core.registry.util.Constants.REGISTRY_RESOURCE; import static org.wso2.developerstudio.eclipse.artifact.sequence.model.SequenceModel.*; + import java.io.File; import java.io.IOException; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; + import javax.xml.namespace.QName; + import org.apache.axiom.om.OMElement; import org.apache.maven.model.Plugin; import org.apache.maven.model.PluginExecution; @@ -77,6 +80,8 @@ public class SequenceProjectCreationWizard extends AbstractWSO2ProjectCreationWi private List fileLst = new ArrayList(); private IProject project; + private String version="1.0.0"; + public void setProject(IProject project) { this.project = project; @@ -142,7 +147,8 @@ public IWizardPage getPreviousPage(IWizardPage page) { public void updatePom() throws Exception{ File mavenProjectPomLocation = project.getFile("pom.xml").getLocation().toFile(); MavenProject mavenProject = MavenUtils.getMavenProject(mavenProjectPomLocation); - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-esb-sequence-plugin", MavenConstants.WSO2_ESB_SEQUENCE_VERSION); @@ -234,7 +240,7 @@ public boolean createSequenceArtifact(IProject prj,SequenceModel sequenceModel) fileLst.add(destFile); ESBArtifact artifact = new ESBArtifact(); artifact.setName(sequenceModel.getSequenceName()); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); artifact.setType("synapse/sequence"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setGroupId(groupId); @@ -381,7 +387,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri if(isNewAritfact){ ESBArtifact artifact=new ESBArtifact(); artifact.setName(name); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); artifact.setType("synapse/sequence"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setGroupId(groupId); @@ -398,7 +404,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri if(isNewAritfact){ ESBArtifact artifact=new ESBArtifact(); artifact.setName(name); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); artifact.setType("synapse/sequence"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setGroupId(groupId); diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/META-INF/MANIFEST.MF index 99b734cef1..6aa5a05b87 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Synapse-API-Artifact Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.synapse.api;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.synapse.api.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, @@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: org.apache.axiom.om, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.ui.ide, org.wso2.developerstudio.eclipse.capp.maven.utils, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/pom.xml index 58a4eae3ff..802a64a474 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/pom.xml @@ -19,11 +19,11 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.synapse.api - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio Synapse API Artifact diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/src/org/wso2/developerstudio/eclipse/artifact/synapse/api/ui/wizard/SynapseAPICreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/src/org/wso2/developerstudio/eclipse/artifact/synapse/api/ui/wizard/SynapseAPICreationWizard.java index 16744c0df6..e8ba37b237 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/src/org/wso2/developerstudio/eclipse/artifact/synapse/api/ui/wizard/SynapseAPICreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.synapse.api/src/org/wso2/developerstudio/eclipse/artifact/synapse/api/ui/wizard/SynapseAPICreationWizard.java @@ -67,6 +67,8 @@ public class SynapseAPICreationWizard extends AbstractWSO2ProjectCreationWizard private ESBProjectArtifact esbProjectArtifact; private IProject esbProject; private List fileLst = new ArrayList(); + + private String version ="1.0.0"; public SynapseAPICreationWizard() { artifactModel = new APIArtifactModel(); @@ -188,7 +190,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri String relativePath = FileUtils.getRelativePath(importLocation.getProject() .getLocation().toFile(), new File( importLocation.getLocation().toFile(), name + ".xml")); - esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, "1.0.0", + esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, version, relativePath)); } } @@ -202,7 +204,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri String relativePath = FileUtils.getRelativePath(importLocation.getProject() .getLocation().toFile(), new File(importLocation.getLocation().toFile(), name + ".xml")); - esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, "1.0.0", + esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, version, relativePath)); } } @@ -227,7 +229,8 @@ private ESBArtifact createArtifact(String name,String groupId,String version,Str public void updatePom() throws Exception{ File mavenProjectPomLocation = esbProject.getFile("pom.xml").getLocation().toFile(); MavenProject mavenProject = MavenUtils.getMavenProject(mavenProjectPomLocation); - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-esb-api-plugin", MavenConstants.WSO2_ESB_API_VERSION); diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.synapse/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.synapse/META-INF/MANIFEST.MF index 7f21474685..29ec0c7209 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.synapse/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.synapse/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Synapse Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.synapse;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.synapse.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime @@ -10,9 +10,9 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.ui.ide, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.synapse/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.synapse/pom.xml index a35bd57235..c23b46564e 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.synapse/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.synapse/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.synapse diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.task/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.task/META-INF/MANIFEST.MF index f31cfb853d..8b87774295 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.task/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.task/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.wso2.developerstudio.eclipse.artifact.Task Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.task;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.task.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, @@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: org.apache.axiom.om, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.wso2.developerstudio.eclipse.capp.maven.utils, org.wso2.developerstudio.eclipse.esb.core.utils, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.task/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.task/pom.xml index 9bb1d8f077..dfc2156013 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.task/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.task/pom.xml @@ -19,11 +19,11 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.task - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio Synapse Task Artifact diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.task/src/org/wso2/developerstudio/eclipse/artifact/task/ui/wizard/TaskCreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.task/src/org/wso2/developerstudio/eclipse/artifact/task/ui/wizard/TaskCreationWizard.java index b73ece5d9f..15c718effe 100755 --- a/esb/org.wso2.developerstudio.eclipse.artifact.task/src/org/wso2/developerstudio/eclipse/artifact/task/ui/wizard/TaskCreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.task/src/org/wso2/developerstudio/eclipse/artifact/task/ui/wizard/TaskCreationWizard.java @@ -67,6 +67,8 @@ public class TaskCreationWizard extends AbstractWSO2ProjectCreationWizard { private ESBProjectArtifact esbProjectArtifact; private IProject esbProject; private List fileLst = new ArrayList(); + + private String version = "1.0.0"; public TaskCreationWizard() { artifactModel = new TaskModel(); setModel(artifactModel); @@ -112,7 +114,7 @@ public boolean performFinish() { new File(location.getLocation().toFile(), artifactModel.getName() + ".xml")) .replaceAll(Pattern.quote(File.separator), "/"); esbProjectArtifact.addESBArtifact(createArtifact(artifactModel.getName(), groupId, - "1.0.0", relativePath)); + version, relativePath)); esbProjectArtifact.toFile(); } esbProject.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); @@ -145,7 +147,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri .getLocation().toFile(), new File(importLocation.getLocation().toFile(), name + ".xml")); esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, - "1.0.0", relativePath)); + version, relativePath)); } } @@ -159,7 +161,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri .getLocation().toFile(), new File(importLocation.getLocation().toFile(), name + ".xml")); esbProjectArtifact.addESBArtifact(createArtifact(name, groupId, - "1.0.0", relativePath)); + version, relativePath)); } } try { @@ -228,7 +230,8 @@ private ESBArtifact createArtifact(String name,String groupId,String version,Str public void updatePom() throws Exception{ File mavenProjectPomLocation = esbProject.getFile("pom.xml").getLocation().toFile(); MavenProject mavenProject = MavenUtils.getMavenProject(mavenProjectPomLocation); - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-esb-task-plugin", MavenConstants.WSO2_ESB_TASK_VERSION); diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/META-INF/MANIFEST.MF index d88107ab95..2ce7d06731 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Template Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.template.sequence;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.template.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime @@ -11,9 +11,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, org.apache.commons.lang, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.wso2.developerstudio.eclipse.capp.maven.utils, org.wso2.developerstudio.eclipse.esb.core.utils, diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/pom.xml b/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/pom.xml index bbc353ff43..8ad51fbe03 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/pom.xml @@ -20,11 +20,11 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.template.sequence - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin Developer Studio Template artifact diff --git a/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/src/org/wso2/developerstudio/eclipse/artifact/template/wizards/TemplateProjectCreationWizard.java b/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/src/org/wso2/developerstudio/eclipse/artifact/template/wizards/TemplateProjectCreationWizard.java index f87658fd27..f95d0aafd0 100644 --- a/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/src/org/wso2/developerstudio/eclipse/artifact/template/wizards/TemplateProjectCreationWizard.java +++ b/esb/org.wso2.developerstudio.eclipse.artifact.template.sequence/src/org/wso2/developerstudio/eclipse/artifact/template/wizards/TemplateProjectCreationWizard.java @@ -45,7 +45,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jface.dialogs.MessageDialog; - import org.wso2.developerstudio.eclipse.artifact.template.Activator; import org.wso2.developerstudio.eclipse.artifact.template.Utils.TemplateImageUtils; import org.wso2.developerstudio.eclipse.artifact.template.model.TemplateModel; @@ -71,6 +70,8 @@ public class TemplateProjectCreationWizard extends AbstractWSO2ProjectCreationWi private List fileLst = new ArrayList(); private IProject project; + private String version ="1.0.0"; + public TemplateProjectCreationWizard() { this.templateModel = new TemplateModel(); @@ -150,7 +151,7 @@ private boolean createSequenceArtifact(TemplateModel sequenceModel) throws Excep fileLst.add(destFile); ESBArtifact artifact = new ESBArtifact(); artifact.setName(sequenceModel.getTemplateName()); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); if("Sequence Template".equals(selectedTemplate.getName())){ artifact.setType("synapse/sequenceTemplate"); }else{ @@ -194,7 +195,8 @@ public String createEPTemplate(String templateContent, String type) throws IOExc public void updatePom() throws Exception{ File mavenProjectPomLocation = project.getFile("pom.xml").getLocation().toFile(); MavenProject mavenProject = MavenUtils.getMavenProject(mavenProjectPomLocation); - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-esb-template-plugin", MavenConstants.WSO2_ESB_TEMPLATE_VERSION); @@ -249,7 +251,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri if(isNewAritfact){ ESBArtifact artifact=new ESBArtifact(); artifact.setName(name); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); artifact.setType("synapse/template"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setGroupId(groupId); @@ -265,7 +267,7 @@ public void copyImportFile(IContainer importLocation,boolean isNewAritfact, Stri if(isNewAritfact){ ESBArtifact artifact=new ESBArtifact(); artifact.setName(name); - artifact.setVersion("1.0.0"); + artifact.setVersion(version); artifact.setType("synapse/template"); artifact.setServerRole("EnterpriseServiceBus"); artifact.setGroupId(groupId); diff --git a/esb/org.wso2.developerstudio.eclipse.esb.edit/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.esb.edit/META-INF/MANIFEST.MF index afd344f565..49ccfff158 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.edit/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.esb.edit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.wso2.developerstudio.eclipse.esb.edit;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-ClassPath: . Bundle-Activator: org.wso2.developerstudio.eclipse.esb.provider.EsbEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/esb/org.wso2.developerstudio.eclipse.esb.edit/pom.xml b/esb/org.wso2.developerstudio.eclipse.esb.edit/pom.xml index d43455c61c..a49fd13618 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.edit/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.esb.edit/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.esb.edit diff --git a/esb/org.wso2.developerstudio.eclipse.esb.editor/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.esb.editor/META-INF/MANIFEST.MF index 5d97fea793..3e9ab6238f 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.editor/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.esb.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.wso2.developerstudio.eclipse.esb.editor;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-ClassPath: lib/org.eclipse.wb.swt.layout.grouplayout_1.0.0.r36x201106161145.jar, lib/org.eclipse.wb.swt_1.0.0.r36x201106161135.jar, lib/org.eclipse.wb.swt.widgets.baseline_1.0.0.r36x201106161140.jar, @@ -27,11 +27,11 @@ Require-Bundle: org.eclipse.core.runtime, Bundle-ActivationPolicy: lazy Import-Package: org.apache.commons.io;version="2.0.0.wso2v1", org.apache.commons.lang, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.model.io.xpp3;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.model.io.xpp3, + org.apache.maven.project, org.apache.xml.serialize, - org.codehaus.plexus.util.xml;version="2.0.1", + org.codehaus.plexus.util.xml, org.eclipse.core.filesystem, org.eclipse.emf.query.conditions.eobjects, org.eclipse.emf.query.statements, diff --git a/esb/org.wso2.developerstudio.eclipse.esb.editor/pom.xml b/esb/org.wso2.developerstudio.eclipse.esb.editor/pom.xml index 97bd70b907..851b2e740f 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.editor/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.esb.editor/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.esb.editor diff --git a/esb/org.wso2.developerstudio.eclipse.esb.mediator/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.esb.mediator/META-INF/MANIFEST.MF index 0573f326d9..4dc4015540 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.mediator/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.esb.mediator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Synapse Mediator Creator Bundle-SymbolicName: org.wso2.developerstudio.eclipse.esb.mediator;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.esb.mediators.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/esb/org.wso2.developerstudio.eclipse.esb.mediator/pom.xml b/esb/org.wso2.developerstudio.eclipse.esb.mediator/pom.xml index b463a48ef9..6d44d5dad0 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.mediator/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.esb.mediator/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.esb.mediator diff --git a/esb/org.wso2.developerstudio.eclipse.esb.project/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.esb.project/META-INF/MANIFEST.MF index 9588df2594..103d7dd8d7 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.project/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.esb.project/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Project Bundle-SymbolicName: org.wso2.developerstudio.eclipse.esb.project;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.esb.project.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -12,10 +12,10 @@ Import-Package: net.lingala.zip4j.core, net.lingala.zip4j.exception, org.apache.axiom.om, org.apache.commons.io;version="2.0.0.wso2v1", - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.model.io.xpp3;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.model.io.xpp3, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jface.text, org.eclipse.text.edits, diff --git a/esb/org.wso2.developerstudio.eclipse.esb.project/pom.xml b/esb/org.wso2.developerstudio.eclipse.esb.project/pom.xml index 229c5a215c..596d6d30a9 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.project/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.esb.project/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.esb.project diff --git a/esb/org.wso2.developerstudio.eclipse.esb.project/src/org/wso2/developerstudio/eclipse/esb/project/nature/ESBProjectNature.java b/esb/org.wso2.developerstudio.eclipse.esb.project/src/org/wso2/developerstudio/eclipse/esb/project/nature/ESBProjectNature.java index ae4b84014b..7e0f9bb3fb 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb.project/src/org/wso2/developerstudio/eclipse/esb/project/nature/ESBProjectNature.java +++ b/esb/org.wso2.developerstudio.eclipse.esb.project/src/org/wso2/developerstudio/eclipse/esb/project/nature/ESBProjectNature.java @@ -67,27 +67,50 @@ private void updatePom() { //Adding maven exec plugin entry Plugin plugin = MavenUtils.createPluginEntry(mavenProject, "org.codehaus.mojo", "exec-maven-plugin", "1.2", true); - PluginExecution pluginExecution = new PluginExecution(); - pluginExecution.addGoal("exec"); - pluginExecution.setPhase("install"); - - Xpp3Dom configurationNode = MavenUtils.createMainConfigurationNode(); - Xpp3Dom executableNode = MavenUtils.createXpp3Node(configurationNode, "executable"); - executableNode.setValue("mvn"); - Xpp3Dom workingDirectoryNode = MavenUtils.createXpp3Node(configurationNode, "workingDirectory"); - workingDirectoryNode.setValue("${project.build.directory}"); - Xpp3Dom argumentsNode = MavenUtils.createXpp3Node(configurationNode, "arguments"); - Xpp3Dom cleanArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); - cleanArgumentNode.setValue("clean"); - Xpp3Dom installArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); - installArgumentNode.setValue("install"); - Xpp3Dom testSkipArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); - testSkipArgumentNode.setValue("-Dmaven.test.skip=${maven.test.skip}"); - - pluginExecution.setConfiguration(configurationNode); - - plugin.addExecution(pluginExecution); - + { + PluginExecution pluginExecution = new PluginExecution(); + pluginExecution.setId("install"); + pluginExecution.addGoal("exec"); + pluginExecution.setPhase("install"); + + Xpp3Dom configurationNode = MavenUtils.createMainConfigurationNode(); + Xpp3Dom executableNode = MavenUtils.createXpp3Node(configurationNode, "executable"); + executableNode.setValue("mvn"); + Xpp3Dom workingDirectoryNode = MavenUtils.createXpp3Node(configurationNode, "workingDirectory"); + workingDirectoryNode.setValue("${project.build.directory}"); + Xpp3Dom argumentsNode = MavenUtils.createXpp3Node(configurationNode, "arguments"); + Xpp3Dom cleanArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + cleanArgumentNode.setValue("clean"); + Xpp3Dom installArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + installArgumentNode.setValue("install"); + Xpp3Dom testSkipArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + testSkipArgumentNode.setValue("-Dmaven.test.skip=${maven.test.skip}"); + + pluginExecution.setConfiguration(configurationNode); + + plugin.addExecution(pluginExecution); + } + { + PluginExecution pluginExecution = new PluginExecution(); + pluginExecution.setId("deploy"); + pluginExecution.addGoal("exec"); + pluginExecution.setPhase("deploy"); + + Xpp3Dom configurationNode = MavenUtils.createMainConfigurationNode(); + Xpp3Dom executableNode = MavenUtils.createXpp3Node(configurationNode, "executable"); + executableNode.setValue("mvn"); + Xpp3Dom workingDirectoryNode = MavenUtils.createXpp3Node(configurationNode, "workingDirectory"); + workingDirectoryNode.setValue("${project.build.directory}"); + Xpp3Dom argumentsNode = MavenUtils.createXpp3Node(configurationNode, "arguments"); + Xpp3Dom deployArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + deployArgumentNode.setValue("deploy"); + Xpp3Dom testSkipArgumentNode = MavenUtils.createXpp3Node(argumentsNode, "argument"); + testSkipArgumentNode.setValue("-Dmaven.test.skip=${maven.test.skip}"); + + pluginExecution.setConfiguration(configurationNode); + + plugin.addExecution(pluginExecution); + } MavenUtils.saveMavenProject(mavenProject, mavenProjectPomLocation); } catch (Exception e) { diff --git a/esb/org.wso2.developerstudio.eclipse.esb/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.esb/META-INF/MANIFEST.MF index e2e0c237c6..d57ff1efd7 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.esb/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.wso2.developerstudio.eclipse.esb;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/esb/org.wso2.developerstudio.eclipse.esb/plugin.xml b/esb/org.wso2.developerstudio.eclipse.esb/plugin.xml index 9682df6063..987d2e2a59 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb/plugin.xml +++ b/esb/org.wso2.developerstudio.eclipse.esb/plugin.xml @@ -1506,13 +1506,6 @@ mediaType="application/vnd.wso2.template.endpoint" extension="xml"> - diff --git a/esb/org.wso2.developerstudio.eclipse.esb/pom.xml b/esb/org.wso2.developerstudio.eclipse.esb/pom.xml index 1418197ba4..00318e6b00 100644 --- a/esb/org.wso2.developerstudio.eclipse.esb/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.esb/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.esb diff --git a/esb/org.wso2.developerstudio.eclipse.esb/resources/templates/datamapper/datamapper-config-template.dmc b/esb/org.wso2.developerstudio.eclipse.esb/resources/templates/datamapper/datamapper-config-template.dmc deleted file mode 100644 index 5319f7aa1a..0000000000 --- a/esb/org.wso2.developerstudio.eclipse.esb/resources/templates/datamapper/datamapper-config-template.dmc +++ /dev/null @@ -1 +0,0 @@ -/* WSO2 Data Mapper Config */ \ No newline at end of file diff --git a/esb/org.wso2.developerstudio.eclipse.esb/resources/templates/datamapper/datamapper-config-template.js b/esb/org.wso2.developerstudio.eclipse.esb/resources/templates/datamapper/datamapper-config-template.js deleted file mode 100644 index 5319f7aa1a..0000000000 --- a/esb/org.wso2.developerstudio.eclipse.esb/resources/templates/datamapper/datamapper-config-template.js +++ /dev/null @@ -1 +0,0 @@ -/* WSO2 Data Mapper Config */ \ No newline at end of file diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/META-INF/MANIFEST.MF index 5e30ca8fed..d6839b0796 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.wso2.developerstudio.eclipse.gmf.esb.diagram; singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-ClassPath: . Bundle-Activator: org.wso2.developerstudio.eclipse.gmf.esb.diagram.part.EsbDiagramEditorPlugin Bundle-Vendor: %providerName @@ -63,8 +63,8 @@ Import-Package: com.damnhandy.uri.template, org.apache.commons.io, org.apache.commons.lang, org.apache.commons.logging, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", + org.apache.maven.model, + org.apache.maven.project, org.apache.synapse, org.apache.synapse.commons.evaluators, org.apache.synapse.commons.evaluators.config, @@ -109,7 +109,7 @@ Import-Package: com.damnhandy.uri.template, org.apache.synapse.util, org.apache.synapse.util.resolver, org.apache.synapse.util.xpath, - org.codehaus.plexus.util.xml;version="2.0.1", + org.codehaus.plexus.util.xml, org.eclipse.core.filesystem, org.eclipse.emf.query.conditions.eobjects, org.eclipse.emf.query.statements, @@ -134,12 +134,6 @@ Import-Package: com.damnhandy.uri.template, org.wso2.carbon.rule.mediator, org.wso2.carbon.rule.mediator.config, org.wso2.carbon.rule.mediator.internal.config, - org.wso2.developerstudio.datamapper, - org.wso2.developerstudio.datamapper.diagram.custom.util, - org.wso2.developerstudio.datamapper.diagram.edit.parts, - org.wso2.developerstudio.datamapper.diagram.part, - org.wso2.developerstudio.datamapper.diagram.providers, - org.wso2.developerstudio.datamapper.impl, org.wso2.developerstudio.eclipse.artifact.localentry.model, org.wso2.developerstudio.eclipse.artifact.localentry.ui.wizard, org.wso2.developerstudio.eclipse.artifact.sequence.model, diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/icons/ico20/localEntry55.gif b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/icons/ico20/localEntry55.gif new file mode 100644 index 0000000000..486b732bd2 Binary files /dev/null and b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/icons/ico20/localEntry55.gif differ diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/pom.xml b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/pom.xml index 30bf5f7096..9ebdd451d1 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/pom.xml @@ -20,12 +20,12 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.gmf.esb.diagram eclipse-plugin - 2.0.0-SNAPSHOT + 2.0.0 Developer Studio ESB Graphical Editor Diagram * * @generated */ - protected void addContinueRoutePropertyDescriptor(Object object) { + protected void addContinueAfterRoutePropertyDescriptor(Object object) { itemPropertyDescriptors.add (createItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_ConditionalRouterMediator_continueRoute_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_ConditionalRouterMediator_continueRoute_feature", "_UI_ConditionalRouterMediator_type"), - EsbPackage.Literals.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE, + getString("_UI_ConditionalRouterMediator_continueAfterRoute_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_ConditionalRouterMediator_continueAfterRoute_feature", "_UI_ConditionalRouterMediator_type"), + EsbPackage.Literals.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE, true, false, false, @@ -194,7 +194,7 @@ public void notifyChanged(Notification notification) { updateChildren(notification); switch (notification.getFeatureID(ConditionalRouterMediator.class)) { - case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE: + case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONDITIONAL_ROUTE_BRANCHES: diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/META-INF/MANIFEST.MF index 2680f2c94f..a055f5de72 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Persistence Bundle-SymbolicName: org.wso2.developerstudio.eclipse.gmf.esb.persistence -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-ClassPath: ., lib/tribes-6.0.16.jar, lib/woden-api-1.0-SNAPSHOT.jar, diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/pom.xml b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/pom.xml index fc691083f6..2d58c3a390 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/pom.xml @@ -20,12 +20,12 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.gmf.esb.persistence eclipse-plugin - 2.0.0-SNAPSHOT + 2.0.0 Developer Studio ESB Graphical Editor Diagram diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/CloneMediatorTransformer.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/CloneMediatorTransformer.java index 57df25485c..de73909b87 100755 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/CloneMediatorTransformer.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/CloneMediatorTransformer.java @@ -3,19 +3,41 @@ import java.util.ArrayList; import java.util.List; -import org.apache.synapse.config.xml.AnonymousListMediator; +import org.apache.synapse.endpoints.AddressEndpoint; +import org.apache.synapse.endpoints.DefaultEndpoint; import org.apache.synapse.endpoints.Endpoint; -import org.apache.synapse.mediators.ListMediator; +import org.apache.synapse.endpoints.FailoverEndpoint; +import org.apache.synapse.endpoints.HTTPEndpoint; +import org.apache.synapse.endpoints.LoadbalanceEndpoint; +import org.apache.synapse.endpoints.RecipientListEndpoint; +import org.apache.synapse.endpoints.TemplateEndpoint; +import org.apache.synapse.endpoints.WSDLEndpoint; +import org.wso2.developerstudio.eclipse.gmf.esb.NamedEndpoint; import org.apache.synapse.mediators.base.SequenceMediator; import org.apache.synapse.mediators.eip.Target; import org.eclipse.core.runtime.Assert; import org.eclipse.emf.ecore.EObject; +import org.wso2.developerstudio.eclipse.gmf.esb.AddressEndPoint; import org.wso2.developerstudio.eclipse.gmf.esb.CloneMediator; import org.wso2.developerstudio.eclipse.gmf.esb.CloneMediatorTargetOutputConnector; import org.wso2.developerstudio.eclipse.gmf.esb.CloneTarget; +import org.wso2.developerstudio.eclipse.gmf.esb.DefaultEndPoint; import org.wso2.developerstudio.eclipse.gmf.esb.EsbNode; +import org.wso2.developerstudio.eclipse.gmf.esb.FailoverEndPoint; +import org.wso2.developerstudio.eclipse.gmf.esb.LoadBalanceEndPoint; +import org.wso2.developerstudio.eclipse.gmf.esb.RecipientListEndPoint; import org.wso2.developerstudio.eclipse.gmf.esb.TargetEndpointType; import org.wso2.developerstudio.eclipse.gmf.esb.TargetSequenceType; +import org.wso2.developerstudio.eclipse.gmf.esb.WSDLEndPoint; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.AddressEndPointImpl; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.DefaultEndPointImpl; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.FailoverEndPointImpl; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.HTTPEndpointImpl; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.LoadBalanceEndPointImpl; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.NamedEndpointImpl; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.RecipientListEndPointImpl; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.TemplateEndpointImpl; +import org.wso2.developerstudio.eclipse.gmf.esb.impl.WSDLEndPointImpl; import org.wso2.developerstudio.eclipse.gmf.esb.persistence.TransformationInfo; public class CloneMediatorTransformer extends AbstractEsbNodeTransformer { @@ -116,9 +138,85 @@ private org.apache.synapse.mediators.eip.splitter.CloneMediator createCloneMedia if (visualTarget.getEndpointType().equals( TargetEndpointType.ANONYMOUS)) { + + EObject endpoint = null; + CloneMediatorTargetOutputConnector outputConnector = visualClone + .getTargetsOutputConnector().get(i); - // TODO handle this situation. - + SequenceMediator targetSequence = new SequenceMediator(); + TransformationInfo newInfo = new TransformationInfo(); + newInfo.setTraversalDirection(information + .getTraversalDirection()); + newInfo.setSynapseConfiguration(information + .getSynapseConfiguration()); + newInfo.setOriginInSequence(information + .getOriginInSequence()); + newInfo.setOriginOutSequence(information + .getOriginOutSequence()); + newInfo.setCurrentProxy(information.getCurrentProxy()); + newInfo.setParentSequence(targetSequence); + + doTransform(newInfo, outputConnector); + + + if (newInfo.isEndPointFound) { + endpoint = newInfo.getFirstEndpoint(); + + if (endpoint instanceof DefaultEndPointImpl) { + DefaultEndPointTransformer transformer = new DefaultEndPointTransformer(); + DefaultEndpoint synapseEP = transformer.create( + (DefaultEndPoint) endpoint, null); + target.setEndpoint(synapseEP); + } else if (endpoint instanceof AddressEndPointImpl) { + AddressEndPointTransformer transformer = new AddressEndPointTransformer(); + AddressEndpoint synapseEP = transformer.create( + (AddressEndPoint) endpoint, null); + target.setEndpoint(synapseEP); + } else if (endpoint instanceof FailoverEndPointImpl) { + FailoverEndPointTransformer transformer = new FailoverEndPointTransformer(); + FailoverEndpoint synapseEP = transformer.create( + newInfo, (FailoverEndPoint) endpoint, null, + null); + target.setEndpoint(synapseEP); + } else if (endpoint instanceof HTTPEndpointImpl) { + HTTPEndPointTransformer transformer = new HTTPEndPointTransformer(); + HTTPEndpoint synapseEP = transformer + .create((org.wso2.developerstudio.eclipse.gmf.esb.HTTPEndpoint) endpoint, + null); + target.setEndpoint(synapseEP); + } else if (endpoint instanceof LoadBalanceEndPointImpl) { + LoadBalanceEndPointTransformer transformer = new LoadBalanceEndPointTransformer(); + LoadbalanceEndpoint synapseEP = transformer.create( + newInfo, (LoadBalanceEndPoint) endpoint, + null, null); + target.setEndpoint(synapseEP); + } else if (endpoint instanceof NamedEndpointImpl) { + NamedEndPointTransformer transformer = new NamedEndPointTransformer(); + @SuppressWarnings("static-access") + Endpoint synapseEP = transformer.create( + (NamedEndpoint) endpoint, null); + target.setEndpoint(synapseEP); + } else if (endpoint instanceof RecipientListEndPointImpl) { + RecipientListEndPointTransformer transformer = new RecipientListEndPointTransformer(); + RecipientListEndpoint synapseEP = transformer + .create(newInfo, + (RecipientListEndPoint) endpoint, + null, null); + target.setEndpoint(synapseEP); + } else if (endpoint instanceof TemplateEndpointImpl) { + TemplateEndPointTransformer transformer = new TemplateEndPointTransformer(); + TemplateEndpoint synapseEP = transformer + .create((org.wso2.developerstudio.eclipse.gmf.esb.TemplateEndpoint) endpoint, + null); + target.setEndpoint(synapseEP); + } else if (endpoint instanceof WSDLEndPointImpl) { + WSDLEndPointTransformer transformer = new WSDLEndPointTransformer(); + WSDLEndpoint synapseEP = transformer.create( + (WSDLEndPoint) endpoint, null); + target.setEndpoint(synapseEP); + } + + } } else if (visualTarget.getEndpointType().equals( TargetEndpointType.REGISTRY_REFERENCE)) { @@ -135,4 +233,5 @@ private org.apache.synapse.mediators.eip.splitter.CloneMediator createCloneMedia return cloneMediator; } + } diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/ConditionalRouterMediatorTransformer.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/ConditionalRouterMediatorTransformer.java index a940a9f2e2..86464f9ede 100755 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/ConditionalRouterMediatorTransformer.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/ConditionalRouterMediatorTransformer.java @@ -69,7 +69,7 @@ private org.apache.synapse.mediators.filters.router.ConditionalRouterMediator cr org.apache.synapse.mediators.filters.router.ConditionalRouterMediator router = new org.apache.synapse.mediators.filters.router.ConditionalRouterMediator(); setCommonProperties(router, routerModel); - router.setContinueAfter(routerModel.isContinueRoute()); + router.setContinueAfter(routerModel.isContinueAfterRoute()); EList routes = routerModel.getConditionalRouteBranches(); for (ConditionalRouteBranch route : routes) { diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/custom/BeanMediatorExtSerializer.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/custom/BeanMediatorExtSerializer.java index addc5cd640..e227b78465 100755 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/custom/BeanMediatorExtSerializer.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/internal/persistence/custom/BeanMediatorExtSerializer.java @@ -17,6 +17,7 @@ package org.wso2.developerstudio.eclipse.gmf.esb.internal.persistence.custom; import org.apache.axiom.om.OMElement; +import org.apache.commons.lang.StringUtils; import org.apache.synapse.Mediator; import org.apache.synapse.config.xml.BeanMediatorSerializer; import org.apache.synapse.config.xml.ValueSerializer; @@ -37,22 +38,22 @@ public OMElement serializeSpecificMediator(Mediator m) { BeanMediatorExt mediator = (BeanMediatorExt) m; - OMElement mediatorElem = fac.createOMElement(BEAN, synNS); - saveTracingState(mediatorElem, mediator); + OMElement mediatorElem = fac.createOMElement(BEAN, synNS); + saveTracingState(mediatorElem, mediator); - if (mediator.getAction() != null) { - mediatorElem.addAttribute(fac.createOMAttribute( - BeanConstants.ACTION, nullNS, mediator.getAction().toString())); - } else { - handleException(); - } + if (null != mediator.getAction()) { // Never becomes empty + mediatorElem.addAttribute(fac.createOMAttribute(BeanConstants.ACTION, nullNS, mediator + .getAction().toString())); + } else { + handleException(); + } - if (mediator.getVarName() != null) { - mediatorElem.addAttribute(fac.createOMAttribute( - BeanConstants.VAR, nullNS, mediator.getVarName())); - } else { - handleException(); - } + if (StringUtils.isNotBlank(mediator.getVarName())) { + mediatorElem.addAttribute(fac.createOMAttribute(BeanConstants.VAR, nullNS, + mediator.getVarName())); + } else { + handleException(); + } switch (mediator.getAction()) { case CREATE: @@ -73,9 +74,9 @@ public OMElement serializeSpecificMediator(Mediator m) { private void serializeCreateBeanCase(OMElement mediatorElem, BeanMediatorExt mediator) { - if (mediator.getClassName() != null) { - mediatorElem.addAttribute(fac.createOMAttribute( - BeanConstants.CLASS, nullNS, mediator.getClassName())); + if (StringUtils.isNotBlank(mediator.getClassName())) { + mediatorElem.addAttribute(fac.createOMAttribute(BeanConstants.CLASS, nullNS, + mediator.getClassName())); } else { handleException(); } @@ -88,11 +89,17 @@ private void serializeCreateBeanCase(OMElement mediatorElem, BeanMediatorExt med private void serializeSetPropertyCase(OMElement mediatorElem, BeanMediatorExt mediator) { - serializePropertyName(mediatorElem, mediator); - - if (mediator.getValue() != null) { - new ValueSerializer().serializeValue( - mediator.getValue(), BeanConstants.VALUE, mediatorElem); + serializePropertyName(mediatorElem, mediator); + + if (null != mediator.getValue()) { + // Check either value literal or expression is not null and not + // empty + if (StringUtils.isNotBlank(mediator.getValue().getKeyValue()) + || StringUtils.isNotBlank(mediator.getValue().getExpression().getExpression())) { + new ValueSerializer().serializeValue(mediator.getValue(), BeanConstants.VALUE, + mediatorElem); + } + } else { handleException(); } @@ -102,9 +109,16 @@ private void serializeGetPropertyCase(OMElement mediatorElem, BeanMediatorExt me serializePropertyName(mediatorElem, mediator); - if (mediator.getTargetValue() != null) { - new ValueSerializer().serializeValue( - mediator.getTargetValue(), BeanConstants.TARGET, mediatorElem); + if (null != mediator.getTargetValue()) { + // Check either value literal or expression is not null and not + // empty + if (StringUtils.isNotBlank(mediator.getTargetValue().getKeyValue()) + || StringUtils.isNotBlank(mediator.getTargetValue().getExpression() + .getExpression())) { + new ValueSerializer().serializeValue(mediator.getTargetValue(), + BeanConstants.TARGET, mediatorElem); + } + } else { handleException(); } @@ -112,7 +126,7 @@ private void serializeGetPropertyCase(OMElement mediatorElem, BeanMediatorExt me private void serializePropertyName(OMElement mediatorElem, BeanMediator mediator) { - if (mediator.getPropertyName() != null) { + if (StringUtils.isNotBlank(mediator.getPropertyName())) { mediatorElem.addAttribute(fac.createOMAttribute( BeanConstants.PROPERTY, nullNS, mediator.getPropertyName())); } else { diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/persistence/TransformationInfo.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/persistence/TransformationInfo.java index a3a90caf2d..7648a22958 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/persistence/TransformationInfo.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.persistence/src/org/wso2/developerstudio/eclipse/gmf/esb/persistence/TransformationInfo.java @@ -76,6 +76,10 @@ public EObject getPreviouNode(){ return previousNode; } + public EObject getFirstEndpoint(){ + return firstEndPoint; + } + public ListMediator getCurrentReferredSequence(){ return currentReferredSequence; } @@ -113,6 +117,10 @@ public void setPreviousNode(EObject previousNode){ this.previousNode=previousNode; } + public void setFirstEndpoint(EObject firstEndpointNode){ + this.firstEndPoint = firstEndpointNode; + } + public void setCurrentReferredSequence(ListMediator currentReferredSequence){ this.currentReferredSequence=currentReferredSequence; } diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb/META-INF/MANIFEST.MF b/esb/org.wso2.developerstudio.eclipse.gmf.esb/META-INF/MANIFEST.MF index 992c5c1e5a..073ae94529 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb/META-INF/MANIFEST.MF +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.wso2.developerstudio.eclipse.gmf.esb;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb/model/esb.ecore b/esb/org.wso2.developerstudio.eclipse.gmf.esb/model/esb.ecore index 1397428df1..f4648696c6 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb/model/esb.ecore +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb/model/esb.ecore @@ -2033,7 +2033,7 @@ containment="true"/> - + - + diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb/pom.xml b/esb/org.wso2.developerstudio.eclipse.gmf.esb/pom.xml index 92ac7a02ae..9306b7edb3 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb/pom.xml +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb/pom.xml @@ -20,12 +20,12 @@ org.wso2.developerstudio esb-tool-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.gmf.esb eclipse-plugin - 2.0.0-SNAPSHOT + 2.0.0 Developer Studio ESB Graphical Editor *

    - * If the meaning of the 'Continue Route' attribute isn't clear, + * If the meaning of the 'Continue After Route' attribute isn't clear, * there really should be more of a description here... *

    * - * @return the value of the 'Continue Route' attribute. - * @see #setContinueRoute(boolean) - * @see org.wso2.developerstudio.eclipse.gmf.esb.EsbPackage#getConditionalRouterMediator_ContinueRoute() + * @return the value of the 'Continue After Route' attribute. + * @see #setContinueAfterRoute(boolean) + * @see org.wso2.developerstudio.eclipse.gmf.esb.EsbPackage#getConditionalRouterMediator_ContinueAfterRoute() * @model * @generated */ - boolean isContinueRoute(); + boolean isContinueAfterRoute(); /** - * Sets the value of the '{@link org.wso2.developerstudio.eclipse.gmf.esb.ConditionalRouterMediator#isContinueRoute Continue Route}' attribute. + * Sets the value of the '{@link org.wso2.developerstudio.eclipse.gmf.esb.ConditionalRouterMediator#isContinueAfterRoute Continue After Route}' attribute. * * - * @param value the new value of the 'Continue Route' attribute. - * @see #isContinueRoute() + * @param value the new value of the 'Continue After Route' attribute. + * @see #isContinueAfterRoute() * @generated */ - void setContinueRoute(boolean value); + void setContinueAfterRoute(boolean value); /** * Returns the value of the 'Conditional Route Branches' containment reference list. diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/EsbPackage.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/EsbPackage.java index 6cb1d6f34f..6eff1470e5 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/EsbPackage.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/EsbPackage.java @@ -14654,13 +14654,13 @@ public interface EsbPackage extends EPackage { int CONDITIONAL_ROUTER_MEDIATOR__REVERSE = MEDIATOR__REVERSE; /** - * The feature id for the 'Continue Route' attribute. + * The feature id for the 'Continue After Route' attribute. * * * @generated * @ordered */ - int CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE = MEDIATOR_FEATURE_COUNT + 0; + int CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE = MEDIATOR_FEATURE_COUNT + 0; /** * The feature id for the 'Conditional Route Branches' containment reference list. @@ -32925,15 +32925,15 @@ public interface EsbPackage extends EPackage { EClass getConditionalRouterMediator(); /** - * Returns the meta object for the attribute '{@link org.wso2.developerstudio.eclipse.gmf.esb.ConditionalRouterMediator#isContinueRoute Continue Route}'. + * Returns the meta object for the attribute '{@link org.wso2.developerstudio.eclipse.gmf.esb.ConditionalRouterMediator#isContinueAfterRoute Continue After Route}'. * * - * @return the meta object for the attribute 'Continue Route'. - * @see org.wso2.developerstudio.eclipse.gmf.esb.ConditionalRouterMediator#isContinueRoute() + * @return the meta object for the attribute 'Continue After Route'. + * @see org.wso2.developerstudio.eclipse.gmf.esb.ConditionalRouterMediator#isContinueAfterRoute() * @see #getConditionalRouterMediator() * @generated */ - EAttribute getConditionalRouterMediator_ContinueRoute(); + EAttribute getConditionalRouterMediator_ContinueAfterRoute(); /** * Returns the meta object for the containment reference list '{@link org.wso2.developerstudio.eclipse.gmf.esb.ConditionalRouterMediator#getConditionalRouteBranches Conditional Route Branches}'. @@ -44563,12 +44563,12 @@ interface Literals { EClass CONDITIONAL_ROUTER_MEDIATOR = eINSTANCE.getConditionalRouterMediator(); /** - * The meta object literal for the 'Continue Route' attribute feature. + * The meta object literal for the 'Continue After Route' attribute feature. * * * @generated */ - EAttribute CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE = eINSTANCE.getConditionalRouterMediator_ContinueRoute(); + EAttribute CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE = eINSTANCE.getConditionalRouterMediator_ContinueAfterRoute(); /** * The meta object literal for the 'Conditional Route Branches' containment reference list feature. diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/AbstractCommonTargetImpl.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/AbstractCommonTargetImpl.java index 2ee28b5312..2a4b50cf49 100755 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/AbstractCommonTargetImpl.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/AbstractCommonTargetImpl.java @@ -86,10 +86,10 @@ public class AbstractCommonTargetImpl extends EsbNodeImpl implements AbstractCom * * * @see #getEndpointType() - * @generated + * @generated NOT * @ordered */ - protected static final TargetEndpointType ENDPOINT_TYPE_EDEFAULT = TargetEndpointType.NONE; + protected static final TargetEndpointType ENDPOINT_TYPE_EDEFAULT = TargetEndpointType.ANONYMOUS; /** * The cached value of the '{@link #getEndpointType() Endpoint Type}' attribute. diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/ConditionalRouterMediatorImpl.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/ConditionalRouterMediatorImpl.java index 35944a10d8..f561778da6 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/ConditionalRouterMediatorImpl.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/ConditionalRouterMediatorImpl.java @@ -36,7 +36,7 @@ *

    * The following features are implemented: *

      - *
    • {@link org.wso2.developerstudio.eclipse.gmf.esb.impl.ConditionalRouterMediatorImpl#isContinueRoute Continue Route}
    • + *
    • {@link org.wso2.developerstudio.eclipse.gmf.esb.impl.ConditionalRouterMediatorImpl#isContinueAfterRoute Continue After Route}
    • *
    • {@link org.wso2.developerstudio.eclipse.gmf.esb.impl.ConditionalRouterMediatorImpl#getConditionalRouteBranches Conditional Route Branches}
    • *
    • {@link org.wso2.developerstudio.eclipse.gmf.esb.impl.ConditionalRouterMediatorImpl#getInputConnector Input Connector}
    • *
    • {@link org.wso2.developerstudio.eclipse.gmf.esb.impl.ConditionalRouterMediatorImpl#getOutputConnector Output Connector}
    • @@ -49,24 +49,24 @@ */ public class ConditionalRouterMediatorImpl extends MediatorImpl implements ConditionalRouterMediator { /** - * The default value of the '{@link #isContinueRoute() Continue Route}' attribute. + * The default value of the '{@link #isContinueAfterRoute() Continue After Route}' attribute. * * - * @see #isContinueRoute() + * @see #isContinueAfterRoute() * @generated * @ordered */ - protected static final boolean CONTINUE_ROUTE_EDEFAULT = false; + protected static final boolean CONTINUE_AFTER_ROUTE_EDEFAULT = false; /** - * The cached value of the '{@link #isContinueRoute() Continue Route}' attribute. + * The cached value of the '{@link #isContinueAfterRoute() Continue After Route}' attribute. * * - * @see #isContinueRoute() + * @see #isContinueAfterRoute() * @generated * @ordered */ - protected boolean continueRoute = CONTINUE_ROUTE_EDEFAULT; + protected boolean continueAfterRoute = CONTINUE_AFTER_ROUTE_EDEFAULT; /** * The cached value of the '{@link #getConditionalRouteBranches() Conditional Route Branches}' containment reference list. @@ -143,8 +143,8 @@ protected EClass eStaticClass() { * * @generated */ - public boolean isContinueRoute() { - return continueRoute; + public boolean isContinueAfterRoute() { + return continueAfterRoute; } /** @@ -152,11 +152,11 @@ public boolean isContinueRoute() { * * @generated */ - public void setContinueRoute(boolean newContinueRoute) { - boolean oldContinueRoute = continueRoute; - continueRoute = newContinueRoute; + public void setContinueAfterRoute(boolean newContinueAfterRoute) { + boolean oldContinueAfterRoute = continueAfterRoute; + continueAfterRoute = newContinueAfterRoute; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE, oldContinueRoute, continueRoute)); + eNotify(new ENotificationImpl(this, Notification.SET, EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE, oldContinueAfterRoute, continueAfterRoute)); } /** @@ -375,8 +375,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE: - return isContinueRoute(); + case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE: + return isContinueAfterRoute(); case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONDITIONAL_ROUTE_BRANCHES: return getConditionalRouteBranches(); case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__INPUT_CONNECTOR: @@ -401,8 +401,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { public void eSet(int featureID, Object newValue) { switch (featureID) { - case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE: - setContinueRoute((Boolean)newValue); + case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE: + setContinueAfterRoute((Boolean)newValue); return; case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONDITIONAL_ROUTE_BRANCHES: getConditionalRouteBranches().clear(); @@ -433,8 +433,8 @@ public void eSet(int featureID, Object newValue) { @Override public void eUnset(int featureID) { switch (featureID) { - case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE: - setContinueRoute(CONTINUE_ROUTE_EDEFAULT); + case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE: + setContinueAfterRoute(CONTINUE_AFTER_ROUTE_EDEFAULT); return; case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONDITIONAL_ROUTE_BRANCHES: getConditionalRouteBranches().clear(); @@ -464,8 +464,8 @@ public void eUnset(int featureID) { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE: - return continueRoute != CONTINUE_ROUTE_EDEFAULT; + case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE: + return continueAfterRoute != CONTINUE_AFTER_ROUTE_EDEFAULT; case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__CONDITIONAL_ROUTE_BRANCHES: return conditionalRouteBranches != null && !conditionalRouteBranches.isEmpty(); case EsbPackage.CONDITIONAL_ROUTER_MEDIATOR__INPUT_CONNECTOR: @@ -491,8 +491,8 @@ public String toString() { if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (continueRoute: "); - result.append(continueRoute); + result.append(" (continueAfterRoute: "); + result.append(continueAfterRoute); result.append(')'); return result.toString(); } diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/EsbPackageImpl.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/EsbPackageImpl.java index d90f54afc9..17f2531c61 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/EsbPackageImpl.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/EsbPackageImpl.java @@ -13691,7 +13691,7 @@ public EClass getConditionalRouterMediator() { * * @generated */ - public EAttribute getConditionalRouterMediator_ContinueRoute() { + public EAttribute getConditionalRouterMediator_ContinueAfterRoute() { return (EAttribute)conditionalRouterMediatorEClass.getEStructuralFeatures().get(0); } @@ -16696,7 +16696,7 @@ public void createPackageContents() { createEReference(conditionalRouteBranchEClass, CONDITIONAL_ROUTE_BRANCH__TARGET_SEQUENCE); conditionalRouterMediatorEClass = createEClass(CONDITIONAL_ROUTER_MEDIATOR); - createEAttribute(conditionalRouterMediatorEClass, CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_ROUTE); + createEAttribute(conditionalRouterMediatorEClass, CONDITIONAL_ROUTER_MEDIATOR__CONTINUE_AFTER_ROUTE); createEReference(conditionalRouterMediatorEClass, CONDITIONAL_ROUTER_MEDIATOR__CONDITIONAL_ROUTE_BRANCHES); createEReference(conditionalRouterMediatorEClass, CONDITIONAL_ROUTER_MEDIATOR__INPUT_CONNECTOR); createEReference(conditionalRouterMediatorEClass, CONDITIONAL_ROUTER_MEDIATOR__OUTPUT_CONNECTOR); @@ -18719,7 +18719,7 @@ public void initializePackageContents() { initEReference(getConditionalRouteBranch_TargetSequence(), this.getRegistryKeyProperty(), null, "targetSequence", null, 0, 1, ConditionalRouteBranch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(conditionalRouterMediatorEClass, ConditionalRouterMediator.class, "ConditionalRouterMediator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getConditionalRouterMediator_ContinueRoute(), ecorePackage.getEBoolean(), "continueRoute", null, 0, 1, ConditionalRouterMediator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getConditionalRouterMediator_ContinueAfterRoute(), ecorePackage.getEBoolean(), "continueAfterRoute", null, 0, 1, ConditionalRouterMediator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getConditionalRouterMediator_ConditionalRouteBranches(), this.getConditionalRouteBranch(), null, "conditionalRouteBranches", null, 0, -1, ConditionalRouterMediator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getConditionalRouterMediator_InputConnector(), this.getConditionalRouterMediatorInputConnector(), null, "inputConnector", null, 0, 1, ConditionalRouterMediator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getConditionalRouterMediator_OutputConnector(), this.getConditionalRouterMediatorOutputConnector(), null, "outputConnector", null, 0, 1, ConditionalRouterMediator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/InputConnectorImpl.java b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/InputConnectorImpl.java index 7ae39bde90..5839509093 100644 --- a/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/InputConnectorImpl.java +++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/InputConnectorImpl.java @@ -8,7 +8,6 @@ import java.util.Collection; import java.util.Iterator; - import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -17,6 +16,7 @@ import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; import org.wso2.developerstudio.eclipse.gmf.esb.CallMediatorEndpointOutputConnector; +import org.wso2.developerstudio.eclipse.gmf.esb.CloneMediatorTargetOutputConnector; import org.wso2.developerstudio.eclipse.gmf.esb.ComplexEndpointsOutputConnector; import org.wso2.developerstudio.eclipse.gmf.esb.EndPoint; import org.wso2.developerstudio.eclipse.gmf.esb.EsbLink; @@ -98,7 +98,7 @@ public boolean shouldConnect(OutputConnector sourceEnd) { /* * Avoid connecting an endpoint to an element other than Send mediator. */ - if (!(sourceEnd instanceof SendMediatorEndpointOutputConnector) && !(sourceEnd instanceof CallMediatorEndpointOutputConnector) + if (!(sourceEnd instanceof SendMediatorEndpointOutputConnector) && !(sourceEnd instanceof CallMediatorEndpointOutputConnector) && !(sourceEnd instanceof CloneMediatorTargetOutputConnector) && !(sourceEnd instanceof ComplexEndpointsOutputConnector) && this.eContainer instanceof EndPoint) { return false; diff --git a/esb/pom.xml b/esb/pom.xml index 7a72331d9e..14de172ba4 100644 --- a/esb/pom.xml +++ b/esb/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio esb-tool-parent @@ -79,12 +79,12 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 diff --git a/features/SoapUI/org.wso2.soapui.feature/pom.xml b/features/SoapUI/org.wso2.soapui.feature/pom.xml index c8580d5319..de21c7a448 100644 --- a/features/SoapUI/org.wso2.soapui.feature/pom.xml +++ b/features/SoapUI/org.wso2.soapui.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-developerstudio-soapui-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/SoapUI/pom.xml b/features/SoapUI/pom.xml index ec16b6c838..2c48ee6fa2 100755 --- a/features/SoapUI/pom.xml +++ b/features/SoapUI/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/app-server/org.wso2.developerstudio.eclipse.appserver.artifact.feature/pom.xml b/features/app-server/org.wso2.developerstudio.eclipse.appserver.artifact.feature/pom.xml index 66a484c5f1..8f8ccf052d 100644 --- a/features/app-server/org.wso2.developerstudio.eclipse.appserver.artifact.feature/pom.xml +++ b/features/app-server/org.wso2.developerstudio.eclipse.appserver.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-appserver-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/app-server/org.wso2.developerstudio.eclipse.appserver.feature/pom.xml b/features/app-server/org.wso2.developerstudio.eclipse.appserver.feature/pom.xml index cc74705f6e..23674dd00d 100644 --- a/features/app-server/org.wso2.developerstudio.eclipse.appserver.feature/pom.xml +++ b/features/app-server/org.wso2.developerstudio.eclipse.appserver.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-appserver-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/app-server/pom.xml b/features/app-server/pom.xml index 996c3466de..ab98443737 100755 --- a/features/app-server/pom.xml +++ b/features/app-server/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/appfactory/org.wso2.developerstudio.eclipse.appfactory.feature/pom.xml b/features/appfactory/org.wso2.developerstudio.eclipse.appfactory.feature/pom.xml index 85c63f5d95..cb234e1d71 100644 --- a/features/appfactory/org.wso2.developerstudio.eclipse.appfactory.feature/pom.xml +++ b/features/appfactory/org.wso2.developerstudio.eclipse.appfactory.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-appfactory-feature - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 diff --git a/features/appfactory/pom.xml b/features/appfactory/pom.xml index d4fb175854..6b214d6372 100755 --- a/features/appfactory/pom.xml +++ b/features/appfactory/pom.xml @@ -5,12 +5,12 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 wso2-eclipse-appfactory-feature - 2.0.0-SNAPSHOT + 2.0.0 pom WSO2 Eclipse App Factory Features diff --git a/features/bps/org.wso2.developerstudio.eclipse.bpel.artifact.feature/pom.xml b/features/bps/org.wso2.developerstudio.eclipse.bpel.artifact.feature/pom.xml index c402a22878..1f7aca61e4 100644 --- a/features/bps/org.wso2.developerstudio.eclipse.bpel.artifact.feature/pom.xml +++ b/features/bps/org.wso2.developerstudio.eclipse.bpel.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-developerstudio-bpel-features - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/bps/org.wso2.developerstudio.eclipse.bpel.feature/pom.xml b/features/bps/org.wso2.developerstudio.eclipse.bpel.feature/pom.xml index 6ae8a40ff9..a5dd135b3d 100644 --- a/features/bps/org.wso2.developerstudio.eclipse.bpel.feature/pom.xml +++ b/features/bps/org.wso2.developerstudio.eclipse.bpel.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-developerstudio-bpel-features - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/bps/pom.xml b/features/bps/pom.xml index 146d4c60fa..c6d1d36a5f 100755 --- a/features/bps/pom.xml +++ b/features/bps/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/brs/org.wso2.developerstudio.eclipse.brs.artifact.feature/pom.xml b/features/brs/org.wso2.developerstudio.eclipse.brs.artifact.feature/pom.xml index 894bfc567e..1d451f5f7f 100755 --- a/features/brs/org.wso2.developerstudio.eclipse.brs.artifact.feature/pom.xml +++ b/features/brs/org.wso2.developerstudio.eclipse.brs.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-developerstudio-brs-feature - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 diff --git a/features/brs/pom.xml b/features/brs/pom.xml index 051032d1d2..00f9c5b10f 100755 --- a/features/brs/pom.xml +++ b/features/brs/pom.xml @@ -5,12 +5,12 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 wso2-eclipse-developerstudio-brs-feature - 2.0.0-SNAPSHOT + 2.0.0 pom WSO2 Eclipse BRS Features diff --git a/features/capp/org.wso2.developerstudio.eclipse.capp.artifacts.feature/pom.xml b/features/capp/org.wso2.developerstudio.eclipse.capp.artifacts.feature/pom.xml index 93d46f45a3..1acf18b351 100644 --- a/features/capp/org.wso2.developerstudio.eclipse.capp.artifacts.feature/pom.xml +++ b/features/capp/org.wso2.developerstudio.eclipse.capp.artifacts.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.developerstudio wso2-eclipse-capp-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.capp.artifacts.feature diff --git a/features/capp/org.wso2.developerstudio.eclipse.capp.feature/pom.xml b/features/capp/org.wso2.developerstudio.eclipse.capp.feature/pom.xml index ed418dc7e5..5471d53000 100644 --- a/features/capp/org.wso2.developerstudio.eclipse.capp.feature/pom.xml +++ b/features/capp/org.wso2.developerstudio.eclipse.capp.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio wso2-eclipse-capp-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.capp.feature diff --git a/features/capp/org.wso2.developerstudio.eclipse.capp.framework.feature/pom.xml b/features/capp/org.wso2.developerstudio.eclipse.capp.framework.feature/pom.xml index 4d97cb56df..ffa5a0982a 100644 --- a/features/capp/org.wso2.developerstudio.eclipse.capp.framework.feature/pom.xml +++ b/features/capp/org.wso2.developerstudio.eclipse.capp.framework.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio wso2-eclipse-capp-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.capp.framework.feature diff --git a/features/capp/pom.xml b/features/capp/pom.xml index ce5faf18b1..04051388b1 100755 --- a/features/capp/pom.xml +++ b/features/capp/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/carbon-studio/pom.xml b/features/carbon-studio/pom.xml index cc4f4c715a..9f77c89d99 100644 --- a/features/carbon-studio/pom.xml +++ b/features/carbon-studio/pom.xml @@ -22,7 +22,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio @@ -80,11 +80,11 @@ diff --git a/features/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle.artifact.feature/pom.xml b/features/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle.artifact.feature/pom.xml index dfeda7e232..b33e7529ce 100644 --- a/features/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle.artifact.feature/pom.xml +++ b/features/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-carbon-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle.feature/pom.xml b/features/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle.feature/pom.xml index b23dff7f14..6e956adda4 100644 --- a/features/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle.feature/pom.xml +++ b/features/carbon/org.wso2.developerstudio.eclipse.carbon.uibundle.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-carbon-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/carbon/pom.xml b/features/carbon/pom.xml index 0a45da66bb..d9dd9e9af0 100644 --- a/features/carbon/pom.xml +++ b/features/carbon/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/cep/org.wso2.developerstudio.eclipse.cep.artifact.feature/pom.xml b/features/cep/org.wso2.developerstudio.eclipse.cep.artifact.feature/pom.xml index 3e410be424..eaabffbca7 100755 --- a/features/cep/org.wso2.developerstudio.eclipse.cep.artifact.feature/pom.xml +++ b/features/cep/org.wso2.developerstudio.eclipse.cep.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-developerstudio-cep-feature - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 diff --git a/features/cep/pom.xml b/features/cep/pom.xml index 1ac5f2421f..640d9aad3e 100755 --- a/features/cep/pom.xml +++ b/features/cep/pom.xml @@ -5,12 +5,12 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 wso2-eclipse-developerstudio-cep-feature - 2.0.0-SNAPSHOT + 2.0.0 pom WSO2 Eclipse CEP Features diff --git a/features/connectors/org.wso2.developerstudio.eclipse.bpel.connector.feature/pom.xml b/features/connectors/org.wso2.developerstudio.eclipse.bpel.connector.feature/pom.xml index 91eda9d4ce..e4068fe53c 100644 --- a/features/connectors/org.wso2.developerstudio.eclipse.bpel.connector.feature/pom.xml +++ b/features/connectors/org.wso2.developerstudio.eclipse.bpel.connector.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.developerstudio wso2-eclipse-connector-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.bpel.connector.feature diff --git a/features/connectors/org.wso2.developerstudio.eclipse.registry.connector.feature/pom.xml b/features/connectors/org.wso2.developerstudio.eclipse.registry.connector.feature/pom.xml index d914ec1e32..0b9f458c5a 100644 --- a/features/connectors/org.wso2.developerstudio.eclipse.registry.connector.feature/pom.xml +++ b/features/connectors/org.wso2.developerstudio.eclipse.registry.connector.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.developerstudio wso2-eclipse-connector-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.registry.connector.feature diff --git a/features/connectors/pom.xml b/features/connectors/pom.xml index bd0e052b4d..fcb6fad4fe 100755 --- a/features/connectors/pom.xml +++ b/features/connectors/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/core/org.wso2.developerstudio.eclipse.framework.core.feature/pom.xml b/features/core/org.wso2.developerstudio.eclipse.framework.core.feature/pom.xml index dbe32891e2..34140f1d6b 100644 --- a/features/core/org.wso2.developerstudio.eclipse.framework.core.feature/pom.xml +++ b/features/core/org.wso2.developerstudio.eclipse.framework.core.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.developerstudio wso2-eclipse-framework-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.framework.core.feature diff --git a/features/core/org.wso2.developerstudio.eclipse.framework.samples.feature/pom.xml b/features/core/org.wso2.developerstudio.eclipse.framework.samples.feature/pom.xml index e377638d20..272594ab1e 100644 --- a/features/core/org.wso2.developerstudio.eclipse.framework.samples.feature/pom.xml +++ b/features/core/org.wso2.developerstudio.eclipse.framework.samples.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.developerstudio wso2-eclipse-framework-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.framework.samples.feature diff --git a/features/core/pom.xml b/features/core/pom.xml index e68b748076..ef5e6db3c3 100755 --- a/features/core/pom.xml +++ b/features/core/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/data-services/org.wso2.developerstudio.eclipse.ds.artifact.feature/pom.xml b/features/data-services/org.wso2.developerstudio.eclipse.ds.artifact.feature/pom.xml index 2aa1b0e775..6d29d9e687 100644 --- a/features/data-services/org.wso2.developerstudio.eclipse.ds.artifact.feature/pom.xml +++ b/features/data-services/org.wso2.developerstudio.eclipse.ds.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-ds-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/data-services/org.wso2.developerstudio.eclipse.ds.feature/pom.xml b/features/data-services/org.wso2.developerstudio.eclipse.ds.feature/pom.xml index 1cd8793abc..48be69e492 100644 --- a/features/data-services/org.wso2.developerstudio.eclipse.ds.feature/pom.xml +++ b/features/data-services/org.wso2.developerstudio.eclipse.ds.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-ds-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/data-services/pom.xml b/features/data-services/pom.xml index 46accfe425..857ddf47ac 100644 --- a/features/data-services/pom.xml +++ b/features/data-services/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/distribution/org.wso2.developerstudio.eclipse.distribution.project.feature/pom.xml b/features/distribution/org.wso2.developerstudio.eclipse.distribution.project.feature/pom.xml index 84fcd79fe9..94159974ef 100644 --- a/features/distribution/org.wso2.developerstudio.eclipse.distribution.project.feature/pom.xml +++ b/features/distribution/org.wso2.developerstudio.eclipse.distribution.project.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio wso2-eclipse-distribution-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.distribution.project.feature diff --git a/features/distribution/pom.xml b/features/distribution/pom.xml index 8243b59462..6044bf08b6 100644 --- a/features/distribution/pom.xml +++ b/features/distribution/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/esb/org.wso2.developerstudio.eclipse.esb.artifact.feature/pom.xml b/features/esb/org.wso2.developerstudio.eclipse.esb.artifact.feature/pom.xml index e88aa4d495..f9d4f62370 100644 --- a/features/esb/org.wso2.developerstudio.eclipse.esb.artifact.feature/pom.xml +++ b/features/esb/org.wso2.developerstudio.eclipse.esb.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-esb-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/esb/org.wso2.developerstudio.eclipse.esb.feature/pom.xml b/features/esb/org.wso2.developerstudio.eclipse.esb.feature/pom.xml index 3e3e76229f..c00e63860f 100644 --- a/features/esb/org.wso2.developerstudio.eclipse.esb.feature/pom.xml +++ b/features/esb/org.wso2.developerstudio.eclipse.esb.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-esb-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/features/esb/org.wso2.developerstudio.eclipse.esb.graphical.editor.feature/pom.xml b/features/esb/org.wso2.developerstudio.eclipse.esb.graphical.editor.feature/pom.xml index 16e0ef0ea0..78761a5e07 100644 --- a/features/esb/org.wso2.developerstudio.eclipse.esb.graphical.editor.feature/pom.xml +++ b/features/esb/org.wso2.developerstudio.eclipse.esb.graphical.editor.feature/pom.xml @@ -23,12 +23,12 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-esb-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.esb.graphical.editor.feature - 2.0.0-SNAPSHOT + 2.0.0 pom Enterprise Service Bus Graphical Editor Tools http://wso2.org diff --git a/features/esb/pom.xml b/features/esb/pom.xml index dedc702797..89eac7e7cc 100644 --- a/features/esb/pom.xml +++ b/features/esb/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/gadgets/com.googlecode.osde.feature/pom.xml b/features/gadgets/com.googlecode.osde.feature/pom.xml index 4e50170f32..98a73f69c9 100644 --- a/features/gadgets/com.googlecode.osde.feature/pom.xml +++ b/features/gadgets/com.googlecode.osde.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-gadget-feature - 4.0.0-SNAPSHOT + 3.7.0 com.googlecode.wso2 4.0.0 diff --git a/features/gadgets/org.wso2.developerstudio.eclipse.gadget.artifact.feature/pom.xml b/features/gadgets/org.wso2.developerstudio.eclipse.gadget.artifact.feature/pom.xml index 3d72eb13b1..2e390faf38 100644 --- a/features/gadgets/org.wso2.developerstudio.eclipse.gadget.artifact.feature/pom.xml +++ b/features/gadgets/org.wso2.developerstudio.eclipse.gadget.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-gadget-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.gadget.artifact.feature diff --git a/features/gadgets/org.wso2.developerstudio.eclipse.gs.jaggery.feature/pom.xml b/features/gadgets/org.wso2.developerstudio.eclipse.gs.jaggery.feature/pom.xml index 6e7d3daa25..127c34ea3b 100644 --- a/features/gadgets/org.wso2.developerstudio.eclipse.gs.jaggery.feature/pom.xml +++ b/features/gadgets/org.wso2.developerstudio.eclipse.gs.jaggery.feature/pom.xml @@ -23,11 +23,11 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-gadget-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.gs.jaggery.feature - 2.0.0-SNAPSHOT + 2.0.0 pom Developer Studio Jaggery Editor http://wso2.org diff --git a/features/gadgets/pom.xml b/features/gadgets/pom.xml index d535e66030..5e3dc7d7b4 100644 --- a/features/gadgets/pom.xml +++ b/features/gadgets/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/installed-distributions/developer-studio-eclipse-jee-kepler-linux-gtk-x86_64/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-kepler-linux-gtk-x86_64/pom.xml index 20da6ca476..71b8452b16 100755 --- a/features/installed-distributions/developer-studio-eclipse-jee-kepler-linux-gtk-x86_64/pom.xml +++ b/features/installed-distributions/developer-studio-eclipse-jee-kepler-linux-gtk-x86_64/pom.xml @@ -21,7 +21,7 @@ org.wso2.eclipse wso2-developer-studio-eclipse-distributions-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio developer-studio-eclipse-jee-kepler-linux-gtk-x86_64 @@ -329,12 +329,10 @@ - + - - @@ -354,8 +352,8 @@ - - + @@ -373,7 +371,7 @@ - + @@ -400,8 +398,8 @@ - - + diff --git a/features/installed-distributions/developer-studio-eclipse-jee-kepler-linux-gtk/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-kepler-linux-gtk/pom.xml index be6e2343d5..37ab863051 100755 --- a/features/installed-distributions/developer-studio-eclipse-jee-kepler-linux-gtk/pom.xml +++ b/features/installed-distributions/developer-studio-eclipse-jee-kepler-linux-gtk/pom.xml @@ -21,7 +21,7 @@ org.wso2.eclipse wso2-developer-studio-eclipse-distributions-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio developer-studio-eclipse-jee-kepler-linux-gtk @@ -333,12 +333,10 @@ - + - - @@ -358,8 +356,8 @@ - - + @@ -404,8 +402,8 @@ - - + diff --git a/features/installed-distributions/developer-studio-eclipse-jee-kepler-macosx-cocoa-x86_64/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-kepler-macosx-cocoa-x86_64/pom.xml index 019afea314..18364794d3 100755 --- a/features/installed-distributions/developer-studio-eclipse-jee-kepler-macosx-cocoa-x86_64/pom.xml +++ b/features/installed-distributions/developer-studio-eclipse-jee-kepler-macosx-cocoa-x86_64/pom.xml @@ -21,7 +21,7 @@ org.wso2.eclipse wso2-developer-studio-eclipse-distributions-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio developer-studio-eclipse-jee-kepler-macosx-cocoa-x86_64 @@ -326,12 +326,10 @@ - + - - @@ -351,8 +349,8 @@ - - + @@ -397,8 +395,8 @@ - - + diff --git a/features/installed-distributions/developer-studio-eclipse-jee-kepler-macosx-cocoa/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-kepler-macosx-cocoa/pom.xml index 007fb7d5f8..6be7f074c9 100755 --- a/features/installed-distributions/developer-studio-eclipse-jee-kepler-macosx-cocoa/pom.xml +++ b/features/installed-distributions/developer-studio-eclipse-jee-kepler-macosx-cocoa/pom.xml @@ -21,7 +21,7 @@ org.wso2.eclipse wso2-developer-studio-eclipse-distributions-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio developer-studio-eclipse-jee-kepler-macosx-cocoa @@ -329,12 +329,10 @@ - + - - @@ -354,8 +352,8 @@ - - + @@ -400,8 +398,8 @@ - - + + diff --git a/features/installed-distributions/developer-studio-eclipse-jee-kepler-win32/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-kepler-win32/pom.xml index d97faa8d7d..be58e6086c 100755 --- a/features/installed-distributions/developer-studio-eclipse-jee-kepler-win32/pom.xml +++ b/features/installed-distributions/developer-studio-eclipse-jee-kepler-win32/pom.xml @@ -21,7 +21,7 @@ org.wso2.eclipse wso2-developer-studio-eclipse-distributions-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio developer-studio-eclipse-jee-kepler-win32 @@ -325,11 +325,9 @@ - + - - @@ -350,8 +348,8 @@ - - + @@ -396,8 +394,8 @@ - - + diff --git a/features/installed-distributions/developer-studio-eclipse-jee-kepler-win64-x86_64/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-kepler-win64-x86_64/pom.xml index 607d9b79cf..77defb14ef 100755 --- a/features/installed-distributions/developer-studio-eclipse-jee-kepler-win64-x86_64/pom.xml +++ b/features/installed-distributions/developer-studio-eclipse-jee-kepler-win64-x86_64/pom.xml @@ -21,7 +21,7 @@ org.wso2.eclipse wso2-developer-studio-eclipse-distributions-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio developer-studio-eclipse-jee-kepler-win64-x86_64 @@ -72,7 +72,7 @@ org.eclipse - eclipse-jee-kepler-win32-x86_64 + eclipse-jee-kepler-win64-x86_64 4.3.2 zip true @@ -325,12 +325,10 @@ - + - - @@ -350,8 +348,8 @@ - - + @@ -396,8 +394,8 @@ - - + diff --git a/features/installed-distributions/pom.xml b/features/installed-distributions/pom.xml index 83c20464c7..245347c476 100644 --- a/features/installed-distributions/pom.xml +++ b/features/installed-distributions/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 wso2-developer-studio-eclipse-distributions-parent @@ -39,7 +39,7 @@ org.wso2.eclipse wso2-developer-studio - 4.0.0-SNAPSHOT + 3.7.0 zip diff --git a/features/jaggery/org.wso2.developerstudio.eclipse.jaggery.artifact.feature/pom.xml b/features/jaggery/org.wso2.developerstudio.eclipse.jaggery.artifact.feature/pom.xml index 47dd46d07f..e83123e811 100644 --- a/features/jaggery/org.wso2.developerstudio.eclipse.jaggery.artifact.feature/pom.xml +++ b/features/jaggery/org.wso2.developerstudio.eclipse.jaggery.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-developerstudio-jaggery-feature - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 @@ -72,19 +72,19 @@ org.eclipse.dltk.core:org.eclipse.dltk.formatter:5.0.0.201306060709 dummy.groupid:org.h2_1.1.117:201105142352 - - org.eclipse.php:org.eclipse.php.debug.core:2.0.0-SNAPSHOT - org.eclipse.php:org.eclipse.php.debug.daemon:2.0.0-SNAPSHOT - org.eclipse.php:org.eclipse.php.debug.ui:2.0.0-SNAPSHOT - org.eclipse.php:org.eclipse.php.server.core:2.0.0-SNAPSHOT - - org.eclipse.php:org.eclipse.php.server.ui:2.0.0-SNAPSHOT - org.eclipse.php:org.eclipse.php.core.parser:2.0.0-SNAPSHOT - org.eclipse.php:org.eclipse.php.core:2.0.0-SNAPSHOT - - org.eclipse.php:org.eclipse.php.ui:2.0.0-SNAPSHOT - org.eclipse.php:org.eclipse.php.help:2.0.0-SNAPSHOT - org.eclipse.php:org.eclipse.php.mylyn.ui:2.0.0-SNAPSHOT + + org.eclipse.php:org.eclipse.php.debug.core:2.0.0 + org.eclipse.php:org.eclipse.php.debug.daemon:2.0.0 + org.eclipse.php:org.eclipse.php.debug.ui:2.0.0 + org.eclipse.php:org.eclipse.php.server.core:2.0.0 + + org.eclipse.php:org.eclipse.php.server.ui:2.0.0 + org.eclipse.php:org.eclipse.php.core.parser:2.0.0 + org.eclipse.php:org.eclipse.php.core:2.0.0 + + org.eclipse.php:org.eclipse.php.ui:2.0.0 + org.eclipse.php:org.eclipse.php.help:2.0.0 + org.eclipse.php:org.eclipse.php.mylyn.ui:2.0.0 diff --git a/features/jaggery/pom.xml b/features/jaggery/pom.xml index eb02b5340f..0b94e53a3d 100644 --- a/features/jaggery/pom.xml +++ b/features/jaggery/pom.xml @@ -5,12 +5,12 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 wso2-eclipse-developerstudio-jaggery-feature - 2.0.0-SNAPSHOT + 2.0.0 pom WSO2 Eclipse Jaggery Features diff --git a/features/library/org.wso2.developerstudio.eclipse.artifact.library.feature/pom.xml b/features/library/org.wso2.developerstudio.eclipse.artifact.library.feature/pom.xml index 5cf1e6b304..06dc898bca 100644 --- a/features/library/org.wso2.developerstudio.eclipse.artifact.library.feature/pom.xml +++ b/features/library/org.wso2.developerstudio.eclipse.artifact.library.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio wso2-eclipse-library-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.library.feature diff --git a/features/library/pom.xml b/features/library/pom.xml index 0c5ff984cf..96854d280a 100644 --- a/features/library/pom.xml +++ b/features/library/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/pom.xml b/features/pom.xml index 92c9d180b8..0cc38929ef 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 wso2-eclipse-tools-features @@ -58,7 +58,7 @@ jaggery - qos + carbon-studio repository diff --git a/features/qos/org.wso2.developerstudio.eclipse.qos.artifact.feature/pom.xml b/features/qos/org.wso2.developerstudio.eclipse.qos.artifact.feature/pom.xml index a7309ff6a2..a3af998ae3 100755 --- a/features/qos/org.wso2.developerstudio.eclipse.qos.artifact.feature/pom.xml +++ b/features/qos/org.wso2.developerstudio.eclipse.qos.artifact.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio wso2-eclipse-developerstudio-qos-feature - 2.0.0-SNAPSHOT + 2.0.0 4.0.0 diff --git a/features/qos/pom.xml b/features/qos/pom.xml index 4eb234f45b..25567a4a16 100755 --- a/features/qos/pom.xml +++ b/features/qos/pom.xml @@ -5,12 +5,12 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 wso2-eclipse-developerstudio-qos-feature - 2.0.0-SNAPSHOT + 2.0.0 pom WSO2 Eclipse QoS Features diff --git a/features/registry/org.wso2.developerstudio.eclipse.registry.artifact.feature/pom.xml b/features/registry/org.wso2.developerstudio.eclipse.registry.artifact.feature/pom.xml index 15e34da514..0406c94f5c 100644 --- a/features/registry/org.wso2.developerstudio.eclipse.registry.artifact.feature/pom.xml +++ b/features/registry/org.wso2.developerstudio.eclipse.registry.artifact.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-registry-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.registry.artifact.feature diff --git a/features/registry/org.wso2.developerstudio.eclipse.registry.feature/pom.xml b/features/registry/org.wso2.developerstudio.eclipse.registry.feature/pom.xml index e92b554230..172eb1a70b 100644 --- a/features/registry/org.wso2.developerstudio.eclipse.registry.feature/pom.xml +++ b/features/registry/org.wso2.developerstudio.eclipse.registry.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio wso2-eclipse-carbonstudio-registry-feature - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.registry.feature diff --git a/features/registry/pom.xml b/features/registry/pom.xml index 98b7e8e5a6..2faca43195 100755 --- a/features/registry/pom.xml +++ b/features/registry/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio 4.0.0 diff --git a/features/repository/pom.xml b/features/repository/pom.xml index 5f6adbe64c..4cd73207e3 100644 --- a/features/repository/pom.xml +++ b/features/repository/pom.xml @@ -18,7 +18,7 @@ org.wso2.eclipse wso2-eclipse-tools-features - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 wso2-developer-studio @@ -119,7 +119,7 @@ org.wso2.developerstudio:org.wso2.developerstudio.eclipse.brs.artifact.feature:${brs.feature.version} org.wso2.developerstudio:org.wso2.soapui.feature:${soapui.feature.version} org.wso2.developerstudio:org.wso2.tcpmon.feature:${tcpmon.feature.version} - org.wso2.developerstudio:org.wso2.developerstudio.eclipse.qos.artifact.feature:${qos.feature.version} + org.wso2.eclipse:org.wso2.developerstudio.eclipse.logging:${common.logging.version} @@ -261,7 +261,7 @@ org.wso2.developerstudio:org.wso2.developerstudio.eclipse.brs.artifact.feature:${brs.feature.version} org.wso2.developerstudio:org.wso2.soapui.feature:${soapui.feature.version} org.wso2.developerstudio:org.wso2.tcpmon.feature:${tcpmon.feature.version} - org.wso2.developerstudio:org.wso2.developerstudio.eclipse.qos.artifact.feature:${qos.feature.version} + diff --git a/jaggery/org.eclipse.php-feature/feature.xml b/jaggery/org.eclipse.php-feature/feature.xml index b20e82125f..a9ff614285 100644 --- a/jaggery/org.eclipse.php-feature/feature.xml +++ b/jaggery/org.eclipse.php-feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/jaggery/org.eclipse.php-feature/pom.xml b/jaggery/org.eclipse.php-feature/pom.xml index 25dddd99dd..e0ee6f3f8d 100644 --- a/jaggery/org.eclipse.php-feature/pom.xml +++ b/jaggery/org.eclipse.php-feature/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 eclipse-feature diff --git a/jaggery/org.eclipse.php-repository/category.xml b/jaggery/org.eclipse.php-repository/category.xml index eab442c295..7a3d51b46c 100644 --- a/jaggery/org.eclipse.php-repository/category.xml +++ b/jaggery/org.eclipse.php-repository/category.xml @@ -1,12 +1,12 @@ - + - + - + diff --git a/jaggery/org.eclipse.php-repository/pom.xml b/jaggery/org.eclipse.php-repository/pom.xml index d55f01a28f..0d645f4958 100644 --- a/jaggery/org.eclipse.php-repository/pom.xml +++ b/jaggery/org.eclipse.php-repository/pom.xml @@ -6,12 +6,12 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.repository - 2.0.0-SNAPSHOT + 2.0.0 eclipse-repository diff --git a/jaggery/org.eclipse.php.all-feature/feature.xml b/jaggery/org.eclipse.php.all-feature/feature.xml index 3d503f995c..d92054f763 100644 --- a/jaggery/org.eclipse.php.all-feature/feature.xml +++ b/jaggery/org.eclipse.php.all-feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/jaggery/org.eclipse.php.all-feature/pom.xml b/jaggery/org.eclipse.php.all-feature/pom.xml index c60c99c47f..aad39ce8a6 100644 --- a/jaggery/org.eclipse.php.all-feature/pom.xml +++ b/jaggery/org.eclipse.php.all-feature/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.all - 2.0.0-SNAPSHOT + 2.0.0 eclipse-feature diff --git a/jaggery/org.eclipse.php.astview/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.astview/META-INF/MANIFEST.MF index a1f80b2e82..48426e6ea8 100644 --- a/jaggery/org.eclipse.php.astview/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.astview/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Astview Plug-in Bundle-SymbolicName: org.eclipse.php.astview;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.astview.ASTViewPlugin Require-Bundle: org.eclipse.ui, org.eclipse.php.ui;bundle-version="1.0.0", diff --git a/jaggery/org.eclipse.php.core.parser/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.core.parser/META-INF/MANIFEST.MF index bbb91a6e51..36eb7ef6e8 100644 --- a/jaggery/org.eclipse.php.core.parser/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.core.parser/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.php.core.parser -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: java_cup, diff --git a/jaggery/org.eclipse.php.core.parser/pom.xml b/jaggery/org.eclipse.php.core.parser/pom.xml index 9dd3f68d01..97bdedee5e 100644 --- a/jaggery/org.eclipse.php.core.parser/pom.xml +++ b/jaggery/org.eclipse.php.core.parser/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.core.parser - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.core.performance.tests/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.core.performance.tests/META-INF/MANIFEST.MF index dd5c1d350b..9189500875 100644 --- a/jaggery/org.eclipse.php.core.performance.tests/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.core.performance.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Core Performance Tests Bundle-SymbolicName: org.eclipse.php.core.performance.tests;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.core.tests.performance.PHPCorePerformanceTests Require-Bundle: org.junit, org.eclipse.wst.sse.core;bundle-version="1.1.400", diff --git a/jaggery/org.eclipse.php.core.performance.tests/pom.xml b/jaggery/org.eclipse.php.core.performance.tests/pom.xml index f64c4805c2..6ba2ddd026 100644 --- a/jaggery/org.eclipse.php.core.performance.tests/pom.xml +++ b/jaggery/org.eclipse.php.core.performance.tests/pom.xml @@ -6,12 +6,12 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.core.performance.tests - 2.0.0-SNAPSHOT + 2.0.0 eclipse-test-plugin diff --git a/jaggery/org.eclipse.php.core.tests/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.core.tests/META-INF/MANIFEST.MF index 5571d588c9..16b5e598e0 100644 --- a/jaggery/org.eclipse.php.core.tests/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Core Unit Tests Bundle-SymbolicName: org.eclipse.php.core.tests;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.core.tests.PHPCoreTests Require-Bundle: org.junit, org.eclipse.core.runtime, diff --git a/jaggery/org.eclipse.php.core.tests/pom.xml b/jaggery/org.eclipse.php.core.tests/pom.xml index 0a7cde7d70..72e88837f4 100644 --- a/jaggery/org.eclipse.php.core.tests/pom.xml +++ b/jaggery/org.eclipse.php.core.tests/pom.xml @@ -6,12 +6,12 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.core.tests - 2.0.0-SNAPSHOT + 2.0.0 eclipse-test-plugin diff --git a/jaggery/org.eclipse.php.core/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.core/META-INF/MANIFEST.MF index aa303e8050..303947f573 100644 --- a/jaggery/org.eclipse.php.core/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.core/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.php.core;singleton=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Name: PDT Core Plug-in Bundle-Activator: org.eclipse.php.internal.core.PHPCorePlugin Bundle-Localization: plugin diff --git a/jaggery/org.eclipse.php.core/pom.xml b/jaggery/org.eclipse.php.core/pom.xml index aeb9ec2940..8fcb6eced8 100644 --- a/jaggery/org.eclipse.php.core/pom.xml +++ b/jaggery/org.eclipse.php.core/pom.xml @@ -6,12 +6,12 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.core - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.debug.core/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.debug.core/META-INF/MANIFEST.MF index 9546e939fc..d2744ff4e8 100644 --- a/jaggery/org.eclipse.php.debug.core/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.debug.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Core Plug-in Bundle-SymbolicName: org.eclipse.php.debug.core; singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.internal.debug.core.PHPDebugPlugin Bundle-Localization: plugin Eclipse-BuddyPolicy: registered diff --git a/jaggery/org.eclipse.php.debug.core/pom.xml b/jaggery/org.eclipse.php.debug.core/pom.xml index 4b0527b145..f62b14ac2d 100644 --- a/jaggery/org.eclipse.php.debug.core/pom.xml +++ b/jaggery/org.eclipse.php.debug.core/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.debug.core - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.debug.daemon/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.debug.daemon/META-INF/MANIFEST.MF index 46ac3cd9e7..8dc99759ff 100644 --- a/jaggery/org.eclipse.php.debug.daemon/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.debug.daemon/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Debug Daemon Plug-in Bundle-SymbolicName: org.eclipse.php.debug.daemon; singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.internal.debug.daemon.DaemonPlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui diff --git a/jaggery/org.eclipse.php.debug.daemon/pom.xml b/jaggery/org.eclipse.php.debug.daemon/pom.xml index 69b7274105..87f9932086 100644 --- a/jaggery/org.eclipse.php.debug.daemon/pom.xml +++ b/jaggery/org.eclipse.php.debug.daemon/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.debug.daemon - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.debug.ui/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.debug.ui/META-INF/MANIFEST.MF index df34b60870..5a6b948a92 100644 --- a/jaggery/org.eclipse.php.debug.ui/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.debug.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Debug UI Plug-in Bundle-SymbolicName: org.eclipse.php.debug.ui; singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.internal.debug.ui.PHPDebugUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/jaggery/org.eclipse.php.debug.ui/pom.xml b/jaggery/org.eclipse.php.debug.ui/pom.xml index 3945219764..ca279e7f83 100644 --- a/jaggery/org.eclipse.php.debug.ui/pom.xml +++ b/jaggery/org.eclipse.php.debug.ui/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.debug.ui - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.help/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.help/META-INF/MANIFEST.MF index 7a083385af..35d5c0894b 100644 --- a/jaggery/org.eclipse.php.help/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.help/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Help Plug-in Bundle-SymbolicName: org.eclipse.php.help; singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.help.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/jaggery/org.eclipse.php.help/pom.xml b/jaggery/org.eclipse.php.help/pom.xml index 3538ae9eb9..e21c5d5c88 100644 --- a/jaggery/org.eclipse.php.help/pom.xml +++ b/jaggery/org.eclipse.php.help/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.help - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.mylyn-feature/feature.xml b/jaggery/org.eclipse.php.mylyn-feature/feature.xml index 48e38111e7..5b24d2c8c0 100644 --- a/jaggery/org.eclipse.php.mylyn-feature/feature.xml +++ b/jaggery/org.eclipse.php.mylyn-feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/jaggery/org.eclipse.php.mylyn-feature/pom.xml b/jaggery/org.eclipse.php.mylyn-feature/pom.xml index 8fa104a987..524e20e5a0 100644 --- a/jaggery/org.eclipse.php.mylyn-feature/pom.xml +++ b/jaggery/org.eclipse.php.mylyn-feature/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.mylyn - 2.0.0-SNAPSHOT + 2.0.0 eclipse-feature diff --git a/jaggery/org.eclipse.php.mylyn.ui/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.mylyn.ui/META-INF/MANIFEST.MF index 99416ae7d7..1aaae2892e 100644 --- a/jaggery/org.eclipse.php.mylyn.ui/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.mylyn.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-SymbolicName: org.eclipse.php.mylyn.ui;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.mylyn.ui.PDTMylynPlugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.dltk.mylyn;resolution:=optional diff --git a/jaggery/org.eclipse.php.mylyn.ui/pom.xml b/jaggery/org.eclipse.php.mylyn.ui/pom.xml index 6e6c8022cf..22634bfb03 100644 --- a/jaggery/org.eclipse.php.mylyn.ui/pom.xml +++ b/jaggery/org.eclipse.php.mylyn.ui/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.mylyn.ui - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.sdk-feature/feature.xml b/jaggery/org.eclipse.php.sdk-feature/feature.xml index 0c3238f4c5..ad942d708c 100644 --- a/jaggery/org.eclipse.php.sdk-feature/feature.xml +++ b/jaggery/org.eclipse.php.sdk-feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/jaggery/org.eclipse.php.sdk-feature/pom.xml b/jaggery/org.eclipse.php.sdk-feature/pom.xml index 17022f4d93..a055cdef5b 100644 --- a/jaggery/org.eclipse.php.sdk-feature/pom.xml +++ b/jaggery/org.eclipse.php.sdk-feature/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.sdk - 2.0.0-SNAPSHOT + 2.0.0 eclipse-feature diff --git a/jaggery/org.eclipse.php.server.core/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.server.core/META-INF/MANIFEST.MF index 91fd931712..a430cbfc7c 100644 --- a/jaggery/org.eclipse.php.server.core/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.server.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Server Core Plug-in Bundle-SymbolicName: org.eclipse.php.server.core;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.internal.server.core.Activator Bundle-Vendor: Eclipse.org Bundle-Localization: plugin diff --git a/jaggery/org.eclipse.php.server.core/pom.xml b/jaggery/org.eclipse.php.server.core/pom.xml index 7d73a6b62c..672da185d7 100644 --- a/jaggery/org.eclipse.php.server.core/pom.xml +++ b/jaggery/org.eclipse.php.server.core/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.server.core - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.server.ui/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.server.ui/META-INF/MANIFEST.MF index 1ccb416abe..c213ae4a1f 100644 --- a/jaggery/org.eclipse.php.server.ui/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.server.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Server UI Plug-in Bundle-SymbolicName: org.eclipse.php.server.ui;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.internal.server.ui.Activator Bundle-Vendor: Eclipse.org Bundle-Localization: plugin diff --git a/jaggery/org.eclipse.php.server.ui/pom.xml b/jaggery/org.eclipse.php.server.ui/pom.xml index 267de39706..ed0a8b43b7 100644 --- a/jaggery/org.eclipse.php.server.ui/pom.xml +++ b/jaggery/org.eclipse.php.server.ui/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.server.ui - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php.source-feature/feature.xml b/jaggery/org.eclipse.php.source-feature/feature.xml index 1abe11e859..46e3760e56 100644 --- a/jaggery/org.eclipse.php.source-feature/feature.xml +++ b/jaggery/org.eclipse.php.source-feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/jaggery/org.eclipse.php.source-feature/pom.xml b/jaggery/org.eclipse.php.source-feature/pom.xml index d5ac301ee5..5975e1d4cc 100644 --- a/jaggery/org.eclipse.php.source-feature/pom.xml +++ b/jaggery/org.eclipse.php.source-feature/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.source - 2.0.0-SNAPSHOT + 2.0.0 eclipse-feature diff --git a/jaggery/org.eclipse.php.test-feature/feature.xml b/jaggery/org.eclipse.php.test-feature/feature.xml index 41fd49944c..aacac368a4 100644 --- a/jaggery/org.eclipse.php.test-feature/feature.xml +++ b/jaggery/org.eclipse.php.test-feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/jaggery/org.eclipse.php.test-feature/pom.xml b/jaggery/org.eclipse.php.test-feature/pom.xml index edca45dec2..178d0b0dc5 100644 --- a/jaggery/org.eclipse.php.test-feature/pom.xml +++ b/jaggery/org.eclipse.php.test-feature/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.test - 2.0.0-SNAPSHOT + 2.0.0 eclipse-feature diff --git a/jaggery/org.eclipse.php.ui.tests/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.ui.tests/META-INF/MANIFEST.MF index aa0785b9af..6fe38f5b32 100644 --- a/jaggery/org.eclipse.php.ui.tests/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: PDT Ui Unit Tests Bundle-SymbolicName: org.eclipse.php.ui.tests;singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.ui.tests.PHPUiTests Require-Bundle: org.junit, org.eclipse.ui;bundle-version="3.5.0", diff --git a/jaggery/org.eclipse.php.ui.tests/pom.xml b/jaggery/org.eclipse.php.ui.tests/pom.xml index 21a424ed24..8dfb6dc9d5 100644 --- a/jaggery/org.eclipse.php.ui.tests/pom.xml +++ b/jaggery/org.eclipse.php.ui.tests/pom.xml @@ -6,12 +6,12 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.ui.tests - 2.0.0-SNAPSHOT + 2.0.0 eclipse-test-plugin diff --git a/jaggery/org.eclipse.php.ui/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php.ui/META-INF/MANIFEST.MF index d1f7ac6110..5d069d4ea0 100644 --- a/jaggery/org.eclipse.php.ui/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.php.ui; singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Name: %Bundle-Name.1 Bundle-Activator: org.eclipse.php.internal.ui.PHPUiPlugin Bundle-Localization: plugin @@ -114,9 +114,9 @@ Export-Package: org.eclipse.php.internal.ui;x-internal:=true, Bundle-Vendor: %Bundle-Vendor.1 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.commons.io, - org.apache.maven.model;version="2.2.1", - org.apache.maven.project;version="2.2.1", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.expressions, org.eclipse.php.internal.ui.preferences, org.wso2.developerstudio.eclipse.maven.util, diff --git a/jaggery/org.eclipse.php.ui/pom.xml b/jaggery/org.eclipse.php.ui/pom.xml index e77fcf1da6..9f276fd128 100644 --- a/jaggery/org.eclipse.php.ui/pom.xml +++ b/jaggery/org.eclipse.php.ui/pom.xml @@ -6,11 +6,11 @@ org.eclipse.pdt.releng org.eclipse.php - 2.0.0-SNAPSHOT + 2.0.0 org.eclipse.php org.eclipse.php.ui - 2.0.0-SNAPSHOT + 2.0.0 eclipse-plugin diff --git a/jaggery/org.eclipse.php/META-INF/MANIFEST.MF b/jaggery/org.eclipse.php/META-INF/MANIFEST.MF index b822650eeb..0c855def7a 100644 --- a/jaggery/org.eclipse.php/META-INF/MANIFEST.MF +++ b/jaggery/org.eclipse.php/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.php; singleton:=true -Bundle-Version: 2.0.0.qualifier +Bundle-Version: 2.0.0 Bundle-Activator: org.eclipse.php.PHPIdePlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime diff --git a/jaggery/pom.xml b/jaggery/pom.xml index db4e1c898d..b3214aabc8 100644 --- a/jaggery/pom.xml +++ b/jaggery/pom.xml @@ -8,12 +8,12 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.eclipse.php org.eclipse.pdt.releng - 2.0.0-SNAPSHOT + 2.0.0 pom diff --git a/library/org.wso2.developerstudio.eclipse.artifact.library/META-INF/MANIFEST.MF b/library/org.wso2.developerstudio.eclipse.artifact.library/META-INF/MANIFEST.MF index c33fed6eb4..7c5dd464ac 100644 --- a/library/org.wso2.developerstudio.eclipse.artifact.library/META-INF/MANIFEST.MF +++ b/library/org.wso2.developerstudio.eclipse.artifact.library/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Library Artifact Wizard Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.library;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.library.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, @@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.ui, org.wso2.developerstudio.eclipse.libraries Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Import-Package: org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", +Import-Package: org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.ui.model, diff --git a/library/org.wso2.developerstudio.eclipse.artifact.library/pom.xml b/library/org.wso2.developerstudio.eclipse.artifact.library/pom.xml index 228d52909f..b817b21e43 100644 --- a/library/org.wso2.developerstudio.eclipse.artifact.library/pom.xml +++ b/library/org.wso2.developerstudio.eclipse.artifact.library/pom.xml @@ -20,7 +20,7 @@ org.wso2.developerstudio carbon-library-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.library diff --git a/library/pom.xml b/library/pom.xml index 5146dde00d..c4253e3a27 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio carbon-library-parent diff --git a/orbit/apache-batik-pdf/pom.xml b/orbit/apache-batik-pdf/pom.xml index b9f1c5c03a..b3f06a41a8 100644 --- a/orbit/apache-batik-pdf/pom.xml +++ b/orbit/apache-batik-pdf/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio developer-studio-orbit-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/orbit/com-eviware-soapui-eclipse/pom.xml b/orbit/com-eviware-soapui-eclipse/pom.xml index 32ee349180..896e98dece 100644 --- a/orbit/com-eviware-soapui-eclipse/pom.xml +++ b/orbit/com-eviware-soapui-eclipse/pom.xml @@ -23,7 +23,7 @@ org.wso2.developerstudio developer-studio-orbit-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 diff --git a/orbit/pom.xml b/orbit/pom.xml index ba5374e755..f40d454427 100644 --- a/orbit/pom.xml +++ b/orbit/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio developer-studio-orbit-parent @@ -74,12 +74,12 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 diff --git a/pom.xml b/pom.xml index 4e6a4674ca..1b49b04c8b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 pom WSO2 Eclipse Tools Parent @@ -27,7 +27,7 @@ registry carbon data-services - data-mapper + esb gs cep @@ -211,95 +211,95 @@ 0.19.0 - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 0.5.0.wso2v1 1.0.3-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 2.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 2.0.0 + 2.0.0 + 2.0.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 3.7.0 + 3.7.0 + 3.7.0 + 2.0.0 0.5.0.wso2v2 - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 0.9.5 1.1.0.v20110215-1231-H25-GA - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT + 2.0.0 + 2.0.0 1.0.1.201105031731 - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT + 2.0.0 + 2.0.0 - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 2.0.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 2.0.0 + 3.7.0 - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 - 4.0.0-SNAPSHOT + 3.7.0 1.1.0.v20110215-1231-H25-GA - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT - 2.0.0-SNAPSHOT + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 + 2.0.0 4.0.1 1.0.0 - 2.0.0-SNAPSHOT + 2.0.0 diff --git a/registry/org.wso2.developerstudio.eclipse.artifact.registry.filter/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.artifact.registry.filter/META-INF/MANIFEST.MF index 60fcea1710..bbbb3dfe7f 100644 --- a/registry/org.wso2.developerstudio.eclipse.artifact.registry.filter/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.artifact.registry.filter/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Registry Filter Artifact Wizard Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.registry.filter;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.registry.filter.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Import-Package: org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", +Import-Package: org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.ui, diff --git a/registry/org.wso2.developerstudio.eclipse.artifact.registry.filter/pom.xml b/registry/org.wso2.developerstudio.eclipse.artifact.registry.filter/pom.xml index 27123396c1..7d83898f60 100644 --- a/registry/org.wso2.developerstudio.eclipse.artifact.registry.filter/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.artifact.registry.filter/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.registry.filter diff --git a/registry/org.wso2.developerstudio.eclipse.artifact.registry.handler/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.artifact.registry.handler/META-INF/MANIFEST.MF index 7a01ed5681..018f2cce7f 100644 --- a/registry/org.wso2.developerstudio.eclipse.artifact.registry.handler/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.artifact.registry.handler/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Registry Handler Artifact Wizard Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.registry.handler;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.registry.handler.Activator Bundle-Vendor: WSO2 Inc Require-Bundle: org.eclipse.ui, @@ -11,9 +11,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Import-Package: org.apache.axiom.om, org.apache.axiom.om.util, - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.core.filesystem, org.eclipse.core.resources, org.eclipse.jdt.core, diff --git a/registry/org.wso2.developerstudio.eclipse.artifact.registry.handler/pom.xml b/registry/org.wso2.developerstudio.eclipse.artifact.registry.handler/pom.xml index a782c28f04..d7fee9f631 100755 --- a/registry/org.wso2.developerstudio.eclipse.artifact.registry.handler/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.artifact.registry.handler/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.registry.handler diff --git a/registry/org.wso2.developerstudio.eclipse.artifact.registry/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.artifact.registry/META-INF/MANIFEST.MF index d4afbe1a9f..90a56726c0 100644 --- a/registry/org.wso2.developerstudio.eclipse.artifact.registry/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.artifact.registry/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Registry Artifact Wizard Bundle-SymbolicName: org.wso2.developerstudio.eclipse.artifact.registry;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.registry.Activator Bundle-Vendor: WSO2 Inc, Require-Bundle: org.eclipse.ui, @@ -13,9 +13,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.apache.axiom.om, org.apache.axiom.om.impl.builder, org.apache.commons.lang;version="2.6.0.wso2v1", - org.apache.maven.model;version="[2.2.1,3.0.0)", - org.apache.maven.project;version="[2.2.1,3.0.0)", - org.codehaus.plexus.util.xml;version="2.0.1", + org.apache.maven.model, + org.apache.maven.project, + org.codehaus.plexus.util.xml, org.eclipse.jdt.core, org.eclipse.jface.text, org.eclipse.ui.forms, diff --git a/registry/org.wso2.developerstudio.eclipse.artifact.registry/pom.xml b/registry/org.wso2.developerstudio.eclipse.artifact.registry/pom.xml index 3d0d812ba8..2b0a4f7572 100644 --- a/registry/org.wso2.developerstudio.eclipse.artifact.registry/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.artifact.registry/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.artifact.registry diff --git a/registry/org.wso2.developerstudio.eclipse.artifact.registry/src/org/wso2/developerstudio/eclipse/artifact/registry/ui/wizard/RegistryResourceCreationWizard.java b/registry/org.wso2.developerstudio.eclipse.artifact.registry/src/org/wso2/developerstudio/eclipse/artifact/registry/ui/wizard/RegistryResourceCreationWizard.java index da1a33d30d..21e4c4cb3f 100644 --- a/registry/org.wso2.developerstudio.eclipse.artifact.registry/src/org/wso2/developerstudio/eclipse/artifact/registry/ui/wizard/RegistryResourceCreationWizard.java +++ b/registry/org.wso2.developerstudio.eclipse.artifact.registry/src/org/wso2/developerstudio/eclipse/artifact/registry/ui/wizard/RegistryResourceCreationWizard.java @@ -74,6 +74,7 @@ public class RegistryResourceCreationWizard extends AbstractWSO2ProjectCreationW private final RegistryArtifactModel regModel; private IFile resourceFile; + private String version = "1.0.0"; public RegistryResourceCreationWizard() { regModel = new RegistryArtifactModel(); @@ -222,12 +223,15 @@ private void updatePOM(IProject project) throws Exception{ MavenProject mavenProject; File mavenProjectPomLocation = project.getFile("pom.xml").getLocation().toFile(); + + if(!mavenProjectPomLocation.exists()){ mavenProject = MavenUtils.createMavenProject("org.wso2.carbon." + project.getName() , project.getName(), "1.0.0","pom"); } else { mavenProject = MavenUtils.getMavenProject(mavenProjectPomLocation); } - + version = mavenProject.getVersion(); + version = version.replaceAll("-SNAPSHOT$", ""); boolean pluginExists = MavenUtils.checkOldPluginEntry(mavenProject, "org.wso2.maven", "wso2-general-project-plugin", MavenConstants.WSO2_GENERAL_PROJECT_VERSION); diff --git a/registry/org.wso2.developerstudio.eclipse.greg.base/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.base/META-INF/MANIFEST.MF index 1e8860cf53..dfd79330b1 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.base/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.base/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Base Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.base;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.base.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/registry/org.wso2.developerstudio.eclipse.greg.base/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.base/pom.xml index 7b86e49bb1..9466d99781 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.base/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.base/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.base diff --git a/registry/org.wso2.developerstudio.eclipse.greg.libraries/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.libraries/META-INF/MANIFEST.MF index c43c0c067b..f4d02fd3de 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.libraries/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.libraries/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Libraries Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.libraries -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-ActivationPolicy: lazy Export-Package: org.wso2.developerstudio.eclipse.greg.libraries.utils Bundle-ClassPath: . diff --git a/registry/org.wso2.developerstudio.eclipse.greg.libraries/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.libraries/pom.xml index bde92152fa..f993df1494 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.libraries/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.libraries/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.libraries diff --git a/registry/org.wso2.developerstudio.eclipse.greg.manager.local/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.manager.local/META-INF/MANIFEST.MF index a149aaa27f..34f6deff17 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.manager.local/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.manager.local/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Local Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.manager.local;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.manager.local.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime diff --git a/registry/org.wso2.developerstudio.eclipse.greg.manager.local/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.manager.local/pom.xml index cf36435bb8..5933bc4cae 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.manager.local/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.manager.local/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.manager.local diff --git a/registry/org.wso2.developerstudio.eclipse.greg.manager.remote/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.manager.remote/META-INF/MANIFEST.MF index 77e29f40e1..f1255a9a5a 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.manager.remote/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.manager.remote/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: App Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.manager.remote;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.manager.remote.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/registry/org.wso2.developerstudio.eclipse.greg.manager.remote/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.manager.remote/pom.xml index 4f4e962c64..1c9e89e82f 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.manager.remote/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.manager.remote/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.manager.remote diff --git a/registry/org.wso2.developerstudio.eclipse.greg.perspective/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.perspective/META-INF/MANIFEST.MF index e77cb8ae29..f34f1a8a57 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.perspective/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.perspective/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Perspective Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.perspective;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.perspective.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime diff --git a/registry/org.wso2.developerstudio.eclipse.greg.perspective/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.perspective/pom.xml index bdfd821011..2cc114e978 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.perspective/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.perspective/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.perspective diff --git a/registry/org.wso2.developerstudio.eclipse.greg.registry.aspects/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.registry.aspects/META-INF/MANIFEST.MF index ebd59ef83a..546e034d40 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.registry.aspects/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.registry.aspects/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Registry Aspects Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.registry.aspects;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.registry.aspects.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.wso2.developerstudio.eclipse.greg.libraries Bundle-ActivationPolicy: lazy -Import-Package: org.apache.maven.model;version="2.2.1", - org.apache.maven.project;version="2.2.1", +Import-Package: org.apache.maven.model, + org.apache.maven.project, org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.ui.wizards, diff --git a/registry/org.wso2.developerstudio.eclipse.greg.registry.aspects/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.registry.aspects/pom.xml index 87ad8387f9..6fa569882c 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.registry.aspects/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.registry.aspects/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.registry.aspects diff --git a/registry/org.wso2.developerstudio.eclipse.greg.registry.filter/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.registry.filter/META-INF/MANIFEST.MF index 69dead1488..c2bf8c6f65 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.registry.filter/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.registry.filter/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Synapse Mediator Creator Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.registry.filter;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.registry.filter.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/registry/org.wso2.developerstudio.eclipse.greg.registry.filter/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.registry.filter/pom.xml index e644cc1486..fc546a19c0 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.registry.filter/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.registry.filter/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.registry.filter diff --git a/registry/org.wso2.developerstudio.eclipse.greg.registry.handler/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.registry.handler/META-INF/MANIFEST.MF index 4ce369cefa..61f8691cd9 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.registry.handler/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.registry.handler/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Synapse Mediator Creator Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.registry.handler;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.registry.handler.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/registry/org.wso2.developerstudio.eclipse.greg.registry.handler/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.registry.handler/pom.xml index 4c7138be17..ea6850c73a 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.registry.handler/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.registry.handler/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.registry.handler diff --git a/registry/org.wso2.developerstudio.eclipse.greg.resource.authorization/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.resource.authorization/META-INF/MANIFEST.MF index f8ee3cc2b2..f86006659b 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.resource.authorization/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.resource.authorization/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Authorization Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.resource.authorization -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.resource.authorization.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/registry/org.wso2.developerstudio.eclipse.greg.resource.authorization/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.resource.authorization/pom.xml index 0b1969bdb3..ee5c5477f6 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.resource.authorization/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.resource.authorization/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.resource.authorization diff --git a/registry/org.wso2.developerstudio.eclipse.greg.search/META-INF/MANIFEST.MF b/registry/org.wso2.developerstudio.eclipse.greg.search/META-INF/MANIFEST.MF index 90943526f9..4fee30cefa 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.search/META-INF/MANIFEST.MF +++ b/registry/org.wso2.developerstudio.eclipse.greg.search/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Search Bundle-SymbolicName: org.wso2.developerstudio.eclipse.greg.search;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.greg.search.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime diff --git a/registry/org.wso2.developerstudio.eclipse.greg.search/pom.xml b/registry/org.wso2.developerstudio.eclipse.greg.search/pom.xml index 2777d9fe26..da758d8931 100644 --- a/registry/org.wso2.developerstudio.eclipse.greg.search/pom.xml +++ b/registry/org.wso2.developerstudio.eclipse.greg.search/pom.xml @@ -21,7 +21,7 @@ org.wso2.developerstudio carbon-registry-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.greg.search diff --git a/registry/pom.xml b/registry/pom.xml index bf25d9b2c1..f8d89fe97f 100644 --- a/registry/pom.xml +++ b/registry/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio carbon-registry-parent @@ -77,13 +77,13 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 0.5.0.wso2v1 - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 diff --git a/server/org.wso2.developerstudio.eclipse.carbonfeatures/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.carbonfeatures/META-INF/MANIFEST.MF index d20bee629b..44a87a7859 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonfeatures/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.carbonfeatures/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbonfeatures Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbonfeatures -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbonfeatures.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime diff --git a/server/org.wso2.developerstudio.eclipse.carbonfeatures/pom.xml b/server/org.wso2.developerstudio.eclipse.carbonfeatures/pom.xml index 7bf4763c6b..7689f008db 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonfeatures/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonfeatures/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbonfeatures diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver.base/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.carbonserver.base/META-INF/MANIFEST.MF index 05951dfc6d..d85961a69c 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver.base/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.carbonserver.base/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbon Server Base Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbonserver.base;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbonserver.base.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver.base/pom.xml b/server/org.wso2.developerstudio.eclipse.carbonserver.base/pom.xml index 07a6285d7a..1b8f60fe92 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver.base/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonserver.base/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbonserver.base diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver.base/src/org/wso2/developerstudio/eclipse/carbonserver/base/monitor/CarbonPingThread.java b/server/org.wso2.developerstudio.eclipse.carbonserver.base/src/org/wso2/developerstudio/eclipse/carbonserver/base/monitor/CarbonPingThread.java index fa8f272d11..c918cf9952 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver.base/src/org/wso2/developerstudio/eclipse/carbonserver/base/monitor/CarbonPingThread.java +++ b/server/org.wso2.developerstudio.eclipse.carbonserver.base/src/org/wso2/developerstudio/eclipse/carbonserver/base/monitor/CarbonPingThread.java @@ -29,7 +29,7 @@ import org.wso2.developerstudio.eclipse.carbonserver.base.impl.CarbonServerBehaviour; public class CarbonPingThread extends PingThread { - private static final int PING_DELAY = 2000; + private static final int PING_DELAY = 10000; // delay between pings private static final int PING_INTERVAL = 250; diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver.base/src/org/wso2/developerstudio/eclipse/carbonserver/base/utils/CAppDeployer.java b/server/org.wso2.developerstudio.eclipse.carbonserver.base/src/org/wso2/developerstudio/eclipse/carbonserver/base/utils/CAppDeployer.java index 2b1d96bce2..fb70b8fa18 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver.base/src/org/wso2/developerstudio/eclipse/carbonserver/base/utils/CAppDeployer.java +++ b/server/org.wso2.developerstudio.eclipse.carbonserver.base/src/org/wso2/developerstudio/eclipse/carbonserver/base/utils/CAppDeployer.java @@ -178,10 +178,11 @@ public static String getMetaDataPath() { */ public static void unDeployCAR(String serverURL, String username, String pwd, String carName) throws Exception{ ApplicationAdminStub appAdminStub = getApplicationAdminStub(serverURL, username, pwd); - String[] existingApplications = appAdminStub.listAllApplications(); - if (existingApplications!=null && Arrays.asList(existingApplications).contains(carName)){ - appAdminStub.deleteApplication(carName); - } + try{ + appAdminStub.deleteApplication(carName); + }catch(Exception e){ + log.error(e); + } } private static ApplicationAdminStub getApplicationAdminStub( diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver.remote/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.carbonserver.remote/META-INF/MANIFEST.MF index 96bf2ec2a9..a8f5ea9077 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver.remote/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.carbonserver.remote/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbonserver32 Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbonserver.remote;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbonserver.remote.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver.remote/pom.xml b/server/org.wso2.developerstudio.eclipse.carbonserver.remote/pom.xml index d73203aa61..74dc4489d5 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver.remote/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonserver.remote/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbonserver.remote diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver30/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.carbonserver30/META-INF/MANIFEST.MF index 9a60cd0a72..182be8ed81 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver30/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.carbonserver30/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbonserver30 Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbonserver30;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbonserver30.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver30/pom.xml b/server/org.wso2.developerstudio.eclipse.carbonserver30/pom.xml index 4b21e822e1..c2d01720d2 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver30/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonserver30/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbonserver30 diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver31/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.carbonserver31/META-INF/MANIFEST.MF index c913d6b0a0..1c027e79bb 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver31/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.carbonserver31/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbonserver31 Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbonserver31;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbonserver31.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver31/pom.xml b/server/org.wso2.developerstudio.eclipse.carbonserver31/pom.xml index 0a2a70a211..c02907bc88 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver31/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonserver31/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbonserver31 diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver32/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.carbonserver32/META-INF/MANIFEST.MF index e79d76697d..6b00f152ab 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver32/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.carbonserver32/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbonserver32 Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbonserver32;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbonserver32.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver32/pom.xml b/server/org.wso2.developerstudio.eclipse.carbonserver32/pom.xml index 492b727a24..d0ebe0d67c 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver32/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonserver32/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbonserver32 diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver40/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.carbonserver40/META-INF/MANIFEST.MF index c0218d5538..16d087f722 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver40/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.carbonserver40/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbonserver40 Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbonserver40;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbonserver40.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver40/pom.xml b/server/org.wso2.developerstudio.eclipse.carbonserver40/pom.xml index 8a0b25b3ee..9fbc33f85c 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver40/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonserver40/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbonserver40 diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver40/serverdefinition/carbon.definition.xml b/server/org.wso2.developerstudio.eclipse.carbonserver40/serverdefinition/carbon.definition.xml index 23fb7e6120..041f344311 100755 --- a/server/org.wso2.developerstudio.eclipse.carbonserver40/serverdefinition/carbon.definition.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonserver40/serverdefinition/carbon.definition.xml @@ -124,7 +124,7 @@ org.wso2.carbon.bootstrap.Bootstrap ${carbon.home} - -Xbootclasspath/a::"${carbon.home}/lib/xboot/org.wso2.carbon.xboot-4.0.0-SNAPSHOT.jar" -Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dcom.sun.management.jmxremote -Djava.io.tmpdir="${carbon.home}/tmp" -Dwso2.server.standalone=true -Dcarbon.home="${carbon.home}" -Dcarbon.registry.root=/ -Djava.endorsed.dirs="${carbon.home}/lib/endorsed" -Djava.util.logging.config.file="${carbon.home}/repository/conf/log4j.properties" -Dcomponents.repo="${carbon.home}/repository/components/plugins" -Dcarbon.config.dir.path="${carbon.home}/repository/conf" -Dcom.atomikos.icatch.file="${carbon.home}/lib/transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dcatalina.base="${carbon.home}/lib/tomcat" -Dconf.location="${carbon.home}/repository/conf" + -Xbootclasspath/a::"${carbon.home}/lib/xboot/org.wso2.carbon.xboot-3.7.0.jar" -Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dcom.sun.management.jmxremote -Djava.io.tmpdir="${carbon.home}/tmp" -Dwso2.server.standalone=true -Dcarbon.home="${carbon.home}" -Dcarbon.registry.root=/ -Djava.endorsed.dirs="${carbon.home}/lib/endorsed" -Djava.util.logging.config.file="${carbon.home}/repository/conf/log4j.properties" -Dcomponents.repo="${carbon.home}/repository/components/plugins" -Dcarbon.config.dir.path="${carbon.home}/repository/conf" -Dcom.atomikos.icatch.file="${carbon.home}/lib/transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path=true -Dcatalina.base="${carbon.home}/lib/tomcat" -Dconf.location="${carbon.home}/repository/conf" carbon.libs ${carbon.debug} diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver42/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.carbonserver42/META-INF/MANIFEST.MF index 317433ce96..3c8aa907a0 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver42/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.carbonserver42/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Carbonserver42 Bundle-SymbolicName: org.wso2.developerstudio.eclipse.carbonserver42;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.carbonserver42.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/server/org.wso2.developerstudio.eclipse.carbonserver42/pom.xml b/server/org.wso2.developerstudio.eclipse.carbonserver42/pom.xml index cf26c80638..cfcb18cf40 100644 --- a/server/org.wso2.developerstudio.eclipse.carbonserver42/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.carbonserver42/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.carbonserver42 diff --git a/server/org.wso2.developerstudio.eclipse.server.base/META-INF/MANIFEST.MF b/server/org.wso2.developerstudio.eclipse.server.base/META-INF/MANIFEST.MF index d246cea6ee..87c7987b0e 100644 --- a/server/org.wso2.developerstudio.eclipse.server.base/META-INF/MANIFEST.MF +++ b/server/org.wso2.developerstudio.eclipse.server.base/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WSO2 Server Base Bundle-SymbolicName: org.wso2.developerstudio.eclipse.server.base;singleton:=true -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.server.base.Activator Bundle-Vendor: WSO2 Require-Bundle: org.eclipse.ui, diff --git a/server/org.wso2.developerstudio.eclipse.server.base/pom.xml b/server/org.wso2.developerstudio.eclipse.server.base/pom.xml index 05509ec14c..33c4f88346 100644 --- a/server/org.wso2.developerstudio.eclipse.server.base/pom.xml +++ b/server/org.wso2.developerstudio.eclipse.server.base/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio wso2-server-tools-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.server.base diff --git a/server/pom.xml b/server/pom.xml index 2cbee5868e..b355eb04c0 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -5,7 +5,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio wso2-server-tools-parent @@ -59,10 +59,10 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 + 3.7.0 + 3.7.0 diff --git a/usermgt/org.wso2.developerstudio.eclipse.usermgt.remote/META-INF/MANIFEST.MF b/usermgt/org.wso2.developerstudio.eclipse.usermgt.remote/META-INF/MANIFEST.MF index 70cd4aef35..2046911470 100644 --- a/usermgt/org.wso2.developerstudio.eclipse.usermgt.remote/META-INF/MANIFEST.MF +++ b/usermgt/org.wso2.developerstudio.eclipse.usermgt.remote/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Remote Bundle-SymbolicName: org.wso2.developerstudio.eclipse.usermgt.remote -Bundle-Version: 4.0.0.qualifier +Bundle-Version: 3.7.0 Bundle-Activator: org.wso2.developerstudio.eclipse.usermgt.remote.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime diff --git a/usermgt/org.wso2.developerstudio.eclipse.usermgt.remote/pom.xml b/usermgt/org.wso2.developerstudio.eclipse.usermgt.remote/pom.xml index c6ef430a8e..26993ee148 100644 --- a/usermgt/org.wso2.developerstudio.eclipse.usermgt.remote/pom.xml +++ b/usermgt/org.wso2.developerstudio.eclipse.usermgt.remote/pom.xml @@ -25,7 +25,7 @@ org.wso2.developerstudio carbon-usermgt-parent - 4.0.0-SNAPSHOT + 3.7.0 4.0.0 org.wso2.developerstudio.eclipse.usermgt.remote diff --git a/usermgt/pom.xml b/usermgt/pom.xml index cc21fe3526..0e083823d2 100644 --- a/usermgt/pom.xml +++ b/usermgt/pom.xml @@ -4,7 +4,7 @@ org.wso2.eclipse wso2-eclipse-parent - 4.0.0-SNAPSHOT + 3.7.0 org.wso2.developerstudio carbon-usermgt-parent @@ -50,11 +50,11 @@ - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0 0.5.0.wso2v1 - 4.0.0-SNAPSHOT - 4.0.0-SNAPSHOT + 3.7.0 + 3.7.0