JBoss Tools SVN: r18058 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-10-13 05:25:08 -0400 (Tue, 13 Oct 2009)
New Revision: 18058
Modified:
trunk/seam/docs/reference/en/modules/creating_mavenized_seam.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-882 - updating 'Maven Integration' chapter according to Maven Seam Configurator implemented;
Modified: trunk/seam/docs/reference/en/modules/creating_mavenized_seam.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/creating_mavenized_seam.xml 2009-10-13 09:23:19 UTC (rev 18057)
+++ trunk/seam/docs/reference/en/modules/creating_mavenized_seam.xml 2009-10-13 09:25:08 UTC (rev 18058)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="create_mavenized_seam" xreflabel="create_mavenized_seam">
+<chapter id="mavenized_seam" xreflabel="mavenized_seam">
<?dbhtml filename="create_mavenized_seam.html"?>
<chapterinfo>
<keywordset>
@@ -8,20 +8,28 @@
<keyword>JBDS</keyword>
</keywordset>
</chapterinfo>
- <title>Creating Maven ready Seam project</title>
-
- <para><property>JBoss Tools 3.1 M2</property> comes with new Jboss Maven Integration plug-in. It makes the Seam Wizard capable of creating
- Maven ready projects to let Maven get the libraries instead of using the Seam runtime. The Jboss Maven Integration requires <ulink url="http://m2eclipse.sonatype.org/"
- >m2eclipse</ulink> to be installed.</para>
-
+
+ <title>Maven Integration for Seam Projects</title>
+ <para>Starting from 3.1 M2 version <property>JBoss Tools</property> includes new Jboss Maven Integration plug-in which for now allows
+ to create mavenized Seam projects and enable Seam tools support for imported Maven projects.</para>
+
+ <para>The Jboss Maven Integration requires <ulink url="http://m2eclipse.sonatype.org/"
+ >m2eclipse</ulink> to be installed.</para>
+
<note>
<title>Note:</title>
<para>For M2 release of <property>Jboss Tools</property> it is important to use m2eclipse <ulink
url="http://m2eclipse.sonatype.org/update/">stable updatesite</ulink> or the <ulink url="http://m2eclipse.sonatype.org/releases/0.9.9.200906081351">latest integration build</ulink> that M2 was
developed against. If you want to use the latest development release of m2eclipse you need to use the <ulink url="http://download.jboss.org/jbosstools/updates/nightly/trunk/">nightly builds</ulink> of
- <property>JBoss Tools</property>.</para>
+ <property>JBoss Tools</property>.</para>
</note>
+ <section id="create_mavenized_project">
+ <title>Creating Maven ready Seam project</title>
+
+ <para>Maven Integration makes the Seam Wizard capable of creating
+ Maven ready projects to let Maven get the libraries instead of using the Seam runtime.</para>
+
<para>To create a mavenized Seam project you should perform the following steps:</para>
<itemizedlist>
@@ -98,4 +106,55 @@
</imageobject>
</mediaobject>
</figure>
+ </section>
+
+ <section id="import_maven_project">
+ <title>Existing Maven Projects Import</title>
+
+ <para>Maven Integration includes the Seam Maven configurator which is called when importing a project, changing
+ <emphasis>
+ <property>pom.xml</property></emphasis> and/or calling <emphasis>
+ <property>Maven > Update Project Configuration</property>.</emphasis> When importing a Maven Seam project, the Seam Maven configurator
+ picks up the settings set up in <emphasis>
+ <property>pom.xml</property></emphasis> and adds to the project the following:</para>
+
+ <itemizedlist>
+ <listitem><para>Seam nature</para></listitem>
+ <listitem><para>Seam facet and dependent facets to the EJB, EAR and WAR projects</para></listitem>
+ <listitem><para>JBoss Maven Integration facet if the Maven project contains a dependency with the
+ org.jboss.seam groupId and an artifactId starting with 'jboss-seam'</para></listitem>
+ <listitem><para>other required facets (Web Module, Java, JSF, etc.)</para></listitem>
+ </itemizedlist>
+
+ <para>If the Seam version from <emphasis>
+ <property>pom.xml</property></emphasis> matches a version of a Seam runtime configured in the workspace,
+ Seam configurator will set that runtime, otherwise no Seam runtime will be set and you'll have to set it manually under
+ <link linkend="project_pref">Seam Settings in the project preferences</link>.</para>
+
+ <para>Seam configurator recognizes the Seam artifacts in the following way: the view folder is a web content folder from the WAR project,
+ the source folder is the first Eclipse source folder. If there is a folder containing "hot" in the name, it will be chosen as the action source folder.
+ Package is the first package that has children or doesn't have any subpackage.
+ </para>
+
+ <para>Configuring the Seam when importing a Maven project as well as a Seam Runtime, Seam artifacts and some facets could be suspended
+ in the JBoss Maven Integration preferences (<emphasis>
+ <property>Window > Preferences > JBoss Tools > JBoss Maven Integration</property></emphasis>).</para>
+
+ <figure>
+ <title>JBoss Maven Integration Preferences</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/create_mavenized_seam/configure_maven_integration.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+
+ <section>
+ <title>Relevant Resources Links</title>
+
+ <para>In the <ulink url="http://in.relation.to/Bloggers/UsingMavenWithJBossTools">Using Maven with JBoss Tools</ulink>
+ article written by Max Andersen you'll find references to the
+ screencasts on how to use the examples of mavenized Seam projects provided by <property>JBoss Tools</property>.</para>
+ </section>
</chapter>
15 years
JBoss Tools SVN: r18057 - trunk/seam/docs/reference/en/images/create_mavenized_seam.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-10-13 05:23:19 -0400 (Tue, 13 Oct 2009)
New Revision: 18057
Added:
trunk/seam/docs/reference/en/images/create_mavenized_seam/configure_maven_integration.png
Log:
https://jira.jboss.org/jira/browse/JBDS-882 - adding new image;
Added: trunk/seam/docs/reference/en/images/create_mavenized_seam/configure_maven_integration.png
===================================================================
(Binary files differ)
Property changes on: trunk/seam/docs/reference/en/images/create_mavenized_seam/configure_maven_integration.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years
JBoss Tools SVN: r18056 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-10-13 04:20:18 -0400 (Tue, 13 Oct 2009)
New Revision: 18056
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4982, AttributeDescriptorValueProvider was added to drop data in VpeController.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-10-13 02:08:30 UTC (rev 18055)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-10-13 08:20:18 UTC (rev 18056)
@@ -743,7 +743,7 @@
DropData dropData = new DropData(flavor, data,
getEditorInput(), getSourceViewer(),
getSelectionProvider());
- dropData.setValueProvider(new AttributeDescriptorValueProviderImpl());
+ dropData.setValueProvider(createAttributeDescriptorValueProvider());
dropData.setAttributeName(dropContext.getAttributeName());
IDropCommand dropCommand = DropCommandFactory.getInstance()
@@ -752,6 +752,7 @@
boolean promptAttributes = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT);
+
dropCommand
.getDefaultModel()
.setPromptForTagAttributesRequired(promptAttributes);
@@ -763,6 +764,10 @@
});
}
+ public AttributeDescriptorValueProvider createAttributeDescriptorValueProvider() {
+ return new AttributeDescriptorValueProviderImpl();
+ }
+
class AttributeDescriptorValueProviderImpl implements AttributeDescriptorValueProvider {
TagProposal proposal;
KbQuery query;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-10-13 02:08:30 UTC (rev 18055)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-10-13 08:20:18 UTC (rev 18056)
@@ -89,10 +89,13 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
import org.jboss.tools.common.resref.core.ResourceReferenceListListener;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.editor.IJSPTextEditor;
import org.jboss.tools.jst.jsp.editor.IVisualController;
+import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper;
import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory;
+import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.jst.web.tld.URIConstants;
import org.jboss.tools.jst.web.tld.model.TLDUtil;
@@ -2226,15 +2229,23 @@
IDropCommand dropCommand = DropCommandFactory.getInstance()
.getDropCommand(flavor, JSPTagProposalFactory.getInstance());
- boolean promptAttributes = "yes" //$NON-NLS-1$
- .equals(VpePreference.ALWAYS_REQUEST_FOR_ATTRIBUTE.getValue());
+ boolean promptAttributes = JspEditorPlugin.getDefault().getPreferenceStore().getBoolean(
+ IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT);
dropCommand.getDefaultModel().setPromptForTagAttributesRequired(
promptAttributes);
-
- dropCommand.execute(new DropData(flavor, data, sourceEditor
+ DropData dropData = new DropData(flavor, data, sourceEditor
.getEditorInput(), (ISourceViewer) sourceEditor
.getAdapter(ISourceViewer.class), new VpeSelectionProvider(
- range.x, range.y), container));
+ range.x, range.y), container);
+ /*
+ * https://jira.jboss.org/jira/browse/JBIDE-4982
+ * Setting the value provider to create tag insert dialog.
+ */
+ if (sourceEditor instanceof JSPTextEditor) {
+ dropData.setValueProvider(((JSPTextEditor) sourceEditor).createAttributeDescriptorValueProvider());
+ }
+
+ dropCommand.execute(dropData);
}
private String getTagName(XModelObject object) {
15 years
JBoss Tools SVN: r18055 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-10-12 22:08:30 -0400 (Mon, 12 Oct 2009)
New Revision: 18055
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java
Log:
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2009-10-13 00:50:41 UTC (rev 18054)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/AbstractGenerateCodeCommand.java 2009-10-13 02:08:30 UTC (rev 18055)
@@ -111,8 +111,13 @@
JBossWSCreationCore.getDefault().logError(
inputResult.toString());
+// there is no way to know if the failure of invoking is because of failure of
+// compiling or because of failure of generating java code, so try to analyze the
+// output string of the command, if the string contains "javac -d", means the java
+// java code generating is complete.
+
if (resultInput != null
- && resultInput.indexOf("compiling code...") >= 0) {//$NON-NLS-1$
+ && resultInput.indexOf("javac -d") >= 0) {//$NON-NLS-1$
return StatusUtils
.warningStatus(errorResult.toString());
}
@@ -153,8 +158,8 @@
}
- //SET JAVA_HOME environment variable to the location of java runtime of the project
- //so jbossws jax-ws command line tools will only use the java runtime to launch java command
+ //SET JAVA_HOME environment variable to the location of java runtime of the project if the user
+ // doesn't set the env variable
private String[] getEnvironmentVariables(IProject project){
String[] env = null;
String javaHome = System.getenv(JAVA_HOME);
15 years
JBoss Tools SVN: r18054 - trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-10-12 20:50:41 -0400 (Mon, 12 Oct 2009)
New Revision: 18054
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java
Log:
fix for seam SWTBot test error
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-10-12 21:57:51 UTC (rev 18053)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/TestControl.java 2009-10-13 00:50:41 UTC (rev 18054)
@@ -4,10 +4,13 @@
import java.io.InputStream;
import java.util.Properties;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.waits.Conditions;
+import org.eclipse.swtbot.swt.finder.waits.ICondition;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
import org.jboss.tools.test.TestProperties;
@@ -165,7 +168,11 @@
protected void createSeamRuntime(Properties runtimeSet, String homeFolder){
bot.menu("Window").menu("Preferences").click();
SWTBotTree tree = bot.tree();
- tree.expandNode("JBoss Tools").expandNode("Web").select("Seam");
+ tree.expandNode("JBoss Tools")
+ .expandNode("Web")
+ .expandNode("Seam")
+ .select();
+
bot.button("Add").click();
bot.textWithLabel("Home Folder:").setText(homeFolder);
bot.textWithLabel("Name:").setText(runtimeSet.getProperty("seamRuntimeName"));
15 years
JBoss Tools SVN: r18053 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-10-12 17:57:51 -0400 (Mon, 12 Oct 2009)
New Revision: 18053
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5016 Show experimental sites checkbox
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2009-10-12 21:53:18 UTC (rev 18052)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java 2009-10-12 21:57:51 UTC (rev 18053)
@@ -88,22 +88,6 @@
button.setText(Messages.ProjectExamplesPreferencePage_Show_experimental_sites);
IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
button.setSelection(store.getBoolean(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES));
- button.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
- store.setValue(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES, button.getSelection());
- if (siteCombo != null) {
- String[] items = getItems();
- siteCombo.setItems(items);
- if (items.length > 0) {
- siteCombo.select(0);
- }
- }
- }
-
- });
new Label(siteComposite,SWT.NONE).setText(Messages.NewProjectExamplesWizardPage_Site);
siteCombo = new Combo(siteComposite,SWT.READ_ONLY);
@@ -128,11 +112,9 @@
viewer.setLabelProvider(new ProjectLabelProvider());
viewer.setContentProvider(new ProjectContentProvider());
- final AdaptableList input = new AdaptableList(getCategories());
-
+ refresh(viewer);
final SiteFilter siteFilter = new SiteFilter();
viewer.addFilter(siteFilter);
- viewer.setInput(input);
Label descriptionLabel = new Label(composite,SWT.NULL);
descriptionLabel.setText(Messages.NewProjectExamplesWizardPage_Description);
@@ -212,11 +194,39 @@
});
+ button.addSelectionListener(new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ IPreferenceStore store = ProjectExamplesActivator.getDefault().getPreferenceStore();
+ store.setValue(ProjectExamplesActivator.SHOW_EXPERIMENTAL_SITES, button.getSelection());
+ refresh(viewer);
+ if (siteCombo != null) {
+ String[] items = getItems();
+ int index = siteCombo.getSelectionIndex();
+ siteCombo.setItems(items);
+ if (items.length > 0 && (index < 0 || index > items.length) ) {
+ siteCombo.select(0);
+ } else {
+ siteCombo.select(index);
+ }
+ }
+ siteFilter.setSite(siteCombo.getText());
+ viewer.refresh();
+ }
+
+ });
setPageComplete(false);
setControl(composite);
}
+ private void refresh(final TreeViewer viewer) {
+ AdaptableList input = new AdaptableList(getCategories());
+ viewer.setInput(input);
+ viewer.refresh();
+ }
+
private List<Category> getCategories() {
return ProjectUtil.getProjects();
}
15 years
JBoss Tools SVN: r18052 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-12 17:53:18 -0400 (Mon, 12 Oct 2009)
New Revision: 18052
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
Log:
JBIDE-4925 - significant discussion with Darryl Miles led to this crafted solution.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2009-10-12 19:38:21 UTC (rev 18051)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2009-10-12 21:53:18 UTC (rev 18052)
@@ -245,25 +245,40 @@
protected void launchDeployCommand(final MBeanServerConnection connection, final ObjectName objectName,
final String methodName, IProgressMonitor monitor) throws Exception {
final Exception[] e = new Exception[1];
+ final Object waitObject = new Object();
+ final Boolean[] subtaskComplete = new Boolean[1];
+ subtaskComplete[0] = new Boolean(false);
Thread t = new Thread() {
public void run() {
+ Exception exception = null;
try {
executeDeploymentCommand(connection, objectName, methodName);
} catch( Exception ex ) {
- e[0] = ex;
+ exception = ex;
}
+ synchronized(waitObject) {
+ e[0] = exception;
+ subtaskComplete[0] = new Boolean(true);
+ waitObject.notifyAll();
+ }
}
};
t.start();
int count = 0;
while(t.isAlive() && !monitor.isCanceled() && count <= 4000) {
- count+= 100;
- Thread.sleep(100);
+ count+= 1000;
+ synchronized(waitObject) {
+ if( subtaskComplete[0].booleanValue() )
+ break;
+ waitObject.wait(1000);
+ }
}
- if( t.isAlive()) {
- t.interrupt();
- IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.DEPLOYMENT_SCANNER_TRANSITION_CANCELED, Messages.JMXScannerCanceled, null);
- ServerLogger.getDefault().log(getServer(), status);
+ synchronized(waitObject) {
+ if( !subtaskComplete[0].booleanValue()) {
+ t.interrupt();
+ IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.DEPLOYMENT_SCANNER_TRANSITION_CANCELED, Messages.JMXScannerCanceled, null);
+ ServerLogger.getDefault().log(getServer(), status);
+ }
}
}
15 years
JBoss Tools SVN: r18051 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-12 15:38:21 -0400 (Mon, 12 Oct 2009)
New Revision: 18051
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
Log:
JBIDE-4925 - changed delay / sleep slightly to check more frequently
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2009-10-12 19:13:31 UTC (rev 18050)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2009-10-12 19:38:21 UTC (rev 18051)
@@ -257,8 +257,8 @@
t.start();
int count = 0;
while(t.isAlive() && !monitor.isCanceled() && count <= 4000) {
- count+= 1000;
- Thread.sleep(1000);
+ count+= 100;
+ Thread.sleep(100);
}
if( t.isAlive()) {
t.interrupt();
15 years, 1 month
JBoss Tools SVN: r18050 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-12 15:13:31 -0400 (Mon, 12 Oct 2009)
New Revision: 18050
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
Log:
JBIDE-4966
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2009-10-12 18:56:40 UTC (rev 18049)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2009-10-12 19:13:31 UTC (rev 18050)
@@ -55,13 +55,13 @@
point="org.jboss.ide.eclipse.archives.ui.nodePopupMenus">
<nodeContribution
class="org.jboss.ide.eclipse.archives.webtools.ui.PublishAction"
- icon="$nl$/icons/publish.gif"
+ icon="icons/publish.gif"
id="org.jboss.ide.eclipse.as.ui.publishNodeContextContrib"
label="%nodeContribution.label.publishToServer"
weight="1"/>
<nodeContribution
class="org.jboss.ide.eclipse.archives.webtools.ui.EditPublishAction"
- icon="$nl$/icons/publishDetails.gif "
+ icon="icons/publishDetails.gif "
id="org.jboss.ide.eclipse.as.ui.modifyPublishNodeContextContrib"
label="%nodeContribution.label.editPublishSettings">
</nodeContribution>
@@ -70,17 +70,17 @@
point="org.jboss.ide.eclipse.archives.ui.newArchiveActions">
<newPackageAction
class="org.jboss.ide.eclipse.archives.webtools.ui.NewWARAction"
- icon="$nl$/icons/war.gif"
+ icon="icons/war.gif"
id="org.jboss.ide.eclipse.packages.ui.newWARAction"
label="%newPackageAction.label.war"/>
<newPackageAction
class="org.jboss.ide.eclipse.archives.webtools.ui.NewEJBJARAction"
- icon="$nl$/icons/EJBJar.gif"
+ icon="icons/EJBJar.gif"
id="org.jboss.ide.eclipse.packages.ui.newEJBJarAction"
label="%newPackageAction.label.ejbJar"/>
<newPackageAction
class="org.jboss.ide.eclipse.archives.webtools.ui.NewEARAction"
- icon="$nl$/icons/ear.gif"
+ icon="icons/ear.gif"
id="org.jboss.ide.eclipse.packages.ui.newEARAction"
label="%newPackageAction.label.ear"/>
</extension>
@@ -104,7 +104,7 @@
<navigatorContent
id="org.jboss.ide.eclipse.archives.webtools.ui.extensions.filesets"
activeByDefault="true"
- icon="$nl$/icons/multiple_files.gif"
+ icon="icons/multiple_files.gif"
contentProvider="org.jboss.ide.eclipse.archives.webtools.filesets.FilesetContentProvider"
labelProvider="org.jboss.ide.eclipse.archives.webtools.filesets.FilesetLabelProvider"
name="%NavigatorContent_Filesets"
15 years, 1 month
JBoss Tools SVN: r18049 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-12 14:56:40 -0400 (Mon, 12 Oct 2009)
New Revision: 18049
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
Log:
JBIDE-4994 - fixed the NPE
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2009-10-12 18:38:54 UTC (rev 18048)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2009-10-12 18:56:40 UTC (rev 18049)
@@ -232,7 +232,7 @@
protected Control createDialogArea(Composite parent) {
String title = original == null ? Messages.XPathNewXpath : Messages.XPathEditXpath;
setTitle(title);
- Composite main = new Composite((Composite)super.createDialogArea(parent), SWT.NONE);
+ main = new Composite((Composite)super.createDialogArea(parent), SWT.NONE);
main.setLayoutData(new GridData(GridData.FILL_BOTH));
main.setLayout(new FormLayout());
layoutWidgets(main);
15 years, 1 month