JBoss Tools SVN: r27116 - branches/jbosstools-3.2.0.Beta2/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-12-02 11:55:43 -0500 (Thu, 02 Dec 2010)
New Revision: 27116
Modified:
branches/jbosstools-3.2.0.Beta2/build/target-platform/jbds.target
Log:
include actual versions in DTP deps
Modified: branches/jbosstools-3.2.0.Beta2/build/target-platform/jbds.target
===================================================================
--- branches/jbosstools-3.2.0.Beta2/build/target-platform/jbds.target 2010-12-02 16:52:33 UTC (rev 27115)
+++ branches/jbosstools-3.2.0.Beta2/build/target-platform/jbds.target 2010-12-02 16:55:43 UTC (rev 27116)
@@ -6,8 +6,8 @@
<unit version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911" id="org.eclipse.cvs.feature.group"/>
<!-- DTP -->
- <unit version="" id="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
- <unit version="" id="org.eclipse.datatools.sdk.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7I977GFE9JfhdnBJPmBCYCq6w5-t" id="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7P9i7KFDxNYrp4cjPjqnPaRKxeyT" id="org.eclipse.datatools.sdk.feature.feature.group"/>
<unit version="1.8.1.v20100618-77078CcNBGKBZI_FcRd" id="org.eclipse.datatools.modelbase.feature.feature.group"/>
<unit version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6" id="org.eclipse.datatools.connectivity.feature.feature.group"/>
<unit version="1.8.1.v20100618-7H7C7ACcNBHBBkHeGSMd" id="org.eclipse.datatools.connectivity.oda.feature.feature.group"/>
14 years
JBoss Tools SVN: r27115 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-12-02 11:52:33 -0500 (Thu, 02 Dec 2010)
New Revision: 27115
Modified:
trunk/build/target-platform/build.xml
Log:
add help re: jbds.target file use
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2010-12-02 16:51:01 UTC (rev 27114)
+++ trunk/build/target-platform/build.xml 2010-12-02 16:52:33 UTC (rev 27115)
@@ -66,9 +66,13 @@
* test.local.target.platform.repo
* test.local.target.platform.installed.base (deprecated)
-Thus, run script like this:
+Thus, default operation is this (if run w/ these options or NO options):
$ ant -DtargetFile=multiple.target build.local.target.platform.repo
+
+To run for JBDS target file instead of JBT target files, pass in alternate target file and resulting repo path:
+
+ $ ant -DtargetFile=jbds.target -DrepoDir=/tmp/JBDS_REPO/
</echo>
</target>
14 years
JBoss Tools SVN: r27114 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-12-02 11:51:01 -0500 (Thu, 02 Dec 2010)
New Revision: 27114
Modified:
trunk/build/target-platform/jbds.target
Log:
include actual versions in DTP deps
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2010-12-02 16:49:58 UTC (rev 27113)
+++ trunk/build/target-platform/jbds.target 2010-12-02 16:51:01 UTC (rev 27114)
@@ -6,8 +6,8 @@
<unit version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911" id="org.eclipse.cvs.feature.group"/>
<!-- DTP -->
- <unit version="" id="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
- <unit version="" id="org.eclipse.datatools.sdk.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7I977GFE9JfhdnBJPmBCYCq6w5-t" id="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
+ <unit version="1.8.1.v20100618-7P9i7KFDxNYrp4cjPjqnPaRKxeyT" id="org.eclipse.datatools.sdk.feature.feature.group"/>
<unit version="1.8.1.v20100618-77078CcNBGKBZI_FcRd" id="org.eclipse.datatools.modelbase.feature.feature.group"/>
<unit version="1.8.1.v20100618-7C7b8hEt1ZvtiLkdlO7BVoL_wm6" id="org.eclipse.datatools.connectivity.feature.feature.group"/>
<unit version="1.8.1.v20100618-7H7C7ACcNBHBBkHeGSMd" id="org.eclipse.datatools.connectivity.oda.feature.feature.group"/>
14 years
JBoss Tools SVN: r27113 - trunk/build/util.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-12-02 11:49:58 -0500 (Thu, 02 Dec 2010)
New Revision: 27113
Modified:
trunk/build/util/checkPOMvsManifest.sh
Log:
fix perms on .sh script
Modified: trunk/build/util/checkPOMvsManifest.sh
===================================================================
Property changes on: trunk/build/util/checkPOMvsManifest.sh
___________________________________________________________________
Name: svn:executable
+ *
14 years
JBoss Tools SVN: r27111 - 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-12-02 11:44:20 -0500 (Thu, 02 Dec 2010)
New Revision: 27111
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-02 16:42:03 UTC (rev 27110)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-02 16:44:20 UTC (rev 27111)
@@ -50,9 +50,10 @@
protected CloudConnectionPage createCloudConnectionPage() {
try {
- if (initialCloud == null)
+ if (initialCloud == null) {
return new CloudConnectionPage(pageTitle, this);
- // else
+ }
+
return new CloudConnectionPage(pageTitle, initialCloud, this);
} catch (Exception e) {
ErrorUtils.handleError(WizardMessages.getString("EditCloudConnectionError.title"),
@@ -87,8 +88,7 @@
DeltaCloud newCloud = new DeltaCloud(name, url, username, password);
return newCloud.testConnection();
} catch (DeltaCloudException e) {
- ErrorUtils
- .handleError(WizardMessages.getString("CloudConnectionAuthError.title"),
+ ErrorUtils.handleError(WizardMessages.getString("CloudConnectionAuthError.title"),
WizardMessages.getFormattedString("CloudConnectionAuthError.message", url), e, getShell());
return true;
}
@@ -112,10 +112,24 @@
public boolean performFinish() {
String name = mainPage.getModel().getName();
String url = mainPage.getModel().getUrl();
+ storeUrl(url);
String username = mainPage.getModel().getUsername();
String password = mainPage.getModel().getPassword();
String type = getServerType();
+ try {
+ DeltaCloud newCloud = new DeltaCloud(name, url, username, password, type);
+ DeltaCloudManager.getDefault().addCloud(newCloud);
+ DeltaCloudManager.getDefault().saveClouds();
+ } catch (Exception e) {
+ // TODO internationalize strings
+ ErrorUtils
+ .handleError("Error", MessageFormat.format("Could not create cloud {0}", name), e, getShell());
+ }
+ return true;
+ }
+
+ private void storeUrl(String url) {
// save URL in some plugin preference key!
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
String previousURL = prefs.get(LAST_USED_URL, "");
@@ -127,16 +141,5 @@
// intentionally ignore, non-critical
}
}
-
- try {
- DeltaCloud newCloud = new DeltaCloud(name, url, username, password, type);
- DeltaCloudManager.getDefault().addCloud(newCloud);
- DeltaCloudManager.getDefault().saveClouds();
- } catch (Exception e) {
- // TODO internationalize strings
- ErrorUtils
- .handleError("Error", MessageFormat.format("Could not create cloud {0}", name), e, getShell());
- }
- return true;
}
}
14 years
JBoss Tools SVN: r27110 - 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-12-02 11:42:03 -0500 (Thu, 02 Dec 2010)
New Revision: 27110
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-02 16:40:48 UTC (rev 27109)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-02 16:42:03 UTC (rev 27110)
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.jboss.tools.internal.deltacloud.ui.wizards;
-import java.net.MalformedURLException;
import java.text.MessageFormat;
import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -74,8 +73,9 @@
@Override
public void addPages() {
mainPage = createCloudConnectionPage();
- if (mainPage != null)
+ if (mainPage != null) {
addPage(mainPage);
+ }
}
public boolean performTest() {
14 years
JBoss Tools SVN: r27109 - 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-12-02 11:40:48 -0500 (Thu, 02 Dec 2010)
New Revision: 27109
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-02 16:08:12 UTC (rev 27108)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-02 16:40:48 UTC (rev 27109)
@@ -27,7 +27,7 @@
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
-public class NewCloudConnectionWizard extends Wizard implements INewWizard, CloudConnection {
+public class NewCloudConnectionWizard extends Wizard implements INewWizard, CloudConnection {
private static final String MAINPAGE_NAME = "NewCloudConnection.name"; //$NON-NLS-1$
public static final String LAST_USED_URL = "org.jboss.tools.internal.deltacloud.ui.wizards.LAST_CREATED_URL";
@@ -38,54 +38,46 @@
public NewCloudConnectionWizard() {
this(WizardMessages.getString(MAINPAGE_NAME));
}
-
+
public NewCloudConnectionWizard(String pageTitle) {
super();
this.pageTitle = pageTitle;
}
-
+
public NewCloudConnectionWizard(String pageTitle, DeltaCloud initial) {
this(pageTitle);
this.initialCloud = initial;
}
-
+
protected CloudConnectionPage createCloudConnectionPage() {
- Exception e = null;
try {
- if( initialCloud == null )
+ if (initialCloud == null)
return new CloudConnectionPage(pageTitle, this);
// else
return new CloudConnectionPage(pageTitle, initialCloud, this);
- } catch (MalformedURLException e2) {
- e = e2;
- } catch (DeltaCloudException e2) {
- e = e2;
- }
- if( e != null ) {
+ } catch (Exception e) {
ErrorUtils.handleError(WizardMessages.getString("EditCloudConnectionError.title"),
WizardMessages.getString("EditCloudConnectionError.message"), e, getShell());
}
return null;
}
-
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
}
-
@Override
public boolean canFinish() {
return mainPage.isPageComplete();
}
-
+
@Override
public void addPages() {
mainPage = createCloudConnectionPage();
- if( mainPage != null )
+ if (mainPage != null)
addPage(mainPage);
}
-
+
public boolean performTest() {
String name = mainPage.getName();
String url = mainPage.getModel().getUrl();
@@ -101,13 +93,13 @@
return true;
}
}
-
+
protected String getServerType() {
DeltaCloudServerType type = mainPage.getModel().getType();
if (type == null) {
return null;
}
-
+
return type.toString();
}
@@ -123,19 +115,19 @@
String username = mainPage.getModel().getUsername();
String password = mainPage.getModel().getPassword();
String type = getServerType();
-
+
// save URL in some plugin preference key!
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
String previousURL = prefs.get(LAST_USED_URL, "");
- if( previousURL == null || previousURL.equals("") || !previousURL.equals(url)) {
+ if (previousURL == null || previousURL.equals("") || !previousURL.equals(url)) {
prefs.put(LAST_USED_URL, url);
try {
prefs.flush();
- } catch( BackingStoreException bse ) {
+ } catch (BackingStoreException bse) {
// intentionally ignore, non-critical
}
}
-
+
try {
DeltaCloud newCloud = new DeltaCloud(name, url, username, password, type);
DeltaCloudManager.getDefault().addCloud(newCloud);
14 years
JBoss Tools SVN: r27108 - branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2010-12-02 11:08:12 -0500 (Thu, 02 Dec 2010)
New Revision: 27108
Modified:
branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java
Log:
[JBIDE-7789] fixed NPE when invalid cloud is selected on startup.
Modified: branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-12-02 15:59:02 UTC (rev 27107)
+++ branches/jbosstools-3.2.0.Beta2/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-12-02 16:08:12 UTC (rev 27108)
@@ -73,6 +73,9 @@
@Override
public Object[] getElements(Object inputElement) {
+ if (images == null) {
+ return new DeltaCloudImage[]{};
+ }
return images;
}
14 years