JBoss Tools SVN: r31732 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-01 11:26:16 -0400 (Wed, 01 Jun 2011)
New Revision: 31732
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
Log:
[JBIDE-8920] extracted method to get better readable code (no functional change!)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2011-06-01 15:17:07 UTC (rev 31731)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2011-06-01 15:26:16 UTC (rev 31732)
@@ -217,15 +217,11 @@
TrueZipUtil.createArchive(path);
de.schlichtherle.io.File root = TrueZipUtil.getFile(path, TrueZipUtil.getJarArchiveDetector());
IModuleResource[] resources = getResources(module);
- results.addAll(Arrays.asList(copy(root, resources)));
+ IStatus[] copyResults = copy(root, resources);
+ results.addAll(Arrays.asList(copyResults));
IModule[] children = server.getChildModules(module, new NullProgressMonitor());
- for( int i = 0; i < children.length; i++ ) {
- if( ServerModelUtilities.isBinaryModule(children[i]))
- results.addAll(Arrays.asList(fullBinaryPublish(server, deployRoot, module, children[i])));
- else
- results.addAll(Arrays.asList(fullPublish(server, deployRoot, combine(module, children[i]))));
- }
+ publishChildren(server, deployRoot, module, results, children);
TrueZipUtil.umount();
hasBeenChanged = true;
return (IStatus[]) results.toArray(new IStatus[results.size()]);
@@ -234,6 +230,17 @@
return (IStatus[]) results.toArray(new IStatus[results.size()]);
}
}
+
+
+ private void publishChildren(IServer server, String deployRoot, IModule[] module, ArrayList<IStatus> results,
+ IModule[] children) {
+ for( int i = 0; i < children.length; i++ ) {
+ if( ServerModelUtilities.isBinaryModule(children[i]))
+ results.addAll(Arrays.asList(fullBinaryPublish(server, deployRoot, module, children[i])));
+ else
+ results.addAll(Arrays.asList(fullPublish(server, deployRoot, combine(module, children[i]))));
+ }
+ }
protected IStatus[] publishChanges(IServer server, String deployRoot, IModule[] module) {
IPath path = getOutputFilePath(module);
13 years, 6 months
JBoss Tools SVN: r31731 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-01 11:17:07 -0400 (Wed, 01 Jun 2011)
New Revision: 31731
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
Log:
[JBIDE-8920] extracted method to get better readable code (no functional change!)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-06-01 13:21:55 UTC (rev 31730)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-06-01 15:17:07 UTC (rev 31731)
@@ -232,12 +232,7 @@
try {
InputStream in = new FileInputStream(tempFile);
IStatus status = copyFile(in, file.getPath());
- if (!status.isOK()) {
- MultiStatus status2 = new MultiStatus(ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorDeleting, file.toString()), null);
- status2.add(status);
- throw new CoreException(status2);
- }
- return;
+ throwOnErrorStatus(file, status);
} catch (FileNotFoundException e) {
// shouldn't occur
} finally {
@@ -254,6 +249,14 @@
NLS.bind(org.jboss.ide.eclipse.as.core.Messages.PublishRenameFailure,
tempFile.toString(), file.getAbsolutePath()), null));
}
+
+ private void throwOnErrorStatus(File file, IStatus status) throws CoreException {
+ if (!status.isOK()) {
+ MultiStatus status2 = new MultiStatus(ServerPlugin.PLUGIN_ID, 0, NLS.bind(Messages.errorDeleting, file.toString()), null);
+ status2.add(status);
+ throw new CoreException(status2);
+ }
+ }
/**
* Safe rename. Will try multiple times before giving up.
13 years, 6 months
JBoss Tools SVN: r31730 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-01 09:21:55 -0400 (Wed, 01 Jun 2011)
New Revision: 31730
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
Log:
[JBIDE-9050] added possible solution to the comments
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-01 12:07:03 UTC (rev 31729)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-01 13:21:55 UTC (rev 31730)
@@ -110,6 +110,17 @@
@Override
protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor)
throws CoreException {
+/* fix for JBIDE-
+* if (method == null)
+* throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Not publishing")); //$NON-NLS-1$
+* try {
+* int result = method.publishModule(this, kind, deltaKind, module, monitor);
+* setModulePublishState(module, result);
+* } catch(CoreException e) {
+* setModulePublishState(module, IServer.PUBLISH_STATE_FULL);
+* throw e;
+* }
+*/
if (method == null)
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Not publishing")); //$NON-NLS-1$
int result = method.publishModule(this, kind, deltaKind, module, monitor);
13 years, 6 months
JBoss Tools SVN: r31729 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-01 08:07:03 -0400 (Wed, 01 Jun 2011)
New Revision: 31729
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
Log:
[JBIDE-8920] simplified code so that it gets better readable (no functional change!)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-06-01 11:48:16 UTC (rev 31728)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-06-01 12:07:03 UTC (rev 31729)
@@ -61,51 +61,51 @@
IServer server, IModule[] module,
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
- this.module = module;
- this.server = server;
- this.method = method;
-
- String taskName = "Publishing " + module[0].getName(); //$NON-NLS-1$
- monitor.beginTask(taskName, 200);
- monitor.setTaskName(taskName);
- if( module.length > 1 ) {
- monitor.done();
- return null;
- }
-
- monitor.setTaskName("Publishing to remote server " + server.getName()); //$NON-NLS-1$
-
- // set up needed vars
- IDeployableServer server2 = ServerConverter.getDeployableServer(server);
- String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server));
- IPath sourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot, server2);
- IPath destFolder = PublishUtil.getDeployPath(method, module, server2);
- String name = sourcePath.lastSegment();
- IStatus result = null;
-
- removeDeployFailedMarker(monitor);
-
- // Am I a removal? If yes, remove me, and return
- if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
- result = removeRemoteDeployment(sourcePath, destFolder, name, monitor);
- } else if( publishType != IJBossServerPublisher.NO_PUBLISH ){
- // Locally zip it up into the remote tmp folder
- result = super.publishModule(method, server, module, publishType, delta,
- AbstractServerToolsPublisher.getSubMon(monitor, 50));
- if( !result.isOK() ) {
- monitor.done();
- } else {
- result = remoteFullPublish(sourcePath, destFolder.removeLastSegments(1), name,
- AbstractServerToolsPublisher.getSubMon(monitor, 150));
+ try {
+ this.module = module;
+ this.server = server;
+ this.method = method;
+
+ String taskName = "Publishing " + module[0].getName(); //$NON-NLS-1$
+ monitor.beginTask(taskName, 200);
+ monitor.setTaskName(taskName);
+ if( module.length > 1 ) {
+ return null;
}
- }
-
- monitor.done();
- if( result != null ) {
+
+ monitor.setTaskName("Publishing to remote server " + server.getName()); //$NON-NLS-1$
+
+ // set up needed vars
+ IDeployableServer server2 = ServerConverter.getDeployableServer(server);
+ String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server));
+ IPath sourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot, server2);
+ IPath destFolder = PublishUtil.getDeployPath(method, module, server2);
+ String name = sourcePath.lastSegment();
+ IStatus result = null;
+
+ removeDeployFailedMarker(monitor);
+
+ // Am I a removal? If yes, remove me, and return
+ if( publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
+ result = removeRemoteDeployment(sourcePath, destFolder, name, monitor);
+ } else if( publishType != IJBossServerPublisher.NO_PUBLISH ){
+ // Locally zip it up into the remote tmp folder
+ result = super.publishModule(method, server, module, publishType, delta,
+ AbstractServerToolsPublisher.getSubMon(monitor, 50));
+ if( result.isOK() ) {
+ result = remoteFullPublish(sourcePath, destFolder.removeLastSegments(1), name,
+ AbstractServerToolsPublisher.getSubMon(monitor, 150));
+ }
+ }
+
+ if( result == null ) {
+ result = Status.OK_STATUS;
+ }
+
return result;
+ } finally {
+ monitor.done();
}
-
- return Status.OK_STATUS;
}
private IStatus remoteFullPublish(IPath sourcePath,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-06-01 11:48:16 UTC (rev 31728)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-06-01 12:07:03 UTC (rev 31729)
@@ -58,18 +58,21 @@
IProgressMonitor monitor) throws CoreException {
// Build all parts together at once.
// When a call for [ear, childWar] comes in, ignore it.
+ IStatus status = Status.OK_STATUS;
+
if( module.length > 1 )
return null;
- if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server))
- return handleJBoss7Deployment(method, server, module, publishType, delta, monitor);
-
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
- String deployRoot = getDeployRoot(module, ds);
- LocalZippedPublisherUtil util = new LocalZippedPublisherUtil();
- IStatus s = util.publishModule(server, deployRoot, module, publishType, delta, monitor);
- monitor.done();
- return s;
+ if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) {
+ status = handleJBoss7Deployment(method, server, module, publishType, delta, monitor);
+ } else {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ String deployRoot = getDeployRoot(module, ds);
+ LocalZippedPublisherUtil util = new LocalZippedPublisherUtil();
+ status = util.publishModule(server, deployRoot, module, publishType, delta, monitor);
+ monitor.done();
+ }
+ return status;
}
public IStatus handleJBoss7Deployment(
13 years, 6 months
JBoss Tools SVN: r31728 - in trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test: .settings and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2011-06-01 07:48:16 -0400 (Wed, 01 Jun 2011)
New Revision: 31728
Added:
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.classpath
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.project
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.pde.core.prefs
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/META-INF/
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/META-INF/MANIFEST.MF
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/bin/
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/build.properties
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/launcher/
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/SWTBotTest-default.properties
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/PolicyPricingProcess.bpmn
trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/PolicyPricingProcess.bpmn_diagram
Log:
[bpmn-bot-test] missing resources commited
Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.classpath
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.classpath (rev 0)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.classpath 2011-06-01 11:48:16 UTC (rev 31728)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.project
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.project (rev 0)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.project 2011-06-01 11:48:16 UTC (rev 31728)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.bpmn.ui.bot.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.jdt.core.prefs 2011-06-01 11:48:16 UTC (rev 31728)
@@ -0,0 +1,8 @@
+#Thu Jan 27 10:40:29 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.pde.core.prefs
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.pde.core.prefs (rev 0)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.pde.core.prefs 2011-06-01 11:48:16 UTC (rev 31728)
@@ -0,0 +1,3 @@
+#Thu Jan 27 10:49:12 CET 2011
+eclipse.preferences.version=1
+resolve.requirebundle=false
Property changes on: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/.settings/org.eclipse.pde.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/META-INF/MANIFEST.MF 2011-06-01 11:48:16 UTC (rev 31728)
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: org.jboss.tools.bpmn.ui.bot.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.bpmn.ui.bot.test.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.gef.finder;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.junit3.headless;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.junit4.headless;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.spy;bundle-version="2.0.1",
+ org.eclipse.swtbot.eclipse.ui;bundle-version="2.0.1",
+ org.eclipse.swtbot.go;bundle-version="2.0.1",
+ org.eclipse.swtbot.junit4_x;bundle-version="2.0.1",
+ org.eclipse.swtbot.swt.finder;bundle-version="2.0.1",
+ org.jboss.tools.ui.bot.ext;bundle-version="3.2.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Eclipse-RegisterBuddy: org.apache.log4j
Property changes on: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/build.properties
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/build.properties (rev 0)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/build.properties 2011-06-01 11:48:16 UTC (rev 31728)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ resources/
Property changes on: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Property changes on: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/SWTBotTest-default.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/PolicyPricingProcess.bpmn
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/PolicyPricingProcess.bpmn (rev 0)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/PolicyPricingProcess.bpmn 2011-06-01 11:48:16 UTC (rev 31728)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:BpmnDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmi:id="_1ZcdAVmhEd2P9rCHPooJgA" iD="_1ZcdAFmhEd2P9rCHPooJgA">
+ <pools xmi:type="bpmn:Pool" xmi:id="_1ZpRUVmhEd2P9rCHPooJgA" iD="_1ZpRUFmhEd2P9rCHPooJgA" name="Policy Pricing">
+ <artifacts xmi:type="bpmn:DataObject" xmi:id="_fliSgVmmEd2P9rCHPooJgA" iD="_fliSgFmmEd2P9rCHPooJgA" name="Driver">
+ <associations xmi:type="bpmn:Association" xmi:id="_iz_ykFmmEd2P9rCHPooJgA" target="_A-sB0FmiEd2P9rCHPooJgA"/>
+ </artifacts>
+ <artifacts xmi:type="bpmn:DataObject" xmi:id="_eFomAVmmEd2P9rCHPooJgA" iD="_eFomAFmmEd2P9rCHPooJgA" name="Policy">
+ <associations xmi:type="bpmn:Association" xmi:id="_iAHekFmmEd2P9rCHPooJgA" target="_A-sB0FmiEd2P9rCHPooJgA"/>
+ </artifacts>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_1ZpRU1mhEd2P9rCHPooJgA" iD="_1ZpRUlmhEd2P9rCHPooJgA" outgoingEdges="_W_ip4VmiEd2P9rCHPooJgA" incomingEdges="_WBEPcVmiEd2P9rCHPooJgA" name="Price Policy" lanes="_GO-2wVmiEd2P9rCHPooJgA" activityType="Task"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_A-sB0FmiEd2P9rCHPooJgA" iD="_A-rawFmiEd2P9rCHPooJgA" associations="_iAHekFmmEd2P9rCHPooJgA _iz_ykFmmEd2P9rCHPooJgA" outgoingEdges="_WBEPcVmiEd2P9rCHPooJgA" lanes="_HHcIwVmiEd2P9rCHPooJgA _GO-2wVmiEd2P9rCHPooJgA" activityType="EventStartMessage"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_OwuOUVmiEd2P9rCHPooJgA" iD="_OwuOUFmiEd2P9rCHPooJgA" outgoingEdges="_h4ty4VmiEd2P9rCHPooJgA _kUIscVmiEd2P9rCHPooJgA" incomingEdges="_W_ip4VmiEd2P9rCHPooJgA" name=" Price Calculated ?" lanes="_GO-2wVmiEd2P9rCHPooJgA _HHcIwVmiEd2P9rCHPooJgA" activityType="GatewayDataBasedExclusive"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_P2TWUVmiEd2P9rCHPooJgA" iD="_P2TWUFmiEd2P9rCHPooJgA" outgoingEdges="_lkjLcVmiEd2P9rCHPooJgA" incomingEdges="_kUIscVmiEd2P9rCHPooJgA" name="Review Pricing" lanes="_HHcIwVmiEd2P9rCHPooJgA"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_ZxYfYVmiEd2P9rCHPooJgA" iD="_ZxYfYFmiEd2P9rCHPooJgA" incomingEdges="_h4ty4VmiEd2P9rCHPooJgA _lkjLcVmiEd2P9rCHPooJgA" lanes="_HHcIwVmiEd2P9rCHPooJgA _GO-2wVmiEd2P9rCHPooJgA" activityType="EventEndEmpty"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_WBEPcVmiEd2P9rCHPooJgA" iD="_WBEPcFmiEd2P9rCHPooJgA" source="_A-sB0FmiEd2P9rCHPooJgA" target="_1ZpRU1mhEd2P9rCHPooJgA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_W_ip4VmiEd2P9rCHPooJgA" iD="_W_ip4FmiEd2P9rCHPooJgA" source="_1ZpRU1mhEd2P9rCHPooJgA" target="_OwuOUVmiEd2P9rCHPooJgA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_h4ty4VmiEd2P9rCHPooJgA" iD="_h4ty4FmiEd2P9rCHPooJgA" name="false" source="_OwuOUVmiEd2P9rCHPooJgA" target="_ZxYfYVmiEd2P9rCHPooJgA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_kUIscVmiEd2P9rCHPooJgA" iD="_kUIscFmiEd2P9rCHPooJgA" name="true" source="_OwuOUVmiEd2P9rCHPooJgA" target="_P2TWUVmiEd2P9rCHPooJgA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_lkjLcVmiEd2P9rCHPooJgA" iD="_lkjLcFmiEd2P9rCHPooJgA" source="_P2TWUVmiEd2P9rCHPooJgA" target="_ZxYfYVmiEd2P9rCHPooJgA"/>
+ <lanes xmi:type="bpmn:Lane" xmi:id="_GO-2wVmiEd2P9rCHPooJgA" iD="_GO-2wFmiEd2P9rCHPooJgA" name="services-lane" activities="_1ZpRU1mhEd2P9rCHPooJgA _OwuOUVmiEd2P9rCHPooJgA _A-sB0FmiEd2P9rCHPooJgA _ZxYfYVmiEd2P9rCHPooJgA"/>
+ <lanes xmi:type="bpmn:Lane" xmi:id="_HHcIwVmiEd2P9rCHPooJgA" iD="_HHcIwFmiEd2P9rCHPooJgA" name="loanprocessor" activities="_A-sB0FmiEd2P9rCHPooJgA _P2TWUVmiEd2P9rCHPooJgA _ZxYfYVmiEd2P9rCHPooJgA _OwuOUVmiEd2P9rCHPooJgA"/>
+ </pools>
+</bpmn:BpmnDiagram>
Added: trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/PolicyPricingProcess.bpmn_diagram
===================================================================
--- trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/PolicyPricingProcess.bpmn_diagram (rev 0)
+++ trunk/bpmn/tests/org.jboss.tools.bpmn.ui.bot.test/resources/original/PolicyPricingProcess.bpmn_diagram 2011-06-01 11:48:16 UTC (rev 31728)
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_1Ze5QFmhEd2P9rCHPooJgA" type="Bpmn" name="PolicyPricingProcess.bpmn_diagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_1ZqfcFmhEd2P9rCHPooJgA" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_1ZrGgFmhEd2P9rCHPooJgA" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_1ZrtkFmhEd2P9rCHPooJgA" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_1Zs7sFmhEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_1Zs7tlmhEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_1Zs7sVmhEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_1Zs7slmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_1Zs7s1mhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_1Zs7tFmhEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_1ZpRU1mhEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZtiwFmhEd2P9rCHPooJgA" x="144" width="133" height="61"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_A-so4FmiEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_A-tP8FmiEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_A-so4VmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_A-so4lmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_A-so41miEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_A-so5FmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_A-sB0FmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A-so5VmiEd2P9rCHPooJgA" x="16" y="80"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_GPAr8FmiEd2P9rCHPooJgA" type="2007">
+ <children xmi:type="notation:Node" xmi:id="_GPBTAFmiEd2P9rCHPooJgA" type="4007"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_GPAr8VmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_GPAr8lmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_GPAr81miEd2P9rCHPooJgA" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_GPAr9FmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Lane" href="PolicyPricingProcess.bpmn#_GO-2wVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GPAr9VmiEd2P9rCHPooJgA" y="5" height="89"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_HHdW4FmiEd2P9rCHPooJgA" type="2007">
+ <children xmi:type="notation:Node" xmi:id="_HHdW5lmiEd2P9rCHPooJgA" type="4007"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_HHdW4VmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_HHdW4lmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_HHdW41miEd2P9rCHPooJgA" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_HHdW5FmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Lane" href="PolicyPricingProcess.bpmn#_HHcIwVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HHdW5VmiEd2P9rCHPooJgA" y="96" height="103"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_OwvccFmiEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_OwwDgFmiEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_OwvccVmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_OwvcclmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_Owvcc1miEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_OwvcdFmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_OwuOUVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OwvcdVmiEd2P9rCHPooJgA" x="373" y="16"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_P2UkcFmiEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_P2VLgFmiEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_P2UkcVmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_P2UkclmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_P2Ukc1miEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_P2UkdFmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_P2TWUVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P2UkdVmiEd2P9rCHPooJgA" x="555" y="141"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_ZxZtgFmiEd2P9rCHPooJgA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_ZxaUlFmiEd2P9rCHPooJgA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_ZxZtgVmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_ZxaUkFmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_ZxaUkVmiEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_ZxaUklmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="PolicyPricingProcess.bpmn#_ZxYfYVmiEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZxaUk1miEd2P9rCHPooJgA" x="832" y="80"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_fli5kFmmEd2P9rCHPooJgA" type="1003">
+ <children xmi:type="notation:Node" xmi:id="_fljgoFmmEd2P9rCHPooJgA" type="4010"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_fli5kVmmEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_fli5klmmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_fli5k1mmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_fli5lFmmEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:DataObject" href="PolicyPricingProcess.bpmn#_fliSgVmmEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fli5lVmmEd2P9rCHPooJgA" x="160" y="144"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_eFp0IFmmEd2P9rCHPooJgA" type="1003">
+ <children xmi:type="notation:Node" xmi:id="_eFp0JlmmEd2P9rCHPooJgA" type="4010"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_eFp0IVmmEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_eFp0IlmmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_eFp0I1mmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_eFp0JFmmEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:DataObject" href="PolicyPricingProcess.bpmn#_eFomAVmmEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eFp0JVmmEd2P9rCHPooJgA" x="64" y="144"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_1ZrtkVmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_1ZrtklmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_1Zrtk1mhEd2P9rCHPooJgA"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_1ZqfcVmhEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_1ZqfclmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_1Zqfc1mhEd2P9rCHPooJgA" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_1ZqfdFmhEd2P9rCHPooJgA" lineColor="11119017"/>
+ <element xmi:type="bpmn:Pool" href="PolicyPricingProcess.bpmn#_1ZpRUVmhEd2P9rCHPooJgA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ZrtlFmhEd2P9rCHPooJgA" x="16" y="32" width="1500" height="214"/>
+ </children>
+ <styles xmi:type="notation:PageStyle" xmi:id="_1Ze5QVmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:GuideStyle" xmi:id="_1Ze5QlmhEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_1Ze5Q1mhEd2P9rCHPooJgA"/>
+ <element xmi:type="bpmn:BpmnDiagram" href="PolicyPricingProcess.bpmn#_1ZcdAVmhEd2P9rCHPooJgA"/>
+ <edges xmi:type="notation:Edge" xmi:id="_WBGEoFmiEd2P9rCHPooJgA" type="3001" source="_A-so4FmiEd2P9rCHPooJgA" target="_1Zs7sFmhEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_WBHSwFmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_WBHSwVmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_WBHSwlmiEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_WBHSw1miEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_WBGEoVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_WBGEolmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_WBGEo1miEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_WBEPcVmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WBGEpFmiEd2P9rCHPooJgA" points="[15, -6, -162, 45]$[113, -50, -64, 1]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_W_kfEFmiEd2P9rCHPooJgA" type="3001" source="_1Zs7sFmhEd2P9rCHPooJgA" target="_OwvccFmiEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_W_kfFVmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_W_kfFlmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_W_kfF1miEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_W_kfGFmiEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_W_kfEVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_W_kfElmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_W_kfE1miEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_W_ip4VmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W_kfFFmiEd2P9rCHPooJgA" points="[65, -4, -136, -1]$[185, -13, -16, -10]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_h4uZ8FmiEd2P9rCHPooJgA" type="3001" source="_OwvccFmiEd2P9rCHPooJgA" target="_ZxZtgFmiEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_h4vBBFmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_h4vBBVmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_h4vBBlmiEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_h4vBB1miEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_h4vBAFmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_h4vBAVmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_h4vBAlmiEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_h4ty4VmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h4vBA1miEd2P9rCHPooJgA" points="[0, 1, -397, -70]$[397, 36, 0, -35]$[397, 71, 0, 0]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_kUJ6kFmiEd2P9rCHPooJgA" type="3001" source="_OwvccFmiEd2P9rCHPooJgA" target="_P2UkcFmiEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_kUKhoFmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_kUKhoVmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_kUKholmiEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_kUKho1miEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_kUJ6kVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_kUJ6klmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_kUJ6k1miEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_kUIscVmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kUJ6lFmiEd2P9rCHPooJgA" points="[13, 11, -186, -101]$[165, 141, -34, 29]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_lklnsFmiEd2P9rCHPooJgA" type="3001" source="_P2UkcFmiEd2P9rCHPooJgA" target="_ZxZtgFmiEd2P9rCHPooJgA">
+ <children xmi:type="notation:Node" xmi:id="_lklntVmiEd2P9rCHPooJgA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_lklntlmiEd2P9rCHPooJgA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_lklnt1miEd2P9rCHPooJgA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_lklnuFmiEd2P9rCHPooJgA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_lklnsVmiEd2P9rCHPooJgA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_lklnslmiEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_lklns1miEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="PolicyPricingProcess.bpmn#_lkjLcVmiEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lklntFmiEd2P9rCHPooJgA" points="[54, -11, -185, 47]$[254, -43, 15, 15]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_iAIFoFmmEd2P9rCHPooJgA" type="3003" source="_eFp0IFmmEd2P9rCHPooJgA" target="_A-so4FmiEd2P9rCHPooJgA">
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_iAIFoVmmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_iAIFolmmEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_iAIFo1mmEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Association" href="PolicyPricingProcess.bpmn#_iAHekFmmEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iAIFpFmmEd2P9rCHPooJgA" points="[-9, -6, 39, 32]$[-63, -40, -15, -2]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iAJ60FmmEd2P9rCHPooJgA" id="(0.25,0.175)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_i0AZoFmmEd2P9rCHPooJgA" type="3003" source="_fli5kFmmEd2P9rCHPooJgA" target="_A-so4FmiEd2P9rCHPooJgA">
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_i0AZoVmmEd2P9rCHPooJgA"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_i0AZolmmEd2P9rCHPooJgA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_i0AZo1mmEd2P9rCHPooJgA" lineColor="0"/>
+ <element xmi:type="bpmn:Association" href="PolicyPricingProcess.bpmn#_iz_ykFmmEd2P9rCHPooJgA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i0AZpFmmEd2P9rCHPooJgA" points="[-12, -3, 160, 36]$[-187, -27, -15, 12]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i0C14FmmEd2P9rCHPooJgA" id="(0.325,0.15)"/>
+ </edges>
+</notation:Diagram>
13 years, 6 months
JBoss Tools SVN: r31727 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-01 04:28:26 -0400 (Wed, 01 Jun 2011)
New Revision: 31727
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java
Log:
JBIDE-8307 - trunk
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2011-06-01 07:35:51 UTC (rev 31726)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesActionProvider.java 2011-06-01 08:28:26 UTC (rev 31727)
@@ -112,7 +112,16 @@
buildAction.setText(ArchivesUIMessages.ProjectPackagesView_buildProjectAction_label);
} else if( element instanceof IArchiveNode ){
IArchiveNode node = (IArchiveNode)element;
-
+ if( manager.find(INITIAL_SEPARATOR_ID) == null){
+ Separator s = new Separator(INITIAL_SEPARATOR_ID);
+ s.setVisible(false);
+ manager.add(s);
+ }
+ if( manager.find(END_ADD_CHILD_SEPARATOR_ID) == null){
+ Separator s = new Separator(END_ADD_CHILD_SEPARATOR_ID);
+ s.setVisible(false);
+ manager.add(s);
+ }
if (node instanceof INamedContainerArchiveNode ) {
manager.insertAfter(INITIAL_SEPARATOR_ID, newFilesetAction);
manager.insertAfter(INITIAL_SEPARATOR_ID, newFolderAction);
13 years, 6 months
JBoss Tools SVN: r31726 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: src/org/jboss/tools/hibernate/jpt/core/internal/context/java and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-06-01 03:35:51 -0400 (Wed, 01 Jun 2011)
New Revision: 31726
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/AbstractHibernateNamedQueryImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQueryImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImpl.java
Log:
https://issues.jboss.org/browse/JBIDE-9046
Fix compilation error due to api change
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2011-06-01 07:28:46 UTC (rev 31725)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2011-06-01 07:35:51 UTC (rev 31726)
@@ -19,7 +19,8 @@
org.eclipse.jpt.jpa.db,
org.eclipse.jpt.jpa.core;bundle-version="3.0.0",
org.eclipse.text;bundle-version="3.5.100",
- org.eclipse.jst.j2ee;bundle-version="1.1.500"
+ org.eclipse.jst.j2ee;bundle-version="1.1.500",
+ org.eclipse.persistence.jpa.jpql;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.hibernate.jpt.core.internal,
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/AbstractHibernateNamedQueryImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/AbstractHibernateNamedQueryImpl.java 2011-06-01 07:28:46 UTC (rev 31725)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/AbstractHibernateNamedQueryImpl.java 2011-06-01 07:35:51 UTC (rev 31726)
@@ -22,7 +22,7 @@
*
*/
@SuppressWarnings("restriction")
-public class AbstractHibernateNamedQueryImpl<T extends HibernateQueryAnnotation> extends AbstractJavaQuery<T>
+public abstract class AbstractHibernateNamedQueryImpl<T extends HibernateQueryAnnotation> extends AbstractJavaQuery<T>
implements HibernateJavaQuery {
private FlushModeType specifiedFlushMode;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-06-01 07:28:46 UTC (rev 31725)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-06-01 07:35:51 UTC (rev 31726)
@@ -304,10 +304,4 @@
}
}
- @Override
- @SuppressWarnings("unchecked")
- public Iterator<JavaQuery> queries() {
- return new CompositeIterator<JavaQuery>(queries(), this.hibernateNamedNativeQueries(), this.hibernateNamedQueries());
- }
-
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQueryImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQueryImpl.java 2011-06-01 07:28:46 UTC (rev 31725)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQueryImpl.java 2011-06-01 07:35:51 UTC (rev 31726)
@@ -10,7 +10,12 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context.java;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedNativeQuery;
import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedNativeQueryAnnotation;
@@ -110,6 +115,12 @@
public boolean isDefaultCallable(){
return HibernateNamedNativeQuery.DEFAULT_CALLABLE;
}
+
+ // ********** validation **********
+ @Override
+ protected void validateQuery_(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
+ // nothing yet
+ }
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImpl.java 2011-06-01 07:28:46 UTC (rev 31725)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImpl.java 2011-06-01 07:35:51 UTC (rev 31726)
@@ -10,7 +10,13 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context.java;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jpt.jpa.core.context.java.JavaJpaContextNode;
+import org.eclipse.jpt.jpa.core.internal.jpql.JpaJpqlQueryHelper;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.hibernate.jpt.core.internal.resource.java.HibernateNamedQueryAnnotation;
/**
@@ -23,5 +29,13 @@
HibernateNamedQueryAnnotation queryAnnotation) {
super(parent, queryAnnotation);
}
+
+ // ********** validation **********
+ @Override
+ protected void validateQuery_(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
+ JpaJpqlQueryHelper helper = new JpaJpqlQueryHelper();
+ helper.validate(this, this.query, this.getQueryAnnotation().getQueryTextRange(astRoot), 1, messages);
+ }
+
}
13 years, 6 months
JBoss Tools SVN: r31725 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-01 03:28:46 -0400 (Wed, 01 Jun 2011)
New Revision: 31725
Modified:
branches/jbosstools-3.2.x/build/target-platform/jbds.target
branches/jbosstools-3.2.x/build/target-platform/multiple.target
branches/jbosstools-3.2.x/build/target-platform/unified.target
Log:
https://issues.jboss.org/browse/JBIDE-9038 bump up to WTP 3.2.4
Modified: branches/jbosstools-3.2.x/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-06-01 07:06:52 UTC (rev 31724)
+++ branches/jbosstools-3.2.x/build/target-platform/jbds.target 2011-06-01 07:28:46 UTC (rev 31725)
@@ -74,27 +74,27 @@
<!-- WTP 3.2.3 -->
<unit id="org.eclipse.jpt.eclipselink.feature.feature.group" version="2.3.3.v201102072310-7778BkBgJ9EA9VGcDFBA"/>
<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.2.v201008242310-7N7UF75FD3wTgbUpoff0aT"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.4.v201104182301-7E7I7CF9JgLWPN-X2DIHK"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.2.v201008170019-377AB8s73533J5J759F"/>
<unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.1.v201007070821-52FMTAkF7B77UBR7W98"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.4.v201104201417-7b7HHfYFSK2WDvSHB0pTyNZ7TpYo"/>
<unit id="org.eclipse.jst.enterprise_userdoc.feature.feature.group" version="3.2.100.v201007151547-62FR7BgJ9E99_EmEJFX"/>
- <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.101.v20100906-208_7w31211A17"/>
+ <unit id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group" version="2.2.102.v201104182301-208_7w31211A17"/>
<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.2.v20100818b-777HFGRCcNBDiBjIbhBA8"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.0.v201005241530-31FA28s73533C66"/>
- <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.4.v20110323-7A5FEn9xFc7TCFKWBBINHK43A"/>
<unit id="org.eclipse.jst.server_userdoc.feature.feature.group" version="3.3.0.v201005241530-2-Eo7w3121162A3329"/>
<unit id="org.eclipse.jst.web_core.feature.feature.group" version="3.2.2.v201008170029-7Q7BG75FE9Le9BCy-tZxTqohz000"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.2.v201101112207-4619oB5865D8I2331"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.3.v201104182301-4619oB5865D8I2331"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.3.v201101262333-7F77FJ_C25TkfyypjhqQuxNYsMrJ"/>
<unit id="org.eclipse.jst.web_userdoc.feature.feature.group" version="3.2.1.v201009091720-2107w31211938"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.2.v201008232129-7H777DFAKlRiOX8lGdRoz0878J"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.3.v201103270854-7H777FFAKlRiQX8jSbaqy878J"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn"/>
<unit id="org.eclipse.jst.ws.jaxws_userdoc.feature.feature.group" version="1.0.2.v201008232129-3-28s73533I67767I"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.4.v201103101400-7B7DFEuF7RZHOaLjSqMqRK"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.2.v201008170019-377AB8s73533J5H335L"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.3.v201102160540-7C78FGUF9JgLWNO2UCNqfa"/>
@@ -102,15 +102,15 @@
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.2.v20100908-30F8V8s734C3I3K"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.3.v20101104-7B4FBuAtJb1qEKLnCKHHHI347"/>
<unit id="org.eclipse.wst.server_userdoc.feature.feature.group" version="3.1.10.v201005241510-20Bg7w3121162A3236"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.4.v201103170600-7E7AFIAAJrn5WMH1wVGEpTILWIDTYd"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.2.v201008100100-7O7CFbKEMf84nUlEJyX7-SPQjhYZ"/>
<unit id="org.eclipse.wst.web_userdoc.feature.feature.group" version="3.2.0.v201005241510-31Eo8s734B3E4H7799"/>
<unit id="org.eclipse.wst.ws_core.feature.feature.group" version="3.2.2.v201008211705-7L7RFezFGtGd-ngz--z0mHnb4852"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
<unit id="org.eclipse.wst.ws_userdoc.feature.feature.group" version="3.1.200.v201007151546-44FO-9oB5855O8M9JHH"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.2.v201008170029-7C7OFXYF7RZHQHI5PyJwPT"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.2.v201008170029-7H7AFUQDxumQGOpBqffOY2f1qxDZ"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.4.v201103231834-7C7OFXfF7RZHQLInN2MhWd"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.4.v201103170600-7H7AFUaDxumQJOs8hggQZ6_jl1EOJGNlUsOsTM"/>
<unit id="org.eclipse.wst.xml_userdoc.feature.feature.group" version="3.2.100.v201005241420-50FXNAkF7B77RBgFFBF"/>
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.6.v201101212357-67K3BgJ9DJAPEUCSKQ"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.3.v201102102045-7S7WFASFIpS-21NUD58xfPVDTLR"/>
@@ -153,7 +153,5 @@
<repository location="http://download.jboss.org/jbosstools/updates/helios/"/>
</location>
</locations>
- <includeBundles>
- <plugin id="org.apache.commons.io"/>
- </includeBundles>
+ <!-- <includeBundles><plugin id="org.apache.commons.io"/></includeBundles> -->
</target>
Modified: branches/jbosstools-3.2.x/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-06-01 07:06:52 UTC (rev 31724)
+++ branches/jbosstools-3.2.x/build/target-platform/multiple.target 2011-06-01 07:28:46 UTC (rev 31725)
@@ -169,42 +169,42 @@
<unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
<unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
- <unit id="org.eclipse.jst.jee" version="1.0.302.v201101122300"/>
+ <unit id="org.eclipse.jst.jee" version="1.0.303.v201103311600"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.103.v201101271715"/>
<unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.2.v201008170019-377AB8s73533J5J759F"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.2.v201008232129-7H777DFAKlRiOX8lGdRoz0878J"/>
- <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.3.v201010220000-7N7UF77FD3wTgcVbmmf0cT"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.3.v201103270854-7H777FFAKlRiQX8jSbaqy878J"/>
+ <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.4.v201104192310-7N7UF77FD3wTgcVbmmf0cT"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.3.v201101121727-377AC8s73543C6H4A5H"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.3.v201011031800-7b7GHfIFSK2WBRT6E1mcyFXGPnSh"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.4.v201104201417-7b7HHfYFSK2WDvSHB0pTyNZ7TpYo"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.3.v201102160541-7O7CFbWEMf84qYjGDyP3DNEwcgFU"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.3.v201102160550-7H7AFUWDxumQJOi9ghcTb5YgkwEZ"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.4.v201103170600-7H7AFUaDxumQJOs8hggQZ6_jl1EOJGNlUsOsTM"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.3.v201102102045-7S7WFASFIpS-21NUD58xfPVDTLR"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.3.v201102160540-7C78FGUF9JgLWNO2UCNqfa"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.4.v201104182301-7E7I7CF9JgLWPN-X2DIHK"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn"/>
<unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.3.v201102071500-52FMUAkF7B87PAT8SA8"/>
<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.3.v20110111-777HFGSCcNBDjBdHV4BA8"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.0.v201005241530-31FA28s73533C66"/>
- <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.4.v20110323-7A5FEn9xFc7TCFKWBBINHK43A"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.3.v201101262333-7F77FJ_C25TkfyypjhqQuxNYsMrJ"/>
<unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.6.v201101212357-67K3BgJ9DJAPEUCSKQ"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.2.v201101112207-4619oB5865D8I2331"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.3.v201104182301-4619oB5865D8I2331"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.4.v201103101400-7B7DFEuF7RZHOaLjSqMqRK"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.3.v20101104-30F8X8s734D3A4C"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.3.v20101104-7B4FBuAtJb1qEKLnCKHHHI347"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.4.v201103170600-7E7AFIAAJrn5WMH1wVGEpTILWIDTYd"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.3.v201102160550-7C7OFXcF7RZHQKIkMxMsW_"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.4.v201103231834-7C7OFXfF7RZHQLInN2MhWd"/>
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
@@ -218,4 +218,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: branches/jbosstools-3.2.x/build/target-platform/unified.target
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-06-01 07:06:52 UTC (rev 31724)
+++ branches/jbosstools-3.2.x/build/target-platform/unified.target 2011-06-01 07:28:46 UTC (rev 31725)
@@ -169,42 +169,42 @@
<unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
<unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/> -->
- <unit id="org.eclipse.jst.jee" version="1.0.302.v201101122300"/>
+ <unit id="org.eclipse.jst.jee" version="1.0.303.v201103311600"/>
<unit id="org.eclipse.wst.common.frameworks" version="1.2.0.v201003040800"/>
<unit id="org.eclipse.wst.common.project.facet.ui" version="1.4.103.v201101271715"/>
<unit id="org.eclipse.jst.jee.web" version="1.0.301.v201007070907"/>
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.2.v201008170019-377AB8s73533J5J759F"/>
<unit id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="1.1.100.v201005241530-78-FF0DZRDKDDePSKwHj"/>
- <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.2.v201008232129-7H777DFAKlRiOX8lGdRoz0878J"/>
- <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.3.v201010220000-7N7UF77FD3wTgcVbmmf0cT"/>
+ <unit id="org.eclipse.jst.ws.cxf.feature.feature.group" version="1.0.3.v201103270854-7H777FFAKlRiQX8jSbaqy878J"/>
+ <unit id="org.eclipse.jpt.feature.feature.group" version="2.3.4.v201104192310-7N7UF77FD3wTgcVbmmf0cT"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.3.v201101121727-377AC8s73543C6H4A5H"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.3.v201011031800-7b7GHfIFSK2WBRT6E1mcyFXGPnSh"/>
+ <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.4.v201104201417-7b7HHfYFSK2WDvSHB0pTyNZ7TpYo"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.3.v201102160541-7O7CFbWEMf84qYjGDyP3DNEwcgFU"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.3.v201102160550-7H7AFUWDxumQJOi9ghcTb5YgkwEZ"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.4.v201103170600-7H7AFUaDxumQJOs8hggQZ6_jl1EOJGNlUsOsTM"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.3.v201102102045-7S7WFASFIpS-21NUD58xfPVDTLR"/>
<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="1.2.3.v201102160540-7C78FGUF9JgLWNO2UCNqfa"/>
- <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
+ <unit id="org.eclipse.jsf.feature.feature.group" version="3.2.4.v201104182301-7E7I7CF9JgLWPN-X2DIHK"/>
<unit id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="1.0.0.v201005241530-5--AkF7B77NBZBgBg"/>
<unit id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="1.0.1.v201008232129-7E777CF8NcJSSK-UBTwXn"/>
<unit id="org.eclipse.jst.enterprise_core.feature.feature.group" version="3.2.3.v201102071500-52FMUAkF7B87PAT8SA8"/>
<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="3.2.3.v20110111-777HFGSCcNBDjBdHV4BA8"/>
<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="3.2.0.v201005241530-208Z7w31211419"/>
<unit id="org.eclipse.jst.server_core.feature.feature.group" version="3.2.0.v201005241530-31FA28s73533C66"/>
- <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.2.v20100908-7A5FEi9xFc7RCJMToAIOJC43A"/>
+ <unit id="org.eclipse.jst.server_ui.feature.feature.group" version="3.2.4.v20110323-7A5FEn9xFc7TCFKWBBINHK43A"/>
<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.2.3.v201101262333-7F77FJ_C25TkfyypjhqQuxNYsMrJ"/>
<unit id="org.eclipse.jsf.feature.source.feature.group" version="3.2.3.v201101112207-7E7I7BF9JgLWPMz0VyDEHH"/>
<unit id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="1.1.6.v201101212357-67K3BgJ9DJAPEUCSKQ"/>
- <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.2.v201101112207-4619oB5865D8I2331"/>
+ <unit id="org.eclipse.jst.webpageeditor.feature.feature.group" version="2.3.3.v201104182301-4619oB5865D8I2331"/>
<unit id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="1.5.300.v201005241450-2407w312116191741"/>
- <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
+ <unit id="org.eclipse.wst.common_core.feature.feature.group" version="3.2.4.v201103101400-7B7DFEuF7RZHOaLjSqMqRK"/>
<unit id="org.eclipse.wst.common_ui.feature.feature.group" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
<unit id="org.eclipse.wst.server_core.feature.feature.group" version="3.2.3.v20101104-30F8X8s734D3A4C"/>
<unit id="org.eclipse.wst.server_ui.feature.feature.group" version="3.2.3.v20101104-7B4FBuAtJb1qEKLnCKHHHI347"/>
- <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.3.v201102160541-7E7AFI3AJrn5TN32vSJ8nRIWLD7_"/>
+ <unit id="org.eclipse.wst.web_core.feature.feature.group" version="3.2.4.v201103170600-7E7AFIAAJrn5WMH1wVGEpTILWIDTYd"/>
<unit id="org.eclipse.wst.ws_ui.feature.feature.group" version="3.2.3.v201102160541-7I78FZIEtEoO2d7AsK6jSNqC-8jj"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.3.v201102160550-7C7OFXcF7RZHQKIkMxMsW_"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.2.4.v201103231834-7C7OFXfF7RZHQLInN2MhWd"/>
<unit id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="1.4.2.v201012211742"/>
<unit id="com.google.gwt.eclipse.sdkbundle.e36.feature.2.1.1.feature.group" version="2.1.1.v201012170127"/>
@@ -218,4 +218,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
13 years, 6 months
JBoss Tools SVN: r31724 - trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-01 03:06:52 -0400 (Wed, 01 Jun 2011)
New Revision: 31724
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
Log:
JBIDE-9043 - trunk
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java 2011-06-01 07:06:25 UTC (rev 31723)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java 2011-06-01 07:06:52 UTC (rev 31724)
@@ -16,6 +16,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceDescription;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.IncrementalProjectBuilder;
@@ -317,6 +318,8 @@
protected void callBuild() throws CoreException {
ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
waitForIdle();
+ ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ waitForIdle();
}
private void waitForIdle() {
13 years, 6 months
JBoss Tools SVN: r31723 - branches/jbosstools-3.2.x/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-01 03:06:25 -0400 (Wed, 01 Jun 2011)
New Revision: 31723
Modified:
branches/jbosstools-3.2.x/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
Log:
JBIDE-9043 - maintenance
Modified: branches/jbosstools-3.2.x/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
===================================================================
--- branches/jbosstools-3.2.x/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java 2011-06-01 06:42:21 UTC (rev 31722)
+++ branches/jbosstools-3.2.x/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java 2011-06-01 07:06:25 UTC (rev 31723)
@@ -325,5 +325,7 @@
protected void callBuild() throws CoreException {
ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
JobUtils.waitForIdle();
+ ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ waitForIdle();
}
}
13 years, 6 months