JBoss Tools SVN: r35331 - trunk/common/tests/org.jboss.tools.common.ui.test.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-04 13:32:29 -0400 (Tue, 04 Oct 2011)
New Revision: 35331
Modified:
trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml
Log:
[JBIDE-9805] reenabled tests
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml 2011-10-04 17:19:53 UTC (rev 35330)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml 2011-10-04 17:32:29 UTC (rev 35331)
@@ -8,19 +8,5 @@
</parent>
<groupId>org.jboss.tools.common.tests</groupId>
<artifactId>org.jboss.tools.common.ui.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <useUIThread>false</useUIThread>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
13 years, 3 months
JBoss Tools SVN: r35330 - trunk/build/aggregate/webtools-site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-10-04 13:19:53 -0400 (Tue, 04 Oct 2011)
New Revision: 35330
Modified:
trunk/build/aggregate/webtools-site/site.xml
Log:
expose only single feature on site -- others are contained and need not be listed (JBIDE-8460)
Modified: trunk/build/aggregate/webtools-site/site.xml
===================================================================
--- trunk/build/aggregate/webtools-site/site.xml 2011-10-04 17:18:06 UTC (rev 35329)
+++ trunk/build/aggregate/webtools-site/site.xml 2011-10-04 17:19:53 UTC (rev 35330)
@@ -2,25 +2,7 @@
<site>
<category-def label="JBoss Application Server Adapters" name="org.eclipse.wst.server.core.serverAdapter">
</category-def>
- <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0">
- <category name="org.eclipse.wst.server.core.serverAdapter"/>
- </feature>
- <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0">
- <category name="org.eclipse.wst.server.core.serverAdapter"/>
- </feature>
- <feature url="features/org.jboss.ide.eclipse.as.archives.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.archives.integration" version="0.0.0">
- <category name="org.eclipse.wst.server.core.serverAdapter"/>
- </feature>
- <feature url="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_0.0.0.jar" id="org.jboss.ide.eclipse.as.serverAdapter.wtp" version="0.0.0">
- <category name="org.eclipse.wst.server.core.serverAdapter"/>
- </feature>
<feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.jboss.ide.eclipse.as.server.rse.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.server.rse.integration" version="0.0.0">
- <category name="org.eclipse.wst.server.core.serverAdapter"/>
- </feature>
- <feature url="features/org.jboss.ide.eclipse.as.jmx.integration_0.0.0.jar" id="org.jboss.ide.eclipse.as.jmx.integration" version="0.0.0">
- <category name="org.eclipse.wst.server.core.serverAdapter"/>
- </feature>
</site>
13 years, 3 months
JBoss Tools SVN: r35329 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2011-10-04 13:18:06 -0400 (Tue, 04 Oct 2011)
New Revision: 35329
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties
Log:
Changed "Build JSF2 Model" -> "Build JSF Model"
https://issues.jboss.org/browse/JBIDE-9832
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2011-10-04 15:36:05 UTC (rev 35328)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2011-10-04 17:18:06 UTC (rev 35329)
@@ -128,4 +128,4 @@
NonExternalizedStringLiteral=Non externalized String literal; It should be moved to resource bundles.
NonExternalizedStringMarkerLabel=Move String "{0}" to resource bundle.
CreateJSF2Composite=Create JSF2 composite...
-BUILD_JSF2_MODEL=Build JSF2 Model.
\ No newline at end of file
+BUILD_JSF2_MODEL=Build JSF Model.
\ No newline at end of file
13 years, 3 months
JBoss Tools SVN: r35328 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-10-04 11:36:05 -0400 (Tue, 04 Oct 2011)
New Revision: 35328
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
https://issues.jboss.org/browse/JBIDE-9827 Check for null has been added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-10-04 15:10:52 UTC (rev 35327)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-10-04 15:36:05 UTC (rev 35328)
@@ -338,16 +338,24 @@
|| includeDocuments == null) {
throw new VpeDisposeException();
}
- // check source node can be changed and link can be a null in this case
- // we shouldn't process this node
- if (sourceNode.getNodeType() != Node.TEXT_NODE
- && sourceNode.getNodeType() != Node.ELEMENT_NODE
- && sourceNode.getNodeType() != Node.COMMENT_NODE
- && sourceNode.getNodeType() != Node.CDATA_SECTION_NODE
- && sourceNode.getNodeType() != Node.DOCUMENT_NODE) {
+ /*
+ * 1) source node can be changed and link can be a null in this case --
+ * we shouldn't process this node
+ * 2) https://issues.jboss.org/browse/JBIDE-9827
+ * Every source node's change/update causes a new update job,
+ * every update job is put to the queue.
+ * When there is the update job for the same node in the queue --
+ * the oldest one is removed from the queue, and then sourceNode could be null.
+ */
+ if ((sourceNode==null)
+ ||(sourceNode.getNodeType() != Node.TEXT_NODE
+ && sourceNode.getNodeType() != Node.ELEMENT_NODE
+ && sourceNode.getNodeType() != Node.COMMENT_NODE
+ && sourceNode.getNodeType() != Node.CDATA_SECTION_NODE
+ && sourceNode.getNodeType() != Node.DOCUMENT_NODE)) {
return null;
}
-
+
Set<Node> ifDependencySet = new HashSet<Node>();
pageContext.setCurrentVisualNode(visualOldContainer);
VpeTemplate template = getTemplateManager().getTemplate(pageContext,
13 years, 3 months
JBoss Tools SVN: r35327 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/selbar.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-10-04 11:10:52 -0400 (Tue, 04 Oct 2011)
New Revision: 35327
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/selbar/SelectionBarTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9482 JobUtils.waitForIdle() was added
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/selbar/SelectionBarTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/selbar/SelectionBarTest.java 2011-10-04 14:29:08 UTC (rev 35326)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/selbar/SelectionBarTest.java 2011-10-04 15:10:52 UTC (rev 35327)
@@ -20,6 +20,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.TestProjectProvider;
import org.jboss.tools.test.util.WorkbenchUtils;
@@ -58,12 +59,31 @@
assertTrue("Should be opened JSPMultiPage Editor", //$NON-NLS-1$
editorPart instanceof JSPMultiPageEditor);
JSPMultiPageEditor multiPageEditor = (JSPMultiPageEditor) editorPart;
+ /*
+ * Set the Source tab active.
+ */
multiPageEditor.pageChange(0);
- assertEquals("check command enabled command status",true,toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue()); //$NON-NLS-1$
- if(multiPageEditor.getPreviewIndex()==-1) return;
- multiPageEditor.pageChange(multiPageEditor.getPreviewIndex());
- assertEquals("check command enabled command status",false,toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue()); //$NON-NLS-1$
- multiPageEditor.pageChange(0);
- assertEquals("check command enabled command status",true,toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue()); //$NON-NLS-1$
+ assertEquals("On Source tab selection bar item should be enabled.", //$NON-NLS-1$
+ true, toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue());
+ int previewIndex = multiPageEditor.getPreviewIndex();
+ if (previewIndex != -1) {
+ /*
+ * Switch to the Preview Tab
+ */
+ multiPageEditor.pageChange(previewIndex);
+ /*
+ * Wait for some time in order to allow the tab to be rendered
+ * and the command state to be refreshed.
+ */
+ JobUtils.waitForIdle();
+ assertEquals("On Preview tab selection bar item should be disabled.", //$NON-NLS-1$
+ false, toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue());
+ /*
+ * Come back to the Source
+ */
+ multiPageEditor.pageChange(0);
+ assertEquals("When returned to the Source tab after Preview -- selection bar item should be enabled.", //$NON-NLS-1$
+ true, toggleSelBarCommand.isEnabled()&&(Boolean)toggleSelBarState.getValue());
+ }
}
}
13 years, 3 months
JBoss Tools SVN: r35326 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: wtp and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: jjankovi
Date: 2011-10-04 10:29:08 -0400 (Tue, 04 Oct 2011)
New Revision: 35326
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPCompAllTests.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
Log:
Workaround for Web Service Client app
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPCompAllTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPCompAllTests.java 2011-10-04 13:40:42 UTC (rev 35325)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPCompAllTests.java 2011-10-04 14:29:08 UTC (rev 35326)
@@ -17,11 +17,11 @@
/**
* Documentation/description is available at <a href="https://docspace.corp.redhat.com/docs/DOC-43675">Docspace</a>}
*
- * @author jlukas
+ * @author jlukas, jjankovi
* @see <a href="https://docspace.corp.redhat.com/docs/DOC-43675">DOC-43675</a>
*/
@SuiteClasses({
- EAPFromJavaTest.class,
+ EAPFromJavaTest.class,
EAPFromWSDLTest.class
})
@RunWith(RequirementAwareSuite.class)
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-10-04 13:40:42 UTC (rev 35325)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/eap/EAPFromWSDLTest.java 2011-10-04 14:29:08 UTC (rev 35326)
@@ -21,10 +21,19 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.Result;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
import org.jboss.tools.ws.ui.bot.test.wtp.TopDownWSTest;
import org.jboss.tools.ws.ui.bot.test.wtp.WSTestBase;
@@ -36,144 +45,222 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
-@Require(server=
-@Server(type = ServerType.EAP), perspective = "Java EE")
+@Require(server = @Server(type = ServerType.EAP), perspective = "Java EE")
@RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ EAPCompAllTests.class})
+@SuiteClasses({ EAPCompAllTests.class })
public class EAPFromWSDLTest extends WSTestBase {
- private static final Logger L = Logger.getLogger(EAPFromWSDLTest.class.getName());
- private static boolean servicePassed = false;
+ private static final Logger L = Logger.getLogger(EAPFromWSDLTest.class
+ .getName());
+ private static boolean servicePassed = false;
- public EAPFromWSDLTest() {
- }
+ public EAPFromWSDLTest() {
+ }
- @Before
- @Override
- public void setup() {
- if (!projectExists(getWsProjectName())) {
- createProject(getWsProjectName());
- }
- if (!projectExists(getWsClientProjectName())) {
- createProject(getWsClientProjectName());
- }
- }
+ @Before
+ @Override
+ public void setup() {
+ if (!projectExists(getWsProjectName())) {
+ createProject(getWsProjectName());
+ }
+ if (!projectExists(getWsClientProjectName())) {
+ createProject(getWsClientProjectName());
+ }
+ }
- @After
- @Override
- public void cleanup() {
- L.info("overridden");
- }
+ @After
+ @Override
+ public void cleanup() {
+ L.info("overridden");
+ }
- @AfterClass
- public static void x() {
- L.info("x");
- servers.removeAllProjectsFromServer();
- }
+ @AfterClass
+ public static void x() {
+ L.info("x");
+ servers.removeAllProjectsFromServer();
+ }
- @Override
- protected String getWsProjectName() {
- return "AreaWSProject";
- }
+ @Override
+ protected String getWsProjectName() {
+ return "AreaWSProject";
+ }
- @Override
- protected String getEarProjectName() {
- return getWsProjectName() + "EAR";
- }
+ @Override
+ protected String getEarProjectName() {
+ return getWsProjectName() + "EAR";
+ }
- protected String getWsClientProjectName() {
- return "AreaWSClientProject";
- }
+ protected String getWsClientProjectName() {
+ return "AreaWSClientProject";
+ }
- protected String getClientEarProjectName() {
- return getWsClientProjectName() + "EAR";
- }
+ protected String getClientEarProjectName() {
+ return getWsClientProjectName() + "EAR";
+ }
- @Override
- protected String getWsPackage() {
- return "org.jboss.ws";
- }
+ @Override
+ protected String getWsPackage() {
+ return "org.jboss.ws";
+ }
- @Override
- protected String getWsName() {
- return "AreaService";
- }
+ @Override
+ protected String getWsName() {
+ return "AreaService";
+ }
- @Override
- protected Slider_Level getLevel() {
- return Slider_Level.DEPLOY;
- }
+ @Override
+ protected Slider_Level getLevel() {
+ return Slider_Level.DEPLOY;
+ }
- @Test
- public void testService() {
- topDownWS(TopDownWSTest.class.getResourceAsStream("/resources/jbossws/AreaService.wsdl"), getWsPackage());
+ @Test
+ public void testService() {
+ topDownWS(TopDownWSTest.class.getResourceAsStream("/resources/jbossws/AreaService.wsdl"),
+ getWsPackage());
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(getWsProjectName());
- IFile f = project.getFile("src/" + getWsPackage().replace(".", "/") + "/AreaServiceImpl.java");
- String content = readFile(f);
- Assert.assertNotNull(content);
- Assert.assertTrue(content.contains("public class AreaServiceImpl implements AreaService {"));
- Assert.assertTrue(content.contains("public float calculateRectArea(Dimensions parameters)"));
- replaceContent(f, "/resources/jbossws/AreaWS.java.ws");
+ IProject project = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(getWsProjectName());
+ IFile f = project.getFile("src/" + getWsPackage().replace(".", "/")
+ + "/AreaServiceImpl.java");
+ String content = readFile(f);
+ Assert.assertNotNull(content);
+ Assert.assertTrue(content
+ .contains("public class AreaServiceImpl implements AreaService {"));
+ Assert.assertTrue(content
+ .contains("public float calculateRectArea(Dimensions parameters)"));
+ replaceContent(f, "/resources/jbossws/AreaWS.java.ws");
- f = project.getFile("WebContent/WEB-INF/web.xml");
- content = readFile(f);
- Assert.assertNotNull(content);
- Assert.assertTrue(content.contains("<servlet-class>org.jboss.ws.AreaServiceImpl</servlet-class>"));
- Assert.assertTrue(content.contains("<url-pattern>/AreaService</url-pattern>"));
- runProject(getEarProjectName());
- assertServiceDeployed(getWSDLUrl(), 10000);
- servicePassed = true;
- }
+ f = project.getFile("WebContent/WEB-INF/web.xml");
+ content = readFile(f);
+ Assert.assertNotNull(content);
+ Assert.assertTrue(content
+ .contains("<servlet-class>org.jboss.ws.AreaServiceImpl</servlet-class>"));
+ Assert.assertTrue(content
+ .contains("<url-pattern>/AreaService</url-pattern>"));
+ runProject(getEarProjectName());
+ assertServiceDeployed(getWSDLUrl(), 10000);
+ servicePassed = true;
+ }
- @Test
- public void testClient() {
- Assert.assertTrue("service must exist", servicePassed);
- createClient(getWSDLUrl(), getWsClientProjectName(), Slider_Level.DEVELOP, "org.jboss.wsclient");
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(getWsClientProjectName());
- String pkg = "org/jboss/wsclient";
- String cls = "src/" + pkg + "/AreaService.java";
- Assert.assertTrue(p.getFile(cls).exists());
- cls = "src/" + pkg + "/clientsample/ClientSample.java";
- IFile f = p.getFile(cls);
- Assert.assertTrue(f.exists());
- replaceContent(f, "/resources/jbossws/clientsample.java.ws");
- eclipse.runJavaApplication(getWsClientProjectName(), "org.jboss.wsclient.clientsample.ClientSample", null);
- util.waitForNonIgnoredJobs();
- bot.sleep(15000);
- String output = console.getConsoleText();
- L.info(output);
- Assert.assertTrue(output.contains("Server said: 37.5"));
- Assert.assertTrue(output.contains("Server said: 3512.3699"));
- }
+ @Test
+ public void testClient() {
+ Assert.assertTrue("service must exist", servicePassed);
+ createClient(getWSDLUrl(), getWsClientProjectName(),
+ Slider_Level.DEVELOP, "org.jboss.wsclient");
+ IProject p = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(getWsClientProjectName());
+ String pkg = "org/jboss/wsclient";
+ String cls = "src/" + pkg + "/AreaService.java";
+ Assert.assertTrue(p.getFile(cls).exists());
+ cls = "src/" + pkg + "/clientsample/ClientSample.java";
+ IFile f = p.getFile(cls);
+ Assert.assertTrue(f.exists());
+ replaceContent(f, "/resources/jbossws/clientsample.java.ws");
- private void replaceContent(IFile f, String content) {
- try {
- f.delete(true, new NullProgressMonitor());
- } catch (CoreException ce) {
- L.log(Level.WARNING, ce.getMessage(), ce);
- }
- InputStream is = null;
- try {
- is = EAPFromWSDLTest.class.getResourceAsStream(content);
- f.create(is, true, new NullProgressMonitor());
- } catch (CoreException ce) {
- L.log(Level.WARNING, ce.getMessage(), ce);
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (IOException ioe) {
- //ignore
- }
- }
- }
- try {
- ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IWorkspaceRoot.DEPTH_INFINITE, new NullProgressMonitor());
- } catch (CoreException e) {
- L.log(Level.WARNING, e.getMessage(), e);
- }
- util.waitForNonIgnoredJobs();
- bot.sleep(1000);
- }
+ /*
+ * workaround for https://issues.jboss.org/browse/JBIDE-9817
+ */
+ projectExplorer.selectProject(getWsClientProjectName());
+ SWTBotTree tree = projectExplorer.bot().tree();
+ SWTBotTreeItem item = tree.getTreeItem(getWsClientProjectName());
+ item.expand();
+ removeRuntimeLibrary(tree, item, bot, util);
+
+ eclipse.runJavaApplication(getWsClientProjectName(),
+ "org.jboss.wsclient.clientsample.ClientSample", null);
+ util.waitForNonIgnoredJobs();
+ bot.sleep(15 * TIME_1S);
+ String output = console.getConsoleText();
+ L.info(output);
+ Assert.assertTrue(output, output.contains("Server said: 37.5"));
+ Assert.assertTrue(output.contains("Server said: 3512.3699"));
+ }
+
+ private void replaceContent(IFile f, String content) {
+ try {
+ f.delete(true, new NullProgressMonitor());
+ } catch (CoreException ce) {
+ L.log(Level.WARNING, ce.getMessage(), ce);
+ }
+ InputStream is = null;
+ try {
+ is = EAPFromWSDLTest.class.getResourceAsStream(content);
+ f.create(is, true, new NullProgressMonitor());
+ } catch (CoreException ce) {
+ L.log(Level.WARNING, ce.getMessage(), ce);
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (IOException ioe) {
+ // ignore
+ }
+ }
+ }
+ try {
+ ResourcesPlugin
+ .getWorkspace()
+ .getRoot()
+ .refreshLocal(IWorkspaceRoot.DEPTH_INFINITE,
+ new NullProgressMonitor());
+ } catch (CoreException e) {
+ L.log(Level.WARNING, e.getMessage(), e);
+ }
+ util.waitForNonIgnoredJobs();
+ bot.sleep(TIME_1S);
+ }
+
+ private void removeRuntimeLibrary(final SWTBotTree tree,
+ SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) {
+ nodeContextMenu(tree, item, "Build Path", "Configure Build Path...")
+ .click();
+ bot.activeShell().activate();
+ bot.tabItem("Libraries").activate();
+ assertTrue(!bot.button("Remove").isEnabled());
+ try {
+ findSelectEnterpriseRuntimeLibrary(bot);
+ assertTrue(bot.button("Remove").isEnabled());
+ bot.button("Remove").click();
+ bot.button("OK").click();
+ bot.sleep(Timing.time2S());
+ util.waitForNonIgnoredJobs();
+ } catch (Exception e) {
+ e.printStackTrace();
+ bot.button("Cancel").click();
+ }
+
+ }
+
+ private void findSelectEnterpriseRuntimeLibrary(SWTBotExt bot)
+ throws Exception {
+ SWTBotTree libraryTree = bot.tree(1);
+ boolean libraryFound = false;
+ for (SWTBotTreeItem libraryItem : libraryTree.getAllItems()) {
+ if (libraryItem.getText().contains(
+ "JBoss Enterprise Application Platform")) {
+ libraryTree.select(libraryItem);
+ libraryFound = true;
+ break;
+ }
+ }
+ if (!libraryFound)
+ throw new Exception("No runtime library has been found");
+ }
+
+ private SWTBotMenu nodeContextMenu(final SWTBotTree tree,
+ SWTBotTreeItem item, final String... menu) {
+ assert menu.length > 0;
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, item);
+ return UIThreadRunnable.syncExec(new Result<SWTBotMenu>() {
+
+ public SWTBotMenu run() {
+ SWTBotMenu m = new SWTBotMenu(ContextMenuHelper.getContextMenu(
+ tree, menu[0], false));
+ for (int i = 1; i < menu.length; i++) {
+ m = m.menu(menu[i]);
+ }
+ return m;
+ }
+ });
+ }
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-10-04 13:40:42 UTC (rev 35325)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2011-10-04 14:29:08 UTC (rev 35326)
@@ -192,7 +192,7 @@
}
wsw.finish();
util.waitForNonIgnoredJobs();
- bot.sleep(1000);
+ bot.sleep(2*TIME_1S);
// let's fail if there's some error in the wizard,
// and close error dialog and the wizard so other tests
13 years, 3 months
JBoss Tools SVN: r35325 - in trunk/as: tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-04 09:40:42 -0400 (Tue, 04 Oct 2011)
New Revision: 35325
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ISSHPublicKey.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/SSHKeyPair.java
trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/SSHPublicKey.java
trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/SSHKeyTest.java
Log:
[JBIDE-9793] implemented capability to load public key files in SSHPublicKey
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ISSHPublicKey.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ISSHPublicKey.java 2011-10-04 13:04:52 UTC (rev 35324)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/ISSHPublicKey.java 2011-10-04 13:40:42 UTC (rev 35325)
@@ -25,5 +25,4 @@
*/
public String getPublicKey() throws OpenshiftException ;
- public void update(ISSHPublicKey sshPublicKey) throws OpenshiftException;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/SSHKeyPair.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/SSHKeyPair.java 2011-10-04 13:04:52 UTC (rev 35324)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/SSHKeyPair.java 2011-10-04 13:40:42 UTC (rev 35325)
@@ -100,11 +100,4 @@
protected String getPublicKeyPath() {
return publicKeyPath;
}
-
- @Override
- public void update(ISSHPublicKey sshPublicKey) {
- // do nothing, there's no sense to update this key since the public key
- // misses the private key
- }
-
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/SSHPublicKey.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/SSHPublicKey.java 2011-10-04 13:04:52 UTC (rev 35324)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/SSHPublicKey.java 2011-10-04 13:40:42 UTC (rev 35325)
@@ -10,26 +10,48 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.openshift.core;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.jboss.ide.eclipse.as.openshift.core.internal.utils.StreamUtils;
+
/**
* @author André Dietisheim
*/
public class SSHPublicKey implements ISSHPublicKey {
+ private static final Pattern PUBLICKEY_PATTERN = Pattern.compile("[^ ]+ ([^ ]+)( .+)*");
+
private String publicKey;
+ public SSHPublicKey(File publicKeyFilePath) throws IOException, OpenshiftException {
+ this.publicKey = extractPublicKey(publicKeyFilePath);
+ }
+
public SSHPublicKey(String publicKey) {
this.publicKey = publicKey;
}
+ private String extractPublicKey(File file) throws OpenshiftException, FileNotFoundException, IOException {
+ String keyWithIdAndComment = StreamUtils.readToString(new FileReader(file));
+ Matcher matcher = PUBLICKEY_PATTERN.matcher(keyWithIdAndComment);
+ if (!matcher.find()
+ || matcher.groupCount() < 1) {
+ throw new OpenshiftException("Could not load public key from file \"{0}\"", file.getAbsolutePath());
+ }
+
+ return matcher.group(1);
+ }
+
public String getPublicKey() {
return publicKey;
}
-
+
void update(String publicKey) {
+ this.publicKey = publicKey;
}
-
- public void update(ISSHPublicKey sshPublicKey) throws OpenshiftException {
- this.publicKey = sshPublicKey.getPublicKey();
- }
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/SSHKeyTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/SSHKeyTest.java 2011-10-04 13:04:52 UTC (rev 35324)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/test/internal/core/SSHKeyTest.java 2011-10-04 13:40:42 UTC (rev 35325)
@@ -10,13 +10,16 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.openshift.test.internal.core;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
+import org.jboss.ide.eclipse.as.openshift.core.ISSHPublicKey;
import org.jboss.ide.eclipse.as.openshift.core.SSHKeyPair;
+import org.jboss.ide.eclipse.as.openshift.core.SSHPublicKey;
import org.junit.Test;
public class SSHKeyTest {
@@ -36,7 +39,7 @@
}
@Test
- public void canLoadPublicKey() throws Exception {
+ public void canLoadKeyPair() throws Exception {
String publicKeyPath = createTempFile().getAbsolutePath();
String privateKeyPath = createTempFile().getAbsolutePath();
SSHKeyPair.create(PASSPHRASE, privateKeyPath, publicKeyPath);
@@ -49,6 +52,23 @@
assertTrue(!publicKey.contains(" ")); // no comment
}
+ @Test
+ public void canLoadPublicKey() throws Exception {
+ String publicKeyPath = createTempFile().getAbsolutePath();
+ String privateKeyPath = createTempFile().getAbsolutePath();
+ SSHKeyPair.create(PASSPHRASE, privateKeyPath, publicKeyPath);
+
+ ISSHPublicKey sshKey = new SSHPublicKey(new File(publicKeyPath));
+ String publicKey = sshKey.getPublicKey();
+
+ assertNotNull(publicKey);
+ assertTrue(!publicKey.contains("ssh-rsa")); // no identifier
+ assertTrue(!publicKey.contains(" ")); // no comment
+
+ SSHKeyPair keyPair = SSHKeyPair.load(privateKeyPath, publicKeyPath);
+ assertEquals(publicKey, keyPair.getPublicKey());
+ }
+
private File createTempFile() throws IOException {
return File.createTempFile(String.valueOf(System.currentTimeMillis()), null);
}
13 years, 3 months
JBoss Tools SVN: r35324 - in trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss: forge/main and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-10-04 09:04:52 -0400 (Tue, 04 Oct 2011)
New Revision: 35324
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/modules/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/modules/main/
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/modules/main/module.xml
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/jboss-modules.jar
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/activation.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/cal10n-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-dev-plugins.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-event-bus.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-git-tools.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-javaee-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-javaee-impl.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-maven-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-parser-java-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-parser-java.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-parser-xml.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-project-model-maven.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-scaffold-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-scaffold-plugins.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-shell-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-shell.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/jsr181-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/jsr250-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/metawidget-forge.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/module.xml
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/seam-render.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/shrinkwrap-descriptors-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/shrinkwrap-descriptors-impl.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/shrinkwrap-descriptors-spi.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-event-bus.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-javaee-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-maven-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-parser-java-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-parser-xml.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-scaffold-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-shell-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/shrinkwrap-descriptors-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/shrinkwrap-descriptors-impl.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/shrinkwrap-descriptors-spi.jar
Log:
JBIDE-9826: Upgrade Forge Embedded Runtime to 1.0.0.Beta3
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/activation.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/cal10n-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-dev-plugins.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-event-bus.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-git-tools.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-javaee-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-javaee-impl.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-maven-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-parser-java-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-parser-java.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-parser-xml.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-project-model-maven.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-scaffold-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-scaffold-plugins.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-shell-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/forge-shell.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/jboss-modules.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/jsr181-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/jsr250-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/metawidget-forge.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/module.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/module.xml 2011-10-04 12:56:05 UTC (rev 35323)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/module.xml 2011-10-04 13:04:52 UTC (rev 35324)
@@ -49,7 +49,6 @@
<resource-root path="jboss-jsp-api_2.2_spec.jar" />
<resource-root path="jboss-logging.jar" />
<resource-root path="jboss-logmanager.jar" />
- <resource-root path="jboss-modules.jar" />
<resource-root path="jboss-saaj-api_1.3_spec.jar" />
<resource-root path="jboss-servlet-api_3.0_spec.jar" />
<resource-root path="jboss-transaction-api_1.1_spec.jar" />
@@ -91,12 +90,8 @@
<dependencies>
<module name="javax.api" />
- <module name="org.jboss.forge.plugins" services="import" optional="true">
- <imports>
- <include path="**" />
- <include path="META-INF" />
- </imports>
- </module>
+ <module name="org.jboss.modules" />
+
<module name="org.jboss.tools.forge.runtime.ext" services="import" optional="true">
<imports>
<include path="**" />
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/seam-render.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/shrinkwrap-descriptors-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/shrinkwrap-descriptors-impl.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/main/shrinkwrap-descriptors-spi.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-event-bus.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-javaee-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-maven-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-parser-java-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-parser-xml.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-scaffold-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/forge-shell-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/shrinkwrap-descriptors-api.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/shrinkwrap-descriptors-impl.jar
===================================================================
(Binary files differ)
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/forge/shell-api/main/shrinkwrap-descriptors-spi.jar
===================================================================
(Binary files differ)
Added: trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/modules/main/module.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/modules/main/module.xml (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/modules/org/jboss/modules/main/module.xml 2011-10-04 13:04:52 UTC (rev 35324)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+~ JBoss, Home of Professional Open Source.
+~ Copyright 2010, Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags. See the copyright.txt file in the
+~ distribution for a full listing of individual contributors.
+~
+~ This is free software; you can redistribute it and/or modify it
+~ under the terms of the GNU Lesser General Public License as
+~ published by the Free Software Foundation; either version 2.1 of
+~ the License, or (at your option) any later version.
+~
+~ This software is distributed in the hope that it will be useful,
+~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+~ Lesser General Public License for more details.
+~
+~ You should have received a copy of the GNU Lesser General Public
+~ License along with this software; if not, write to the Free
+~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.modules">
+ <dependencies>
+ <module name="system" export="false">
+ <exports>
+ <include-set>
+ <path name="org/jboss/modules"/>
+ <path name="org/jboss/modules/log"/>
+ <path name="org/jboss/modules/filter"/>
+ <path name="org/jboss/modules/ref"/>
+ <path name="org/jboss/modules/management"/>
+ </include-set>
+ </exports>
+ </module>
+ </dependencies>
+</module>
\ No newline at end of file
13 years, 3 months
JBoss Tools SVN: r35323 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-10-04 08:56:05 -0400 (Tue, 04 Oct 2011)
New Revision: 35323
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-8995 , tooltips were changed.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2011-10-04 12:26:49 UTC (rev 35322)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2011-10-04 12:56:05 UTC (rev 35323)
@@ -133,10 +133,10 @@
DEFAULT_VPE_TAB_VISUAL_SOURCE=Visual/Source
DEFAULT_VPE_TAB_SOURCE=Source
DEFAULT_VPE_TAB_PREVIEW=Preview
-SPLITTING_VERT_TOP_SOURCE=Vertical splitting with Source Editor on the top
-SPLITTING_VERT_TOP_VISUAL=Vertical splitting with Visual Editor on the top
-SPLITTING_HORIZ_LEFT_SOURCE=Horizontal splitting with Source Editor to the left
-SPLITTING_HORIZ_LEFT_VISUAL=Horizontal splitting with Visual Editor to the left
+SPLITTING_HORIZ_LEFT_SOURCE=Switch Visual Editor to the bottom
+SPLITTING_VERT_TOP_SOURCE=Switch Visual Editor to the left
+SPLITTING_HORIZ_LEFT_VISUAL=Switch Visual Editor to the top
+SPLITTING_VERT_TOP_VISUAL=Switch Visual Editor to the right
# Import/Export user specified tag templates messages
IMPORT_USER_TAGS_TEMPLATES_WIZARD_PAGE=Import user specified tag templates wizard page
13 years, 3 months
JBoss Tools SVN: r35322 - in trunk/common/tests/org.jboss.tools.common.ui.test: src/org/jboss/tools/common and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-10-04 08:26:49 -0400 (Tue, 04 Oct 2011)
New Revision: 35322
Added:
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/CommonUITestSuite.java
Removed:
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/preferencevalue/
Modified:
trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml
trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/StringsPreferenceValueTest.java
Log:
[JBIDE-9805] added test suite & moved tests to internal package
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml 2011-10-04 12:21:36 UTC (rev 35321)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/pom.xml 2011-10-04 12:26:49 UTC (rev 35322)
@@ -11,10 +11,6 @@
<packaging>eclipse-test-plugin</packaging>
- <properties>
- <emma.instrument.bundles>org.jboss.tools.common.ui.preferencevalue</emma.instrument.bundles>
- </properties>
-
<build>
<plugins>
<plugin>
Added: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/CommonUITestSuite.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/CommonUITestSuite.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/CommonUITestSuite.java 2011-10-04 12:26:49 UTC (rev 35322)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.internal.ui.preferencevalue;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+
+(a)RunWith(Suite.class)
+(a)Suite.SuiteClasses({
+ StringsPreferenceValueTest.class
+})
+/**
+ * @author André Dietisheim
+ */
+public class CommonUITestSuite {
+
+}
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/CommonUITestSuite.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/StringsPreferenceValueTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/ui/preferencevalue/StringsPreferenceValueTest.java 2011-10-03 20:23:54 UTC (rev 35299)
+++ trunk/common/tests/org.jboss.tools.common.ui.test/src/org/jboss/tools/common/internal/ui/preferencevalue/StringsPreferenceValueTest.java 2011-10-04 12:26:49 UTC (rev 35322)
@@ -8,10 +8,11 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.common.ui.preferencevalue;
+package org.jboss.tools.common.internal.ui.preferencevalue;
import static org.junit.Assert.assertEquals;
+import org.jboss.tools.common.ui.preferencevalue.StringsPreferenceValue;
import org.junit.Before;
import org.junit.Test;
13 years, 3 months