JBoss Tools SVN: r25313 - 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: jjohnstn
Date: 2010-09-29 17:30:58 -0400 (Wed, 29 Sep 2010)
New Revision: 25313
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.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/InstanceView.java
Log:
2010-09-29 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java: New file.
* src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java: New file.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java: Remove action thread classes as they
are now external so they can be used from the Cloud Viewer as well.
(refreshInstance): Removed.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-29 20:44:52 UTC (rev 25312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-29 21:30:58 UTC (rev 25313)
@@ -1,5 +1,13 @@
2010-09-29 Jeff Johnston <jjohnstn(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java: New file.
+ * src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java: New file.
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java: Remove action thread classes as they
+ are now external so they can be used from the Cloud Viewer as well.
+ (refreshInstance): Removed.
+
+2010-09-29 Jeff Johnston <jjohnstn(a)redhat.com>
+
* icons/reboot.gif: New file.
* icons/rebootd.gif: New file.
* icons/runningd.gif: New file.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-09-29 20:44:52 UTC (rev 25312)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-09-29 21:30:58 UTC (rev 25313)
@@ -64,7 +64,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.core.ICloudManagerListener;
@@ -112,7 +111,6 @@
private Action rseAction;
private Map<String, Action> instanceActions;
- private Map<String, Job> currentPerformingActions = new HashMap<String, Job>();
private InstanceView parentView;
@@ -349,106 +347,6 @@
manager.add(instanceActions.get(DeltaCloudInstance.DESTROY));
}
- private class PerformInstanceActionThread extends Job {
- private DeltaCloud cloud;
- private DeltaCloudInstance instance;
- private String action;
- private String taskName;
- private String expectedState;
-
- public PerformInstanceActionThread(DeltaCloud cloud, DeltaCloudInstance instance,
- String action, String title, String taskName, String expectedState) {
- super(title);
- this.cloud = cloud;
- this.instance = instance;
- this.action = action;
- this.taskName = taskName;
- this.expectedState = expectedState;
- }
-
- @Override
- public IStatus run(IProgressMonitor pm) {
- String id = instance.getId();
- try {
- pm.beginTask(taskName, IProgressMonitor.UNKNOWN);
- pm.worked(1);
- // To handle the user starting a new action when we haven't confirmed the last one yet,
- // cancel the previous job and then go on performing this action
- Job job = cloud.getActionJob(id);
- if (job != null) {
- job.cancel();
- try {
- job.join();
- } catch (InterruptedException e) {
- // do nothing, this is ok
- }
- }
- currentPerformingActions.put(id, this);
- cloud.performInstanceAction(id, action);
- while (instance != null && !(instance.getState().equals(expectedState))
- && !(instance.getState().equals(DeltaCloudInstance.TERMINATED))) {
- instance = refreshInstance(instance);
- try {
- Thread.sleep(300);
- } catch (InterruptedException e) {
- break;
- }
- }
- } catch (DeltaCloudException e) {
- // do nothing..action had problem executing..perhaps illegal
- } finally {
- cloud.removeActionJob(id, this);
- pm.done();
- }
- return Status.OK_STATUS;
- }
- }
-
- private class PerformDestroyInstanceActionThread extends Job {
- private DeltaCloud cloud;
- private DeltaCloudInstance instance;
- private String taskName;
-
- public PerformDestroyInstanceActionThread(DeltaCloud cloud, DeltaCloudInstance instance,
- String title, String taskName) {
- super(title);
- this.cloud = cloud;
- this.instance = instance;
- this.taskName = taskName;
- }
-
- @Override
- public IStatus run(IProgressMonitor pm) {
- String id = instance.getId();
- try {
- pm.beginTask(taskName, IProgressMonitor.UNKNOWN);
- pm.worked(1);
- // To handle the user starting a new action when we haven't confirmed the last one yet,
- // cancel the previous job and then go on performing this action
- Job job = cloud.getActionJob(id);
- if (job != null) {
- job.cancel();
- try {
- job.join();
- } catch (InterruptedException e) {
- // do nothing, this is ok
- }
- }
- cloud.registerActionJob(id, this);
- Display.getDefault().asyncExec(new Runnable() {
- @Override
- public void run() {
- cloud.destroyInstance(instance.getId());
- }
- });
- } finally {
- cloud.removeActionJob(id, this);
- pm.done();
- }
- return Status.OK_STATUS;
- }
- }
-
private void makeActions() {
refreshAction = new Action() {
public void run() {
@@ -593,17 +491,6 @@
instanceActions.put(DeltaCloudInstance.DESTROY, destroyAction);
}
- private DeltaCloudInstance refreshInstance(DeltaCloudInstance instance) {
- DeltaCloudInstance[] instances = (DeltaCloudInstance[])contentProvider.getElements(currCloud);
- for (int i = 0; i < instances.length; ++i) {
- DeltaCloudInstance d = instances[i];
- if (d.getId().equals(instance.getId())) {
- return currCloud.refreshInstance(d.getId());
- }
- }
- return null;
- }
-
@Override
public void setFocus() {
// TODO Auto-generated method stub
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java 2010-09-29 21:30:58 UTC (rev 25313)
@@ -0,0 +1,54 @@
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+
+public class PerformDestroyInstanceActionThread extends Job {
+ private DeltaCloud cloud;
+ private DeltaCloudInstance instance;
+ private String taskName;
+
+ public PerformDestroyInstanceActionThread(DeltaCloud cloud, DeltaCloudInstance instance,
+ String title, String taskName) {
+ super(title);
+ this.cloud = cloud;
+ this.instance = instance;
+ this.taskName = taskName;
+ }
+
+ @Override
+ public IStatus run(IProgressMonitor pm) {
+ String id = instance.getId();
+ try {
+ pm.beginTask(taskName, IProgressMonitor.UNKNOWN);
+ pm.worked(1);
+ // To handle the user starting a new action when we haven't confirmed the last one yet,
+ // cancel the previous job and then go on performing this action
+ Job job = cloud.getActionJob(id);
+ if (job != null) {
+ job.cancel();
+ try {
+ job.join();
+ } catch (InterruptedException e) {
+ // do nothing, this is ok
+ }
+ }
+ cloud.registerActionJob(id, this);
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ cloud.destroyInstance(instance.getId());
+ }
+ });
+ } finally {
+ cloud.removeActionJob(id, this);
+ pm.done();
+ }
+ return Status.OK_STATUS;
+ }
+}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java 2010-09-29 21:30:58 UTC (rev 25313)
@@ -0,0 +1,63 @@
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+
+public class PerformInstanceActionThread extends Job {
+ private DeltaCloud cloud;
+ private DeltaCloudInstance instance;
+ private String action;
+ private String taskName;
+ private String expectedState;
+
+ public PerformInstanceActionThread(DeltaCloud cloud, DeltaCloudInstance instance,
+ String action, String title, String taskName, String expectedState) {
+ super(title);
+ this.cloud = cloud;
+ this.instance = instance;
+ this.action = action;
+ this.taskName = taskName;
+ this.expectedState = expectedState;
+ }
+
+ @Override
+ public IStatus run(IProgressMonitor pm) {
+ String id = instance.getId();
+ try {
+ pm.beginTask(taskName, IProgressMonitor.UNKNOWN);
+ pm.worked(1);
+ // To handle the user starting a new action when we haven't confirmed the last one yet,
+ // cancel the previous job and then go on performing this action
+ Job job = cloud.getActionJob(id);
+ if (job != null) {
+ job.cancel();
+ try {
+ job.join();
+ } catch (InterruptedException e) {
+ // do nothing, this is ok
+ }
+ }
+ cloud.performInstanceAction(id, action);
+ while (instance != null && !(instance.getState().equals(expectedState))
+ && !(instance.getState().equals(DeltaCloudInstance.TERMINATED))) {
+ instance = cloud.refreshInstance(id);
+ try {
+ Thread.sleep(300);
+ } catch (InterruptedException e) {
+ break;
+ }
+ }
+ } catch (DeltaCloudException e) {
+ // do nothing..action had problem executing..perhaps illegal
+ } finally {
+ cloud.removeActionJob(id, this);
+ pm.done();
+ }
+ return Status.OK_STATUS;
+ }
+}
15 years, 3 months
JBoss Tools SVN: r25312 - trunk/build/target-platform/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-29 16:44:52 -0400 (Wed, 29 Sep 2010)
New Revision: 25312
Modified:
trunk/build/target-platform/site/pom.xml
Log:
remove non-functional subversive sites and bump up URLs to HeliosSR1 values
Modified: trunk/build/target-platform/site/pom.xml
===================================================================
--- trunk/build/target-platform/site/pom.xml 2010-09-29 20:37:05 UTC (rev 25311)
+++ trunk/build/target-platform/site/pom.xml 2010-09-29 20:44:52 UTC (rev 25312)
@@ -65,17 +65,6 @@
</releases>
</repository>
<repository>
- <id>download.eclipse.org_technology_subversive_0.7_update-site_</id>
- <url>http://download.eclipse.org/technology/subversive/0.7/update-site/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
<id>download.eclipse.org_technology_subversive_0.7_weekly-site_</id>
<url>http://download.eclipse.org/technology/subversive/0.7/weekly-site/</url>
<layout>p2</layout>
@@ -87,17 +76,6 @@
</releases>
</repository>
<repository>
- <id>download.eclipse.org_technology_subversive_0.7_headless-update-site_</id>
- <url>http://download.eclipse.org/technology/subversive/0.7/headless-update-site/</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
<id>download.jboss.org_jbosstools_updates_requirements_orbit_R20100519200754_</id>
<url>http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519...</url>
<layout>p2</layout>
@@ -142,8 +120,8 @@
</releases>
</repository>
<repository>
- <id>download.eclipse.org_tptp_4.7.0_TPTP-4.7.0_repo_</id>
- <url>http://download.eclipse.org/tptp/4.7.0/TPTP-4.7.0/repo/</url>
+ <id>download.eclipse.org_tptp_updates_</id>
+ <url>http://download.eclipse.org/tptp/updates/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -153,8 +131,8 @@
</releases>
</repository>
<repository>
- <id>download.eclipse.org_modeling_emf_emf_updates_2.6_R201006141136_</id>
- <url>http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201006141136/</url>
+ <id>download.eclipse.org_modeling_emf_emf_updates_2.6_R201009141218_</id>
+ <url>http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -208,8 +186,8 @@
</releases>
</repository>
<repository>
- <id>download.eclipse.org_webtools_downloads_drops_R3.2.2_R-3.2.2-20100915173744_repository_</id>
- <url>http://download.eclipse.org/webtools/downloads/drops/R3.2.2/R-3.2.2-20100...</url>
+ <id>download.eclipse.org_webtools_repository_helios_</id>
+ <url>http://download.eclipse.org/webtools/repository/helios/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
15 years, 3 months
JBoss Tools SVN: r25311 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2010-09-29 16:37:05 -0400 (Wed, 29 Sep 2010)
New Revision: 25311
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
Log:
JBIDE-7168
Code completion inserts methods with parameters.
The parameters are excluded.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2010-09-29 20:20:02 UTC (rev 25310)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2010-09-29 20:37:05 UTC (rev 25311)
@@ -1085,13 +1085,13 @@
methods.add(new MemberPresentation(name.toString(), method));
}
- // Add method as 'foo(param1,param2)'
+ // As requirement of JBIDE-7168: Add method as 'foo()' (do not extract the parameters)
name.append('(');
- String[] mParams = method.getParameterNames();
- for (int j = 0; mParams != null && j < mParams.length; j++) {
- if (j > 0) name.append(", "); //$NON-NLS-1$
- name.append(mParams[j]);
- }
+// String[] mParams = method.getParameterNames();
+// for (int j = 0; mParams != null && j < mParams.length; j++) {
+// if (j > 0) name.append(", "); //$NON-NLS-1$
+// name.append(mParams[j]);
+// }
name.append(')');
methods.add(new MemberPresentation(name.toString(), method));
15 years, 3 months
JBoss Tools SVN: r25310 - in workspace: examples and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: elvisisking
Date: 2010-09-29 16:20:02 -0400 (Wed, 29 Sep 2010)
New Revision: 25310
Modified:
workspace/dflorian/teiid-designer/parts_modelProjectSet.zip
workspace/examples/project-examples-3.2.xml
Log:
JBIDE-7073 Added tag to change to Teiid Designer perspective after importing a Teiid Designer project example.
TEIIDDES-555 Contributing a new zip of the PartsProject.
Modified: workspace/dflorian/teiid-designer/parts_modelProjectSet.zip
===================================================================
(Binary files differ)
Modified: workspace/examples/project-examples-3.2.xml
===================================================================
--- workspace/examples/project-examples-3.2.xml 2010-09-29 19:58:23 UTC (rev 25309)
+++ workspace/examples/project-examples-3.2.xml 2010-09-29 20:20:02 UTC (rev 25310)
@@ -16,5 +16,6 @@
<url>
http://anonsvn.jboss.org/repos/jbosstools/workspace/dflorian/teiid-design...
</url>
+ <perspectiveId>modelerPerspective</perspectiveId>
</project>
</projects>
15 years, 3 months
JBoss Tools SVN: r25308 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: icons and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: jjohnstn
Date: 2010-09-29 15:05:26 -0400 (Wed, 29 Sep 2010)
New Revision: 25308
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/reboot.gif
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/rebootd.gif
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/runningd.gif
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/stoppedd.gif
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
Log:
2010-09-29 Jeff Johnston <jjohnstn(a)redhat.com>
* icons/reboot.gif: New file.
* icons/rebootd.gif: New file.
* icons/runningd.gif: New file.
* icons/stoppedd.gif: New file.
* src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java: Add new images for starting, stopping, and
rebooting, plus their disabled versions.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (handleSelection): Disable actions unless
the selected item is an instance and then use its actions to determine which actions should be enabled.
(makeActions): Add images for enabled and disabled for starting, stopping, rebooting, and destroy actions.
(fillLocalToolBar): Add starting, stopping, rebooting, and destroy actions.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-29 19:02:51 UTC (rev 25307)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-09-29 19:05:26 UTC (rev 25308)
@@ -1,3 +1,16 @@
+2010-09-29 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * icons/reboot.gif: New file.
+ * icons/rebootd.gif: New file.
+ * icons/runningd.gif: New file.
+ * icons/stoppedd.gif: New file.
+ * src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java: Add new images for starting, stopping, and
+ rebooting, plus their disabled versions.
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (handleSelection): Disable actions unless
+ the selected item is an instance and then use its actions to determine which actions should be enabled.
+ (makeActions): Add images for enabled and disabled for starting, stopping, rebooting, and destroy actions.
+ (fillLocalToolBar): Add starting, stopping, rebooting, and destroy actions.
+
2010-09-17 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java: Renamed.
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/reboot.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/reboot.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/rebootd.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/rebootd.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/runningd.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/runningd.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/stoppedd.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/icons/stoppedd.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java 2010-09-29 19:02:51 UTC (rev 25307)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java 2010-09-29 19:05:26 UTC (rev 25308)
@@ -41,6 +41,12 @@
public static final String IMG_COLLAPSE_ALL= NAME_PREFIX + "collapseall.gif"; //$NON-NLS-1$
public static final String IMG_DELTA= NAME_PREFIX + "delta.gif"; //$NON-NLS-1$
public static final String IMG_DELTA_LARGE= NAME_PREFIX + "delta-large.gif"; //$NON-NLS-1$
+ public static final String IMG_START= NAME_PREFIX + "running.gif"; //$NON-NLS-1$
+ public static final String IMG_STARTD = NAME_PREFIX + "runningd.gif"; //$NON-NLS-1$
+ public static final String IMG_STOP = NAME_PREFIX + "stopped.gif"; //$NON-NLS-1$
+ public static final String IMG_STOPD = NAME_PREFIX + "stoppedd.gif"; //$NON-NLS-1$
+ public static final String IMG_REBOOT = NAME_PREFIX + "reboot.gif"; //$NON-NLS-1$
+ public static final String IMG_REBOOTD = NAME_PREFIX + "rebootd.gif"; //$NON-NLS-1$
public static final ImageDescriptor DESC_CLOUD= createManaged("", IMG_CLOUD);
public static final ImageDescriptor DESC_FOLDER= createManaged("", IMG_FOLDER);
public static final ImageDescriptor DESC_INSTANCE= createManaged("", IMG_INSTANCE);
@@ -48,6 +54,12 @@
public static final ImageDescriptor DESC_COLLAPSE_ALL= createManaged("", IMG_COLLAPSE_ALL);
public static final ImageDescriptor DESC_DELTA= createManaged("", IMG_DELTA);
public static final ImageDescriptor DESC_DELTA_LARGE= createManaged("", IMG_DELTA_LARGE);
+ public static final ImageDescriptor DESC_START= createManaged("", IMG_START);
+ public static final ImageDescriptor DESC_STARTD= createManaged("", IMG_STARTD);
+ public static final ImageDescriptor DESC_STOP= createManaged("", IMG_STOP);
+ public static final ImageDescriptor DESC_STOPD= createManaged("", IMG_STOPD);
+ public static final ImageDescriptor DESC_REBOOT= createManaged("", IMG_REBOOT);
+ public static final ImageDescriptor DESC_REBOOTD= createManaged("", IMG_REBOOTD);
private static ImageDescriptor createManaged(String prefix, String name) {
return createManaged(imageRegistry, prefix, name);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-09-29 19:02:51 UTC (rev 25307)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-09-29 19:05:26 UTC (rev 25308)
@@ -26,6 +26,7 @@
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.layout.TableColumnLayout;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -70,6 +71,7 @@
import org.jboss.tools.deltacloud.core.IInstanceListListener;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
+import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
import org.osgi.service.prefs.Preferences;
public class InstanceView extends ViewPart implements ICloudManagerListener, IInstanceListListener {
@@ -299,6 +301,16 @@
private void handleSelection() {
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
selectedElement = (DeltaCloudInstance)selection.getFirstElement();
+ instanceActions.get(DeltaCloudInstance.START).setEnabled(false);
+ instanceActions.get(DeltaCloudInstance.STOP).setEnabled(false);
+ instanceActions.get(DeltaCloudInstance.REBOOT).setEnabled(false);
+ instanceActions.get(DeltaCloudInstance.DESTROY).setEnabled(false);
+ if (selectedElement != null) {
+ List<String> actions = selectedElement.getActions();
+ for (String action : actions) {
+ instanceActions.get(action).setEnabled(true);
+ }
+ }
}
private void fillLocalPullDown(IMenuManager manager) {
@@ -331,7 +343,10 @@
}
private void fillLocalToolBar(IToolBarManager manager) {
- //TODO
+ manager.add(instanceActions.get(DeltaCloudInstance.START));
+ manager.add(instanceActions.get(DeltaCloudInstance.STOP));
+ manager.add(instanceActions.get(DeltaCloudInstance.REBOOT));
+ manager.add(instanceActions.get(DeltaCloudInstance.DESTROY));
}
private class PerformInstanceActionThread extends Job {
@@ -469,6 +484,8 @@
};
startAction.setText(CVMessages.getString(START_LABEL));
startAction.setToolTipText(CVMessages.getString(START_LABEL));
+ startAction.setImageDescriptor(SWTImagesFactory.DESC_START);
+ startAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_STARTD);
stopAction = new Action() {
public void run() {
@@ -484,6 +501,8 @@
};
stopAction.setText(CVMessages.getString(STOP_LABEL));
stopAction.setToolTipText(CVMessages.getString(STOP_LABEL));
+ stopAction.setImageDescriptor(SWTImagesFactory.DESC_STOP);
+ stopAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_STOPD);
rebootAction = new Action() {
public void run() {
@@ -499,6 +518,8 @@
};
rebootAction.setText(CVMessages.getString(REBOOT_LABEL));
rebootAction.setToolTipText(CVMessages.getString(REBOOT_LABEL));
+ rebootAction.setImageDescriptor(SWTImagesFactory.DESC_REBOOT);
+ rebootAction.setDisabledImageDescriptor(SWTImagesFactory.DESC_REBOOTD);
destroyAction = new Action() {
public void run() {
@@ -513,6 +534,11 @@
};
destroyAction.setText(CVMessages.getString(DESTROY_LABEL));
destroyAction.setToolTipText(CVMessages.getString(DESTROY_LABEL));
+ ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
+ ImageDescriptor delete = ImageDescriptor.createFromImage(sharedImages.getImage(ISharedImages.IMG_ETOOL_DELETE));
+ ImageDescriptor delete_disabled = ImageDescriptor.createFromImage(sharedImages.getImage(ISharedImages.IMG_ETOOL_DELETE_DISABLED));
+ destroyAction.setImageDescriptor(delete);
+ destroyAction.setDisabledImageDescriptor(delete_disabled);
rseAction = new Action() {
public void run() {
15 years, 3 months
JBoss Tools SVN: r25307 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-29 15:02:51 -0400 (Wed, 29 Sep 2010)
New Revision: 25307
Modified:
trunk/build/target-platform/pom.xml
Log:
pom should use target2p2mirror.xml instead of target2site.xml
Modified: trunk/build/target-platform/pom.xml
===================================================================
--- trunk/build/target-platform/pom.xml 2010-09-29 19:02:22 UTC (rev 25306)
+++ trunk/build/target-platform/pom.xml 2010-09-29 19:02:51 UTC (rev 25307)
@@ -49,9 +49,9 @@
<phase>validate</phase>
<configuration>
<tasks>
- <!-- generate a pom.xml and site.xml for subsequent generation of a target as update site -->
+ <!-- generate a p2mirror.xml for subsequent generation of a target as update site -->
<property name="targetFile" value="${targetFile}" />
- <ant antfile="target2site.xml"/>
+ <ant antfile="target2p2mirror.xml"/>
</tasks>
</configuration>
<goals>
15 years, 3 months
JBoss Tools SVN: r25306 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-29 15:02:22 -0400 (Wed, 29 Sep 2010)
New Revision: 25306
Added:
trunk/build/target-platform/target2p2mirror.xml
Log:
initial ant script to generate p2 mirror script from .target file
Added: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml (rev 0)
+++ trunk/build/target-platform/target2p2mirror.xml 2010-09-29 19:02:22 UTC (rev 25306)
@@ -0,0 +1,13 @@
+<project default="custom.build" name="jbosstools target platform p2.mirror generator">
+ <property name="targetFile" value="e361-wtp322.target" />
+
+ <target name="custom.build" depends="gen.p2mirror.script, run.p2mirror.script" />
+
+ <target name="gen.p2mirror.script" description="use XSLT to generate a p2.mirror script from .target">
+ <echo level="verbose">Generate ${targetFile}.p2mirror.xml from ${targetFile}</echo>
+ <xslt style="target2p2mirrorXml.xsl" in="${targetFile}" out="${targetFile}.p2mirror.xml" processor="trax" />
+ </target>
+
+ <target name="run.p2mirror.script" />
+
+</project>
Property changes on: trunk/build/target-platform/target2p2mirror.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 3 months
JBoss Tools SVN: r25305 - trunk/build/target-platform.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-09-29 15:01:24 -0400 (Wed, 29 Sep 2010)
New Revision: 25305
Added:
trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
trunk/build/target-platform/target2p2mirrorXml.xsl
Removed:
trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml
trunk/build/target-platform/target2ant.xsl
Log:
refactor and create ant script to run xslt .target -> p2mirror script
Deleted: trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml 2010-09-29 18:55:24 UTC (rev 25304)
+++ trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml 2010-09-29 19:01:24 UTC (rev 25305)
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Download target platform" default="download.target.platform">
- <target name="help">
- <echo>
- Use followStrict="true" to prevent downloading all
- requirements not included in the target platform
- or
- followStrict="false" to fetch everything
-
- To run this script:
-
- /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
- /tmp/workspace -consolelog -application \
- org.eclipse.ant.core.antRunner -f out.xml \
- -Ddebug=true \
- -DfollowStrict=true \
- -Drepo.dir=/tmp/REPO/
-</echo>
- </target>
- <target name="init" unless="repo.dir">
- <fail>Must set -Drepo.dir=/abs/path/to/download/artifacts/</fail>
- </target>
- <target name="download.target.platform" depends="init" description="Download from target platform definition" if="repo.dir">
- <property name="verbose" value="false" />
- <property name="followStrict" value="false" />
- <echo level="info">Download features/plugins into ${repo.dir}</echo>
- <p2.mirror destination="file:${repo.dir}" verbose="${verbose}">
- <!-- should we add latestVersionOnly="true" to <slicingOptions> ? -->
- <slicingOptions includeFeatures="true" followStrict="${followStrict}" />
- <source>
- <repository location="http://m2eclipse.sonatype.org/sites/m2e/" />
- <repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/" />
- <repository location="http://eclipse.svnkit.com/1.3.x/" />
- <repository location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..." />
- <!-- <repository location="http://download.eclipse.org/technology/subversive/0.7/update-site/"/> -->
- <repository location="http://download.eclipse.org/technology/subversive/0.7/weekly-site/" />
- <!-- <repository location="http://download.eclipse.org/technology/subversive/0.7/headless-update-site/"/> -->
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..." />
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/thirdparty/" />
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/" />
- <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2" />
- <repository location="http://download.eclipse.org/tptp/updates/" />
- <repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/" />
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/" />
- <repository location="http://download.eclipse.org/birt/update-site/2.6/" />
- <repository location="http://download.eclipse.org/eclipse/updates/3.6.x/" />
- <repository location="http://download.jboss.org/jbosstools/updates/requirements/helios/" />
- <repository location="http://download.eclipse.org/webtools/repository/helios/" />
- <repository location="http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools/all..." />
- <repository location="http://dl.google.com/eclipse/plugin/3.6/" />
- </source>
- <iu id="org.maven.ide.eclipse.feature.feature.group" version="" />
- <iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version="" />
- <iu id="javax.wsdl.feature.feature.group" version="" />
- <iu id="org.apache.oro.feature.feature.group" version="" />
- <iu id="org.jdom.feature.feature.group" version="" />
- <iu id="org.mozilla.xulrunner.feature.feature.group" version="" />
- <iu id="org.mozilla.xpcom.feature.feature.group" version="" />
- <iu id="org.eclipse.emf.ecore.feature.group" version="" />
- <iu id="org.eclipse.emf.feature.group" version="" />
- <iu id="org.eclipse.emf.codegen.feature.group" version="" />
- <iu id="org.eclipse.emf.common.feature.group" version="" />
- <iu id="org.eclipse.emf.databinding.feature.group" version="" />
- <iu id="org.eclipse.emf.codegen.ecore.feature.group" version="" />
- <iu id="org.eclipse.emf.ecore.edit.feature.group" version="" />
- <iu id="org.eclipse.emf.ecore.editor.feature.group" version="" />
- <iu id="org.eclipse.emf.ecore.feature.group" version="" />
- <iu id="org.eclipse.emf.edit.feature.group" version="" />
- <iu id="org.eclipse.xsd.feature.group" version="" />
- <iu id="org.eclipse.swtbot.eclipse.feature.group" version="" />
- <iu id="org.eclipse.swtbot.eclipse.gef.feature.group" version="" />
- <iu id="org.eclipse.swtbot.ide.feature.group" version="" />
- <iu id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="" />
- <iu id="org.eclipse.swtbot.feature.group" version="" />
- <iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="" />
- <iu id="org.eclipse.birt.feature.group" version="" />
- <iu id="org.eclipse.birt.integration.wtp.feature.group" version="" />
- <iu id="com.ibm.icu.base.feature.group" version="" />
- <iu id="org.eclipse.equinox.server.core.feature.group" version="" />
- <iu id="org.eclipse.cvs.feature.group" version="" />
- <iu id="org.eclipse.help.feature.group" version="" />
- <iu id="org.eclipse.jdt.feature.group" version="" />
- <iu id="org.eclipse.platform.feature.group" version="" />
- <iu id="org.eclipse.platform.ide" version="" />
- <iu id="org.eclipse.equinox.executable.feature.group" version="" />
- <iu id="org.eclipse.equinox.executable" version="" />
- <iu id="org.eclipse.platform.sdk" version="" />
- <iu id="org.eclipse.pde.feature.group" version="" />
- <iu id="org.eclipse.sdk.feature.group" version="" />
- <iu id="org.eclipse.rcp.feature.group" version="" />
- <iu id="org.eclipse.rcp.id" version="" />
- <iu id="org.eclipse.rcp.sdk.id" version="" />
- <iu id="org.eclipse.releng.tools.feature.group" version="" />
- <iu id="org.eclipse.sdk.ide" version="" />
- <iu id="org.eclipse.sdk.examples.feature.group" version="" />
- <iu id="org.eclipse.sdk.examples.source.feature.group" version="" />
- <iu id="org.eclipse.equinox.compendium.sdk.feature.group" version="" />
- <iu id="org.eclipse.equinox.core.sdk.feature.group" version="" />
- <iu id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="" />
- <iu id="org.eclipse.equinox.p2.user.ui.feature.group" version="" />
- <iu id="org.eclipse.equinox.p2.sdk.feature.group" version="" />
- <iu id="org.eclipse.equinox.serverside.sdk.feature.group" version="" />
- <iu id="org.eclipse.equinox.sdk.feature.group" version="" />
- <iu id="org.eclipse.equinox.weaving.sdk.feature.group" version="" />
- <iu id="org.eclipse.equinox.server.jetty.feature.group" version="" />
- <iu id="org.eclipse.equinox.server.p2.feature.group" version="" />
- <iu id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="" />
- <iu id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="" />
- <iu id="org.eclipse.equinox.server.servletbridge.feature.group" version="" />
- <iu id="org.eclipse.equinox.server.simple.feature.group" version="" />
- <iu id="org.eclipse.birt.feature.group" version="" />
- <iu id="org.eclipse.datatools.connectivity.feature.feature.group" version="" />
- <iu id="org.eclipse.datatools.enablement.feature.feature.group" version="" />
- <iu id="org.eclipse.datatools.sdk.feature.feature.group" version="" />
- <iu id="org.eclipse.datatools.enablement.jdt.feature.feature.group" version="" />
- <iu id="org.eclipse.datatools.modelbase.feature.feature.group" version="" />
- <iu id="org.eclipse.draw2d.feature.group" version="" />
- <iu id="org.eclipse.gef.feature.group" version="" />
- <iu id="org.eclipse.zest.feature.group" version="" />
- <iu id="org.eclipse.uml2.feature.group" version="" />
- <iu id="org.eclipse.jst.jee" version="" />
- <iu id="org.eclipse.wst.common.frameworks" version="" />
- <iu id="org.eclipse.wst.common.project.facet.ui" version="" />
- <iu id="org.eclipse.jst.jee.web" version="" />
- <iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="" />
- <iu id="org.eclipse.jst.ws.axis2tools.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.ws.cxf.feature.feature.group" version="" />
- <iu id="org.eclipse.jpt.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.common.fproj.feature.group" version="" />
- <iu id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.web_ui.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.xml_ui.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.xsl.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.jsdt.feature.feature.group" version="" />
- <iu id="org.eclipse.jsf.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.enterprise_core.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.server_adapters.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.server_core.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.server_ui.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.web_ui.feature.feature.group" version="" />
- <iu id="org.eclipse.jsf.feature.source.feature.group" version="" />
- <iu id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group" version="" />
- <iu id="org.eclipse.jst.webpageeditor.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.common_core.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.common_ui.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.server_adapters.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.server_core.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.server_ui.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.web_core.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.ws_ui.feature.feature.group" version="" />
- <iu id="org.eclipse.wst.xml_core.feature.feature.group" version="" />
- <iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group" version="" />
- <iu id="org.drools.eclipse.feature.feature.group" version="" />
- <iu id="org.drools.eclipse.task.feature.feature.group" version="" />
- <iu id="org.guvnor.tools.feature.feature.group" version="" />
- <iu id="org.mozilla.xulrunner.feature.feature.group" version="" />
- <iu id="org.mozilla.xpcom.feature.feature.group" version="" />
- </p2.mirror>
- </target>
-</project>
Copied: trunk/build/target-platform/e361-wtp322.target.p2mirror.xml (from rev 25302, trunk/build/target-platform/e361-wtp322.target.p2-mirror.xml)
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2mirror.xml (rev 0)
+++ trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-09-29 19:01:24 UTC (rev 25305)
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Download target platform" default="download.target.platform">
+ <target name="help">
+ <echo>
+ Use followStrict="true" to prevent downloading all
+ requirements not included in the target platform
+ or
+ followStrict="false" to fetch everything
+
+ To run this script:
+
+ /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
+ /tmp/workspace -consolelog -application \
+ org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml \
+ -Ddebug=true \
+ -DfollowStrict=true \
+ -Drepo.dir=/tmp/REPO/
+</echo>
+ </target>
+ <target name="init" unless="repo.dir">
+ <fail>Must set -Drepo.dir=/abs/path/to/download/artifacts/</fail>
+ </target>
+ <target name="download.target.platform" depends="init"
+ description="Download from target platform definition" if="repo.dir">
+ <property name="verbose" value="false" />
+ <property name="followStrict" value="false" />
+ <echo level="info">Download features/plugins into ${repo.dir}</echo>
+ <p2.mirror destination="file:${repo.dir}" verbose="${verbose}">
+ <slicingOptions includeFeatures="true" followStrict="${followStrict}" />
+ <source>
+ <repository location="http://m2eclipse.sonatype.org/sites/m2e/" />
+ <repository location="http://m2eclipse.sonatype.org/sites/m2e-extras/" />
+ <repository location="http://eclipse.svnkit.com/1.3.x/" />
+ <repository
+ location="http://www.polarion.org/projects/subversive/download/eclipse/2.0/update-s..." />
+ <repository
+ location="http://download.eclipse.org/technology/subversive/0.7/weekly-site/" />
+ <repository
+ location="http://download.jboss.org/jbosstools/updates/requirements/orbit/R20100519..." />
+ <repository
+ location="http://download.jboss.org/jbosstools/updates/requirements/thirdparty/" />
+ <repository
+ location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/" />
+ <repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2" />
+ <repository location="http://download.eclipse.org/tptp/updates/" />
+ <repository
+ location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/" />
+ <repository
+ location="http://download.jboss.org/jbosstools/updates/requirements/swtbot-helios/" />
+ <repository location="http://download.eclipse.org/birt/update-site/2.6/" />
+ <repository location="http://download.eclipse.org/eclipse/updates/3.6.x/" />
+ <repository
+ location="http://download.jboss.org/jbosstools/updates/requirements/helios/" />
+ <repository
+ location="http://download.eclipse.org/webtools/repository/helios/" />
+ <repository
+ location="http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools/all..." />
+ <repository location="http://dl.google.com/eclipse/plugin/3.6/" />
+ </source>
+ <iu id="org.maven.ide.eclipse.feature.feature.group" version="" />
+ <iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version="" />
+ <iu id="javax.wsdl.feature.feature.group" version="" />
+ <iu id="org.apache.oro.feature.feature.group" version="" />
+ <iu id="org.jdom.feature.feature.group" version="" />
+ <iu id="org.mozilla.xulrunner.feature.feature.group" version="" />
+ <iu id="org.mozilla.xpcom.feature.feature.group" version="" />
+ <iu id="org.eclipse.emf.ecore.feature.group" version="" />
+ <iu id="org.eclipse.emf.feature.group" version="" />
+ <iu id="org.eclipse.emf.codegen.feature.group" version="" />
+ <iu id="org.eclipse.emf.common.feature.group" version="" />
+ <iu id="org.eclipse.emf.databinding.feature.group" version="" />
+ <iu id="org.eclipse.emf.codegen.ecore.feature.group" version="" />
+ <iu id="org.eclipse.emf.ecore.edit.feature.group" version="" />
+ <iu id="org.eclipse.emf.ecore.editor.feature.group" version="" />
+ <iu id="org.eclipse.emf.ecore.feature.group" version="" />
+ <iu id="org.eclipse.emf.edit.feature.group" version="" />
+ <iu id="org.eclipse.xsd.feature.group" version="" />
+ <iu id="org.eclipse.swtbot.eclipse.feature.group" version="" />
+ <iu id="org.eclipse.swtbot.eclipse.gef.feature.group" version="" />
+ <iu id="org.eclipse.swtbot.ide.feature.group" version="" />
+ <iu id="org.eclipse.swtbot.eclipse.test.junit4.feature.group"
+ version="" />
+ <iu id="org.eclipse.swtbot.feature.group" version="" />
+ <iu id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="" />
+ <iu id="org.eclipse.birt.feature.group" version="" />
+ <iu id="org.eclipse.birt.integration.wtp.feature.group" version="" />
+ <iu id="com.ibm.icu.base.feature.group" version="" />
+ <iu id="org.eclipse.equinox.server.core.feature.group" version="" />
+ <iu id="org.eclipse.cvs.feature.group" version="" />
+ <iu id="org.eclipse.help.feature.group" version="" />
+ <iu id="org.eclipse.jdt.feature.group" version="" />
+ <iu id="org.eclipse.platform.feature.group" version="" />
+ <iu id="org.eclipse.platform.ide" version="" />
+ <iu id="org.eclipse.equinox.executable.feature.group" version="" />
+ <iu id="org.eclipse.equinox.executable" version="" />
+ <iu id="org.eclipse.platform.sdk" version="" />
+ <iu id="org.eclipse.pde.feature.group" version="" />
+ <iu id="org.eclipse.sdk.feature.group" version="" />
+ <iu id="org.eclipse.rcp.feature.group" version="" />
+ <iu id="org.eclipse.rcp.id" version="" />
+ <iu id="org.eclipse.rcp.sdk.id" version="" />
+ <iu id="org.eclipse.releng.tools.feature.group" version="" />
+ <iu id="org.eclipse.sdk.ide" version="" />
+ <iu id="org.eclipse.sdk.examples.feature.group" version="" />
+ <iu id="org.eclipse.sdk.examples.source.feature.group" version="" />
+ <iu id="org.eclipse.equinox.compendium.sdk.feature.group" version="" />
+ <iu id="org.eclipse.equinox.core.sdk.feature.group" version="" />
+ <iu id="org.eclipse.equinox.p2.discovery.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.equinox.p2.user.ui.feature.group" version="" />
+ <iu id="org.eclipse.equinox.p2.sdk.feature.group" version="" />
+ <iu id="org.eclipse.equinox.serverside.sdk.feature.group" version="" />
+ <iu id="org.eclipse.equinox.sdk.feature.group" version="" />
+ <iu id="org.eclipse.equinox.weaving.sdk.feature.group" version="" />
+ <iu id="org.eclipse.equinox.server.jetty.feature.group" version="" />
+ <iu id="org.eclipse.equinox.server.p2.feature.group" version="" />
+ <iu id="org.eclipse.pde.api.tools.ee.fragments.feature.group"
+ version="" />
+ <iu id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="" />
+ <iu id="org.eclipse.equinox.server.servletbridge.feature.group"
+ version="" />
+ <iu id="org.eclipse.equinox.server.simple.feature.group" version="" />
+ <iu id="org.eclipse.birt.feature.group" version="" />
+ <iu id="org.eclipse.datatools.connectivity.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.datatools.enablement.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.datatools.sdk.feature.feature.group" version="" />
+ <iu id="org.eclipse.datatools.enablement.jdt.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.datatools.modelbase.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.draw2d.feature.group" version="" />
+ <iu id="org.eclipse.gef.feature.group" version="" />
+ <iu id="org.eclipse.zest.feature.group" version="" />
+ <iu id="org.eclipse.uml2.feature.group" version="" />
+ <iu id="org.eclipse.jst.jee" version="" />
+ <iu id="org.eclipse.wst.common.frameworks" version="" />
+ <iu id="org.eclipse.wst.common.project.facet.ui" version="" />
+ <iu id="org.eclipse.jst.jee.web" version="" />
+ <iu id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"
+ version="" />
+ <iu id="org.eclipse.jst.ws.axis2tools.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.jst.ws.cxf.feature.feature.group" version="" />
+ <iu id="org.eclipse.jpt.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.common.fproj.feature.group" version="" />
+ <iu id="org.eclipse.jst.enterprise_ui.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.wst.web_ui.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.xml_ui.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.xsl.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.jsdt.feature.feature.group" version="" />
+ <iu id="org.eclipse.jsf.feature.feature.group" version="" />
+ <iu id="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.jst.ws.jaxws.feature.feature.group" version="" />
+ <iu id="org.eclipse.jst.enterprise_core.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.jst.server_adapters.ext.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.jst.server_adapters.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.jst.server_core.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.jst.server_ui.feature.feature.group" version="" />
+ <iu id="org.eclipse.jst.web_ui.feature.feature.group" version="" />
+ <iu id="org.eclipse.jsf.feature.source.feature.group" version="" />
+ <iu id="org.eclipse.wst.xml.xpath2.processor.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.jst.webpageeditor.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.wst.ws_wsdl15.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.common_core.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.wst.common_ui.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.server_adapters.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.wst.server_core.feature.feature.group"
+ version="" />
+ <iu id="org.eclipse.wst.server_ui.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.web_core.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.ws_ui.feature.feature.group" version="" />
+ <iu id="org.eclipse.wst.xml_core.feature.feature.group" version="" />
+ <iu id="com.google.gdt.eclipse.suite.e36.feature.feature.group"
+ version="" />
+ <iu id="org.drools.eclipse.feature.feature.group" version="" />
+ <iu id="org.drools.eclipse.task.feature.feature.group" version="" />
+ <iu id="org.guvnor.tools.feature.feature.group" version="" />
+ <iu id="org.mozilla.xulrunner.feature.feature.group" version="" />
+ <iu id="org.mozilla.xpcom.feature.feature.group" version="" />
+ </p2.mirror>
+ </target>
+</project>
Property changes on: trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/build/target-platform/target2ant.xsl
===================================================================
--- trunk/build/target-platform/target2ant.xsl 2010-09-29 18:55:24 UTC (rev 25304)
+++ trunk/build/target-platform/target2ant.xsl 2010-09-29 19:01:24 UTC (rev 25305)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
- <xsl:output method="xml" indent="yes" encoding="UTF-8"
- version="1.0" />
- <xsl:decimal-format decimal-separator="."
- grouping-separator="," />
-
- <!-- should we include {@version} for specific ver, or 0.0.0 for latest
- avail? -->
- <xsl:param name="useLatest" select="'true'" />
-
- <xsl:param name="verbose" select="'${verbose}'" />
- <xsl:param name="followStrict" select="'${followStrict}'" />
- <xsl:param name="destination" select="'file:${repo.dir}'" />
-
- <xsl:variable name="platformFilter"
- select="concat(/target/environment/os/text(), ',', /target/environment/ws/text(), ',', /target/environment/arch/text())" />
-
- <xsl:template match="target">
- <project name="Download target platform" default="download.target.platform">
- <target name="help">
- <echo>
- Use followStrict="true" to prevent downloading all
- requirements not included in the target platform
- or
- followStrict="false" to fetch everything
-
- To run this script:
-
- /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
- /tmp/workspace -consolelog -application \
- org.eclipse.ant.core.antRunner -f out.xml \
- -Ddebug=true \
- -DfollowStrict=true \
- -Drepo.dir=/tmp/REPO/
-</echo>
- </target>
- <target name="init" unless="repo.dir">
- <fail>Must set -Drepo.dir=/abs/path/to/download/artifacts/</fail>
- </target>
- <target name="download.target.platform" depends="init"
- description="Download from target platform definition" if="repo.dir">
- <property name="verbose" value="false" />
- <property name="followStrict" value="false" />
- <echo level="info">Download features/plugins into ${repo.dir}</echo>
- <p2.mirror destination="{$destination}" verbose="{$verbose}">
- <!-- should we add latestVersionOnly="true" to <slicingOptions> ? -->
- <slicingOptions includeFeatures="true" followStrict="{$followStrict}"/>
- <source>
- <xsl:apply-templates select="//repository" />
- </source>
- <xsl:apply-templates select="//unit" />
- <xsl:apply-templates select="//feature" />
- <xsl:apply-templates select="//plugin" />
- </p2.mirror>
- </target>
- </project>
- </xsl:template>
-
- <xsl:template match="//repository">
- <xsl:variable name="locationUrl" select="./@location" />
- <repository location="{$locationUrl}" />
- </xsl:template>
-
- <xsl:template match="//unit">
- <xsl:choose>
- <xsl:when test="$useLatest='true'">
- <iu id="{@id}" version="" />
- </xsl:when>
- <xsl:otherwise>
- <iu id="{@id}" version="{@version}" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template match="//plugin">
- <iu id="{@id}" version="" />
- </xsl:template>
-
- <xsl:template match="//feature">
- <iu id="{(a)id}.feature.group" version="" />
- </xsl:template>
-
- <!-- ignore anything else -->
- <xsl:template match="environment|targetJRE|launcherArgs|includeBundles" />
-
-</xsl:stylesheet>
Copied: trunk/build/target-platform/target2p2mirrorXml.xsl (from rev 25302, trunk/build/target-platform/target2ant.xsl)
===================================================================
--- trunk/build/target-platform/target2p2mirrorXml.xsl (rev 0)
+++ trunk/build/target-platform/target2p2mirrorXml.xsl 2010-09-29 19:01:24 UTC (rev 25305)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+ <xsl:output method="xml" indent="yes" encoding="UTF-8"
+ version="1.0" />
+ <xsl:decimal-format decimal-separator="."
+ grouping-separator="," />
+
+ <!-- should we include {@version} for specific ver, or 0.0.0 for latest
+ avail? -->
+ <xsl:param name="useLatest" select="'true'" />
+
+ <xsl:param name="verbose" select="'${verbose}'" />
+ <xsl:param name="followStrict" select="'${followStrict}'" />
+ <xsl:param name="destination" select="'file:${repo.dir}'" />
+
+ <xsl:variable name="platformFilter"
+ select="concat(/target/environment/os/text(), ',', /target/environment/ws/text(), ',', /target/environment/arch/text())" />
+
+ <xsl:template match="target">
+ <project name="Download target platform" default="download.target.platform">
+ <target name="help">
+ <echo>
+ Use followStrict="true" to prevent downloading all
+ requirements not included in the target platform
+ or
+ followStrict="false" to fetch everything
+
+ To run this script:
+
+ /abs/path/to/eclipse -vm /opt/jdk1.6.0/bin/java -nosplash -data \
+ /tmp/workspace -consolelog -application \
+ org.eclipse.ant.core.antRunner -f *.target.p2mirror.xml \
+ -Ddebug=true \
+ -DfollowStrict=true \
+ -Drepo.dir=/tmp/REPO/
+</echo>
+ </target>
+ <target name="init" unless="repo.dir">
+ <fail>Must set -Drepo.dir=/abs/path/to/download/artifacts/</fail>
+ </target>
+ <target name="download.target.platform" depends="init"
+ description="Download from target platform definition" if="repo.dir">
+ <property name="verbose" value="false" />
+ <property name="followStrict" value="false" />
+ <echo level="info">Download features/plugins into ${repo.dir}</echo>
+ <p2.mirror destination="{$destination}" verbose="{$verbose}">
+ <!-- should we add latestVersionOnly="true" to <slicingOptions> ? -->
+ <slicingOptions includeFeatures="true" followStrict="{$followStrict}"/>
+ <source>
+ <xsl:apply-templates select="//repository" />
+ </source>
+ <xsl:apply-templates select="//unit" />
+ <xsl:apply-templates select="//feature" />
+ <xsl:apply-templates select="//plugin" />
+ </p2.mirror>
+ </target>
+ </project>
+ </xsl:template>
+
+ <xsl:template match="//repository">
+ <xsl:variable name="locationUrl" select="./@location" />
+ <repository location="{$locationUrl}" />
+ </xsl:template>
+
+ <xsl:template match="//unit">
+ <xsl:choose>
+ <xsl:when test="$useLatest='true'">
+ <iu id="{@id}" version="" />
+ </xsl:when>
+ <xsl:otherwise>
+ <iu id="{@id}" version="{@version}" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="//plugin">
+ <iu id="{@id}" version="" />
+ </xsl:template>
+
+ <xsl:template match="//feature">
+ <iu id="{(a)id}.feature.group" version="" />
+ </xsl:template>
+
+ <!-- ignore anything else -->
+ <xsl:template match="environment|targetJRE|launcherArgs|includeBundles" />
+
+</xsl:stylesheet>
Property changes on: trunk/build/target-platform/target2p2mirrorXml.xsl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 3 months
JBoss Tools SVN: r25304 - trunk/build/parent.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-09-29 14:55:24 -0400 (Wed, 29 Sep 2010)
New Revision: 25304
Modified:
trunk/build/parent/pom.xml
Log:
https://jira.jboss.org/browse/JBIDE-6953 Disable Usage Reporting in Tests
fixed in trunk and beta1 branch
-Dusage_reporting_enabled=false added to system properties
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-09-29 18:52:54 UTC (rev 25303)
+++ trunk/build/parent/pom.xml 2010-09-29 18:55:24 UTC (rev 25304)
@@ -17,7 +17,7 @@
<BUILD_ALIAS>Beta2</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
- <systemProperties></systemProperties>
+ <systemProperties>-Dusage_reporting_enabled=false</systemProperties>
<target.platform>e36-wtp32</target.platform>
</properties>
15 years, 3 months