October 2010 - jbosstools-commits

JBoss Tools SVN: r25541 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-10-06 18:59:04 -0400 (Wed, 06 Oct 2010) New Revision: 25541 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllImageFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/FieldMatcher.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IFieldMatcher.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java Log: 2010-10-06 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java: New file. * src/org/jboss/tools/deltacloud/core/AllImageFilter.java: New file. * src/org/jboss/tools/deltacloud/core/FieldMatcher.java: New file. * src/org/jboss/tools/deltacloud/core/IFieldMatcher.java: New file. * src/org/jboss/tools/deltacloud/core/IImageFilter.java: New file. * src/org/jboss/tools/deltacloud/core/ImageFilter.java: New file. * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (save): New method. (createImageFilter): Ditto. (getImageFilter): Ditto. (DeltaCloud): Add a image filter rules parameter. * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (loadClouds): Add check for image filtering rules. (saveClouds): Save image filtering rules. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-06 22:58:03 UTC (rev 25540) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-06 22:59:04 UTC (rev 25541) @@ -1,3 +1,19 @@ +2010-10-06 Jeff Johnston <jjohnstn(a)redhat.com> + + * src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java: New file. + * src/org/jboss/tools/deltacloud/core/AllImageFilter.java: New file. + * src/org/jboss/tools/deltacloud/core/FieldMatcher.java: New file. + * src/org/jboss/tools/deltacloud/core/IFieldMatcher.java: New file. + * src/org/jboss/tools/deltacloud/core/IImageFilter.java: New file. + * src/org/jboss/tools/deltacloud/core/ImageFilter.java: New file. + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (save): New method. + (createImageFilter): Ditto. + (getImageFilter): Ditto. + (DeltaCloud): Add a image filter rules parameter. + * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (loadClouds): Add + check for image filtering rules. + (saveClouds): Save image filtering rules. + 2010-09-17 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (editCloud): New method. Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllFieldMatcher.java 2010-10-06 22:59:04 UTC (rev 25541) @@ -0,0 +1,15 @@ +package org.jboss.tools.deltacloud.core; + +public class AllFieldMatcher implements IFieldMatcher { + + @Override + public boolean matches(String input) { + return true; + } + + @Override + public String toString() { + return "*"; //$NON-NLS-1$ + } + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllImageFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllImageFilter.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AllImageFilter.java 2010-10-06 22:59:04 UTC (rev 25541) @@ -0,0 +1,38 @@ +package org.jboss.tools.deltacloud.core; + +public class AllImageFilter implements IImageFilter { + + private IFieldMatcher matcher = new AllFieldMatcher(); + + @Override + public boolean isVisible(DeltaCloudImage image) { + return true; + } + + @Override + public void setRules(String ruleString) { + // ignore, never set the rules for this filter + } + + @Override + public String toString() { + return ALL_STRING; + } + + public IFieldMatcher getNameRule() { + return matcher; //$NON-NLS-1$ + } + + public IFieldMatcher getIdRule() { + return matcher; //$NON-NLS-1$ + } + + public IFieldMatcher getArchRule() { + return matcher; //$NON-NLS-1$ + } + + public IFieldMatcher getDescRule() { + return matcher; //$NON-NLS-1$ + } + +} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-06 22:58:03 UTC (rev 25540) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-06 22:59:04 UTC (rev 25541) @@ -41,6 +41,7 @@ private DeltaCloudClient client; private ArrayList<DeltaCloudInstance> instances; private ArrayList<DeltaCloudImage> images; + private IImageFilter imageFilter; private Map<String, Job> actionJobs; private Object imageLock = new Object(); private Object instanceLock = new Object(); @@ -50,15 +51,23 @@ ListenerList imageListeners = new ListenerList(); public DeltaCloud(String name, String url, String username, String passwd) throws MalformedURLException { - this(name, url, username, passwd, null, false); + this(name, url, username, passwd, null, false, IImageFilter.ALL_STRING); } - public DeltaCloud(String name, String url, String username, String passwd, String type, boolean persistent) throws MalformedURLException { + public DeltaCloud(String name, String url, String username, String passwd, + String type, boolean persistent) throws MalformedURLException { + this(name, url, username, passwd, null, persistent, IImageFilter.ALL_STRING); + } + + public DeltaCloud(String name, String url, String username, String passwd, + String type, boolean persistent, String imageFilterRules) throws MalformedURLException { this.client = new DeltaCloudClient(new URL(url + "/api"), username, passwd); //$NON-NLS-1$ this.url = url; this.name = name; this.username = username; this.type = type; + imageFilter = new ImageFilter(); + imageFilter.setRules(imageFilterRules); if (persistent) { ISecurePreferences root = SecurePreferencesFactory.getDefault(); String key = DeltaCloud.getPreferencesKey(url, username); @@ -109,6 +118,24 @@ return type; } + public IImageFilter getImageFilter() { + return imageFilter; + } + + public void createImageFilter(String ruleString) { + String rules = getImageFilter().toString(); + if (IImageFilter.ALL_STRING.equals(ruleString)) + imageFilter = new AllImageFilter(); + else { + imageFilter = new ImageFilter(); + imageFilter.setRules(ruleString); + } + if (!rules.equals(ruleString)) { + save(); + notifyImageListListeners(getCurrImages()); + } + } + public void loadChildren() { Thread t = new Thread(new Runnable() { @@ -122,6 +149,11 @@ t.start(); } + private void save() { + // Currently we have to save all clouds instead of just this one + DeltaCloudManager.getDefault().saveClouds(); + } + public void addInstanceListListener(IInstanceListListener listener) { instanceListeners.add(listener); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-10-06 22:58:03 UTC (rev 25540) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-10-06 22:59:04 UTC (rev 25541) @@ -62,17 +62,24 @@ Node urlNode = attrs.getNamedItem("url"); // $NON-NLS-1$ Node usernameNode = attrs.getNamedItem("username"); // $NON-NLS-1$ Node typeNode = attrs.getNamedItem("type"); // $NON-NLS-1$ + Node imageFilterNode = attrs.getNamedItem("imagefilter"); //$NON-NLS-1$ String name = nameNode.getNodeValue(); String url = urlNode.getNodeValue(); String username = usernameNode.getNodeValue(); String type = typeNode.getNodeValue(); String key = DeltaCloud.getPreferencesKey(url, username); + String imageFilterRules = null; + if (imageFilterNode != null) + imageFilterRules = imageFilterNode.getNodeValue(); + else + imageFilterRules = IImageFilter.ALL_STRING; ISecurePreferences root = SecurePreferencesFactory.getDefault(); ISecurePreferences node = root.node(key); String password; try { password = node.get("password", null); //$NON-NLS-1$ - DeltaCloud cloud = new DeltaCloud(name, url, username, password, type, false); + DeltaCloud cloud = new DeltaCloud(name, url, username, password, type, + false, imageFilterRules); cloud.loadChildren(); clouds.add(cloud); } catch (Exception e1) { @@ -90,7 +97,7 @@ } } - private void saveClouds() { + public void saveClouds() { try { IPath stateLocation = Activator.getDefault().getStateLocation(); File cloudFile = stateLocation.append(CLOUDFILE_NAME).toFile(); @@ -104,7 +111,8 @@ p.println("<cloud name=\"" + d.getName() + "\" url=\"" //$NON-NLS-1$ //$NON-NLS-2$ + d.getURL() + "\" username=\"" + d.getUsername() + - "\" type=\"" + d.getType() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ + "\" type=\"" + d.getType() + + "\" imagefilter=\"" + d.getImageFilter() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ } p.println("</clouds>"); //$NON-NLS-1$ p.close(); Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/FieldMatcher.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/FieldMatcher.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/FieldMatcher.java 2010-10-06 22:59:04 UTC (rev 25541) @@ -0,0 +1,27 @@ +package org.jboss.tools.deltacloud.core; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class FieldMatcher implements IFieldMatcher { + + private String rule; + private Pattern pattern; + + public FieldMatcher(String rule) { + this.rule = rule; + pattern = Pattern.compile(rule); + } + + @Override + public boolean matches(String input) { + Matcher m = pattern.matcher(input); + return m.matches(); + } + + @Override + public String toString() { + return rule; + } + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IFieldMatcher.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IFieldMatcher.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IFieldMatcher.java 2010-10-06 22:59:04 UTC (rev 25541) @@ -0,0 +1,7 @@ +package org.jboss.tools.deltacloud.core; + +public interface IFieldMatcher { + + public boolean matches(String input); + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java 2010-10-06 22:59:04 UTC (rev 25541) @@ -0,0 +1,13 @@ +package org.jboss.tools.deltacloud.core; + +public interface IImageFilter { + + public final static String ALL_STRING = "*;*;*;*"; //$NON-NLS-1$ + + public boolean isVisible(DeltaCloudImage image); + public void setRules(String ruleString); + public IFieldMatcher getNameRule(); + public IFieldMatcher getIdRule(); + public IFieldMatcher getArchRule(); + public IFieldMatcher getDescRule(); +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java 2010-10-06 22:59:04 UTC (rev 25541) @@ -0,0 +1,66 @@ +package org.jboss.tools.deltacloud.core; + +public class ImageFilter implements IImageFilter { + + private IFieldMatcher nameRule; + private IFieldMatcher idRule; + private IFieldMatcher archRule; + private IFieldMatcher descRule; + + @Override + public boolean isVisible(DeltaCloudImage image) { + return nameRule.matches(image.getName()) && + idRule.matches(image.getId()) && + archRule.matches(image.getArchitecture()) && + descRule.matches(image.getDescription()); + } + + @Override + public void setRules(String ruleString) { + String[] tokens = ruleString.split(";"); + if (tokens[0].equals("*")) { + nameRule = new AllFieldMatcher(); + } else { + nameRule = new FieldMatcher(tokens[0]); + } + if (tokens[1].equals("*")) { + idRule = new AllFieldMatcher(); + } else { + idRule = new FieldMatcher(tokens[1]); + } + if (tokens[2].equals("*")) { + archRule = new AllFieldMatcher(); + } else { + archRule = new FieldMatcher(tokens[2]); + } + if (tokens[3].equals("*")) { + descRule = new AllFieldMatcher(); + } else { + descRule = new FieldMatcher(tokens[3]); + } + } + + @Override + public String toString() { + return nameRule + ";" //$NON-NLS-1$ + + idRule + ";" //$NON-NLS-1$ + + archRule + ";" //$NON-NLS-1$ + + descRule; //$NON-NLS-1$ + } + + public IFieldMatcher getNameRule() { + return nameRule; + } + + public IFieldMatcher getIdRule() { + return idRule; + } + + public IFieldMatcher getArchRule() { + return archRule; + } + + public IFieldMatcher getDescRule() { + return descRule; + } +}

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25540 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-10-06 18:58:03 -0400 (Wed, 06 Oct 2010) New Revision: 25540 Modified: trunk/build/target-platform/publish.sh Log: delay-updates flag not supported on qa boxen. lame. Modified: trunk/build/target-platform/publish.sh =================================================================== --- trunk/build/target-platform/publish.sh 2010-10-06 22:57:39 UTC (rev 25539) +++ trunk/build/target-platform/publish.sh 2010-10-06 22:58:03 UTC (rev 25540) @@ -13,12 +13,12 @@ du -sh ${repoPath} ${destinationPath}/${targetFile} # copy/update into central place for reuse by local downstream build jobs - date; rsync -arzqc --delete-after --delete-excluded --delay-updates --rsh=ssh --exclude '.blobstore' * ${destinationPath}/${targetFile}/ + date; rsync -arzqc --delete-after --delete-excluded --rsh=ssh --exclude '.blobstore' * ${destinationPath}/${targetFile}/ du -sh ${repoPath} ${destinationPath}/${targetFile} # upload to http://download.jboss.org/jbossotools/updates/target-platform/latest/ for public use - date; rsync -arzqc --delete-after --delete-excluded --delay-updates --rsh=ssh --exclude '.blobstore' * ${DESTINATION}/latest/ + date; rsync -arzqc --delete-after --delete-excluded --rsh=ssh --exclude '.blobstore' * ${DESTINATION}/latest/ # create zip, then upload to http://download.jboss.org/jbossotools/updates/target-platform/${targetFil... for public use zip -q -r9 /tmp/${targetFile}.zip *

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25539 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-10-06 18:57:39 -0400 (Wed, 06 Oct 2010) New Revision: 25539 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterPage.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties Log: 2010-10-06 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java: New file. * src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterPage.java: New file. * src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java (listChanged): Apply filtering. (getChildren): Ditto. (filter): New method. * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (handleSelection): Disable set of global actions when nothing is selected. (makeActions): Create image filtering action. (fillLocalPullDown): Add image filtering action. (fillContextMenu): Ditto. * src/org/jboss/tools/deltacloud/ui/views/ImageView.java (makeActions): Create image filtering action. (fillLocalPullDown): Add image filtering action. (createPartControl): Add a filtered label that pops up when the list is filtered. * src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java (inputChanged): Apply filtering. (filter): New method. * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new messages. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-06 21:16:10 UTC (rev 25538) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-06 22:57:39 UTC (rev 25539) @@ -1,3 +1,26 @@ +2010-10-06 Jeff Johnston <jjohnstn(a)redhat.com> + + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java: New file. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterPage.java: New file. + * src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java (listChanged): + Apply filtering. + (getChildren): Ditto. + (filter): New method. + * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: + * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (handleSelection): + Disable set of global actions when nothing is selected. + (makeActions): Create image filtering action. + (fillLocalPullDown): Add image filtering action. + (fillContextMenu): Ditto. + * src/org/jboss/tools/deltacloud/ui/views/ImageView.java (makeActions): Create image + filtering action. + (fillLocalPullDown): Add image filtering action. + (createPartControl): Add a filtered label that pops up when the list is filtered. + * src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java (inputChanged): + Apply filtering. + (filter): New method. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new messages. + 2010-10-06 André Dietisheim <adietish(a)redhat.com> * src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java (checkURL): changed url and added accept headers Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-10-06 21:16:10 UTC (rev 25538) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-10-06 22:57:39 UTC (rev 25539) @@ -10,11 +10,14 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; +import java.util.ArrayList; + import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.widgets.Display; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudImage; +import org.jboss.tools.deltacloud.core.IImageFilter; import org.jboss.tools.deltacloud.core.IImageListListener; public class CVImagesCategoryElement extends CVCategoryElement implements IImageListListener { @@ -41,7 +44,7 @@ if (!initialized) { DeltaCloud cloud = (DeltaCloud)getElement(); cloud.removeImageListListener(this); - DeltaCloudImage[] images = cloud.getCurrImages(); + DeltaCloudImage[] images = filter(cloud.getCurrImages()); for (int i = 0; i < images.length; ++i) { DeltaCloudImage d = images[i]; CVImageElement element = new CVImageElement(d, d.getName()); @@ -54,8 +57,9 @@ } @Override - public void listChanged(DeltaCloud cloud, DeltaCloudImage[] images) { + public void listChanged(DeltaCloud cloud, DeltaCloudImage[] newImages) { clearChildren(); + DeltaCloudImage[] images = filter(newImages); for (int i = 0; i < images.length; ++i) { DeltaCloudImage d = images[i]; CVImageElement element = new CVImageElement(d, d.getName()); @@ -69,5 +73,18 @@ } }); } + + public DeltaCloudImage[] filter(DeltaCloudImage[] input) { + ArrayList<DeltaCloudImage> array = new ArrayList<DeltaCloudImage>(); + DeltaCloud cloud = (DeltaCloud)getElement(); + IImageFilter f = cloud.getImageFilter(); + for (int i = 0; i < input.length; ++i) { + DeltaCloudImage image = input[i]; + if (f.isVisible(image)) + array.add(image); + } + return array.toArray(new DeltaCloudImage[array.size()]); + } + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-10-06 21:16:10 UTC (rev 25538) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-10-06 22:57:39 UTC (rev 25539) @@ -33,6 +33,10 @@ RemoveCloud.label=Disconnect Cloud EditCloud.label=Edit Connection Refresh.label=Refresh Cloud +Filter.label=Filter... +Filtered.label=filtered +FilteredImages.tooltip=Images shown have been filtered +ImageFilter.label=Filter Images... CreateInstance.label=Launch Instance DeleteInstance.label=Delete Instance ShowInRSE.label=Show in Remote System Explorer Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-10-06 21:16:10 UTC (rev 25538) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-10-06 22:57:39 UTC (rev 25539) @@ -34,6 +34,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IActionBars; @@ -50,6 +51,7 @@ import org.jboss.tools.deltacloud.core.ICloudManagerListener; import org.jboss.tools.deltacloud.ui.SWTImagesFactory; import org.jboss.tools.internal.deltacloud.ui.wizards.EditCloudConnection; +import org.jboss.tools.internal.deltacloud.ui.wizards.ImageFilter; import org.jboss.tools.internal.deltacloud.ui.wizards.NewInstance; @@ -79,6 +81,7 @@ private final static String REBOOTING_INSTANCE_MSG = "RebootingInstance.msg"; //$NON-NLS-1$ private final static String DESTROYING_INSTANCE_TITLE = "DestroyingInstance.title"; //$NON-NLS-1$ private final static String DESTROYING_INSTANCE_MSG = "DestroyingInstance.msg"; //$NON-NLS-1$ + private final static String IMAGE_FILTER = "ImageFilter.label"; //$NON-NLS-1$ public static final String COLLAPSE_ALL = "CollapseAll.label"; //$NON-NLS-1$ @@ -93,6 +96,7 @@ private Action doubleClickAction; private Action createInstance; private Action editCloud; + private Action imageFilterAction; private Map<String, Action> instanceActions; @@ -169,6 +173,10 @@ private void handleSelection() { IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); selectedElement = (CloudViewElement)selection.getFirstElement(); + editCloud.setEnabled(selectedElement != null); + removeCloud.setEnabled(selectedElement != null); + refreshAction.setEnabled(selectedElement != null); + imageFilterAction.setEnabled(selectedElement != null); } private void fillLocalPullDown(IMenuManager manager) { @@ -176,6 +184,7 @@ manager.add(editCloud); manager.add(removeCloud); manager.add(refreshAction); + manager.add(imageFilterAction); } private void fillContextMenu(IMenuManager manager) { @@ -192,6 +201,7 @@ } manager.add(editCloud); manager.add(removeCloud); + manager.add(imageFilterAction); // Other plug-ins can contribute there actions here manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); } @@ -407,6 +417,35 @@ instanceActions.put(DeltaCloudInstance.REBOOT, rebootAction); instanceActions.put(DeltaCloudInstance.DESTROY, destroyAction); + imageFilterAction = new Action() { + public void run() { + IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); + CloudViewElement element = (CloudViewElement)selection.getFirstElement(); + while (element != null && !(element instanceof CVCloudElement)) { + element = (CloudViewElement)element.getParent(); + } + if (element != null) { + CVCloudElement cve = (CVCloudElement)element; + final DeltaCloud cloud = (DeltaCloud)cve.getElement(); + Display.getDefault().asyncExec(new Runnable() { + + @Override + public void run() { + // TODO Auto-generated method stub + Shell shell = viewer.getControl().getShell(); + IWizard wizard = new ImageFilter(cloud); + WizardDialog dialog = new WizardDialog(shell, wizard); + dialog.create(); + dialog.open(); + } + + }); + } + } + }; + imageFilterAction.setText(CVMessages.getString(IMAGE_FILTER)); + imageFilterAction.setToolTipText(CVMessages.getString(IMAGE_FILTER)); + doubleClickAction = new Action() { public void run() { ISelection selection = viewer.getSelection(); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-10-06 21:16:10 UTC (rev 25538) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-10-06 22:57:39 UTC (rev 25539) @@ -54,9 +54,11 @@ import org.jboss.tools.deltacloud.core.DeltaCloudImage; import org.jboss.tools.deltacloud.core.DeltaCloudManager; import org.jboss.tools.deltacloud.core.ICloudManagerListener; +import org.jboss.tools.deltacloud.core.IImageFilter; import org.jboss.tools.deltacloud.core.IImageListListener; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; +import org.jboss.tools.internal.deltacloud.ui.wizards.ImageFilter; import org.jboss.tools.internal.deltacloud.ui.wizards.NewInstance; import org.osgi.service.prefs.Preferences; @@ -65,10 +67,13 @@ private final static String CLOUD_SELECTOR_LABEL = "CloudSelector.label"; //$NON-NLS-1$ private final static String LAUNCH_INSTANCE = "CreateInstance.label"; //$NON-NLS-1$ private static final String REFRESH = "Refresh.label"; //$NON-NLS-1$ - + private static final String FILTER = "Filter.label"; //$NON-NLS-1$ + private static final String FILTERED_LABEL = "Filtered.label"; //$NON-NLS-1$ + private static final String FILTERED_TOOLTIP = "FilteredImages.tooltip"; //$NON-NLS-1$ private TableViewer viewer; private Composite container; private Combo cloudSelector; + private Label filterLabel; @SuppressWarnings("unused") private DeltaCloudImage selectedElement; @@ -78,6 +83,7 @@ private ImageViewLabelAndContentProvider contentProvider; private Action refreshAction; + private Action filterAction; private Action launchAction; private ImageView parentView; @@ -175,6 +181,10 @@ } }); + filterLabel = new Label(container, SWT.NULL); + filterLabel.setText(CVMessages.getString(FILTERED_LABEL)); + filterLabel.setToolTipText(CVMessages.getString(FILTERED_TOOLTIP)); + Composite tableArea = new Composite(container, SWT.NULL); TableColumnLayout tableLayout = new TableColumnLayout(); tableArea.setLayout(tableLayout); @@ -205,6 +215,8 @@ currCloud.removeImageListListener(parentView); viewer.setInput(currCloud); currCloud.addImageListListener(parentView); + IImageFilter filter = currCloud.getImageFilter(); + filterLabel.setVisible(!filter.toString().equals(IImageFilter.ALL_STRING)); } Point p1 = cloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); @@ -220,6 +232,11 @@ f.top = new FormAttachment(0, 5); f.left = new FormAttachment(cloudSelectorLabel, 5); cloudSelector.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(0, 5 + centering); + f.right = new FormAttachment(100, -10); + filterLabel.setLayoutData(f); f = new FormData(); f.top = new FormAttachment(cloudSelector, 8); @@ -273,6 +290,7 @@ private void fillLocalPullDown(IMenuManager manager) { manager.add(refreshAction); + manager.add(filterAction); } private void fillContextMenu(IMenuManager manager) { @@ -305,7 +323,31 @@ refreshAction.setToolTipText(CVMessages.getString(REFRESH)); refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages(). getImageDescriptor(ISharedImages.IMG_TOOL_REDO)); + + filterAction = new Action() { + public void run() { + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + // TODO Auto-generated method stub + Shell shell = viewer.getControl().getShell(); + IWizard wizard = new ImageFilter(currCloud); + WizardDialog dialog = new WizardDialog(shell, wizard); + dialog.create(); + dialog.open(); + if (!currCloud.getImageFilter().toString().equals(IImageFilter.ALL_STRING)) + filterLabel.setVisible(true); + else + filterLabel.setVisible(false); + } + + }); + } + }; + filterAction.setText(CVMessages.getString(FILTER)); + filterAction.setToolTipText(CVMessages.getString(FILTER)); + launchAction = new Action() { public void run() { ISelection selection = viewer.getSelection(); @@ -320,7 +362,6 @@ WizardDialog dialog = new WizardDialog(shell, wizard); dialog.create(); dialog.open(); - } }); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-10-06 21:16:10 UTC (rev 25538) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-10-06 22:57:39 UTC (rev 25539) @@ -10,6 +10,7 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; +import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; @@ -21,6 +22,7 @@ import org.eclipse.swt.graphics.Image; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudImage; +import org.jboss.tools.deltacloud.core.IImageFilter; public class ImageViewLabelAndContentProvider extends BaseLabelProvider implements IStructuredContentProvider, ITableLabelProvider { @@ -81,14 +83,25 @@ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput != null) { if (newInput instanceof DeltaCloudImage[]) { - images = (DeltaCloudImage[])newInput; + images = filter((DeltaCloudImage[])newInput); } else { cloud = (DeltaCloud)newInput; - images = cloud.getCurrImages(); + images = filter(cloud.getCurrImages()); } } } + private DeltaCloudImage[] filter(DeltaCloudImage[] input) { + ArrayList<DeltaCloudImage> array = new ArrayList<DeltaCloudImage>(); + IImageFilter f = cloud.getImageFilter(); + for (int i = 0; i < input.length; ++i) { + DeltaCloudImage image = input[i]; + if (f.isVisible(image)) + array.add(image); + } + return array.toArray(new DeltaCloudImage[array.size()]); + } + @Override public Image getColumnImage(Object element, int columnIndex) { return null; Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-10-06 22:57:39 UTC (rev 25539) @@ -0,0 +1,43 @@ +package org.jboss.tools.internal.deltacloud.ui.wizards; + +import org.eclipse.jface.wizard.Wizard; +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudManager; + +public class ImageFilter extends Wizard { + + private DeltaCloud cloud; + private ImageFilterPage mainPage; + + public ImageFilter(DeltaCloud cloud) { + this.cloud = cloud; + } + + @Override + public void addPages() { + // TODO Auto-generated method stub + mainPage = new ImageFilterPage(cloud); + addPage(mainPage); + } + + @Override + public boolean canFinish() { + return mainPage.isPageComplete(); + } + + @Override + public boolean performFinish() { + String nameRule = mainPage.getNameRule(); + String idRule = mainPage.getIdRule(); + String archRule = mainPage.getArchRule(); + String descRule = mainPage.getDescRule(); + + cloud.createImageFilter(nameRule + ";" + //$NON-NLS-1$ + idRule + ";" + //$NON-NLS-1$ + archRule + ";" + //$NON-NLS-1$ + descRule); //$NON-NLS-1$ + + return true; + } + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterPage.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilterPage.java 2010-10-06 22:57:39 UTC (rev 25539) @@ -0,0 +1,189 @@ +package org.jboss.tools.internal.deltacloud.ui.wizards; + +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.ui.SWTImagesFactory; + +public class ImageFilterPage extends WizardPage { + + private final static String NAME = "ImageFilter.name"; //$NON-NLS-1$ + private final static String TITLE = "ImageFilter.title"; //$NON-NLS-1$ + private final static String DESC = "ImageFilter.desc"; //$NON-NLS-1$ + private final static String FILTER_LABEL = "ImageFilter.label"; //$NON-NLS-1$ + private final static String EMPTY_RULE = "ErrorFilterEmptyRule.msg"; //$NON-NLS-1$ + private final static String INVALID_SEMICOLON = "ErrorFilterSemicolon.msg"; //$NON-NLS-1$ + private final static String NAME_LABEL = "Name.label"; //$NON-NLS-1$ + private final static String ID_LABEL = "Id.label"; //$NON-NLS-1$ + private final static String ARCH_LABEL = "Arch.label"; //$NON-NLS-1$ + private final static String DESC_LABEL = "Desc.label"; //$NON-NLS-1$ + + private DeltaCloud cloud; + private Text nameText; + private Text idText; + private Text archText; + private Text descText; + + public ImageFilterPage(DeltaCloud cloud) { + super(WizardMessages.getString(NAME)); + this.cloud = cloud; + setDescription(WizardMessages.getString(DESC)); + setTitle(WizardMessages.getString(TITLE)); + setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE); + setPageComplete(false); + } + + public String getNameRule() { + return nameText.getText(); + } + + public String getIdRule() { + return idText.getText(); + } + + public String getArchRule() { + return archText.getText(); + } + + public String getDescRule() { + return descText.getText(); + } + + private ModifyListener Listener = new ModifyListener() { + + @Override + public void modifyText(ModifyEvent e) { + // TODO Auto-generated method stub + validate(); + } + }; + + private void validate() { + boolean complete = true; + boolean error = false; + + if (nameText.getText().length() == 0 || + idText.getText().length() == 0 || + archText.getText().length() == 0 || + descText.getText().length() == 0) { + + setErrorMessage(WizardMessages.getString(EMPTY_RULE)); + error = true; + } else if (nameText.getText().contains(";") || + idText.getText().contains(";") || + archText.getText().contains(";") || + descText.getText().contains(";")) { + setErrorMessage(WizardMessages.getString(INVALID_SEMICOLON)); + error = true; + } + if (!error) + setErrorMessage(null); + setPageComplete(complete && !error); + } + + @Override + public void createControl(Composite parent) { + final Composite container = new Composite(parent, SWT.NULL); + FormLayout layout = new FormLayout(); + layout.marginHeight = 5; + layout.marginWidth = 5; + container.setLayout(layout); + + Label label = new Label(container, SWT.NULL); + label.setText(WizardMessages.getString(FILTER_LABEL)); + + Label nameLabel = new Label(container, SWT.NULL); + nameLabel.setText(WizardMessages.getString(NAME_LABEL)); + + nameText = new Text(container, SWT.BORDER | SWT.SINGLE); + nameText.setText(cloud.getImageFilter().getNameRule().toString()); + nameText.addModifyListener(Listener); + + Label idLabel = new Label(container, SWT.NULL); + idLabel.setText(WizardMessages.getString(ID_LABEL)); + + idText = new Text(container, SWT.BORDER | SWT.SINGLE); + idText.setText(cloud.getImageFilter().getIdRule().toString()); + idText.addModifyListener(Listener); + + Label archLabel = new Label(container, SWT.NULL); + archLabel.setText(WizardMessages.getString(ARCH_LABEL)); + + archText = new Text(container, SWT.BORDER | SWT.SINGLE); + archText.setText(cloud.getImageFilter().getArchRule().toString()); + archText.addModifyListener(Listener); + + Label descLabel = new Label(container, SWT.NULL); + descLabel.setText(WizardMessages.getString(DESC_LABEL)); + + descText = new Text(container, SWT.BORDER | SWT.SINGLE); + descText.setText(cloud.getImageFilter().getDescRule().toString()); + descText.addModifyListener(Listener); + + Point p1 = label.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point p2 = nameText.computeSize(SWT.DEFAULT, SWT.DEFAULT); + + int centering = (p2.y - p1.y + 1) / 2; + + FormData f = new FormData(); + f.top = new FormAttachment(0); + label.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(label, 8 + centering); + f.left = new FormAttachment(0, 0); + nameLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(label, 8); + f.left = new FormAttachment(archLabel, 5); + f.right = new FormAttachment(100); + nameText.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(nameLabel, 8 + centering); + f.left = new FormAttachment(0, 0); + idLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(nameLabel, 8); + f.left = new FormAttachment(archLabel, 5); + f.right = new FormAttachment(100); + idText.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(idLabel, 8 + centering); + f.left = new FormAttachment(0, 0); + archLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(idLabel, 8); + f.left = new FormAttachment(archLabel, 5); + f.right = new FormAttachment(100); + archText.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(archLabel, 8 + centering); + f.left = new FormAttachment(0, 0); + descLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(archLabel, 8); + f.left = new FormAttachment(archLabel, 5); + f.right = new FormAttachment(100); + descText.setLayoutData(f); + + setControl(container); + setPageComplete(true); + } + +} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-10-06 21:16:10 UTC (rev 25538) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-10-06 22:57:39 UTC (rev 25539) @@ -23,8 +23,10 @@ Password.label=Password: TestButton.label=Test UnknownType.label=Unknown +Id.label=ID: Image.label=Image: Arch.label=Architecture: +Desc.label=Description: Profile.label=Hardware Profile: Properties.label=Profile Properties Cpu.label=CPUs: @@ -70,6 +72,14 @@ ManageKeys.title=Manage Keys ManageKeys.name=Manage Keys +ImageFilter.desc=Specify rules to determine which Images will appear in the dialog. +ImageFilter.title=Image Filter +ImageFilter.name=Image Filter + +ImageFilter.label=Show all images which match the following regex rules: +ErrorFilterEmptyRule.msg=Rules cannot be empty strings +ErrorFilterSemicolon.msg=Rules cannot contain a semi-colon character + ErrorInvalidDirectory.text=Specified directory is not a valid existing directory Directory.label=Directory

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25538 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-10-06 17:16:10 -0400 (Wed, 06 Oct 2010) New Revision: 25538 Modified: trunk/build/target-platform/publish.sh Log: tweak rsync rules Modified: trunk/build/target-platform/publish.sh =================================================================== --- trunk/build/target-platform/publish.sh 2010-10-06 21:10:15 UTC (rev 25537) +++ trunk/build/target-platform/publish.sh 2010-10-06 21:16:10 UTC (rev 25538) @@ -13,16 +13,16 @@ du -sh ${repoPath} ${destinationPath}/${targetFile} # copy/update into central place for reuse by local downstream build jobs - date; rsync -arzq --delete --exclude '.blobstore' * ${destinationPath}/${targetFile}/ + date; rsync -arzqc --delete-after --delete-excluded --delay-updates --rsh=ssh --exclude '.blobstore' * ${destinationPath}/${targetFile}/ du -sh ${repoPath} ${destinationPath}/${targetFile} # upload to http://download.jboss.org/jbossotools/updates/target-platform/latest/ for public use - date; rsync -arzq --delete --rsh=ssh --exclude '.blobstore' * ${DESTINATION}/latest/ + date; rsync -arzqc --delete-after --delete-excluded --delay-updates --rsh=ssh --exclude '.blobstore' * ${DESTINATION}/latest/ # create zip, then upload to http://download.jboss.org/jbossotools/updates/target-platform/${targetFil... for public use zip -q -r9 /tmp/${targetFile}.zip * du -sh /tmp/${targetFile}.zip - date; rsync -arzq --delete --rsh=ssh /tmp/${targetFile}.zip ${DESTINATION}/ + date; rsync -arzq --rsh=ssh /tmp/${targetFile}.zip ${DESTINATION}/ rm -f /tmp/${targetFile}.zip fi

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25537 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-10-06 17:10:15 -0400 (Wed, 06 Oct 2010) New Revision: 25537 Modified: trunk/build/target-platform/publish.sh Log: exclude .blobstore from rsync Modified: trunk/build/target-platform/publish.sh =================================================================== --- trunk/build/target-platform/publish.sh 2010-10-06 19:35:51 UTC (rev 25536) +++ trunk/build/target-platform/publish.sh 2010-10-06 21:10:15 UTC (rev 25537) @@ -8,18 +8,19 @@ DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform if [[ -d ${repoPath} ]]; then + cd ${repoPath} + du -sh ${repoPath} ${destinationPath}/${targetFile} # copy/update into central place for reuse by local downstream build jobs - date; rsync -arzq --delete ${repoPath}/* ${destinationPath}/${targetFile}/ + date; rsync -arzq --delete --exclude '.blobstore' * ${destinationPath}/${targetFile}/ du -sh ${repoPath} ${destinationPath}/${targetFile} # upload to http://download.jboss.org/jbossotools/updates/target-platform/latest/ for public use - date; rsync -arzq --delete --rsh=ssh ${repoPath}/* ${DESTINATION}/latest/ + date; rsync -arzq --delete --rsh=ssh --exclude '.blobstore' * ${DESTINATION}/latest/ # create zip, then upload to http://download.jboss.org/jbossotools/updates/target-platform/${targetFil... for public use - cd ${repoPath} zip -q -r9 /tmp/${targetFile}.zip * du -sh /tmp/${targetFile}.zip date; rsync -arzq --delete --rsh=ssh /tmp/${targetFile}.zip ${DESTINATION}/

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25536 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: editparts and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2010-10-06 15:35:51 -0400 (Wed, 06 Oct 2010) New Revision: 25536 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java Log: https://jira.jboss.org/browse/JBIDE-7250 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java 2010-10-06 19:19:53 UTC (rev 25535) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/SetConstraintCommand.java 2010-10-06 19:35:51 UTC (rev 25536) @@ -53,7 +53,8 @@ @Override public String getLabel() { - if (newSize == null || oldSize.equals(newSize)) + // https://jira.jboss.org/browse/JBIDE-7250 + if (newSize == null || newSize.equals(oldSize)) return IBPELUIConstants.CMD_REPOSITION_NODE; return IBPELUIConstants.CMD_RESIZE_NODE; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java 2010-10-06 19:19:53 UTC (rev 25535) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayAccessibleEditPart.java 2010-10-06 19:35:51 UTC (rev 25536) @@ -31,7 +31,9 @@ if (labeledElement != null) { childType = labeledElement.getTypeLabel(part.getModel()); displayName = labeledElement.getLabel(part.getModel()); - if (childType != null && displayName.equals(childType)) { + // https://jira.jboss.org/browse/JBIDE-7250 + // prevent possible NPE + if (childType != null && childType.equals(displayName)) { childType = null; } } else { Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java 2010-10-06 19:19:53 UTC (rev 25535) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/LinkEditPart.java 2010-10-06 19:35:51 UTC (rev 25536) @@ -385,7 +385,9 @@ if (labeledElement != null) { childType = labeledElement.getTypeLabel(thisPart.getModel()); displayName = labeledElement.getLabel(thisPart.getModel()); - if (childType != null && displayName.equals(childType)) { + // https://jira.jboss.org/browse/JBIDE-7250 + // prevent possible NPE + if (childType != null && childType.equals(displayName)) { childType = null; } } else {

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25535 - in trunk/bpel/plugins/org.eclipse.bpel.ui: src/org/eclipse/bpel/ui/wizards and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2010-10-06 15:19:53 -0400 (Wed, 06 Oct 2010) New Revision: 25535 Added: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.wsdl Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/template.properties trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.bpel trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/template.properties trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/template.properties Log: https://jira.jboss.org/browse/JBIDE-7165 Added a WSDL for "Empty Process" template. The process will be invalid because it does not have a start activity Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -63,19 +63,26 @@ static final String BUNDLE_DIRECTORY = "/"; //$NON-NLS-1$ /** Key or property under which the name of the template is present */ - static final String PROPERTY_NAME = "name"; //$NON-NLS-1$ + public static final String PROPERTY_NAME = "name"; //$NON-NLS-1$ /** The key name of the template */ - static final String PROPERTY_KEY = "key"; //$NON-NLS-1$ + public static final String PROPERTY_KEY = "key"; //$NON-NLS-1$ + + // https://jira.jboss.org/browse/JBIDE-7165 + /** All of the known template keys */ + public static final String TEMPLATE_KEY_ASYNC = "async"; + public static final String TEMPLATE_KEY_SYNC = "sync"; + public static final String TEMPLATE_KEY_EMPTY = "empty"; + /** Add more above, as new templates are created */ /** * Key or property under which the encoding information for the template * resources is present */ - static final String PROPERTY_ENCODING = "encoding"; //$NON-NLS-1$ + public static final String PROPERTY_ENCODING = "encoding"; //$NON-NLS-1$ /** Key or property under which the description of the template is present */ - static final String PROPERTY_DESCRIPTION = "description"; //$NON-NLS-1$ + public static final String PROPERTY_DESCRIPTION = "description"; //$NON-NLS-1$ /** avoid empty string */ static final String EMPTY = ""; //$NON-NLS-1$ @@ -191,6 +198,8 @@ mTemplateByName.put(name, template); String id = props.getProperty(PROPERTY_KEY); if (id != null) { + // https://jira.jboss.org/browse/JBIDE-7165 + template.mKey = id; mTemplateByKey.put(id, template); } @@ -340,6 +349,10 @@ public class Template { + // https://jira.jboss.org/browse/JBIDE-7165 + /** Template key so we don't have to worry about using localized names everywhere */ + String mKey; + /** Name of the process template */ String mName; @@ -358,6 +371,14 @@ return mName; } + /** + * @return the key + * @see https://jira.jboss.org/browse/JBIDE-7165 + */ + public String getKey() { + return mKey; + } + void add(TemplateResource resource) { mResources.add(resource); resource.mTemplate = this; @@ -476,18 +497,26 @@ int start = src.indexOf("</definitions>"); if (start > 0) { StringBuffer ss = new StringBuffer(src.substring(0, start)); - if ("Asynchronous BPEL Process".equals(args.get("type"))) { - if ("soap".equals(args.get("protocol"))) { + // https://jira.jboss.org/browse/JBIDE-7165 + // use key instead of [possibly] localized template name + Object key = args.get(Templates.PROPERTY_KEY); + String protocol = (String) args.get("protocol"); + if (protocol!=null) + protocol = protocol.toLowerCase(); + if (Templates.TEMPLATE_KEY_ASYNC.equals(key)) { + if ("soap".equals(protocol)) { ss.append(WSDLServiceDetail.Async_SOAPDetail); } else { ss.append(WSDLServiceDetail.Async_HTTPDetail); } - } else if ("Synchronous BPEL Process".equals(args.get("type"))) { - if ("soap".equals(args.get("protocol"))) { + } else if (Templates.TEMPLATE_KEY_SYNC.equals(key)) { + if ("soap".equals(protocol)) { ss.append(WSDLServiceDetail.Sync_SOAPDetail); } else { ss.append(WSDLServiceDetail.Sync_HTTPDetail); } + } else if (Templates.TEMPLATE_KEY_EMPTY.equals(key)) { + ss.append(WSDLServiceDetail.Empty_Detail); } ss.append("</definitions>"); src = ss.toString(); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -16,6 +16,7 @@ import java.util.Map; import org.eclipse.bpel.ui.BPELUIPlugin; +import org.eclipse.bpel.ui.Templates.Template; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -248,6 +249,15 @@ } /** + * @return the currently selected Template + * @see https://jira.jboss.org/browse/JBIDE-7165 + */ + public Template getSelectedTemplate() + { + return fMainPage.getSelectedTemplate(); + } + + /** * * Final condition for the wizard to finish */ Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -21,6 +21,7 @@ import org.eclipse.bpel.model.util.BPELConstants; import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.IBPELUIConstants; +import org.eclipse.bpel.ui.Templates; import org.eclipse.bpel.ui.Templates.Template; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; @@ -205,12 +206,15 @@ public void handleEvent(Event event) { String val = processTemplateField.getText().trim(); - mArgs.put("type", val); + // https://jira.jboss.org/browse/JBIDE-7165 + mArgs.put(Templates.PROPERTY_NAME, val); Template template = BPELUIPlugin.INSTANCE.getTemplates() .getTemplateByName(val); if (template != null) { String txt = template.getDescription(); templateDescription.setText(txt == null ? EMPTY : txt); + // https://jira.jboss.org/browse/JBIDE-7165 + mArgs.put(Templates.PROPERTY_KEY, template.getKey()); } } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLCustomPage.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -5,6 +5,8 @@ import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.bpel.ui.IBPELUIConstants; +import org.eclipse.bpel.ui.Templates; +import org.eclipse.bpel.ui.Templates.Template; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -23,14 +25,19 @@ /** Service name field */ private Text serviceNameField; + // https://jira.jboss.org/browse/JBIDE-7165 + // make labels class variables so we can hide them for the "Empty" template /** Port name field */ + private Label portNameLabel; private Text portNameField; /** Address name field */ + private Label addressLabel; private Text addressField; /** binding protocol */ - Combo bindingField; + private Label bindingLabel; + private Combo bindingField; private Map<String, String> mArgs = new HashMap<String, String>(); @@ -98,9 +105,9 @@ serviceNameField.addListener(SWT.Modify, validateListner); // new port label - Label portLabel = new Label(fields, SWT.NONE); - portLabel.setText(Messages.NewFileWizard_WSDLCustomPage_PortLabel); - portLabel.setFont(parent.getFont()); + portNameLabel = new Label(fields, SWT.NONE); + portNameLabel.setText(Messages.NewFileWizard_WSDLCustomPage_PortLabel); + portNameLabel.setFont(parent.getFont()); // new port name entry field portNameField = new Text(fields, SWT.BORDER); @@ -111,7 +118,7 @@ portNameField.addListener(SWT.Modify, validateListner); // new address label - Label addressLabel = new Label(fields, SWT.NONE); + addressLabel = new Label(fields, SWT.NONE); addressLabel .setText(Messages.NewFileWizard_WSDLCustomPage_AddressLabel); addressLabel.setFont(parent.getFont()); @@ -124,7 +131,7 @@ addressField.setFont(parent.getFont()); addressField.addListener(SWT.Modify, validateListner); - Label bindingLabel = new Label(fields, SWT.NONE); + bindingLabel = new Label(fields, SWT.NONE); bindingLabel .setText(Messages.NewFileWizard_WSDLCustomPage_BindingLabel); bindingLabel.setFont(parent.getFont()); @@ -141,36 +148,76 @@ bindingField.addListener(SWT.Modify, validateListner); } + // https://jira.jboss.org/browse/JBIDE-7165 + // show or hide additional WSDL parameters depending on whether the template is the "Empty" + @Override + public void setVisible(boolean visible) { + // TODO Auto-generated method stub + super.setVisible(visible); + Template template = ((NewFileWizard)getWizard()).getSelectedTemplate(); + if ( template==null || Templates.TEMPLATE_KEY_EMPTY.equals(template.getKey()) ) { + // this is an Empty BPEL process, so no ports or bindings will be generated. + // Hide the Port Name, Service Address and Binding controls + portNameLabel.setVisible(false); + portNameField.setVisible(false); + + addressLabel.setVisible(false); + addressField.setVisible(false); + + bindingLabel.setVisible(false); + bindingField.setVisible(false); + } + else { + portNameLabel.setVisible(true); + portNameField.setVisible(true); + + addressLabel.setVisible(true); + addressField.setVisible(true); + + bindingLabel.setVisible(true); + bindingField.setVisible(true); + } + } + protected boolean validatePage() { + setErrorMessage(null); + String serviceName = serviceNameField.getText().trim(); if (isEmptyOrSpace(serviceName, "Service Name")) { return false; } - String portName = portNameField.getText().trim(); - if (isEmptyOrSpace(portName, "Port Name")) { - return false; + + // https://jira.jboss.org/browse/JBIDE-7165 + Template template = ((NewFileWizard)getWizard()).getSelectedTemplate(); + if ( template!=null && !Templates.TEMPLATE_KEY_EMPTY.equals(template.getKey()) ) { + String portName = portNameField.getText().trim(); + if (isEmptyOrSpace(portName, "Port Name")) { + return false; + } + String addressName = addressField.getText().trim(); + if (isEmptyOrSpace(addressName, "Service Address")) { + return false; + } + String protocol = bindingField.getText().trim(); + if (!("SOAP".equals(protocol) || "HTTP".equals(protocol))) { + setErrorMessage(Messages.Error_NewFileWizard_WSDLCustomPage_Protocol); + return false; + } + + // Template arguments + mArgs.put("portName", portName); //$NON-NLS-1$ + mArgs.put("address", addressName); //$NON-NLS-1$ + mArgs.put("protocol", protocol.toLowerCase()); //$NON-NLS-1$ + if("SOAP".equals(protocol)){ + mArgs.put("protocolNamespace", SOAP_NAMESPACE); + } else { + mArgs.put("protocolNamespace", HTTP_NAMESPACE); + } } - String addressName = addressField.getText().trim(); - if (isEmptyOrSpace(addressName, "Service Address")) { - return false; - } - String protocol = bindingField.getText().trim(); - if (!("SOAP".equals(protocol) || "HTTP".equals(protocol))) { - setErrorMessage(Messages.Error_NewFileWizard_WSDLCustomPage_Protocol); - return false; - } - setErrorMessage(null); - + // Template arguments mArgs.put("serviceName", serviceName); //$NON-NLS-1$ - mArgs.put("portName", portName); //$NON-NLS-1$ - mArgs.put("address", addressName); //$NON-NLS-1$ - mArgs.put("protocol", protocol.toLowerCase()); //$NON-NLS-1$ - if("SOAP".equals(protocol)){ - mArgs.put("protocolNamespace", SOAP_NAMESPACE); - } else { - mArgs.put("protocolNamespace", HTTP_NAMESPACE); - } + return true; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/WSDLServiceDetail.java 2010-10-06 19:19:53 UTC (rev 25535) @@ -2,10 +2,157 @@ public class WSDLServiceDetail { - public static final String Sync_SOAPDetail = "\n\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n <soap:binding style=\"document\"\n transport=\"http://schemas.xmlsoap.org/soap/http\" />\n <operation name=\"process\">\n <soap:operation\n soapAction=\"${namespace}/process\" />\n <input>\n <soap:body use=\"literal\" />\n </input>\n <output>\n <soap:body use=\"literal\" />\n </output>\n </operation>\n </binding>\n\n\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <soap:address location=\"${address}\" />\n </port>\n </service>\n"; - public static final String Sync_HTTPDetail = "\n\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"process\">\n <http:operation location=\"/process\" />\n <input>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </input>\n <output>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </output>\n </operation>\n </binding>\n\n\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <http:address location=\"${address}\"/>\n </port>\n </service>\n"; - public static final String Async_SOAPDetail = "\n\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n <soap:binding style=\"document\"\n transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n <operation name=\"initiate\">\n <soap:operation\n soapAction=\"${namespace}/initiate\"/>\n <input>\n <soap:body use=\"literal\"/>\n </input>\n </operation>\n </binding>\n\n <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\">\n <soap:binding style=\"document\" transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n <operation name=\"onResult\">\n <soap:operation\n so! apAction=\"${namespace}/onResult\"/>\n <input>\n <soap:body use=\"literal\"/>\n </input>\n </operation>\n </binding>\n\n\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <soap:address location=\"${address}\"/>\n </port>\n </service>\n\n <service name=\"${serviceName}Callback\">\n <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n <soap:address location=\"${address}Callback\"/>\n </port>\n </service>\n"; - public static final String Async_HTTPDetail = "\n\n <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"initiate\">\n <http:operation location=\"/initiate\" />\n <input>\n <mime:content type=\"text/xml\" part=\"payload\"/>\n </input>\n </operation>\n </binding>\n\n <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n <http:binding verb=\"POST\" />\n <operation name=\"onResult\">\n <http:operation location=\"/onResult\" />\n <input>\n <mime:content type! =\"text/xml\" part=\"payload\"/>\n </input>\n </operation>\n </binding>\n\n\n <service name=\"${serviceName}\">\n <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n <http:address location=\"${address}\"/>\n </port>\n </service>\n\n <service name=\"${serviceName}Callback\">\n <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n <http:address location=\"${address}Callback\"/>\n </port>\n </service>\n"; + // https://jira.jboss.org/browse/JBIDE-7165 + // reformatted because the extremely long line lengths were causing eclipse editor to crash! + public static final String Sync_SOAPDetail = "\n"+ + "\n"+ + " <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n"+ + " <soap:binding style=\"document\"\n"+ + " transport=\"http://schemas.xmlsoap.org/soap/http\" />\n"+ + " <operation name=\"process\">\n"+ + " <soap:operation\n"+ + " soapAction=\"${namespace}/process\" />\n"+ + " <input>\n"+ + " <soap:body use=\"literal\" />\n"+ + " </input>\n"+ + " <output>\n"+ + " <soap:body use=\"literal\" />\n"+ + " </output>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + "\n"+ + " <service name=\"${serviceName}\">\n"+ + " <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n"+ + " <soap:address location=\"${address}\" />\n"+ + " </port>\n"+ + " </service>\n"; + + public static final String Sync_HTTPDetail = "\n"+ + "\n"+ + " <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n"+ + " <http:binding verb=\"POST\" />\n"+ + " <operation name=\"process\">\n"+ + " <http:operation location=\"/process\" />\n"+ + " <input>\n"+ + " <mime:content type=\"text/xml\" part=\"payload\"/>\n"+ + " </input>\n"+ + " <output>\n"+ + " <mime:content type=\"text/xml\" part=\"payload\"/>\n"+ + " </output>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + "\n"+ + " <service name=\"${serviceName}\">\n"+ + " <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n"+ + " <http:address location=\"${address}\"/>\n"+ + " </port>\n"+ + " </service>\n"; + + public static final String Async_SOAPDetail = "\n"+ + "\n"+ + " <binding name=\"${processName}Binding\" type=\"tns:${processName}\">\n"+ + " <soap:binding style=\"document\"\n"+ + " transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n"+ + " <operation name=\"initiate\">\n"+ + " <soap:operation\n"+ + " soapAction=\"${namespace}/initiate\"/>\n"+ + " <input>\n"+ + " <soap:body use=\"literal\"/>\n"+ + " </input>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + " <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\">\n"+ + " <soap:binding style=\"document\" transport=\"http://schemas.xmlsoap.org/soap/http\"/>\n"+ + " <operation name=\"onResult\">\n"+ + " <soap:operation\n"+ + " soapAction=\"${namespace}/onResult\"/>\n"+ + " <input>\n"+ + " <soap:body use=\"literal\"/>\n"+ + " </input>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + "\n"+ + " <service name=\"${serviceName}\">\n"+ + " <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n"+ + " <soap:address location=\"${address}\"/>\n"+ + " </port>\n"+ + " </service>\n"+ + "\n"+ + " <service name=\"${serviceName}Callback\">\n"+ + " <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n"+ + " <soap:address location=\"${address}Callback\"/>\n"+ + " </port>\n"+ + " </service>\n"; + + public static final String Async_HTTPDetail = "\n"+ + "\n"+ + " <binding name=\"${processName}Binding\" type=\"tns:${processName}\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n"+ + " <http:binding verb=\"POST\" />\n"+ + " <operation name=\"initiate\">\n"+ + " <http:operation location=\"/initiate\" />\n"+ + " <input>\n"+ + " <mime:content type=\"text/xml\" part=\"payload\"/>\n"+ + " </input>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + " <binding name=\"${processName}CallbackBinding\" type=\"tns:${processName}Callback\" xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\">\n"+ + " <http:binding verb=\"POST\" />\n"+ + " <operation name=\"onResult\">\n"+ + " <http:operation location=\"/onResult\" />\n"+ + " <input>\n"+ + " <mime:content type=\"text/xml\" part=\"payload\"/>\n"+ + " </input>\n"+ + " </operation>\n"+ + " </binding>\n"+ + "\n"+ + "\n"+ + " <service name=\"${serviceName}\">\n"+ + " <port name=\"${portName}\" binding=\"tns:${processName}Binding\">\n"+ + " <http:address location=\"${address}\"/>\n"+ + " </port>\n"+ + " </service>\n"+ + "\n"+ + " <service name=\"${serviceName}Callback\">\n"+ + " <port name=\"${portName}CallbackPort\" binding=\"tns:${processName}CallbackBinding\">\n"+ + " <http:address location=\"${address}Callback\"/>\n"+ + " </port>\n"+ + " </service>\n"; + public static final String Empty_Detail = "\n"+ + "\n"+ + " <service name=\"${serviceName}\">\n"+ + " </service>\n"; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,12 +1,12 @@   - <bpel:process name="${processName}" targetNamespace="${namespace}" suppressJoinFailure="yes" xmlns:tns="${namespace}" xmlns:bpel="${bpelNamespace}" > +  <bpel:import location="${processName}Artifacts.wsdl" namespace="${namespace}" importType="http://schemas.xmlsoap.org/wsdl/" /> Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/template.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/template.properties 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/template.properties 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,5 +1,6 @@ # # +key=async name = Asynchronous BPEL Process # resource.1 = sample.bpel Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.bpel =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.bpel 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.bpel 2010-10-06 19:19:53 UTC (rev 25535) @@ -6,26 +6,18 @@ xmlns:tns="${namespace}" xmlns:bpel="${bpelNamespace}" > - -  -  -  -  - <bpel:partnerLinks> - </bpel:partnerLinks> - -  -  -  -  - <bpel:variables> - </bpel:variables> -  -  -  -  -  - <bpel:sequence/> +  + <bpel:import location="${processName}Artifacts.wsdl" namespace="${namespace}" + importType="http://schemas.xmlsoap.org/wsdl/" /> + +  +  +  +  +  + <bpel:sequence name="main"> + <bpel:empty name="Empty"></bpel:empty> + </bpel:sequence> </bpel:process> Added: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.wsdl =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.wsdl (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/sample.wsdl 2010-10-06 19:19:53 UTC (rev 25535) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<definitions name="${processName}" + targetNamespace="${namespace}" + xmlns:tns="${namespace}" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:${protocol}="${protocolNamespace}" + > + +</definitions> Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/template.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/template.properties 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/empty/template.properties 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,9 +1,13 @@ # # +key=empty name = Empty BPEL Process resource.1 = sample.bpel resource.1.name = ${processName}.bpel +resource.2 = sample.wsdl +resource.2.name = ${processName}Artifacts.wsdl + description = Generates a completely empty BPEL process. No partner links are generated. \ Only the basic skeleton of the BPEL process is created. # Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,4 +1,5 @@  + <bpel:process name="${processName}" targetNamespace="${namespace}" suppressJoinFailure="yes" Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/template.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/template.properties 2010-10-06 18:07:31 UTC (rev 25534) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/template.properties 2010-10-06 19:19:53 UTC (rev 25535) @@ -1,5 +1,6 @@ # # +key=sync name = Synchronous BPEL Process resource.1 = sample.bpel resource.1.name = ${processName}.bpel

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25534 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-10-06 14:07:31 -0400 (Wed, 06 Oct 2010) New Revision: 25534 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog Log: [JBIDE-7259] corrected request-url and adapted accept-headers Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-06 18:06:08 UTC (rev 25533) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-06 18:07:31 UTC (rev 25534) @@ -1,6 +1,6 @@ 2010-10-06 André Dietisheim <adietish(a)redhat.com> - * src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java (getURLContent): + * src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java (checkURL): changed url and added accept headers 2010-10-01 Jeff Johnston <jjohnstn(a)redhat.com>

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25533 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-10-06 14:06:08 -0400 (Wed, 06 Oct 2010) New Revision: 25533 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java Log: [JBIDE-7259] corrected request-url and adapted accept-headers Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-10-06 17:48:01 UTC (rev 25532) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-10-06 18:06:08 UTC (rev 25533) @@ -258,7 +258,7 @@ if (url.length() > 0) { if (!url.equals(oldurl)) { try { - Object o = getURLContent(url); + Object o = getURLContent(url + "/api?format=xml"); //$NON-NLS-1$ if (o instanceof InputStream) { String xml = ""; InputStream is = (InputStream)o;

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r25532 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-10-06 13:48:01 -0400 (Wed, 06 Oct 2010) New Revision: 25532 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog Log: fixed https://jira.jboss.org/browse/JBIDE-7259 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-06 17:41:32 UTC (rev 25531) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-06 17:48:01 UTC (rev 25532) @@ -1,3 +1,7 @@ +2010-10-06 André Dietisheim <adietish(a)redhat.com> + + * src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java (getURLContent): + 2010-10-01 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/IDeltaCloudPreferenceConstants.java: Add new constant

13 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2010