December 2010 - jbosstools-commits

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

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-03 05:45:59 -0500 (Fri, 03 Dec 2010) New Revision: 27137 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/AbstractCloudChildrenTableView.java Log: [JBIDE-7149] added listener to gloabl selection, changing selected cloud in instance- and image-view accordingly Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-03 10:43:26 UTC (rev 27136) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-03 10:45:59 UTC (rev 27137) @@ -2,6 +2,7 @@ * src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java: [JBIDE-7790] corrected storage & retrieval of selected cloud in the preferences + [JBIDE-7149] added listener to gloabl selection, changing selected cloud in instance- and image-view accordingly 2010-12-02 André Dietisheim <adietish(a)redhat.com> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java 2010-12-03 10:43:26 UTC (rev 27136) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java 2010-12-03 10:45:59 UTC (rev 27137) @@ -10,9 +10,13 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; +import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -32,6 +36,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.ui.ISelectionListener; +import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; import org.jboss.tools.deltacloud.core.DeltaCloud; @@ -56,30 +62,26 @@ private static final String FILTERED_LABEL = "Filtered.label"; //$NON-NLS-1$ private static final String FILTERED_TOOLTIP = "FilteredImages.tooltip"; //$NON-NLS-1$ - private Combo cloudSelector; - private Label cloudSelectorLabel; + private Combo currentCloudSelector; + private Label currentCloudSelectorLabel; private TableViewer viewer; - private DeltaCloud currCloud; + private DeltaCloud currentCloud; - TextPreferenceValue lastSelectedCloudPref; + private TextPreferenceValue lastSelectedCloudPref; - public AbstractCloudChildrenTableView() { - lastSelectedCloudPref = new TextPreferenceValue(getSelectedCloudPrefsKey(), Activator.getDefault()); - } - private ModifyListener cloudModifyListener = new ModifyListener() { @Override public void modifyText(ModifyEvent e) { - int index = cloudSelector.getSelectionIndex(); + int index = currentCloudSelector.getSelectionIndex(); if (index < 0) { return; } - removeListener(currCloud); + removeListener(currentCloud); - final DeltaCloud currentCloud = setCurrentCloud(index); + final DeltaCloud currentCloud = getCurrentCloud(index); if (currentCloud != null) { lastSelectedCloudPref.store(currentCloud.getName()); Display.getCurrent().asyncExec(new Runnable() { @@ -94,6 +96,21 @@ } }; + private ISelectionListener workbenchSelectionListener = new ISelectionListener() { + + @Override + public void selectionChanged(IWorkbenchPart part, ISelection selection) { + DeltaCloud cloud = UIUtils.getFirstAdaptedElement(selection, DeltaCloud.class); + if (cloud != null) { + currentCloudSelector.select(getIndexInClouds(cloud, getClouds())); + } + } + }; + + public AbstractCloudChildrenTableView() { + lastSelectedCloudPref = new TextPreferenceValue(getSelectedCloudPrefsKey(), Activator.getDefault()); + } + private class ColumnListener extends SelectionAdapter { private int column; @@ -144,7 +161,7 @@ createCloudSelector(container); - initCloudSelector(lastSelectedCloudPref.get(null), cloudSelector, clouds); + initCloudSelector(lastSelectedCloudPref.get(null), currentCloudSelector, clouds); Label filterLabel = new Label(container, SWT.NULL); filterLabel.setText(CVMessages.getString(FILTERED_LABEL)); @@ -153,25 +170,25 @@ Composite tableArea = new Composite(container, SWT.NULL); viewer = createTableViewer(tableArea); - currCloud = getCurrentCloud(cloudSelector.getSelectionIndex(), clouds); + currentCloud = getCurrentCloud(currentCloudSelector.getSelectionIndex(), clouds); - addListener(currCloud); - setViewerInput(currCloud); - setFilterLabelVisible(currCloud, filterLabel); + addListener(currentCloud); + setViewerInput(currentCloud); + setFilterLabelVisible(currentCloud, filterLabel); - Point p1 = cloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); - Point p2 = cloudSelector.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point p1 = currentCloudSelectorLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); + Point p2 = currentCloudSelector.computeSize(SWT.DEFAULT, SWT.DEFAULT); int centering = (p2.y - p1.y + 1) / 2; FormData f = new FormData(); f.top = new FormAttachment(0, 5 + centering); f.left = new FormAttachment(0, 30); - cloudSelectorLabel.setLayoutData(f); + currentCloudSelectorLabel.setLayoutData(f); f = new FormData(); f.top = new FormAttachment(0, 5); - f.left = new FormAttachment(cloudSelectorLabel, 5); - cloudSelector.setLayoutData(f); + f.left = new FormAttachment(currentCloudSelectorLabel, 5); + currentCloudSelector.setLayoutData(f); f = new FormData(); f.top = new FormAttachment(0, 5 + centering); @@ -179,7 +196,7 @@ filterLabel.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(cloudSelector, 8); + f.top = new FormAttachment(currentCloudSelector, 8); f.left = new FormAttachment(0, 0); f.right = new FormAttachment(100, 0); f.bottom = new FormAttachment(100, 0); @@ -189,6 +206,7 @@ PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer"); hookContextMenu(viewer.getControl()); getSite().setSelectionProvider(viewer); + getSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(workbenchSelectionListener); DeltaCloudManager.getDefault().addCloudManagerListener(this); } @@ -225,6 +243,11 @@ viewer.setInput(input); } + /** + * Gets the clouds that are available in the model. + * + * @return the clouds + */ private DeltaCloud[] getClouds() { DeltaCloud[] clouds = new DeltaCloud[] {}; try { @@ -239,16 +262,36 @@ return clouds; } - private DeltaCloud setCurrentCloud(int index) { + private DeltaCloud getCurrentCloud(int index) { DeltaCloud[] clouds = getClouds(); if (index < 0 || index >= clouds.length) { - currCloud = null; + return null; } else { - currCloud = getClouds()[index]; + return clouds[index]; } - return currCloud; } + private int getIndexInClouds(DeltaCloud cloudToSelect, DeltaCloud[] clouds) { + if (cloudToSelect == null) { + return 0; + } + return getCurrentCloud(cloudToSelect.getName(), clouds); + } + + private int getCurrentCloud(String cloudName, DeltaCloud[] clouds) { + int index = 0; + if (cloudName != null && clouds.length > 0) { + for (int i = 0; i < clouds.length; i++) { + DeltaCloud cloud = clouds[i]; + if (cloudName != null && cloudName.equals(cloud.getName())) { + index = i; + break; + } + } + } + return index; + } + private void setFilterLabelVisible(DeltaCloud currentCloud, Label filterLabel) { if (currentCloud == null) { filterLabel.setVisible(false); @@ -282,14 +325,14 @@ } private void createCloudSelector(Composite parent) { - this.cloudSelectorLabel = new Label(parent, SWT.NULL); - cloudSelectorLabel.setText(CVMessages.getString(CLOUD_SELECTOR_LABEL)); + this.currentCloudSelectorLabel = new Label(parent, SWT.NULL); + currentCloudSelectorLabel.setText(CVMessages.getString(CLOUD_SELECTOR_LABEL)); - this.cloudSelector = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); - cloudSelector.addModifyListener(cloudModifyListener); + this.currentCloudSelector = new Combo(parent, SWT.BORDER | SWT.READ_ONLY); + currentCloudSelector.addModifyListener(cloudModifyListener); // Following is a kludge so that on Linux the Combo is read-only but // has a white background. - cloudSelector.addVerifyListener(new VerifyListener() { + currentCloudSelector.addVerifyListener(new VerifyListener() { @Override public void verifyText(VerifyEvent e) { e.doit = false; @@ -319,40 +362,43 @@ } public void cloudsChanged(int type) { - String currName = null; int currIndex = 0; - if (currCloud != null) { - currName = currCloud.getName(); - currIndex = cloudSelector.getSelectionIndex(); + if (currentCloud != null) { + currIndex = currentCloudSelector.getSelectionIndex(); } DeltaCloud[] clouds = getClouds(); - String[] cloudNames = new String[clouds.length]; - int index = 0; - for (int i = 0; i < clouds.length; ++i) { - cloudNames[i] = clouds[i].getName(); - if (cloudNames[i].equals(currName)) - index = i; - } + int index = getIndexInClouds(currentCloud, getClouds()); if (type == ICloudManagerListener.RENAME_EVENT) { index = currIndex; // no change in cloud displayed } + String[] cloudNames = toCloudNames(clouds); setCloudSelectorItems(cloudNames); - setCurrentCloud(index); + this.currentCloud = getCurrentCloud(index); if (cloudNames.length > 0) { - cloudSelector.setText(cloudNames[index]); - viewer.setInput(currCloud); + currentCloudSelector.setText(cloudNames[index]); + viewer.setInput(currentCloud); } else { - cloudSelector.setText(""); + currentCloudSelector.setText(""); viewer.setInput(new DeltaCloudInstance[0]); } } + private String[] toCloudNames(DeltaCloud[] clouds) { + List<String> cloudNames = new ArrayList<String>(); + for (DeltaCloud cloud : clouds) { + if (cloud != null) { + cloudNames.add(cloud.getName()); + } + } + return (String[]) cloudNames.toArray(new String[cloudNames.size()]); + } + private void setCloudSelectorItems(String[] cloudNames) { - cloudSelector.removeModifyListener(cloudModifyListener); - cloudSelector.setItems(cloudNames); - cloudSelector.addModifyListener(cloudModifyListener); + currentCloudSelector.removeModifyListener(cloudModifyListener); + currentCloudSelector.setItems(cloudNames); + currentCloudSelector.addModifyListener(cloudModifyListener); } /** @@ -364,8 +410,8 @@ // Run following under Display thread since this can be // triggered by a non-display thread notifying listeners. if (cloud != null - && currCloud != null - && cloud.getName().equals(currCloud.getName())) { + && currentCloud != null + && cloud.getName().equals(currentCloud.getName())) { Display.getDefault().syncExec(new Runnable() { @Override public void run() {

