JBoss Tools SVN: r28193 - trunk/drools.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-13 13:37:13 -0500 (Thu, 13 Jan 2011)
New Revision: 28193
Added:
trunk/drools/JBIDE-1484_MANIFEST.MF.patch
Modified:
trunk/drools/build.sh
Log:
JBIDE-1484: patch org.drools.eclipse/META-INF/MANIFEST.MF
Added: trunk/drools/JBIDE-1484_MANIFEST.MF.patch
===================================================================
--- trunk/drools/JBIDE-1484_MANIFEST.MF.patch (rev 0)
+++ trunk/drools/JBIDE-1484_MANIFEST.MF.patch 2011-01-13 18:37:13 UTC (rev 28193)
@@ -0,0 +1,9 @@
+Index: META-INF/MANIFEST.MF
+===================================================================
+--- META-INF/MANIFEST.MF (revision 36519)
++++ META-INF/MANIFEST.MF (working copy)
+@@ -50,3 +50,4 @@
+ lib/jbpm-flow.jar,
+ lib/jbpm-flow-builder.jar
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Export-Package: org.drools.eclipse.util
Modified: trunk/drools/build.sh
===================================================================
--- trunk/drools/build.sh 2011-01-13 15:18:24 UTC (rev 28192)
+++ trunk/drools/build.sh 2011-01-13 18:37:13 UTC (rev 28193)
@@ -29,6 +29,12 @@
# fetch drools-eclipse sources into child folder, "sources/drools"
if [[ ! -d ${WORKSPACE}/sources/drools ]]; then svn co https://anonsvn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-eclipse drools; fi
+# JBIDE-1484: patch org.drools.eclipse/META-INF/MANIFEST.MF
+cd ${WORKSPACE}/sources/drools/org.drools.eclipse
+wget http://anonsvn.jboss.org/repos/jbosstools/trunk/drools/JBIDE-1484_MANIFES...
+patch ${WORKSPACE}/sources/drools/org.drools.eclipse/META-INF/MANIFEST.MF JBIDE-1484_MANIFEST.MF.patch
+cd ${WORKSPACE}/sources
+
# fetch Drools' parent pom into root folder, "sources"
rm -fr ${WORKSPACE}/sources/pom.xml; wget https://anonsvn.jboss.org/repos/labs/labs/jbossrules/trunk/pom.xml
15 years, 3 months
JBoss Tools SVN: r28192 - branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-01-13 10:18:24 -0500 (Thu, 13 Jan 2011)
New Revision: 28192
Modified:
branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-8108 Fixed typo in ENABLE_JSF_CODE_COMPLETION_TEXT
Modified: branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties
===================================================================
--- branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2011-01-13 15:14:02 UTC (rev 28191)
+++ branches/jbosstools-3.2.0.CR1/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2011-01-13 15:18:24 UTC (rev 28192)
@@ -29,7 +29,7 @@
ADD_JSF_CAPABILITIES_BUTTTON_LABEL=Add JSF Capabilities...
ENABLE_JSF_CAPABILITIES_TEXT=JBoss Tools Editor might not fully work in project "{0}" because it does not have JSF and code completion enabled completely.\n\nPlease use the Configure menu on the project or "Add JSF Capabilities..." fix button to enable JSF if you want all features of the editor working.
ENABLE_JSF_CODE_COMPLETION_BUTTON_LABEL=Enable JSF Code Completion...
-ENABLE_JSF_CODE_COMPLETION_TEXT=The project "{0}" does not have JSF code completion and validation enabled completely.\n\nPlease use "Enabale JSF Code Completion..." fix button if you want these features working.
+ENABLE_JSF_CODE_COMPLETION_TEXT=The project "{0}" does not have JSF code completion and validation enabled completely.\n\nPlease use "Enable JSF Code Completion..." fix button if you want these features working.
DONT_SHOW_CHECKER_DIALOG=Do not show this dialog again!
MISSING_NATURES_INFO_MESSAGE_TITLE=Missing Natures
SKIP_BUTTON_LABEL=Skip
15 years, 3 months
JBoss Tools SVN: r28191 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-01-13 10:14:02 -0500 (Thu, 13 Jan 2011)
New Revision: 28191
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-8108 Fixed typo in ENABLE_JSF_CODE_COMPLETION_TEXT
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2011-01-13 11:01:42 UTC (rev 28190)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/messages.properties 2011-01-13 15:14:02 UTC (rev 28191)
@@ -29,7 +29,7 @@
ADD_JSF_CAPABILITIES_BUTTTON_LABEL=Add JSF Capabilities...
ENABLE_JSF_CAPABILITIES_TEXT=JBoss Tools Editor might not fully work in project "{0}" because it does not have JSF and code completion enabled completely.\n\nPlease use the Configure menu on the project or "Add JSF Capabilities..." fix button to enable JSF if you want all features of the editor working.
ENABLE_JSF_CODE_COMPLETION_BUTTON_LABEL=Enable JSF Code Completion...
-ENABLE_JSF_CODE_COMPLETION_TEXT=The project "{0}" does not have JSF code completion and validation enabled completely.\n\nPlease use "Enabale JSF Code Completion..." fix button if you want these features working.
+ENABLE_JSF_CODE_COMPLETION_TEXT=The project "{0}" does not have JSF code completion and validation enabled completely.\n\nPlease use "Enable JSF Code Completion..." fix button if you want these features working.
DONT_SHOW_CHECKER_DIALOG=Do not show this dialog again!
MISSING_NATURES_INFO_MESSAGE_TITLE=Missing Natures
SKIP_BUTTON_LABEL=Skip
15 years, 3 months
JBoss Tools SVN: r28190 - branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-13 06:01:42 -0500 (Thu, 13 Jan 2011)
New Revision: 28190
Modified:
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
Log:
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-13 10:59:16 UTC (rev 28189)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-13 11:01:42 UTC (rev 28190)
@@ -21,6 +21,7 @@
import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateListStrategy;
+import org.eclipse.core.databinding.UpdateSetStrategy;
import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.conversion.Converter;
@@ -29,8 +30,6 @@
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
@@ -191,7 +190,7 @@
archLabel.setText(WizardMessages.getString(ARCH_LABEL));
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(archLabel);
arch = new Label(container, SWT.NULL);
- GridDataFactory.fillDefaults().span(2,1).align(SWT.FILL, SWT.CENTER).applyTo(arch);
+ GridDataFactory.fillDefaults().span(2, 1).align(SWT.FILL, SWT.CENTER).applyTo(arch);
Label realmLabel = new Label(container, SWT.NULL);
realmLabel.setText(WizardMessages.getString(REALM_LABEL));
@@ -239,20 +238,20 @@
bindKey(keyText, dbc);
}
- private void bindArchLabel(final Label architecture, IObservableValue imageObservable, DataBindingContext dbc) {
- DataBindingUtils.addValueChangeListener(new IValueChangeListener() {
-
- @Override
- public void handleValueChange(ValueChangeEvent event) {
- Object newValue = event.diff.getNewValue();
- if (newValue == null
- || !(newValue instanceof DeltaCloudImage)) {
- return;
- }
- DeltaCloudImage image = (DeltaCloudImage) newValue;
- architecture.setText(image.getArchitecture());
- }
- }, imageObservable, architecture);
+ private void bindArchLabel(final Label architectureLabel, IObservableValue imageObservable, DataBindingContext dbc) {
+ dbc.bindValue(WidgetProperties.text().observe(architectureLabel),
+ imageObservable,
+ new UpdateValueStrategy(UpdateSetStrategy.POLICY_NEVER),
+ new UpdateValueStrategy().setConverter(new Converter(DeltaCloudImage.class, String.class) {
+
+ @Override
+ public Object convert(Object fromObject) {
+ if (!(fromObject instanceof DeltaCloudImage)) {
+ return null;
+ }
+ return ((DeltaCloudImage) fromObject).getArchitecture();
+ }
+ }));
}
private void bindRealmCombo(final Combo realmCombo, DataBindingContext dbc) {
15 years, 3 months
JBoss Tools SVN: r28189 - 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: 2011-01-13 05:59:16 -0500 (Thu, 13 Jan 2011)
New Revision: 28189
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
Log:
[JBIDE-8020] corrected architecture to be displayed when the page opens up (was: architecture was only updated when chaning the image)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-13 10:55:47 UTC (rev 28188)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-13 10:59:16 UTC (rev 28189)
@@ -190,7 +190,6 @@
archLabel.setText(WizardMessages.getString(ARCH_LABEL));
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(archLabel);
arch = new Label(container, SWT.NULL);
- arch.setBackground(arch.getDisplay().getSystemColor(SWT.COLOR_RED));
GridDataFactory.fillDefaults().span(2, 1).align(SWT.FILL, SWT.CENTER).applyTo(arch);
Label realmLabel = new Label(container, SWT.NULL);
15 years, 3 months
JBoss Tools SVN: r28188 - 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: 2011-01-13 05:55:47 -0500 (Thu, 13 Jan 2011)
New Revision: 28188
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
Log:
[JBIDE-8020] corrected architecture to be displayed when the page opens up (was: architecture was only updated when chaning the image)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-13 05:57:12 UTC (rev 28187)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-13 10:55:47 UTC (rev 28188)
@@ -21,6 +21,7 @@
import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.UpdateListStrategy;
+import org.eclipse.core.databinding.UpdateSetStrategy;
import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.conversion.Converter;
@@ -29,8 +30,6 @@
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
@@ -191,7 +190,8 @@
archLabel.setText(WizardMessages.getString(ARCH_LABEL));
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(archLabel);
arch = new Label(container, SWT.NULL);
- GridDataFactory.fillDefaults().span(2,1).align(SWT.FILL, SWT.CENTER).applyTo(arch);
+ arch.setBackground(arch.getDisplay().getSystemColor(SWT.COLOR_RED));
+ GridDataFactory.fillDefaults().span(2, 1).align(SWT.FILL, SWT.CENTER).applyTo(arch);
Label realmLabel = new Label(container, SWT.NULL);
realmLabel.setText(WizardMessages.getString(REALM_LABEL));
@@ -239,20 +239,20 @@
bindKey(keyText, dbc);
}
- private void bindArchLabel(final Label architecture, IObservableValue imageObservable, DataBindingContext dbc) {
- DataBindingUtils.addValueChangeListener(new IValueChangeListener() {
-
- @Override
- public void handleValueChange(ValueChangeEvent event) {
- Object newValue = event.diff.getNewValue();
- if (newValue == null
- || !(newValue instanceof DeltaCloudImage)) {
- return;
- }
- DeltaCloudImage image = (DeltaCloudImage) newValue;
- architecture.setText(image.getArchitecture());
- }
- }, imageObservable, architecture);
+ private void bindArchLabel(final Label architectureLabel, IObservableValue imageObservable, DataBindingContext dbc) {
+ dbc.bindValue(WidgetProperties.text().observe(architectureLabel),
+ imageObservable,
+ new UpdateValueStrategy(UpdateSetStrategy.POLICY_NEVER),
+ new UpdateValueStrategy().setConverter(new Converter(DeltaCloudImage.class, String.class) {
+
+ @Override
+ public Object convert(Object fromObject) {
+ if (!(fromObject instanceof DeltaCloudImage)) {
+ return null;
+ }
+ return ((DeltaCloudImage) fromObject).getArchitecture();
+ }
+ }));
}
private void bindRealmCombo(final Combo realmCombo, DataBindingContext dbc) {
15 years, 3 months
JBoss Tools SVN: r28187 - workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-13 00:57:12 -0500 (Thu, 13 Jan 2011)
New Revision: 28187
Added:
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/HudsonSharedImages.java
Log:
more hudson stuff for nick
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/HudsonSharedImages.java
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/HudsonSharedImages.java (rev 0)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/HudsonSharedImages.java 2011-01-13 05:57:12 UTC (rev 28187)
@@ -0,0 +1,45 @@
+package org.jboss.tools.hudson.manager.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+public class HudsonSharedImages {
+
+ // image ids
+ public static final String GREY_BALL = "icons/grey.gif"; //$NON-NLS-1$
+ public static final String RED_BALL = "icons/red.gif"; //$NON-NLS-1$
+ public static final String BLUE_BALL = "icons/blue.gif";//$NON-NLS-1$
+ public static final String YELLOW_BALL = "icons/yellow.gif";//$NON-NLS-1$
+ public static final String PROGRESS = "icons/pview.gif";//$NON-NLS-1$
+ public static final String GEAR = "icons/gear.gif";//$NON-NLS-1$
+ public static final String SERVER = "icons/computer.gif";//$NON-NLS-1$
+
+
+ static {
+ register(Activator.getDefault().getImageRegistry());
+ }
+
+ public static void register(ImageRegistry registry) {
+ registerImages(registry, new String[] {
+ GEAR, GREY_BALL, RED_BALL, BLUE_BALL,
+ YELLOW_BALL, PROGRESS, SERVER
+ });
+ }
+
+ private static void registerImages (ImageRegistry reg, String ids[]) {
+ for (int i = 0; i < ids.length; i++)
+ reg.put(ids[i], AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, ids[i]));
+ }
+
+ // helper methods
+ public static Image getImage (String id) {
+ return Activator.getDefault().getImageRegistry().get(id);
+ }
+
+ public static ImageDescriptor getImageDescriptor (String id) {
+ return Activator.getDefault().getImageRegistry().getDescriptor(id);
+ }
+
+}
\ No newline at end of file
15 years, 3 months
JBoss Tools SVN: r28186 - in workspace/rstryker/hudson/plugins: org.jboss.tools.hudson.manager.core/META-INF and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-13 00:56:35 -0500 (Thu, 13 Jan 2011)
New Revision: 28186
Added:
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/blue.gif
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/computer.gif
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/gear.gif
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/grey.gif
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/help.png
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/pview.gif
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/red.gif
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/yellow.gif
Modified:
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/.classpath
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/META-INF/MANIFEST.MF
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/build.properties
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/jobs/LoadHudsonJobJob.java
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/model/HudsonJob.java
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/model/HudsonModel.java
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider$1$1.class
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider$1.class
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider$DelayObject.class
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider.class
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonLabelProvider.class
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonManagerView.class
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider.java
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonLabelProvider.java
workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonManagerView.java
Log:
more hudson stuff for nick
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/.classpath
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/.classpath 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/.classpath 2011-01-13 05:56:35 UTC (rev 28186)
@@ -6,5 +6,6 @@
<classpathentry kind="lib" path="libs/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="libs/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="libs/maven-plugin-api-2.0.jar"/>
+ <classpathentry kind="lib" path="libs/jaxen-1.1.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/META-INF/MANIFEST.MF
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/META-INF/MANIFEST.MF 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/META-INF/MANIFEST.MF 2011-01-13 05:56:35 UTC (rev 28186)
@@ -14,4 +14,5 @@
Bundle-ClassPath: libs/commons-httpclient-3.1.jar,
libs/dom4j-1.6.1.jar,
libs/maven-plugin-api-2.0.jar,
- .
+ .,
+ libs/jaxen-1.1.1.jar
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/build.properties
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/build.properties 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/build.properties 2011-01-13 05:56:35 UTC (rev 28186)
@@ -4,4 +4,5 @@
.,\
libs/commons-httpclient-3.1.jar,\
libs/dom4j-1.6.1.jar,\
- libs/maven-plugin-api-2.0.jar
+ libs/maven-plugin-api-2.0.jar,\
+ libs/jaxen-1.1.1.jar
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/jobs/LoadHudsonJobJob.java
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/jobs/LoadHudsonJobJob.java 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/jobs/LoadHudsonJobJob.java 2011-01-13 05:56:35 UTC (rev 28186)
@@ -18,7 +18,6 @@
this(server);
postJob = r;
}
-
@Override
protected IStatus run(IProgressMonitor monitor) {
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/model/HudsonJob.java
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/model/HudsonJob.java 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/model/HudsonJob.java 2011-01-13 05:56:35 UTC (rev 28186)
@@ -2,12 +2,15 @@
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
+import org.dom4j.Node;
import org.dom4j.io.SAXReader;
import org.eclipse.core.runtime.Path;
@@ -42,12 +45,15 @@
if( fdetails == null ) {
fdetails = loadDetails();
}
+ if( fdetails == null ) {
+ System.out.println("WAIT");
+ }
return fdetails;
}
private JobExtendedDetails loadDetails() {
try {
- String url = fserver.getUrl() + "job" + Path.SEPARATOR + fname + Path.SEPARATOR + HudsonModel.API_XML;
+ String url = fserver.getUrl() + "job" + Path.SEPARATOR + fname + Path.SEPARATOR + HudsonModel.API_XML_DEPT_1;
URL url2 = new URL(url);
Document dom;
dom = new SAXReader().read(url2);
@@ -79,11 +85,15 @@
ArrayList<JobBuild> list = new ArrayList<JobBuild>();
Document d = getDocument();
for (Element job : (List<Element>) d.getRootElement().elements("build")) {
- String number = job.elementText("number");
- String url = job.elementText("url");
- list.add(new JobBuild(number, url));
- builds = (JobBuild[]) list.toArray(new JobBuild[list.size()]);
+ list.add(new JobBuild(job));
}
+ Comparator<JobBuild> c = new Comparator<JobBuild>() {
+ public int compare(JobBuild o1, JobBuild o2) {
+ return o2.getNumberInt() - o1.getNumberInt();
+ }
+ };
+ Collections.sort(list, c);
+ builds = (JobBuild[]) list.toArray(new JobBuild[list.size()]);
}
private Document getDocument() {
@@ -98,28 +108,125 @@
}
public static class JobBuild {
- private String number, url;
- public JobBuild(String number, String url) {
- this.number = number;
- this.url = url;
+ private Element job;
+ private BuildCause cause = null;
+ public JobBuild(Element job) {
+ this.job = job;
+ getBuildCause();
}
+ public Element getElement() {
+ return job;
+ }
+
+ public int getNumberInt() {
+ String num = getNumber();
+ return Integer.parseInt(num);
+ }
public String getNumber() {
- return number;
+ return job.elementText("number");
}
public String getUrl() {
- return url;
+ return job.elementText("url");
}
+ public String getResult() {
+ return job.elementText("result");
+ }
+ public String getId() {
+ return job.elementText("id");
+ }
+ public String getBuiltOn() {
+ return job.elementText("builtOn");
+ }
+ public BuildCause getBuildCause() {
+ if( cause == null ) {
+ cause = new BuildCause(this);
+ }
+ return cause;
+ }
}
- public static class OtherProject {
- public static final boolean UP_STREAM = true;
- public static final boolean DOWN_STREAM = false;
- private boolean fdirection;
- private String fname, furl;
- public OtherProject(boolean direction, String name, String url) {
- this.fdirection = direction;
- this.fname = name;
- this.furl = url;
+ public static class BuildCause {
+ public static final int KICKED_BY_USER_TYPE = 0;
+ public static final int SVN_CHANGE_TYPE = 1;
+ public static final int UPSTREAM_PROJECT_TYPE = 2;
+
+ public static final String ACTION_CAUSE = "action/cause";
+ public static final String USERNAME = "userName";
+ public static final String UPSTREAM_BUILD = "upstreamBuild";
+ public static final String UPSTREAM_PROJECT = "upstreamProject";
+ public static final String UPSTREAM_URL= "upstreamUrl";
+ public static final String SHORT_DESCRIPTION = "shortDescription";
+
+ private JobBuild build;
+ private int type = -1;
+ private Node cause;
+ public BuildCause(JobBuild build) {
+ this.build = build;
+ setType();
+// System.out.println(build.getId());
+// System.out.println(" " + getType());
+// System.out.println(" " + getDescription());
+// System.out.println(" " + getUpstreamBuild());
+// System.out.println(" " + getUpstreamUrl());
+// System.out.println(" " + getUserName());
+//
}
+
+ protected void setType() {
+ String xml = build.getElement().asXML();
+ List list = build.getElement().selectNodes(ACTION_CAUSE);
+ if( list.size() > 0 ) {
+ if( list.size() == 2)
+ cause = (Node)list.get(1);
+ else
+ cause = (Node)list.get(0);
+ List child = cause.selectNodes(USERNAME);
+ if( child.size() > 0 ) {
+ type = KICKED_BY_USER_TYPE;
+ } else {
+ child = cause.selectNodes(UPSTREAM_BUILD);
+ if( list.size() > 0 )
+ type = UPSTREAM_PROJECT_TYPE;
+ else
+ type = SVN_CHANGE_TYPE;
+ }
+ }
+ }
+ public int getType() {
+ return type;
+ }
+ public String getCauseNode(String name) {
+ List list = cause.selectNodes(name);
+ if( list.size() > 0 )
+ return ((Node)list.get(0)).getText().trim();
+ return null;
+ }
+ public String getDescription() {
+ return getCauseNode(SHORT_DESCRIPTION);
+ }
+ public String getUpstreamBuild() {
+ return getCauseNode(UPSTREAM_BUILD);
+ }
+ public String getUpstreamProject() {
+ return getCauseNode(UPSTREAM_PROJECT);
+ }
+ public String getUpstreamUrl() {
+ return getCauseNode(UPSTREAM_URL);
+ }
+ public String getUserName() {
+ return getCauseNode(USERNAME);
+ }
}
+
+// public static class OtherProject {
+// public static final boolean UP_STREAM = true;
+// public static final boolean DOWN_STREAM = false;
+// private boolean fdirection;
+// private String fname, furl;
+// public OtherProject(boolean direction, String name, String url) {
+// this.fdirection = direction;
+// this.fname = name;
+// this.furl = url;
+// }
+// }
}
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/model/HudsonModel.java
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/model/HudsonModel.java 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.core/src/org/jboss/tools/hudson/manager/core/model/HudsonModel.java 2011-01-13 05:56:35 UTC (rev 28186)
@@ -5,6 +5,7 @@
public class HudsonModel {
public static final String API_XML = "api/xml";
+ public static final String API_XML_DEPT_1 = API_XML + "?depth=1";
private static HudsonModel instance = null;
public static HudsonModel getInstance() {
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider$1$1.class
===================================================================
(Binary files differ)
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider$1.class
===================================================================
(Binary files differ)
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider$DelayObject.class
===================================================================
(Binary files differ)
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider.class
===================================================================
(Binary files differ)
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonLabelProvider.class
===================================================================
(Binary files differ)
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/bin/org/jboss/tools/hudson/manager/ui/views/HudsonManagerView.class
===================================================================
(Binary files differ)
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/blue.gif
===================================================================
(Binary files differ)
Property changes on: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/blue.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/computer.gif
===================================================================
(Binary files differ)
Property changes on: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/computer.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/gear.gif
===================================================================
(Binary files differ)
Property changes on: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/gear.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/grey.gif
===================================================================
(Binary files differ)
Property changes on: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/grey.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/help.png
===================================================================
(Binary files differ)
Property changes on: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/help.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/pview.gif
===================================================================
(Binary files differ)
Property changes on: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/pview.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/red.gif
===================================================================
(Binary files differ)
Property changes on: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/red.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/yellow.gif
===================================================================
(Binary files differ)
Property changes on: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/icons/yellow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider.java
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider.java 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonContentProvider.java 2011-01-13 05:56:35 UTC (rev 28186)
@@ -4,6 +4,7 @@
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.hudson.manager.core.jobs.LoadHudsonBuildsJob;
import org.jboss.tools.hudson.manager.core.jobs.LoadHudsonJobJob;
import org.jboss.tools.hudson.manager.core.jobs.LoadHudsonModelJob;
import org.jboss.tools.hudson.manager.core.model.HudsonJob;
@@ -56,7 +57,7 @@
}
return HudsonModel.getInstance().getServers();
}
-
+
private Object[] handleHudsonServer(HudsonServer parent) {
if( !parent.jobsLoaded()) {
DelayObject delay = getDelayObject(parent);
@@ -66,6 +67,15 @@
return parent.getHudsonJobs();
}
+ private Object[] handleHudsonJob(HudsonJob parent) {
+ if( !parent.detailsLoaded()) {
+ DelayObject delay = getDelayObject(parent);
+ new LoadHudsonBuildsJob(parent, refreshParentRunnable(v, parent)).schedule();
+ return new Object[]{delay};
+ }
+ return parent.getDetails().getBuilds();
+ }
+
@Override
public Object[] getChildren(Object parentElement) {
if( parentElement instanceof HudsonManagerView ) {
@@ -75,9 +85,9 @@
return handleHudsonServer((HudsonServer)parentElement);
}
if( parentElement instanceof HudsonJob ) {
- return ((HudsonJob)parentElement).getDetails().getBuilds();
+ return handleHudsonJob((HudsonJob)parentElement);
}
- return new String[]{"a", "b", "c"};
+ return new String[]{};
}
public Object getParent(Object element) {
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonLabelProvider.java
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonLabelProvider.java 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonLabelProvider.java 2011-01-13 05:56:35 UTC (rev 28186)
@@ -6,11 +6,32 @@
import org.jboss.tools.hudson.manager.core.model.HudsonJob;
import org.jboss.tools.hudson.manager.core.model.HudsonServer;
import org.jboss.tools.hudson.manager.core.model.HudsonJob.JobBuild;
+import org.jboss.tools.hudson.manager.ui.HudsonSharedImages;
import org.jboss.tools.hudson.manager.ui.views.HudsonContentProvider.DelayObject;
public class HudsonLabelProvider extends LabelProvider implements
ILabelProvider {
public Image getImage(Object element) {
+ if( element instanceof HudsonServer) {
+ return HudsonSharedImages.getImage(HudsonSharedImages.SERVER);
+ }
+ if( element instanceof HudsonJob) {
+ return HudsonSharedImages.getImage(HudsonSharedImages.GEAR);
+ }
+ if( element instanceof JobBuild) {
+ String xy = ((JobBuild)element).getResult();
+ if( "SUCCESS".equals(xy)) {
+ return HudsonSharedImages.getImage(HudsonSharedImages.BLUE_BALL);
+ } else if("FAILURE".equals(xy)) {
+ return HudsonSharedImages.getImage(HudsonSharedImages.RED_BALL);
+ } else if("ABORTED".equals(xy)) {
+ return HudsonSharedImages.getImage(HudsonSharedImages.GREY_BALL);
+ } else if( "UNSTABLE".equals(xy)) {
+ return HudsonSharedImages.getImage(HudsonSharedImages.YELLOW_BALL);
+ } else {
+ return HudsonSharedImages.getImage(HudsonSharedImages.PROGRESS);
+ }
+ }
return null;
}
@@ -19,7 +40,8 @@
return "Loading...";
}
if( element instanceof HudsonServer ) {
- return ((HudsonServer)element).getName();
+ HudsonServer hs = (HudsonServer)element;
+ return hs.getName() + " [ " + hs.getUrl() + " ]";
}
if( element instanceof HudsonJob) {
return ((HudsonJob)element).getName();
Modified: workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonManagerView.java
===================================================================
--- workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonManagerView.java 2011-01-13 05:33:28 UTC (rev 28185)
+++ workspace/rstryker/hudson/plugins/org.jboss.tools.hudson.manager.ui/src/org/jboss/tools/hudson/manager/ui/views/HudsonManagerView.java 2011-01-13 05:56:35 UTC (rev 28186)
@@ -1,6 +1,8 @@
package org.jboss.tools.hudson.manager.ui.views;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.navigator.CommonNavigator;
+import org.eclipse.ui.navigator.CommonViewerSorter;
public class HudsonManagerView extends CommonNavigator {
@@ -10,4 +12,8 @@
protected Object getInitialInput() {
return this;
}
+ public void createPartControl(Composite aParent) {
+ super.createPartControl(aParent);
+ getCommonViewer().setSorter(null);
+ }
}
15 years, 3 months
JBoss Tools SVN: r28185 - trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started.
by jbosstools-commits＠lists.jboss.org
Author: mcaspers
Date: 2011-01-13 00:33:28 -0500 (Thu, 13 Jan 2011)
New Revision: 28185
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_1.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_2.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3_1.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3_2.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3_3_1.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3_4.png
trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_4.png
Log:
Updated images
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_1.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_2.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3_1.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3_2.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3_3_1.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_3_4.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/getting_started/getting_started_4.png
===================================================================
(Binary files differ)
15 years, 3 months
JBoss Tools SVN: r28184 - branches/jbosstools-3.2.0.CR1/drools.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-12 23:38:35 -0500 (Wed, 12 Jan 2011)
New Revision: 28184
Added:
branches/jbosstools-3.2.0.CR1/drools/build.sh
Modified:
branches/jbosstools-3.2.0.CR1/drools/.gitignore
Log:
merge from trunk into branch
Modified: branches/jbosstools-3.2.0.CR1/drools/.gitignore
===================================================================
--- branches/jbosstools-3.2.0.CR1/drools/.gitignore 2011-01-13 04:38:33 UTC (rev 28183)
+++ branches/jbosstools-3.2.0.CR1/drools/.gitignore 2011-01-13 04:38:35 UTC (rev 28184)
@@ -1 +1,3 @@
drools-5.2.0-SNAPSHOT-eclipse-all.zip
+m2-repository
+sources
Added: branches/jbosstools-3.2.0.CR1/drools/build.sh
===================================================================
--- branches/jbosstools-3.2.0.CR1/drools/build.sh (rev 0)
+++ branches/jbosstools-3.2.0.CR1/drools/build.sh 2011-01-13 04:38:35 UTC (rev 28184)
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# first, make sure JBT parent pom is built + installed into local ~/.m2 repo (?)
+
+# find mvn3
+if [[ -f /qa/tools/opt/maven-3.0.1/bin/mvn ]]; then
+ mvn3="/qa/tools/opt/maven-3.0.1/bin/mvn"
+else
+ for d in $(whereis mvn | grep 3); do e=$(echo $d | grep -v ".bat" | grep 3); if [[ $e ]] && [[ -x $d ]]; then mvn3=$d; break; fi; done
+fi
+
+echo "Using mvn3 = $mvn3"
+
+devnull="2>&1 1>/dev/null"
+if [[ ! ${WORKSPACE} ]]; then
+ WORKSPACE=`pwd`
+ devnull=""
+ BUILD_NUMBER=000
+fi
+
+# create working dir (if not already present in Hudson)
+mkdir -p ${WORKSPACE}/sources; cd ${WORKSPACE}/sources
+
+# store JBT's drools pom.xml (for running JBT Drools tests)
+if [[ -f ${WORKSPACE}/sources/pom.xml ]]; then
+ mv ${WORKSPACE}/sources/pom.xml ${WORKSPACE}/sources/pom_drools.xml
+fi
+
+# fetch drools-eclipse sources into child folder, "sources/drools"
+if [[ ! -d ${WORKSPACE}/sources/drools ]]; then svn co https://anonsvn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-eclipse drools; fi
+
+# fetch Drools' parent pom into root folder, "sources"
+rm -fr ${WORKSPACE}/sources/pom.xml; wget https://anonsvn.jboss.org/repos/labs/labs/jbossrules/trunk/pom.xml
+
+# build w/ maven using Drools' parent pom (will fail with missing deps); suppress logged output
+$mvn3 -B -fn clean install -f ${WORKSPACE}/sources/drools/pom.xml -Dmaven.repo.local=${WORKSPACE}/m2-repository $devnull
+
+# fetch JBT parent pom into root folder, "sources"
+rm -fr ${WORKSPACE}/sources/pom.xml; wget http://anonsvn.jboss.org/repos/jbosstools/trunk/build/pom.xml
+
+# add missing pom instructions into Drools' root pom
+mv ${WORKSPACE}/sources/drools/pom.xml ${WORKSPACE}/sources/drools/pom.xml_ORIG
+head -n -4 ${WORKSPACE}/sources/drools/pom.xml_ORIG > ${WORKSPACE}/sources/drools/pom.xml
+echo "
+ <!-- added by nboldt to fix packaging and artifact naming -->
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}'</format>
+ <archiveSite>true</archiveSite>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>" >> ${WORKSPACE}/sources/drools/pom.xml
+
+# build w/ maven using JBT parent pom (will pass - all deps available now)
+$mvn3 -B -fae clean install -f ${WORKSPACE}/sources/drools/pom.xml -Dmaven.repo.local=${WORKSPACE}/m2-repository
+
+#revert inserted code
+mv -f ${WORKSPACE}/sources/drools/pom.xml_ORIG ${WORKSPACE}/sources/drools/pom.xml
+
+# restore from before (running JBT Drools tests)
+if [[ -f ${WORKSPACE}/sources/pom_drools.xml ]]; then
+ mv ${WORKSPACE}/sources/pom_drools.xml ${WORKSPACE}/sources/pom.xml
+fi
+
Property changes on: branches/jbosstools-3.2.0.CR1/drools/build.sh
___________________________________________________________________
Name: svn:executable
+ *
15 years, 3 months