From 77c5a0fb32e12287d35d019c979a4d4fb508a9dd Mon Sep 17 00:00:00 2001
From: asankas
Date: Fri, 28 Feb 2014 11:13:16 +0530
Subject: [PATCH 01/21] * Merging parent and features pom.xml changes from
3.5.0 branch to trunk.
---
features/bps/org.eclipse.bpel.feature/pom.xml | 4 +-
.../pom.xml | 6 +-
features/bps/pom.xml | 4 +-
.../pom.xml | 85 +++++------
.../pom.xml | 89 ++++++------
.../pom.xml | 125 ++++++++++------
.../pom.xml | 136 ++++++++++++------
.../pom.xml | 79 +++++-----
.../pom.xml | 79 +++++-----
features/pom.xml | 8 +-
features/repository/pom.xml | 20 +--
pom.xml | 2 +-
12 files changed, 364 insertions(+), 273 deletions(-)
diff --git a/features/bps/org.eclipse.bpel.feature/pom.xml b/features/bps/org.eclipse.bpel.feature/pom.xml
index 496623349..1f0f78b39 100644
--- a/features/bps/org.eclipse.bpel.feature/pom.xml
+++ b/features/bps/org.eclipse.bpel.feature/pom.xml
@@ -63,8 +63,8 @@
org.eclipse.bpel.plugins:org.eclipse.bpel.validator:${eclipse.bps.tools.version}
org.eclipse.bpelins:org.eclipse.bpel.wsil.model:${eclipse.bps.tools.version}
org.eclipse.bpelins:org.eclipse.bpel.xpath10:${eclipse.bps.tools.version}
- org.wso2.developerstudio:org.wso2.developerstudio.bpel.humantask.model:${bps.humantask.tools.feature.version}
- org.wso2.developerstudio:org.wso2.developerstudio.bpel.humantask.ui:${bps.humantask.tools.feature.version}
+
org.wso2.developerstudio:org.wso2.wsf.ide.bpel.export:${bps.export.tool.version}
diff --git a/features/bps/org.wso2.developerstudio.eclipse.bps.feature/pom.xml b/features/bps/org.wso2.developerstudio.eclipse.bps.feature/pom.xml
index f72f80d3e..19f357c4f 100644
--- a/features/bps/org.wso2.developerstudio.eclipse.bps.feature/pom.xml
+++ b/features/bps/org.wso2.developerstudio.eclipse.bps.feature/pom.xml
@@ -49,7 +49,7 @@
${project.artifactId}
../../feature.properties
- org.wso2.developerstudio:org.eclipse.bpel.apache.ode.deploy.model:${bps.tools.version}
+
org.wso2.developerstudio:org.wso2.developerstudio.bpel.humantask.model:${bps.humantask.tools.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.bpel.humantask.ui:${bps.humantask.tools.feature.version}
- org.wso2.developerstudio:org.wso2.wsf.ide.bpel.export:${bps.export.tool.version}
+
diff --git a/features/bps/pom.xml b/features/bps/pom.xml
index 9e0624c7c..125dfb224 100755
--- a/features/bps/pom.xml
+++ b/features/bps/pom.xml
@@ -14,8 +14,8 @@
WSO2 Eclipse BPS Features
org.wso2.developerstudio.eclipse.bpel.artifact.feature
-
- org.eclipse.bpel.feature
+ org.wso2.developerstudio.eclipse.bps.feature
+
diff --git a/features/installed-distributions/developer-studio-eclipse-jee-juno-linux-gtk-x86_64/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-juno-linux-gtk-x86_64/pom.xml
index 275066b5c..29abd7af3 100755
--- a/features/installed-distributions/developer-studio-eclipse-jee-juno-linux-gtk-x86_64/pom.xml
+++ b/features/installed-distributions/developer-studio-eclipse-jee-juno-linux-gtk-x86_64/pom.xml
@@ -257,7 +257,11 @@
org.wso2.tcpmon.feature.feature.group
${tcpmon.feature.version}
-
+
+
+ org.wso2.developerstudio.eclipse.qos.artifact.feature.group
+ ${qos.feature.version}
+
@@ -266,6 +270,40 @@
maven-antrun-plugin
+
+ install-egit
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
install-eclipse
package
@@ -291,10 +329,12 @@
-
+
+
+
@@ -333,7 +373,7 @@
-
+
@@ -360,45 +400,8 @@
-
-
-
-
-
-
-
- maven-antrun-plugin
-
-
- install-egit
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/features/installed-distributions/developer-studio-eclipse-jee-juno-linux-gtk/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-juno-linux-gtk/pom.xml
index 3871ac6f7..24dcf23c3 100755
--- a/features/installed-distributions/developer-studio-eclipse-jee-juno-linux-gtk/pom.xml
+++ b/features/installed-distributions/developer-studio-eclipse-jee-juno-linux-gtk/pom.xml
@@ -261,7 +261,11 @@
org.wso2.tcpmon.feature.feature.group
${tcpmon.feature.version}
-
+
+
+ org.wso2.developerstudio.eclipse.qos.artifact.feature.group
+ ${qos.feature.version}
+
@@ -270,6 +274,40 @@
maven-antrun-plugin
+
+ install-egit
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
install-eclipse
package
@@ -295,10 +333,12 @@
-
+
+
+
@@ -337,7 +377,7 @@
-
+
@@ -359,11 +399,13 @@
-
+
+
+
@@ -449,45 +491,6 @@
-
- maven-antrun-plugin
-
-
- install-egit
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/features/installed-distributions/developer-studio-eclipse-jee-juno-macosx-cocoa-x86_64/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-juno-macosx-cocoa-x86_64/pom.xml
index 5fdad7645..a19cdd7c7 100755
--- a/features/installed-distributions/developer-studio-eclipse-jee-juno-macosx-cocoa-x86_64/pom.xml
+++ b/features/installed-distributions/developer-studio-eclipse-jee-juno-macosx-cocoa-x86_64/pom.xml
@@ -263,9 +263,44 @@
+
maven-antrun-plugin
+
+ install-egit
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
install-eclipse
package
@@ -291,10 +326,12 @@
-
+
+
+
@@ -333,6 +370,8 @@
+
+
@@ -358,6 +397,8 @@
+
+
@@ -373,10 +414,49 @@
package
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -404,45 +484,6 @@
-
- maven-antrun-plugin
-
-
- install-egit
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/features/installed-distributions/developer-studio-eclipse-jee-juno-macosx-cocoa/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-juno-macosx-cocoa/pom.xml
index 6fe556e0c..641b9391c 100755
--- a/features/installed-distributions/developer-studio-eclipse-jee-juno-macosx-cocoa/pom.xml
+++ b/features/installed-distributions/developer-studio-eclipse-jee-juno-macosx-cocoa/pom.xml
@@ -118,7 +118,11 @@
${basedir}/target/eclipse
false
-
+
+ org.wso2.developerstudio.eclipse.carbonstudio.feature.feature.group
+ ${carbonstudio.tools.feature.version}
+
+
org.wso2.developerstudio.eclipse.appserver.feature.feature.group
${appserver.tools.feature.version}
@@ -266,6 +270,40 @@
maven-antrun-plugin
+
+ install-egit
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
install-eclipse
package
@@ -291,10 +329,12 @@
-
+
+
+
@@ -332,6 +372,8 @@
+
+
@@ -353,11 +395,13 @@
-
+
+
+
@@ -373,11 +417,50 @@
package
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
run
@@ -404,45 +487,6 @@
-
- maven-antrun-plugin
-
-
- install-egit
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/features/installed-distributions/developer-studio-eclipse-jee-juno-win32/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-juno-win32/pom.xml
index 1d63090c7..db1fdd6bc 100755
--- a/features/installed-distributions/developer-studio-eclipse-jee-juno-win32/pom.xml
+++ b/features/installed-distributions/developer-studio-eclipse-jee-juno-win32/pom.xml
@@ -266,6 +266,40 @@
maven-antrun-plugin
+
+ install-egit
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
install-eclipse
package
@@ -291,9 +325,11 @@
-
+
+
+
@@ -360,6 +396,8 @@
+
+
@@ -445,45 +483,6 @@
-
- maven-antrun-plugin
-
-
- install-egit
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/features/installed-distributions/developer-studio-eclipse-jee-juno-win64-x86_64/pom.xml b/features/installed-distributions/developer-studio-eclipse-jee-juno-win64-x86_64/pom.xml
index 4b3e8e930..dcc434eb6 100755
--- a/features/installed-distributions/developer-studio-eclipse-jee-juno-win64-x86_64/pom.xml
+++ b/features/installed-distributions/developer-studio-eclipse-jee-juno-win64-x86_64/pom.xml
@@ -266,6 +266,40 @@
maven-antrun-plugin
+
+ install-egit
+ package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
install-eclipse
package
@@ -291,10 +325,12 @@
-
+
+
+
@@ -360,6 +396,8 @@
+
+
@@ -445,45 +483,6 @@
-
- maven-antrun-plugin
-
-
- install-egit
- package
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/features/pom.xml b/features/pom.xml
index 5bcb5dd05..a707d719d 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -41,7 +41,7 @@
usermgt
registry
app-server
-
+ bps
esb
appfactory
data-services
@@ -56,9 +56,9 @@
SoapUI
tcpmon
-
- jaggery
-
+
+ jaggery
+ qos
carbon-studio
repository
diff --git a/features/repository/pom.xml b/features/repository/pom.xml
index 4958f58bc..4a5ae059e 100644
--- a/features/repository/pom.xml
+++ b/features/repository/pom.xml
@@ -77,10 +77,9 @@
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.appserver.feature:${appserver.tools.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.appserver.artifact.feature:${appserver.tools.feature.version}
-
-
-
+ org.wso2.developerstudio:org.wso2.developerstudio.eclipse.bps.feature:${bps.tools.feature.version}
+ org.wso2.developerstudio:org.wso2.developerstudio.eclipse.bpel.artifact.feature:${bps.tools.feature.version}
+ org.wso2.developerstudio:org.eclipse.bpel.feature:${eclipse.bpel.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.registry.feature:${registry.tools.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.registry.artifact.feature:${registry.tools.feature.version}
@@ -120,6 +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}
@@ -204,10 +204,9 @@
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.appserver.feature:${appserver.tools.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.appserver.artifact.feature:${appserver.tools.feature.version}
-
-
-
+ org.wso2.developerstudio:org.wso2.developerstudio.eclipse.bps.feature:${bps.tools.feature.version}
+ org.wso2.developerstudio:org.wso2.developerstudio.eclipse.bpel.artifact.feature:${bps.tools.feature.version}
+ org.wso2.developerstudio:org.eclipse.bpel.feature:${eclipse.bpel.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.registry.feature:${registry.tools.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.registry.artifact.feature:${registry.tools.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.esb.feature:${esb.tools.feature.version}
@@ -239,10 +238,13 @@
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.server.framework.feature:${server.framework.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.usermgt.core.feature:${usermgt.tools.feature.version}
org.wso2.developerstudio:org.wso2.developerstudio.eclipse.cep.artifact.feature:${cep.feature.version}
- org.wso2.developerstudio:org.wso2.developerstudio.eclipse.jaggery.artifact.feature:${jaggery.feature.version}
+ org.wso2.developerstudio:org.wso2.developerstudio.eclipse.jaggery.artifact.feature:${jaggery.feature.version}
+
+
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}
'Upgrade Plugin Versions in pom.xml' context menu
+ * item of developer studio project.
+ *
+ */
+public class UpgradePluginVersionsAction implements IObjectActionDelegate {
+ private static IDeveloperStudioLog log = Logger.getLog(Activator.PLUGIN_ID);
+ private IProject project;
+ private IFile mavenProjectFile;
+
+ @Override
+ public void run(IAction action) {
+ MavenProject mavenProject;
+ try {
+ String message = "This will upgrade the WSO2 maven plugin versions in pom.xml. Do you want to continue?";
+ boolean okPressed = MessageDialog.open(MessageDialog.QUESTION,
+ Display.getCurrent().getActiveShell(),
+ "Upgrading Plugin Versions", message,
+ SWT.NONE);
+ if (okPressed) {
+ mavenProject = MavenUtils.getMavenProject(mavenProjectFile.getLocation().toFile());
+ MavenUtils.upgradePluginVersions(project, mavenProject);
+ MavenUtils.saveMavenProject(mavenProject, mavenProjectFile.getLocation().toFile());
+
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+ } catch (Exception e) {
+ log.error("Error occured while updating the pom.xml of " + project.getName(), e);
+ }
+
+ }
+
+ @Override
+ public void selectionChanged(IAction action, ISelection selection) {
+ if (selection instanceof TreeSelection) {
+ TreeSelection treeSelection = (TreeSelection) selection;
+ if (treeSelection.getFirstElement() instanceof IProject) {
+ IProject project = (IProject) treeSelection.getFirstElement();
+ action.setEnabled(project.isOpen());
+ this.project = project;
+ mavenProjectFile = project.getFile("pom.xml");
+ if (mavenProjectFile.exists()) {
+ action.setText("Upgrade Plugin Versions in pom.xml");
+ }
+ } else {
+ action.setEnabled(false);
+ }
+ }
+
+ }
+
+ @Override
+ public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
\ No newline at end of file
From fb83813592da0f5f245407cbf23455f10f830850 Mon Sep 17 00:00:00 2001
From: sumuditha-viraj
Date: Fri, 28 Feb 2014 15:22:03 +0530
Subject: [PATCH 03/21] Adding DataMapper Mediator
---
.../META-INF/MANIFEST.MF | 4 +-
.../messages.properties | 4 +
.../plugin.properties | 3 +
.../plugin.xml | 44 +-
.../DataMapperMediatorCreateCommand.java | 82 +
...erMediatorInputConnectorCreateCommand.java | 87 +
...rMediatorOutputConnectorCreateCommand.java | 87 +
.../helpers/DataMapperMediatorEditHelper.java | 7 +
...apperMediatorInputConnectorEditHelper.java | 7 +
...pperMediatorOutputConnectorEditHelper.java | 7 +
...esourceEndpointInputConnectorEditPart.java | 1 +
...sourceEndpointOutputConnectorEditPart.java | 4 +
...PIResourceFaultInputConnectorEditPart.java | 6 +-
.../APIResourceInputConnectorEditPart.java | 6 +-
.../APIResourceOutputConnectorEditPart.java | 6 +-
.../edit/parts/AddressEndPoint2EditPart.java | 6 +-
.../edit/parts/AddressEndPointEditPart.java | 19 +-
.../parts/BAMMediatorDescriptionEditPart.java | 2 +-
.../BeanMediatorDescriptionEditPart.java | 2 +-
.../BuilderMediatorDescriptionEditPart.java | 2 +-
...llTemplateMediatorDescriptionEditPart.java | 2 +-
.../CalloutMediatorDescriptionEditPart.java | 2 +-
.../ClassMediatorDescriptionEditPart.java | 2 +-
.../CloudConnectorDescriptionEditPart.java | 2 +-
.../CloudConnectorInputConnectorEditPart.java | 1 +
...ConnectorOperationDescriptionEditPart.java | 2 +-
.../CloudConnectorOperationEditPart.java | 3 +-
...CloudConnectorOutputConnectorEditPart.java | 4 +
.../CommandMediatorDescriptionEditPart.java | 4 +-
...onalRouterMediatorDescriptionEditPart.java | 2 +-
.../DBLookupMediatorDescriptionEditPart.java | 2 +-
.../DBReportMediatorDescriptionEditPart.java | 2 +-
...DataMapperMediatorDescriptionEditPart.java | 603 +
.../parts/DataMapperMediatorEditPart.java | 327 +
...aMapperMediatorInputConnectorEditPart.java | 335 +
...MapperMediatorOutputConnectorEditPart.java | 554 +
.../DropMediatorDescriptionEditPart.java | 2 +-
.../parts/EJBMediatorDescriptionEditPart.java | 2 +-
.../EnqueueMediatorDescriptionEditPart.java | 2 +-
.../EnrichMediatorDescriptionEditPart.java | 2 +-
.../edit/parts/EsbEditPartFactory.java | 12 +
.../EventMediatorDescriptionEditPart.java | 2 +-
...loverEndPointOutputConnector2EditPart.java | 4 +
.../FaultMediatorDescriptionEditPart.java | 2 +-
.../edit/parts/HTTPEndpointEditPart.java | 4 +-
.../HeaderMediatorDescriptionEditPart.java | 2 +-
...eEndPointWestOutputConnector2EditPart.java | 4 +
.../parts/LogMediatorDescriptionEditPart.java | 2 +-
.../LoopBackMediatorDescriptionEditPart.java | 2 +-
...FlowMediatorFlowCompartment15EditPart.java | 6 +-
...FlowMediatorFlowCompartment19EditPart.java | 37 +-
...rFlowMediatorFlowCompartment5EditPart.java | 6 +-
...orFlowMediatorFlowCompartmentEditPart.java | 6 +-
.../MergeNodeFirstInputConnectorEditPart.java | 1 +
.../MergeNodeOutputConnectorEditPart.java | 4 +
...MergeNodeSecondInputConnectorEditPart.java | 1 +
.../parts/MessageInputConnectorEditPart.java | 1 +
.../parts/MessageOutputConnectorEditPart.java | 4 +
.../edit/parts/NamedEndpointEditPart.java | 2 +-
.../OAuthMediatorDescriptionEditPart.java | 2 +-
...oadFactoryMediatorDescriptionEditPart.java | 2 +-
.../PropertyMediatorDescriptionEditPart.java | 2 +-
.../ProxyFaultInputConnectorEditPart.java | 6 +-
.../parts/ProxyInputConnectorEditPart.java | 6 +-
...RMSequenceMediatorDescriptionEditPart.java | 2 +-
.../RespondMediatorDescriptionEditPart.java | 2 +-
.../ScriptMediatorDescriptionEditPart.java | 2 +-
.../edit/parts/SequenceNameEditPart.java | 2 +-
.../SmooksMediatorDescriptionEditPart.java | 2 +-
.../SpringMediatorDescriptionEditPart.java | 2 +-
.../StoreMediatorDescriptionEditPart.java | 2 +-
...plateEndpointOutputConnector2EditPart.java | 4 +
.../TemplateTemplateCompartmentEditPart.java | 2 +-
...ransactionMediatorDescriptionEditPart.java | 2 +-
...URLRewriteMediatorDescriptionEditPart.java | 2 +-
.../edit/parts/WSDLEndPointEditPart.java | 2 +-
.../XQueryMediatorDescriptionEditPart.java | 2 +-
.../XSLTMediatorDescriptionEditPart.java | 2 +-
...DataMapperMediatorCanonicalEditPolicy.java | 183 +
...rInputConnectorItemSemanticEditPolicy.java | 107 +
...aMapperMediatorItemSemanticEditPolicy.java | 114 +
...OutputConnectorItemSemanticEditPolicy.java | 107 +
.../EsbDiagramCanonicalEditPolicy.java | 23 +
.../MediatorFlow10ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow11ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow12ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow13ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow14ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow15ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow16ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow17ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow18ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow19ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow20ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow21ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow22ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow23ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow24ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow2ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow3ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow4ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow5ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow6ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow7ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow8ItemSemanticEditPolicy.java | 7 +
.../MediatorFlow9ItemSemanticEditPolicy.java | 7 +
.../MediatorFlowItemSemanticEditPolicy.java | 7 +
...rFlowCompartment10CanonicalEditPolicy.java | 2 +
...owCompartment10ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment11CanonicalEditPolicy.java | 2 +
...owCompartment11ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment12CanonicalEditPolicy.java | 2 +
...owCompartment12ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment13CanonicalEditPolicy.java | 2 +
...owCompartment13ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment14CanonicalEditPolicy.java | 2 +
...owCompartment14ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment15CanonicalEditPolicy.java | 2 +
...owCompartment15ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment16CanonicalEditPolicy.java | 2 +
...owCompartment16ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment17CanonicalEditPolicy.java | 2 +
...owCompartment17ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment18CanonicalEditPolicy.java | 2 +
...owCompartment18ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment19CanonicalEditPolicy.java | 2 +
...owCompartment19ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment20CanonicalEditPolicy.java | 2 +
...owCompartment20ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment21CanonicalEditPolicy.java | 2 +
...owCompartment21ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment22CanonicalEditPolicy.java | 2 +
...owCompartment22ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment23CanonicalEditPolicy.java | 2 +
...owCompartment23ItemSemanticEditPolicy.java | 4 +
...rFlowCompartment24CanonicalEditPolicy.java | 2 +
...owCompartment24ItemSemanticEditPolicy.java | 4 +
...orFlowCompartment2CanonicalEditPolicy.java | 2 +
...lowCompartment2ItemSemanticEditPolicy.java | 4 +
...orFlowCompartment3CanonicalEditPolicy.java | 2 +
...lowCompartment3ItemSemanticEditPolicy.java | 4 +
...orFlowCompartment4CanonicalEditPolicy.java | 2 +
...lowCompartment4ItemSemanticEditPolicy.java | 4 +
...orFlowCompartment5CanonicalEditPolicy.java | 2 +
...lowCompartment5ItemSemanticEditPolicy.java | 4 +
...orFlowCompartment6CanonicalEditPolicy.java | 2 +
...lowCompartment6ItemSemanticEditPolicy.java | 4 +
...orFlowCompartment7CanonicalEditPolicy.java | 2 +
...lowCompartment7ItemSemanticEditPolicy.java | 4 +
...orFlowCompartment8CanonicalEditPolicy.java | 2 +
...lowCompartment8ItemSemanticEditPolicy.java | 4 +
...orFlowCompartment9CanonicalEditPolicy.java | 2 +
...lowCompartment9ItemSemanticEditPolicy.java | 4 +
...torFlowCompartmentCanonicalEditPolicy.java | 2 +
...FlowCompartmentItemSemanticEditPolicy.java | 4 +
.../EsbNavigatorContentProvider.java | 9914 +++++++++--------
.../navigator/EsbNavigatorLabelProvider.java | 2401 ++--
.../esb/diagram/part/EsbDiagramEditor.java | 37 +-
.../esb/diagram/part/EsbDiagramUpdater.java | 225 +
.../esb/diagram/part/EsbPaletteFactory.java | 44 +-
.../esb/diagram/part/EsbVisualIDRegistry.java | 167 +
.../gmf/esb/diagram/part/Messages.java | 20 +
.../diagram/providers/EsbElementTypes.java | 32 +
.../EsbModelingAssistantProvider.java | 98 +-
.../diagram/providers/EsbParserProvider.java | 21 +
.../diagram/providers/EsbViewProvider.java | 127 +
.../esb/diagram/sheet/EsbPropertySection.java | 6 +-
...ector_DataMapperMediatorInputConnector.gif | Bin 0 -> 223 bytes
...ctor_DataMapperMediatorOutputConnector.gif | Bin 0 -> 223 bytes
...dpointFlow_children_DataMapperMediator.gif | Bin 0 -> 223 bytes
...ence_childMediators_DataMapperMediator.gif | Bin 0 -> 223 bytes
...eEsbServer_children_DataMapperMediator.gif | Bin 0 -> 223 bytes
...diatorFlow_children_DataMapperMediator.gif | Bin 0 -> 223 bytes
...e_includedMediators_DataMapperMediator.gif | Bin 0 -> 223 bytes
...reateTemplate_child_DataMapperMediator.gif | Bin 0 -> 223 bytes
.../icons/full/obj16/DataMapperMediator.gif | Bin 0 -> 129 bytes
.../DataMapperMediatorInputConnector.gif | Bin 0 -> 129 bytes
.../DataMapperMediatorOutputConnector.gif | Bin 0 -> 129 bytes
.../plugin.properties | 5 +
...perMediatorInputConnectorItemProvider.java | 118 +
.../DataMapperMediatorItemProvider.java | 176 +
...erMediatorOutputConnectorItemProvider.java | 118 +
.../provider/EndpointFlowItemProvider.java | 5 +
.../EsbItemProviderAdapterFactory.java | 72 +
.../esb/provider/EsbSequenceItemProvider.java | 5 +
.../esb/provider/EsbServerItemProvider.java | 5 +
.../provider/MediatorFlowItemProvider.java | 5 +
.../esb/provider/SequenceItemProvider.java | 5 +
.../esb/provider/TemplateItemProvider.java | 5 +
.../model/esb.ecore | 8 +
.../model/esb.genmodel | 6 +
.../model/esb.gmfgen | 1900 ++--
.../model/esb.gmfgraph | 40 +
.../model/esb.gmfmap | 44 +-
.../model/esb.gmftool | 9 +
.../model/esb.trace | 13 +
.../eclipse/gmf/esb/DataMapperMediator.java | 89 +
.../esb/DataMapperMediatorInputConnector.java | 30 +
.../DataMapperMediatorOutputConnector.java | 30 +
.../eclipse/gmf/esb/EsbFactory.java | 27 +
.../eclipse/gmf/esb/EsbPackage.java | 411 +-
.../gmf/esb/impl/DataMapperMediatorImpl.java | 255 +
.../DataMapperMediatorInputConnectorImpl.java | 52 +
...DataMapperMediatorOutputConnectorImpl.java | 52 +
.../eclipse/gmf/esb/impl/EsbFactoryImpl.java | 35 +
.../eclipse/gmf/esb/impl/EsbPackageImpl.java | 88 +
.../gmf/esb/util/EsbAdapterFactory.java | 54 +
.../eclipse/gmf/esb/util/EsbSwitch.java | 70 +
208 files changed, 13016 insertions(+), 7045 deletions(-)
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/commands/DataMapperMediatorCreateCommand.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/commands/DataMapperMediatorInputConnectorCreateCommand.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/commands/DataMapperMediatorOutputConnectorCreateCommand.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/helpers/DataMapperMediatorEditHelper.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/helpers/DataMapperMediatorInputConnectorEditHelper.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/helpers/DataMapperMediatorOutputConnectorEditHelper.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/parts/DataMapperMediatorDescriptionEditPart.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/parts/DataMapperMediatorEditPart.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/parts/DataMapperMediatorInputConnectorEditPart.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/parts/DataMapperMediatorOutputConnectorEditPart.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/policies/DataMapperMediatorCanonicalEditPolicy.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/policies/DataMapperMediatorInputConnectorItemSemanticEditPolicy.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/policies/DataMapperMediatorItemSemanticEditPolicy.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/src/org/wso2/developerstudio/eclipse/gmf/esb/diagram/edit/policies/DataMapperMediatorOutputConnectorItemSemanticEditPolicy.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/ctool16/CreateDataMapperMediator_inputConnector_DataMapperMediatorInputConnector.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/ctool16/CreateDataMapperMediator_outputConnector_DataMapperMediatorOutputConnector.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/ctool16/CreateEndpointFlow_children_DataMapperMediator.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/ctool16/CreateEsbSequence_childMediators_DataMapperMediator.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/ctool16/CreateEsbServer_children_DataMapperMediator.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/ctool16/CreateMediatorFlow_children_DataMapperMediator.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/ctool16/CreateSequence_includedMediators_DataMapperMediator.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/ctool16/CreateTemplate_child_DataMapperMediator.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/obj16/DataMapperMediator.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/obj16/DataMapperMediatorInputConnector.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/icons/full/obj16/DataMapperMediatorOutputConnector.gif
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/src/org/wso2/developerstudio/eclipse/gmf/esb/provider/DataMapperMediatorInputConnectorItemProvider.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/src/org/wso2/developerstudio/eclipse/gmf/esb/provider/DataMapperMediatorItemProvider.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb.edit/src/org/wso2/developerstudio/eclipse/gmf/esb/provider/DataMapperMediatorOutputConnectorItemProvider.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/DataMapperMediator.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/DataMapperMediatorInputConnector.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/DataMapperMediatorOutputConnector.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/DataMapperMediatorImpl.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/DataMapperMediatorInputConnectorImpl.java
create mode 100644 esb/org.wso2.developerstudio.eclipse.gmf.esb/src/org/wso2/developerstudio/eclipse/gmf/esb/impl/DataMapperMediatorOutputConnectorImpl.java
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 982b41954..556a1c728 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: 1.3.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.wso2.developerstudio.eclipse.gmf.esb.diagram.part.EsbDiagramEditorPlugin
Bundle-Vendor: %providerName
@@ -50,7 +50,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.wst.xml.xpath.core,
org.eclipse.gmf.tooling.runtime;visibility:=reexport
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-LazyStart: true
Import-Package: com.damnhandy.uri.template,
javax.xml.stream;version="1.0.1.wso2v1",
diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/messages.properties b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/messages.properties
index 490e29804..cfb4af80a 100644
--- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/messages.properties
+++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/messages.properties
@@ -400,3 +400,7 @@ NavigatorGroupName_EntitlementMediatorAdviceOutputConnector_3750_outgoinglinks=o
NavigatorGroupName_EntitlementMediatorOnRejectOutputConnector_3748_outgoinglinks=outgoing links
NavigatorGroupName_EntitlementMediatorObligationsOutputConnector_3751_outgoinglinks=outgoing links
NavigatorGroupName_EntitlementMediatorOnAcceptOutputConnector_3749_outgoinglinks=outgoing links
+DataMapperMediator46CreationTool_title=DataMapperMediator
+DataMapperMediator46CreationTool_desc=Create new DataMapperMediator
+NavigatorGroupName_DataMapperMediatorOutputConnector_3763_outgoinglinks=outgoing links
+NavigatorGroupName_DataMapperMediatorInputConnector_3762_incominglinks=incoming links
diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/plugin.properties b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/plugin.properties
index a9297e891..f85e55796 100644
--- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/plugin.properties
+++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/plugin.properties
@@ -807,3 +807,6 @@ metatype.name.EntitlementAdviceContainer_3757=EntitlementAdviceContainer
metatype.name.MediatorFlow_3758=MediatorFlow
metatype.name.EntitlementObligationsContainer_3759=EntitlementObligationsContainer
metatype.name.MediatorFlow_3760=MediatorFlow
+metatype.name.DataMapperMediator_3761=DataMapperMediator
+metatype.name.DataMapperMediatorInputConnector_3762=DataMapperMediatorInputConnector
+metatype.name.DataMapperMediatorOutputConnector_3763=DataMapperMediatorOutputConnector
diff --git a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/plugin.xml b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/plugin.xml
index 796a7378f..5e34dce56 100644
--- a/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/plugin.xml
+++ b/esb/org.wso2.developerstudio.eclipse.gmf.esb.diagram/plugin.xml
@@ -223,7 +223,7 @@
-
+
@@ -236,13 +236,13 @@