Skip to content
This repository has been archived by the owner on Apr 13, 2024. It is now read-only.

Commit

Permalink
Merge pull request #6 from wso2-dev/master
Browse files Browse the repository at this point in the history
Merge parent and features pom.xml changes from 3.5.0 branch to trunk
  • Loading branch information
Jasintha committed Mar 5, 2014
2 parents 3203c40 + 2c2d589 commit d44f6b9
Show file tree
Hide file tree
Showing 580 changed files with 15,115 additions and 8,834 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# ignore target and bin folders from status
target/
bin/
# see http://schacon.github.io/git/gitignore.html for config details

Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.3.0.qualifier
Bundle-Version: 3.6.0.qualifier
Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.axis2.Activator
Bundle-Vendor: WSO2 Inc
Require-Bundle: org.eclipse.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.developerstudio.eclipse.artifact.axis2</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.3.0.qualifier
Bundle-Version: 3.6.0.qualifier
Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.axis2serviceclient.Activator
Bundle-Vendor: WSO2 Inc
Require-Bundle: org.eclipse.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.developerstudio.eclipse.artifact.axis2serviceclient</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.jaxrs.Activator
Bundle-Vendor: WSO2 Inc
Require-Bundle: org.eclipse.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.developerstudio.eclipse.artifact.jaxrs</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<name>Developer Studio Jax-RS Artifact</name>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.3.0.qualifier
Bundle-Version: 3.6.0.qualifier
Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.jaxws.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.developerstudio.eclipse.artifact.jaxws</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.3.0.qualifier
Bundle-Version: 3.6.0.qualifier
Bundle-Activator: org.wso2.developerstudio.eclipse.artifact.webapp.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.developerstudio.eclipse.artifact.webapp</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.3.0.qualifier
Bundle-Version: 3.6.0.qualifier
Bundle-Activator: org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver.Activator
Bundle-Vendor: WSO2
Require-Bundle: org.eclipse.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.developerstudio.eclipse.axis2.rpcmessagereceiver</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.4.1.qualifier
Bundle-Version: 3.5.0.qualifier
Bundle-Activator: org.wso2.wsf.ide.consumption.core.plugin.WebServiceWSASConsumptionCorePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Expand Down
4 changes: 2 additions & 2 deletions app-server/org.wso2.wsf.ide.consumption.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>3.4.1-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
<artifactId>org.wso2.wsf.ide.consumption.core</artifactId>
<packaging>eclipse-plugin</packaging>
<name>Carbon App Server Consumption Core</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.4.1.qualifier
Bundle-Version: 3.5.0.qualifier
Bundle-Activator: org.wso2.wsf.ide.consumption.ui.plugin.WebServiceWSASConsumptionUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Expand Down
4 changes: 2 additions & 2 deletions app-server/org.wso2.wsf.ide.consumption.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>3.4.1-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
<artifactId>org.wso2.wsf.ide.consumption.ui</artifactId>
<packaging>eclipse-plugin</packaging>
<name>Carbon App Server Consumption UI</name>
Expand Down
2 changes: 1 addition & 1 deletion app-server/org.wso2.wsf.ide.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.4.1.qualifier
Bundle-Version: 3.5.0.qualifier
Bundle-Activator: org.wso2.wsf.ide.core.plugin.WebServiceWSASCorePlugin
Bundle-Vendor: WSO2
Bundle-Localization: plugin
Expand Down
4 changes: 2 additions & 2 deletions app-server/org.wso2.wsf.ide.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>3.4.1-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
<artifactId>org.wso2.wsf.ide.core</artifactId>
<packaging>eclipse-plugin</packaging>
<name>Carbon App Server Tools Core</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.4.1.qualifier
Bundle-Version: 3.5.0.qualifier
Bundle-Localization: plugin
Bundle-Activator: org.wso2.wsf.ide.creation.core.plugin.WebServiceWSASCreationCorePlugin
Require-Bundle: org.eclipse.core.runtime,
Expand Down
4 changes: 2 additions & 2 deletions app-server/org.wso2.wsf.ide.creation.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>3.4.1-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
<artifactId>org.wso2.wsf.ide.creation.core</artifactId>
<packaging>eclipse-plugin</packaging>
<name>Carbon App Server Creation Core</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 3.4.1.qualifier
Bundle-Version: 3.5.0.qualifier
Bundle-Activator: org.wso2.wsf.ide.creation.ui.plugin.WebServiceWSASCreationUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Expand Down
4 changes: 2 additions & 2 deletions app-server/org.wso2.wsf.ide.creation.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>3.4.1-SNAPSHOT</version>
<version>3.5.0-SNAPSHOT</version>
<artifactId>org.wso2.wsf.ide.creation.ui</artifactId>
<packaging>eclipse-plugin</packaging>
<name>Carbon App Server Creation UI</name>
Expand Down
4 changes: 2 additions & 2 deletions app-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>org.wso2.eclipse</groupId>
<artifactId>wso2-eclipse-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-appserver-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<name>WSO2 App Server Eclipse Tools Parent</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-Activator: org.wso2.developerstudio.appfactory.core.Activator
Bundle-Vendor: WSO2 Inc
Require-Bundle: org.eclipse.core.runtime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>appfactory-tool-parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.developerstudio.appfactory.core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1.3.0.qualifier
Bundle-Version: 1.4.0.qualifier
Bundle-Activator: org.wso2.developerstudio.appfactory.ui.Activator
Bundle-Vendor: WSO2 Inc
Require-Bundle: org.eclipse.ui,
Expand All @@ -25,7 +25,6 @@ Import-Package: com.google.gson;version="2.1.0",
org.eclipse.e4.core.di.extensions,
org.eclipse.e4.core.services.events,
org.eclipse.e4.core.services.log,
org.eclipse.e4.core.services.util,
org.eclipse.e4.ui.di,
org.eclipse.equinox.security.storage;version="1.0.0",
org.eclipse.jgit.api;version="2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion appfactory/org.wso2.developerstudio.appfactory.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>appfactory-tool-parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.developerstudio.appfactory.ui</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions appfactory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>org.wso2.eclipse</groupId>
<artifactId>wso2-eclipse-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>appfactory-tool-parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
<version>1.4.0-SNAPSHOT</version>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<name>WSO2 AppFactory Eclipse Tools Parent</name>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.apache.ode.deploy.model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<version>0.5.0.wso2v2</version>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<version>0.5.0.wso2v2</version>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.apache.ode.runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<version>0.5.0.wso2v2</version>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.common.model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<version>0.5.0.wso2v2</version>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.common.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<version>0.5.0.wso2v2</version>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.examples.extensionPoints/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>0.3.0.wso2v2</version>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<version>0.5.0.wso2v2</version>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.runtimes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<version>0.5.0.wso2v2</version>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<version>0.5.0.wso2v2</version>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.validator.junit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0.0.wso2v2</version>
Expand Down
2 changes: 1 addition & 1 deletion bps/org.eclipse.bpel.validator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.developerstudio</groupId>
<artifactId>carbon-bps-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>0.5.0.wso2v2</version>
Expand Down
Loading

0 comments on commit d44f6b9

Please sign in to comment.