JBoss Tools SVN: r40992 - in trunk/download.jboss.org/jbosstools/updates/development/indigo: central and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-14 13:25:56 -0400 (Mon, 14 May 2012)
New Revision: 40992
Added:
trunk/download.jboss.org/jbosstools/updates/development/indigo/central/
trunk/download.jboss.org/jbosstools/updates/development/indigo/central/RE...
trunk/download.jboss.org/jbosstools/updates/development/indigo/central/core/
trunk/download.jboss.org/jbosstools/updates/development/indigo/central/co...
trunk/download.jboss.org/jbosstools/updates/development/indigo/central/co...
trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so...
trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so...
trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so...
Log:
https://issues.jboss.org/browse/JBDS-2134 add new composite sites for indigo dev milestone (core, soa) which can then be used by Central
Added: trunk/download.jboss.org/jbosstools/updates/development/indigo/central/RE...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/central/RE... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/central/RE... 2012-05-14 17:25:56 UTC (rev 40992)
@@ -0,0 +1,2 @@
+This folder contains composite sites which allow a user to resolve all of a Central connector's upstream deps via a single URL.
+
Added: trunk/download.jboss.org/jbosstools/updates/development/indigo/central/co...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/central/co... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/central/co... 2012-05-14 17:25:56 UTC (rev 40992)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Central Update Site - Core - Development Milestone' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1337016163000'/>
+</properties>
+<children size='2'>
+<child location='http://download.jboss.org/jbosstools/updates/development/indigo/'/>
+<child location='http://download.jboss.org/jbosstools/updates/indigo/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/development/indigo/central/co...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/central/co... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/central/co... 2012-05-14 17:25:56 UTC (rev 40992)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Central Update Site - Core - Development Milestone' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1337016163000'/>
+</properties>
+<children size='2'>
+<child location='http://download.jboss.org/jbosstools/updates/development/indigo/'/>
+<child location='http://download.jboss.org/jbosstools/updates/indigo/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so... 2012-05-14 17:25:56 UTC (rev 40992)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Central Update Site - SOA Tooling - Development Milestone' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1337016291000'/>
+</properties>
+<children size='3'>
+<child location='http://download.jboss.org/jbosstools/updates/development/indigo/soa-tooling/'/>
+<child location='http://download.jboss.org/jbosstools/updates/development/indigo/'/>
+<child location='http://download.jboss.org/jbosstools/updates/indigo/'/>
+</children>
+</repository>
Added: trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so... (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/central/so... 2012-05-14 17:25:56 UTC (rev 40992)
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Central Update Site - SOA Tooling - Development Milestone' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1337016294000'/>
+</properties>
+<children size='3'>
+<child location='http://download.jboss.org/jbosstools/updates/development/indigo/soa-tooling/'/>
+<child location='http://download.jboss.org/jbosstools/updates/development/indigo/'/>
+<child location='http://download.jboss.org/jbosstools/updates/indigo/'/>
+</children>
+</repository>
13 years, 11 months
JBoss Tools SVN: r40991 - in trunk: common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: xcoulon
Date: 2012-05-14 12:53:56 -0400 (Mon, 14 May 2012)
New Revision: 40991
Added:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/dialog/
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/dialog/CheckboxMessageDialog.java
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java
Log:
Fixed - JBIDE-11852
Improve responsiveness of User contextual menu in OpenShift Explorer
https://issues.jboss.org/browse/JBIDE-11852
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-05-14 16:11:21 UTC (rev 40990)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-05-14 16:53:56 UTC (rev 40991)
@@ -34,6 +34,7 @@
org.eclipse.jdt.junit;bundle-version="3.7.0"
Export-Package: org.jboss.tools.common.ui,
org.jboss.tools.common.ui.databinding,
+ org.jboss.tools.common.ui.dialog,
org.jboss.tools.common.ui.marker,
org.jboss.tools.common.ui.preferences,
org.jboss.tools.common.ui.preferencevalue,
Added: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/dialog/CheckboxMessageDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/dialog/CheckboxMessageDialog.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/dialog/CheckboxMessageDialog.java 2012-05-14 16:53:56 UTC (rev 40991)
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.ui.dialog;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * A MessageDialog that displays a check box under the message. By default, the check box is unselected.
+ *
+ * @author Xavier Coulon
+ *
+ */
+public class CheckboxMessageDialog extends MessageDialog {
+
+ public static final int INCLUDE_APPS = 2;
+ private final String checkboxMessage;
+
+ private boolean toggleState;
+
+ public CheckboxMessageDialog(Shell parentShell, String dialogTitle, String dialogMessage,
+ String checkboxMessage) {
+ super(parentShell, dialogTitle, null, dialogMessage, CONFIRM, new String[] { IDialogConstants.OK_LABEL,
+ IDialogConstants.CANCEL_LABEL }, 1 );
+ setShellStyle(getShellStyle() | (SWT.NONE & SWT.SHEET));
+ this.checkboxMessage = checkboxMessage;
+ }
+
+ @Override
+ public Image getImage() {
+ return getQuestionImage();
+ }
+
+
+ @Override
+ protected Control createDialogArea(Composite parent) {
+ Composite dialogAreaComposite = (Composite) super
+ .createDialogArea(parent);
+ setToggleButton(createToggleButton(dialogAreaComposite));
+ return dialogAreaComposite;
+ }
+
+ private void setToggleButton(final Button button) {
+ button.setText(checkboxMessage);
+ button.setSelection(false);
+
+ }
+
+ /**
+ * Creates a toggle button without any text or state. The text and state
+ * will be created by <code>createDialogArea</code>.
+ *
+ * @param parent
+ * The composite in which the toggle button should be placed;
+ * must not be <code>null</code>.
+ * @return The added toggle button; never <code>null</code>.
+ */
+ protected Button createToggleButton(Composite parent) {
+ final Button button = new Button(parent, SWT.CHECK | SWT.LEFT);
+
+ GridData data = new GridData(SWT.NONE);
+ data.horizontalSpan = 2;
+ button.setLayoutData(data);
+ button.setFont(parent.getFont());
+
+ button.addSelectionListener(new SelectionAdapter() {
+
+ public void widgetSelected(SelectionEvent e) {
+ toggleState = button.getSelection();
+ }
+
+ });
+
+ return button;
+ }
+
+ @Override
+ public int open() {
+ int result = super.open();
+ if(toggleState) {
+ result += INCLUDE_APPS;
+ }
+ return result;
+ }
+
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/dialog/CheckboxMessageDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-05-14 16:11:21 UTC (rev 40990)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-05-14 16:53:56 UTC (rev 40991)
@@ -44,7 +44,8 @@
org.eclipse.equinox.security;bundle-version="1.1.1",
org.jboss.ide.eclipse.as.dmr;bundle-version="2.3.0",
org.eclipse.jsch.ui;bundle-version="1.1.300",
- org.eclipse.jdt.debug.ui;bundle-version="3.6.1"
+ org.eclipse.jdt.debug.ui;bundle-version="3.6.1",
+ org.jboss.tools.common.ui;bundle-version="3.3.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.jboss.tools.common.databinding,
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-05-14 16:11:21 UTC (rev 40990)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-05-14 16:53:56 UTC (rev 40991)
@@ -16,14 +16,16 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.common.ui.dialog.CheckboxMessageDialog;
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -38,7 +40,7 @@
.getImageDescriptor(ISharedImages.IMG_ETOOL_DELETE));
}
- @Override
+ /*@Override
public void validate() {
boolean enable = false;
if (selection instanceof ITreeSelection
@@ -63,7 +65,7 @@
}
}
setEnabled(enable);
- }
+ }*/
@Override
public void run() {
@@ -75,28 +77,39 @@
final IDomain domain = user.getDefaultDomain();
if (domain != null) {
boolean confirm = false;
- confirm = MessageDialog.openConfirm(Display.getCurrent()
+ MessageDialog dialog = new CheckboxMessageDialog(Display.getCurrent()
.getActiveShell(), "Domain deletion", NLS.bind(
+ "You are about to delete the \"{0}\" domain.\n"
+ + "Do you want to continue?",
+ domain.getId()), "Force applications deletion (data will be lost and operation cannot be undone)");
+ /*confirm = MessageDialog.openConfirm(Display.getCurrent()
+ .getActiveShell(), "Domain deletion", NLS.bind(
"You are about to delete the \"{0}\" domain.\n"
+ "Do you want to continue?",
- domain.getId()));
+ domain.getId()));*/
+ int result = dialog.open();
+ if((result == CheckboxMessageDialog.INCLUDE_APPS) || (result == MessageDialog.OK)) {
+ confirm = true;
+ }
+ final boolean includeApps = ((result & CheckboxMessageDialog.INCLUDE_APPS) > 0);
if (confirm) {
Job job = new Job("Deleting OpenShift Domain...") {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
try {
- domain.destroy();
+ domain.destroy(includeApps);
+ return Status.OK_STATUS;
} catch (OpenShiftException e) {
- Logger.error(NLS.bind("Failed to delete domain \"{0}\"", domain.getId()), e);
+ return new Status(Status.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind("Failed to delete domain \"{0}\"", domain.getId()), e);
+
} catch (SocketTimeoutException e) {
- Logger.error(NLS.bind("Failed to delete domain \"{0}\"", domain.getId()), e);
+ return new Status(Status.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind("Failed to delete domain \"{0}\"", domain.getId()), e);
}
} finally {
monitor.done();
}
- return Status.OK_STATUS;
}
};
job.setPriority(Job.SHORT);
13 years, 11 months
JBoss Tools SVN: r40990 - in trunk/ws/tests: org.jboss.tools.ws.ui.bot.test and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-05-14 12:11:21 -0400 (Mon, 14 May 2012)
New Revision: 40990
Removed:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/requirements.properties
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties
Modified:
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties
Log:
JBIDE-11714: Remove requirements.properties in favor of pom.xml in "ws" module
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2012-05-14 15:43:51 UTC (rev 40989)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2012-05-14 16:11:21 UTC (rev 40990)
@@ -13,7 +13,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jre.6=${jbosstools.test.jre.6} -Djbosstools.test.jre.5=${jbosstools.test.jre.5} -Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA</systemProperties>
+ <systemProperties>-Djbosstools.test.jre.6=${jbosstools.test.jre.6} -Djbosstools.test.jre.5=${jbosstools.test.jre.5} -Djbosstools.test.jboss.home.4.2=${project.build.directory}/requirements/jboss-4.2.3.GA</systemProperties>
<coverage.filter>org.jboss.tools.ws.creation.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.ws.creation.core</emma.instrument.bundles>
</properties>
@@ -30,6 +30,31 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <version>4.2.3.GA</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/requirements</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
Deleted: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/requirements.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/requirements.properties 2012-05-14 15:43:51 UTC (rev 40989)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/requirements.properties 2012-05-14 16:11:21 UTC (rev 40990)
@@ -1 +0,0 @@
-requirements=jbossas-4.2.3.GA
\ No newline at end of file
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-05-14 15:43:51 UTC (rev 40989)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-05-14 16:11:21 UTC (rev 40990)
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.ws</groupId>
@@ -10,23 +11,50 @@
</parent>
<groupId>org.jboss.tools.ws.tests</groupId>
<artifactId>org.jboss.tools.ws.ui.bot.test</artifactId>
-
+
<packaging>eclipse-test-plugin</packaging>
<properties>
<!-- debug option -->
- <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Dswtbot.test.properties.file=${project.basedir}/properties/config_files/swtbot.properties</systemProperties> -->
- <systemProperties> -Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
-
-
+ <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y
+ -Dswtbot.test.properties.file=${project.basedir}/properties/config_files/swtbot.properties</systemProperties> -->
+ <systemProperties>-Dswtbot.test.properties.file=${project.basedir}/properties/swtbot.properties</systemProperties>
+
+
<!-- need to manually set path to swtbot.test.properties with property -->
- <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> -->
+ <!-- <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y
+ -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> -->
<!-- <systemProperties>-Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> -->
-
+
</properties>
-
+
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <version>7.1.1.Final</version>
+ <type>zip</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/requirements</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
@@ -34,7 +62,8 @@
<testClass>org.jboss.tools.ws.ui.bot.test.WSAllBotTests</testClass>
<useUIThread>false</useUIThread>
<skip>${swtbot.test.skip}</skip>
- <!-- Kill swt bot test take more than 3 hours minutes (10800 seconds) to finish -->
+ <!-- Kill swt bot test take more than 3 hours minutes (10800 seconds)
+ to finish -->
<forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds>
<dependencies combine.children="append">
<dependency>
@@ -54,32 +83,14 @@
<version>0.0.0</version>
</dependency>
<!-- end of workaround -->
- <!--
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.jst.web_ui.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.wst.web_ui.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.wst.ws_ui.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.wst.xml_ui.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency> -->
+ <!-- <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId>
+ <version>0.0.0</version> </dependency> <dependency> <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.web_ui.feature.feature.group</artifactId> <version>0.0.0</version>
+ </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.wst.web_ui.feature.feature.group</artifactId>
+ <version>0.0.0</version> </dependency> <dependency> <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.wst.ws_ui.feature.feature.group</artifactId> <version>0.0.0</version>
+ </dependency> <dependency> <type>p2-installable-unit</type> <artifactId>org.eclipse.wst.xml_ui.feature.feature.group</artifactId>
+ <version>0.0.0</version> </dependency> -->
</dependencies>
</configuration>
</plugin>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties 2012-05-14 15:43:51 UTC (rev 40989)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/properties/swtbot.properties 2012-05-14 16:11:21 UTC (rev 40990)
@@ -1,5 +1,5 @@
#SERVER=AS,6.0,default,../../../requirements/target/jboss-6.0.0.Final
#SERVER=AS,7.0,default,../../../requirements/target/jboss-as-web-7.0.2.Final
-SERVER=AS,7.1,default,../../../requirements/target/jboss-as-7.1.1.Final
+SERVER=AS,7.1,default,target/requirements/jboss-as-7.1.1.Final
#SERVER=AS,7.1,default,/home/jjankovi/Dokumenty/Red_Hat_Stuff/Runtimes/jboss-as-7.1.1.Final
#SERVER=AS,6.0,default,/home/jjankovi/jboss-6.0.0.Final-WS
Deleted: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties 2012-05-14 15:43:51 UTC (rev 40989)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/requirements.properties 2012-05-14 16:11:21 UTC (rev 40990)
@@ -1,2 +0,0 @@
-#requirements=jbossas-7.0.2.Final
-requirements=jbossas-7.1.1.Final
13 years, 11 months
JBoss Tools SVN: r40989 - trunk/build/parent.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-05-14 11:43:51 -0400 (Mon, 14 May 2012)
New Revision: 40989
Modified:
trunk/build/parent/pom.xml
Log:
JBIDE-11700: latest stable build of m2e-apt for use with JBDS product builds
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-05-14 14:53:22 UTC (rev 40988)
+++ trunk/build/parent/pom.xml 2012-05-14 15:43:51 UTC (rev 40989)
@@ -75,6 +75,9 @@
<coverage.filter>org.jboss.tools.*</coverage.filter>
<requirements.root>${basedir}/../../../requirements</requirements.root>
<requirement.build.root>${requirements.root}/target</requirement.build.root>
+
+ <!-- JBIDE-11700: latest stable build of m2e-apt for use with JBDS product builds -->
+ <m2e-apt>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</m2e-apt>
</properties>
13 years, 11 months
JBoss Tools SVN: r40988 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2012-05-14 10:53:22 -0400 (Mon, 14 May 2012)
New Revision: 40988
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
Log:
fix for compilation errors in trunk continuous build
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2012-05-14 13:24:10 UTC (rev 40987)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2012-05-14 14:53:22 UTC (rev 40988)
@@ -205,7 +205,7 @@
String rtId = data[1];
IRuntime runtime = ServerCore.findRuntime(rtId);
IServer newServer = null;
- newServer = ServerCreationUtils.createServer2(instance.getAlias(), runtime);
+ newServer = ServerCreationUtils.createServer2(runtime,instance.getAlias());
newServer = RSEUtils.setServerToRSEMode(newServer, host, home, config);
return;
}
@@ -268,7 +268,7 @@
String config = data[1];
String rtId = data[2];
IRuntime runtime = ServerCore.findRuntime(rtId);
- IServer newServer = ServerCreationUtils.createServer2(instance.getAlias(), runtime);
+ IServer newServer = ServerCreationUtils.createServer2(runtime,instance.getAlias());
newServer = RSEUtils.setServerToRSEMode(newServer, host, home, config);
}
13 years, 11 months
JBoss Tools SVN: r40987 - in workspace/fred/repositories/snapshot/org/jboss: aerogear and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2012-05-14 09:24:10 -0400 (Mon, 14 May 2012)
New Revision: 40987
Added:
workspace/fred/repositories/snapshot/org/jboss/aerogear/
workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/
workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/
workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/1.0.0.M3-JBT/
workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/1.0.0.M3-JBT/jboss-html5-mobile-archetype-1.0.0.M3-JBT.jar
workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/1.0.0.M3-JBT/jboss-html5-mobile-archetype-1.0.0.M3-JBT.pom
Log:
Add aerogear archetype compatible with EAP ER6 / WFK ER5 repos
Added: workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/1.0.0.M3-JBT/jboss-html5-mobile-archetype-1.0.0.M3-JBT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/1.0.0.M3-JBT/jboss-html5-mobile-archetype-1.0.0.M3-JBT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/1.0.0.M3-JBT/jboss-html5-mobile-archetype-1.0.0.M3-JBT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/1.0.0.M3-JBT/jboss-html5-mobile-archetype-1.0.0.M3-JBT.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/aerogear/archetypes/jboss-html5-mobile-archetype/1.0.0.M3-JBT/jboss-html5-mobile-archetype-1.0.0.M3-JBT.pom 2012-05-14 13:24:10 UTC (rev 40987)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>6-beta-2</version>
+ </parent>
+
+ <groupId>org.jboss.aerogear.archetypes</groupId>
+ <artifactId>jboss-html5-mobile-archetype</artifactId>
+ <version>1.0.0.M3-JBT</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>Java EE 6 HTML5 Mobile Web Application</name>
+
+ <description>An archetype that generates a Java EE 6 application using HTML5, and JAX-RS to support both desktop and mobile web browsers</description>
+
+ <url>http://jboss.org/jbossas</url>
+
+ <developers>
+ <developer>
+ <name>Steven Boscarine</name>
+ <email>stevenboscarine(a)gmail.com</email>
+ </developer>
+ <developer>
+ <id>fbricon</id>
+ <name>Fred Bricon</name>
+ <email>fbricon(a)gmail.com</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/fbricon</url>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <email>dan.j.allen(a)gmail.com</email>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://community.jboss.org/people/dan.j.allen</url>
+ </developer>
+ <developer>
+ <name>Pete Muir</name>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+ <developer>
+ <name>Jay Balunas</name>
+ <email>jbalunas(a)jboss.org</email>
+ <organization>Red Hat, Inc.</organization>
+ <organizationUrl>http://redhat.com/jboss</organizationUrl>
+ <url>http://in.relation.to/Bloggers/Jay</url>
+ </developer>
+ </developers>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.1</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
13 years, 11 months
JBoss Tools SVN: r40985 - in workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart: 2.0.0.Final-JBT and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2012-05-14 06:32:53 -0400 (Mon, 14 May 2012)
New Revision: 40985
Added:
workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0.0.Final-JBT/
workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0.0.Final-JBT/kitchensink-quickstart-2.0.0.Final-JBT.jar
workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0.0.Final-JBT/kitchensink-quickstart-2.0.0.Final-JBT.pom
Log:
Add errai archetype compatible with EAP ER6 / WFK ER5 repos
Added: workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0.0.Final-JBT/kitchensink-quickstart-2.0.0.Final-JBT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0.0.Final-JBT/kitchensink-quickstart-2.0.0.Final-JBT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0.0.Final-JBT/kitchensink-quickstart-2.0.0.Final-JBT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0.0.Final-JBT/kitchensink-quickstart-2.0.0.Final-JBT.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/jboss/errai/archetypes/kitchensink-quickstart/2.0.0.Final-JBT/kitchensink-quickstart-2.0.0.Final-JBT.pom 2012-05-14 10:32:53 UTC (rev 40985)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.errai.archetypes</groupId>
+ <artifactId>archetypes-parent</artifactId>
+ <version>2.0.0.Final</version>
+ </parent>
+
+ <artifactId>kitchensink-quickstart</artifactId>
+ <packaging>maven-archetype</packaging>
+ <name>Errai Kitchenk Sink Quickstart Archetype</name>
+ <version>2.0.0.Final-JBT</version>
+
+ <properties>
+ <!-- Specifies which version of Errai the generated project will depend on. See readme.txt for details -->
+ <errai.target.version>2.0.0.Final</errai.target.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.1</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <description>A starter Errai + Java EE 6 webapp project for use on JBoss AS 7 / EAP 6, generated from the kitchensink-quickstart archetype</description>
+</project>
13 years, 11 months
JBoss Tools SVN: r40984 - workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2012-05-14 05:37:47 -0400 (Mon, 14 May 2012)
New Revision: 40984
Modified:
workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.jar
Log:
Add richfaces archetype compatible with EAP ER6 / WFK ER5 repos
Modified: workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.jar
===================================================================
(Binary files differ)
13 years, 11 months