JBoss Tools SVN: r36889 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-12-02 13:10:47 -0500 (Fri, 02 Dec 2011)
New Revision: 36889
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
Log:
Added a 'OpenShiftApplicationNotAvailableException'
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 1 month
JBoss Tools SVN: r36888 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/action.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-12-02 13:05:32 -0500 (Fri, 02 Dec 2011)
New Revision: 36888
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/action/CopyToClipboardActionProvider.java
Log:
removing obsolete code
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/action/CopyToClipboardActionProvider.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/action/CopyToClipboardActionProvider.java 2011-12-02 18:05:00 UTC (rev 36887)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/action/CopyToClipboardActionProvider.java 2011-12-02 18:05:32 UTC (rev 36888)
@@ -37,23 +37,12 @@
*/
@Override
public void init(ICommonActionExtensionSite aSite) {
-
- /*
- * ICompilationUnit cu = member.getCompilationUnit(); IEditorPart
- * javaEditor = JavaUI.openInEditor(cu);
- * JavaUI.revealInEditor(javaEditor, (IJavaElement)member);
- */
-
ICommonViewerSite viewSite = aSite.getViewSite();
if (viewSite instanceof ICommonViewerWorkbenchSite) {
- //ICommonViewerWorkbenchSite commonViewerWorkbenchSite = (ICommonViewerWorkbenchSite) viewSite;
- //JavaUI.revealInEditor(JavaUI.openInEditor(element), element)
- //JavaUI.openInEditor(null)
copyToClipboardAction = new CopyToClipboardAction();
copyToClipboardAction.setSelection(aSite.getStructuredViewer().getSelection());
aSite.getStructuredViewer().addSelectionChangedListener(copyToClipboardAction);
}
-
}
/*
13 years, 1 month
JBoss Tools SVN: r36887 - trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-12-02 13:05:00 -0500 (Fri, 02 Dec 2011)
New Revision: 36887
Modified:
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
Log:
Lowering dependency version to enable p2 updates
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-12-02 18:04:37 UTC (rev 36886)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/META-INF/MANIFEST.MF 2011-12-02 18:05:00 UTC (rev 36887)
@@ -20,7 +20,7 @@
org.eclipse.jdt.ui;bundle-version="3.7.0",
org.eclipse.jdt.doc.user;bundle-version="3.7.0";resolution:=optional,
org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.equinox.ds;bundle-version="1.3.1",
+ org.eclipse.equinox.ds;bundle-version="1.3.0",
org.eclipse.jdt.core;bundle-version="3.7.0",
org.eclipse.jface.text;bundle-version="3.7.0",
org.eclipse.ui.workbench;bundle-version="3.7.0",
13 years, 1 month
JBoss Tools SVN: r36886 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-12-02 13:04:37 -0500 (Fri, 02 Dec 2011)
New Revision: 36886
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelBuildJob.java
Log:
Prevent NPE/unnecessary processing when no change occurred
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelBuildJob.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelBuildJob.java 2011-12-02 17:27:17 UTC (rev 36885)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/builder/JaxrsMetamodelBuildJob.java 2011-12-02 18:04:37 UTC (rev 36886)
@@ -74,10 +74,14 @@
events, progressMonitor);
final List<JaxrsEndpointChangedEvent> jaxrsEndpointChanges = jaxrsElementChangedProcessor.processEvents(
jaxrsElementChanges, progressMonitor);
+ if(jaxrsEndpointChanges == null || jaxrsEndpointChanges.isEmpty()) {
+ Logger.debug("No JAX-RS change to publish to the UI");
+ } else {
for (JaxrsEndpointChangedEvent change : jaxrsEndpointChanges) {
Logger.debug(change.toString());
EventService.getInstance().publish(change);
}
+ }
} catch (Throwable e) {
Logger.error("Failed to build or refresh the JAX-RS metamodel", e);
} finally {
13 years, 1 month
JBoss Tools SVN: r36885 - trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-12-02 12:27:17 -0500 (Fri, 02 Dec 2011)
New Revision: 36885
Modified:
trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF
Log:
Add hibernate libs dependency. Fix compile error.
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF 2011-12-02 17:23:30 UTC (rev 36884)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/META-INF/MANIFEST.MF 2011-12-02 17:27:17 UTC (rev 36885)
@@ -15,6 +15,7 @@
org.eclipse.ui.workbench.texteditor,
org.hibernate.eclipse.console,
org.hibernate.eclipse,
+ org.hibernate.eclipse.libs;bundle-version="3.4.0",
org.eclipse.core.resources
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
13 years, 1 month
JBoss Tools SVN: r36884 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-12-02 12:23:30 -0500 (Fri, 02 Dec 2011)
New Revision: 36884
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
Log:
JBIDE-10322 : Reuse the last selected target runtime in the Archetype-based Project Example wizard
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-12-02 15:59:13 UTC (rev 36883)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/wizard/ArchetypeExamplesWizardFirstPage.java 2011-12-02 17:23:30 UTC (rev 36884)
@@ -65,6 +65,7 @@
*/
public class ArchetypeExamplesWizardFirstPage extends MavenProjectWizardLocationPage {
+ private static final String TARGET_RUNTIME = "targetRuntime";
private Label projectNameLabel;
private Combo projectNameCombo;
private Label packageLabel;
@@ -88,6 +89,7 @@
}
+
@Override
protected void createAdditionalControls(Composite container) {
@@ -162,11 +164,21 @@
serverTargetCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
serverTargetCombo.setLayoutData(gridData);
serverRuntimes = getServerRuntimes(facetVersion);
- for (String runtimeName : serverRuntimes.keySet()) {
- serverTargetCombo.add(runtimeName);
+ serverTargetCombo.add(Messages.ArchetypeExamplesWizardFirstPage_No_TargetRuntime);
+ int i =0, selectedRuntimeIdx = 0;
+ String lastUsedRuntime = dialogSettings.get(TARGET_RUNTIME);
+
+ for (Map.Entry<String, IRuntime> entry : serverRuntimes.entrySet()) {
+ serverTargetCombo.add(entry.getKey());
+ ++i;
+ IRuntime runtime = entry.getValue();
+ if (lastUsedRuntime != null && lastUsedRuntime.equals(runtime.getId())) {
+ selectedRuntimeIdx = i;
+ }
}
- serverTargetCombo.add(Messages.ArchetypeExamplesWizardFirstPage_No_TargetRuntime);
- serverTargetCombo.select(0);
+
+ serverTargetCombo.select(selectedRuntimeIdx);
+
serverTargetCombo.addModifyListener(new ModifyListener() {
@Override
@@ -174,6 +186,7 @@
validateEnterpriseRepo();
}
});
+
}
protected void validate() {
@@ -355,4 +368,16 @@
MavenProjectExamplesActivator.log(e);
}
}
+
+ @Override
+ public void dispose() {
+ if (dialogSettings != null && serverRuntimes != null && serverTargetCombo != null) {
+ IRuntime lastUsedRuntime = serverRuntimes.get(serverTargetCombo.getText());
+ if (lastUsedRuntime != null) {
+ dialogSettings.put(TARGET_RUNTIME, lastUsedRuntime.getId());
+ }
+ }
+ super.dispose();
+ }
+
}
13 years, 1 month
JBoss Tools SVN: r36883 - trunk/requirements/soap.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2011-12-02 10:59:13 -0500 (Fri, 02 Dec 2011)
New Revision: 36883
Modified:
trunk/requirements/soap/build.properties
Log:
Updated jbosstools/requirements/soap to reference correct SOA-P URLs.
Modified: trunk/requirements/soap/build.properties
===================================================================
--- trunk/requirements/soap/build.properties 2011-12-02 15:33:01 UTC (rev 36882)
+++ trunk/requirements/soap/build.properties 2011-12-02 15:59:13 UTC (rev 36883)
@@ -4,7 +4,7 @@
soap43.build.archive.md5=9d19284caf81b96d93c21148477df2fd
soap43.build.archive.root=jboss-soa-p.4.3.0
-soap50.build.uri=http://download.devel.redhat.com/released/JBossSOAP/5.0/5.0.1/
+soap50.build.uri=http://download.devel.redhat.com/released/JBossSOAP/5.0.1/
soap50.build.name=soa-5.0.1.GA-signed
soap50.build.archive=${soap50.build.name}.zip
soap50.build.archive.md5=b9088f7884c7464419623c596dafe25f
@@ -19,9 +19,17 @@
soap51.build.archive.root=jboss-soa-p.5.1.0
# http://jawa05.englab.brq.redhat.com/candidate/soa-5.2.0.ER6/soa-p-5.2.0.E...
-soap52.build.uri=http://jawa05.englab.brq.redhat.com/candidate/soa-5.2.0.ER6/
-soap52.build.name=soa-p-5.2.0.ER6
-soap52.build.archive=${soap51.build.name}.zip
-soap52.build.archive.md5=abc110a6e71c0c93713a350dacfcec46
+#soap52.build.uri=http://jawa05.englab.brq.redhat.com/candidate/soa-5.2.0.ER6/
+#soap52.build.name=soa-p-5.2.0.ER6
+#soap52.build.archive=${soap51.build.name}.zip
+#soap52.build.archive.md5=abc110a6e71c0c93713a350dacfcec46
+#soap52.build.archive.root=jboss-soa-p.5.2.0
+
+# Added Dec 2 2011 - ldimaggi
+# http://download.devel.redhat.com/released/JBossSOAP/5.2.0/
+soap52.build.uri=http://download.devel.redhat.com/released/JBossSOAP/5.2.0/
+soap52.build.name=soa-p-5.2.0.GA
+soap52.build.archive=${soap52.build.name}.zip
+soap52.build.archive.md5=4d2768e7291e83240398adf8d57ff8b8
soap52.build.archive.root=jboss-soa-p.5.2.0
13 years, 1 month
JBoss Tools SVN: r36882 - trunk/central/plugins/org.jboss.tools.community.central.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-12-02 10:33:01 -0500 (Fri, 02 Dec 2011)
New Revision: 36882
Modified:
trunk/central/plugins/org.jboss.tools.community.central/plugin.xml
Log:
Add HTML5 quickstart, remove quickstart suffixes
Modified: trunk/central/plugins/org.jboss.tools.community.central/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.community.central/plugin.xml 2011-12-02 15:05:14 UTC (rev 36881)
+++ trunk/central/plugins/org.jboss.tools.community.central/plugin.xml 2011-12-02 15:33:01 UTC (rev 36882)
@@ -18,7 +18,7 @@
<tutorial
id="org.jboss.tools.central.jbossas.quickstart.helloworld"
categoryId="org.jboss.tools.central.jbossas.quickstart"
- name="Helloworld quickstart"
+ name="Helloworld"
type="projectExample"
priority="1"
icon="icons/jbossas7.png"
@@ -26,7 +26,7 @@
<tutorial
id="org.jboss.tools.central.jbossas.quickstart.numberguess"
categoryId="org.jboss.tools.central.jbossas.quickstart"
- name="Numberguess quickstart"
+ name="Numberguess"
type="projectExample"
priority="2"
icon="icons/jbossas7.png"
@@ -35,7 +35,7 @@
<tutorial
id="org.jboss.tools.central.jbossas.quickstart.login"
categoryId="org.jboss.tools.central.jbossas.quickstart"
- name="Login quickstart"
+ name="Login"
type="projectExample"
priority="3"
icon="icons/jbossas7.png"
@@ -44,11 +44,30 @@
<tutorial
id="org.jboss.tools.central.jbossas.quickstart.kitchensink"
categoryId="org.jboss.tools.central.jbossas.quickstart"
- name="Kitchensink quickstart"
+ name="Kitchensink"
type="projectExample"
priority="4"
icon="icons/jbossas7.png"
reference="JBoss AS 7 Quickstarts::kitchensink"/>
+
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.poh5helloworld"
+ categoryId="org.jboss.tools.central.jbossas.quickstart"
+ name="HTML5"
+ type="projectExample"
+ priority="5"
+ icon="icons/jbossas7.png"
+ reference="JBoss AS 7 Quickstarts::poh5-helloworld"/>
+
+ <tutorial
+ id="org.jboss.tools.central.jbossas.quickstart.ticketmonster"
+ categoryId="org.jboss.tools.central.jbossas.quickstart"
+ name="Ticket Monster"
+ type="projectExample"
+ priority="6"
+ icon="icons/jbossas7.png"
+ reference="JBoss AS 7 Quickstarts::ticketmonster"/>
+
<!--
<tutorial
id="org.jboss.tools.central.Seam.registration2"
13 years, 1 month
JBoss Tools SVN: r36881 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-12-02 10:05:14 -0500 (Fri, 02 Dec 2011)
New Revision: 36881
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java
Log:
JBIDE-10217 JBoss Central Search location & defaults
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java 2011-12-02 13:49:14 UTC (rev 36880)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java 2011-12-02 15:05:14 UTC (rev 36881)
@@ -205,7 +205,7 @@
gridLayout.marginWidth = 0;
gridLayout.verticalSpacing = 0;
gridLayout.marginLeft = 0;
- gridLayout.marginRight = 0;
+ gridLayout.marginRight = 10;
searchComposite.setLayout(gridLayout);
ImageHyperlink menuLink = getToolkit().createImageHyperlink(
searchComposite, SWT.NONE);
13 years, 1 month
JBoss Tools SVN: r36880 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-12-02 08:49:14 -0500 (Fri, 02 Dec 2011)
New Revision: 36880
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java
Log:
Added test for Code Completion functionality for msgs[...
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-02 13:32:34 UTC (rev 36879)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-12-02 13:49:14 UTC (rev 36880)
@@ -14,7 +14,9 @@
import java.util.LinkedList;
import java.util.List;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.ext.Assertions;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
@@ -304,6 +306,46 @@
expectedProposals);
}
/**
+ * Test Code Completion functionality for msgs[
+ */
+ public void testCodeCompletionOfMsgsWithBrackets(){
+ initFaceletsPageTest();
+ SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot,
+ FACELETS_TEST_PAGE,
+ "<h:message ",
+ 0,
+ 0,
+ 0);
+ editor.insertText("\n");
+ String textToInsert = "<h:outputText value=\"#{msg[";
+ final SWTBotShell[] shellsBefore = bot.shells();
+ editor.typeText(textToInsert);
+ bot.sleep(Timing.time2S());
+ // Check Content Assist invoked by typing
+ ContentAssistBot contentAssist = editor.contentAssist();
+ final List<String> caProposals = contentAssist.getProposalList(shellsBefore, bot.shells(), true);
+ String useCodeAssist = "greeting";
+ assertTrue("Content assist has to contain item " + useCodeAssist +
+ " but it does not.",
+ caProposals.contains(useCodeAssist));
+ useCodeAssist = "prompt";
+ assertTrue("Content assist has to contain item " + useCodeAssist +
+ " but it does not.",
+ caProposals.contains(useCodeAssist));
+ // Check Content Assist invoked by Ctrl-Space
+ useCodeAssist = "greeting";
+ contentAssist.checkContentAssist(useCodeAssist, false);
+ useCodeAssist = "prompt";
+ contentAssist.checkContentAssist(useCodeAssist, true);
+ final String textToInsertAtEnd = "\"/>";
+ editor.insertText(editor.cursorPosition().line,
+ editor.cursorPosition().column + 2,
+ textToInsertAtEnd);
+ Assertions.assertSourceEditorContains(editor.getText(),
+ textToInsert + "'" + useCodeAssist + "']}" + textToInsertAtEnd,
+ FACELETS_TEST_PAGE);
+ }
+ /**
* Initialize test which are using facelets test page
*/
private void initFaceletsPageTest() {
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2011-12-02 13:32:34 UTC (rev 36879)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts/ContentAssistBot.java 2011-12-02 13:49:14 UTC (rev 36880)
@@ -95,10 +95,9 @@
}
}
/**
- * Logs proposal list contents, usual for debug purposes
- *
- * @param text
- */
+ * Returns proposal list
+ * @return
+ */
public List<String>getProposalList() {
List<String> result = null;
SWTBotShell shell = openProposalList();
@@ -108,6 +107,24 @@
return result;
}
+ /**
+ * Logs proposal list contents, when Content Assist window is already opened
+ * @param shellsBefore - list of shells before Content Assist was invoked
+ * @param shellsAfter - list of shells after Content Assist was invoked
+ * @param closeShell
+ * @return
+ */
+ public List<String>getProposalList(SWTBotShell[] shellsBefore, SWTBotShell[] shellsAfter, boolean closeShell) {
+ List<String> result = null;
+ SWTBotShell caShell = getContentAssistShell(shellsBefore, shellsAfter);
+ SWTBotTable caTable = getProposalTable(caShell);
+ result = getTableItems(caTable);
+ if (closeShell) {
+ caShell.close();
+ }
+
+ return result;
+ }
// ------------------------------------------------------------
// Private
// ------------------------------------------------------------
13 years, 1 month