14 years

1
0
0 / 0

JBoss Tools SVN: r27136 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-12-03 05:43:26 -0500 (Fri, 03 Dec 2010) New Revision: 27136 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java Log: Many unit tests are printing this non-critical error, where project-scope preferences are trying to be saved on a project which has just been deleted JBIDE-7792 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2010-12-03 09:58:24 UTC (rev 27135) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/SingleDeployableFactory.java 2010-12-03 10:43:26 UTC (rev 27136) @@ -211,14 +211,16 @@ } String qualifier = JBossServerCorePlugin.getDefault().getDescriptor().getUniqueIdentifier(); - IScopeContext context = new ProjectScope(project); - IEclipsePreferences node = context.getNode(qualifier); - if (node != null) - node.put(PREFERENCE_KEY, list); - try { - node.flush(); - } catch (BackingStoreException e) { - // TODO Log + if( project.exists() ) { + IScopeContext context = new ProjectScope(project); + IEclipsePreferences node = context.getNode(qualifier); + if (node != null) + node.put(PREFERENCE_KEY, list); + try { + node.flush(); + } catch (BackingStoreException e) { + // TODO Log + } } }

14 years

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-03 04:58:24 -0500 (Fri, 03 Dec 2010) New Revision: 27135 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/AbstractCloudChildrenTableView.java Log: [JBIDE-7790] corrected storage & retrieval of selected cloud in the preferences Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-03 08:52:24 UTC (rev 27134) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-03 09:58:24 UTC (rev 27135) @@ -1,3 +1,8 @@ +2010-12-03 André Dietisheim <adietish(a)redhat.com> + + * src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java: + [JBIDE-7790] corrected storage & retrieval of selected cloud in the preferences + 2010-12-02 André Dietisheim <adietish(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java 2010-12-03 08:52:24 UTC (rev 27134) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudChildrenTableView.java 2010-12-03 09:58:24 UTC (rev 27135) @@ -10,7 +10,6 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; -import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.layout.TableColumnLayout; import org.eclipse.jface.viewers.ColumnWeightData; @@ -43,9 +42,8 @@ import org.jboss.tools.deltacloud.core.IInstanceFilter; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.ErrorUtils; -import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; +import org.jboss.tools.internal.deltacloud.ui.preferences.TextPreferenceValue; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; -import org.osgi.service.prefs.Preferences; /** * @author Jeff Johnston @@ -64,6 +62,12 @@ private DeltaCloud currCloud; + TextPreferenceValue lastSelectedCloudPref; + + public AbstractCloudChildrenTableView() { + lastSelectedCloudPref = new TextPreferenceValue(getSelectedCloudPrefsKey(), Activator.getDefault()); + } + private ModifyListener cloudModifyListener = new ModifyListener() { @Override @@ -77,7 +81,7 @@ final DeltaCloud currentCloud = setCurrentCloud(index); if (currentCloud != null) { - storeSelectedCloud(currentCloud); + lastSelectedCloudPref.store(currentCloud.getName()); Display.getCurrent().asyncExec(new Runnable() { @Override @@ -88,15 +92,6 @@ }); } } - - private void storeSelectedCloud(DeltaCloud cloud) { - Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); - try { - prefs.put(getSelectedCloudPrefsKey(), cloud.getName()); - } catch (Exception exc) { - // do nothing - } - } }; private class ColumnListener extends SelectionAdapter { @@ -148,8 +143,9 @@ DeltaCloud[] clouds = getClouds(); createCloudSelector(container); - initCloudSelector(getLastSelectedCloud(), cloudSelector, clouds); + initCloudSelector(lastSelectedCloudPref.get(null), cloudSelector, clouds); + Label filterLabel = new Label(container, SWT.NULL); filterLabel.setText(CVMessages.getString(FILTERED_LABEL)); filterLabel.setToolTipText(CVMessages.getString(FILTERED_TOOLTIP)); @@ -271,12 +267,6 @@ return clouds[selectedCloudIndex]; } - private String getLastSelectedCloud() { - Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID); - String lastSelectedCloud = prefs.get(IDeltaCloudPreferenceConstants.LAST_CLOUD_INSTANCE_VIEW, ""); - return lastSelectedCloud; - } - private void createColumns(TableColumnLayout tableLayout, Table table) { for (int i = 0; i < InstanceViewLabelAndContentProvider.Column.getSize(); ++i) { InstanceViewLabelAndContentProvider.Column c =

14 years

1
0
0 / 0

JBoss Tools SVN: r27134 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2010-12-03 03:52:24 -0500 (Fri, 03 Dec 2010) New Revision: 27134 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java Log: https://jira.jboss.org/browse/JBIDE-7771 Show full parameters list in QueryParamView Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java 2010-12-03 08:50:33 UTC (rev 27133) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java 2010-12-03 08:52:24 UTC (rev 27134) @@ -382,7 +382,13 @@ case 1: return cqp.getType().getName(); case 2: - return cqp.getStringValues()[0]; + { + String label = cqp.getStringValues()[0]; + for (int j = 1; j < cqp.getStringValues().length; j++) { + label += "|" + cqp.getStringValues()[j]; //$NON-NLS-1$ + } + return label; + } case 3: return null; //cqp.isNull()?"X":""; default:

14 years

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-12-03 03:50:33 -0500 (Fri, 03 Dec 2010) New Revision: 27133 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java Log: added copyright header, added author Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java 2010-12-03 03:34:00 UTC (rev 27132) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java 2010-12-03 08:50:33 UTC (rev 27133) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.internal.deltacloud.ui.preferences; import org.eclipse.core.runtime.Plugin; @@ -5,6 +15,9 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; +/** + * @author Andre Dietisheim + */ public class TextPreferenceValue { private Plugin plugin;

14 years

1
0
0 / 0

JBoss Tools SVN: r27132 - branches/jbosstools-3.2.0.Beta2/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-12-02 22:34:00 -0500 (Thu, 02 Dec 2010) New Revision: 27132 Modified: branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml Log: revert to using a collection of sites until component zip aggregator can use composite site instead Modified: branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml 2010-12-02 23:48:47 UTC (rev 27131) +++ branches/jbosstools-3.2.0.Beta2/build/aggregate/site/pom.xml 2010-12-03 03:34:00 UTC (rev 27132) @@ -16,18 +16,12 @@ <properties>  -  -  - <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/3.2.0.Beta2/</inputRepo1> - <inputRepos>1</inputRepos> + <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...</inputRepo1> + <inputRepo2>http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...</inputRepo2> + <inputRepo3>http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...</inputRepo3> + <inputRepo4>http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2...</inputRepo4> + <inputRepo5>http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1...</inputRepo5> + <inputRepos>1,2,3,4,5</inputRepos> </properties> <build> @@ -44,11 +38,10 @@ <quiet>true</quiet> <tasks> <property name="inputRepo1" value="${inputRepo1}" /> -  + <property name="inputRepo2" value="${inputRepo2}" /> + <property name="inputRepo3" value="${inputRepo3}" /> + <property name="inputRepo4" value="${inputRepo4}" /> + <property name="inputRepo5" value="${inputRepo5}" /> <property name="inputRepos" value="${inputRepos}" />  @@ -98,22 +91,47 @@ <enabled>true</enabled> </snapshots> </repository> -  <repository> + <id>inputRepo1</id> + <url>${inputRepo1}/all/repo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>inputRepo2</id> + <url>${inputRepo2}/all/repo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>inputRepo3</id> + <url>${inputRepo3}/all/repo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>inputRepo4</id> + <url>${inputRepo4}/all/repo/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>inputRepo5</id> + <url>${inputRepo5}/tools/</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> <id>helios</id> <url>http://download.eclipse.org/releases/helios/</url> <layout>p2</layout>

14 years

1
0
0 / 0

JBoss Tools SVN: r27131 - trunk/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-12-02 18:48:47 -0500 (Thu, 02 Dec 2010) New Revision: 27131 Modified: trunk/build/publishComponentZipToStaging.sh trunk/build/publishUpdateZipToStaging.sh Log: md5 sum file should only contain the hash Modified: trunk/build/publishComponentZipToStaging.sh =================================================================== --- trunk/build/publishComponentZipToStaging.sh 2010-12-02 23:39:33 UTC (rev 27130) +++ trunk/build/publishComponentZipToStaging.sh 2010-12-02 23:48:47 UTC (rev 27131) @@ -35,8 +35,9 @@ #echo "Fetch ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip} + # generate MD5 sums for each zip - md5sum ${targetZip} > ${targetZip}.MD5 + for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done #echo "Publish ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q Modified: trunk/build/publishUpdateZipToStaging.sh =================================================================== --- trunk/build/publishUpdateZipToStaging.sh 2010-12-02 23:39:33 UTC (rev 27130) +++ trunk/build/publishUpdateZipToStaging.sh 2010-12-02 23:48:47 UTC (rev 27131) @@ -17,12 +17,14 @@ # get zip name from zip.list.txt path=$(wget -q http://download.jboss.org/jbosstools/builds/staging/${JOBNAMEREDUX}/logs/... -O - | egrep -- "-Update-" | head -1 | sed "s#,\\\\##"); -#echo "Fetch ${path} as ${JOBNAMEREDUX}-Update.zip" +targetZip="${JOBNAMEREDUX}-Update.zip" +#echo "Fetch ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q -date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${JOBNAMEREDUX}-Update.zip +date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip} + # generate MD5 sum for each zip -md5sum ${JOBNAMEREDUX}-Update.zip > ${JOBNAMEREDUX}-Update.zip.MD5 +for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done -#echo "Publish ${path} as ${JOBNAMEREDUX}-Update.zip" +#echo "Publish ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q -date; rsync -arzq --rsh=ssh ${JOBNAMEREDUX}-Update.zip ${JOBNAMEREDUX}-Update.zip.MD5 ${DESTINATION}/updates/staging/ +date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/

14 years

1
0
0 / 0

JBoss Tools SVN: r27130 - trunk/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-12-02 18:39:33 -0500 (Thu, 02 Dec 2010) New Revision: 27130 Modified: trunk/build/publishComponentZipToStaging.sh trunk/build/publishUpdateZipToStaging.sh Log: generate MD5 sums for zips published for use with JBDS Modified: trunk/build/publishComponentZipToStaging.sh =================================================================== --- trunk/build/publishComponentZipToStaging.sh 2010-12-02 21:48:43 UTC (rev 27129) +++ trunk/build/publishComponentZipToStaging.sh 2010-12-02 23:39:33 UTC (rev 27130) @@ -35,8 +35,10 @@ #echo "Fetch ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip} + # generate MD5 sums for each zip + md5sum ${targetZip} > ${targetZip}.MD5 #echo "Publish ${path} as ${targetZip}" # to test locally, may need to use --protocol=29 and -P instead of -q - date; rsync -arzq --rsh=ssh ${targetZip} ${DESTINATION}/updates/staging/$BRANCH/ -done \ No newline at end of file + date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/ +done Modified: trunk/build/publishUpdateZipToStaging.sh =================================================================== --- trunk/build/publishUpdateZipToStaging.sh 2010-12-02 21:48:43 UTC (rev 27129) +++ trunk/build/publishUpdateZipToStaging.sh 2010-12-02 23:39:33 UTC (rev 27130) @@ -20,7 +20,9 @@ #echo "Fetch ${path} as ${JOBNAMEREDUX}-Update.zip" # to test locally, may need to use --protocol=29 and -P instead of -q date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${JOBNAMEREDUX}-Update.zip +# generate MD5 sum for each zip +md5sum ${JOBNAMEREDUX}-Update.zip > ${JOBNAMEREDUX}-Update.zip.MD5 #echo "Publish ${path} as ${JOBNAMEREDUX}-Update.zip" # to test locally, may need to use --protocol=29 and -P instead of -q -date; rsync -arzq --rsh=ssh ${JOBNAMEREDUX}-Update.zip ${DESTINATION}/updates/staging/ +date; rsync -arzq --rsh=ssh ${JOBNAMEREDUX}-Update.zip ${JOBNAMEREDUX}-Update.zip.MD5 ${DESTINATION}/updates/staging/

14 years

1
0
0 / 0

JBoss Tools SVN: r27129 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-12-02 16:48:43 -0500 (Thu, 02 Dec 2010) New Revision: 27129 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties Log: https://jira.jboss.org/browse/JBIDE-7674 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-12-02 20:32:01 UTC (rev 27128) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-12-02 21:48:43 UTC (rev 27129) @@ -50,4 +50,4 @@ MESSAGE_INTERCEPTOR_BINDINGS_EMPTY=Interceptor Bindings list is empty -MAKE_FIELD_STATIC_MARKER_RESOLUTION_TITLE=Make field: ''{0}'' static +MAKE_FIELD_STATIC_MARKER_RESOLUTION_TITLE=Make ''{0}'' field static

14 years

1
0
0 / 0

JBoss Tools SVN: r27128 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-12-02 15:32:01 -0500 (Thu, 02 Dec 2010) New Revision: 27128 Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java Log: https://jira.jboss.org/browse/JBIDE-6575 Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2010-12-02 19:55:35 UTC (rev 27127) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2010-12-02 20:32:01 UTC (rev 27128) @@ -24,7 +24,7 @@ private IProject project; private ContentAssistantTestCase caTest = new ContentAssistantTestCase(); private static final String PAGE_NAME = "WebContent/test.jsp"; - private String[] beanProposals = new String[] {"example", "example.com", "fish", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefish", "wolf"}; + private String[] beanProposals = new String[] {"example", "example.com", "fishJBT", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefishJBT", "wolf"}; private String[] propertyProposals = new String[] {"game.value", "game.initialize()"}; public CATest() {

14 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2010