May 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r22004 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/help.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-05-11 07:53:06 -0400 (Tue, 11 May 2010) New Revision: 22004 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-menu.properties Log: https://jira.jboss.org/jira/browse/JBIDE-6269 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-menu.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-menu.properties 2010-05-11 08:09:39 UTC (rev 22003) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-menu.properties 2010-05-11 11:53:06 UTC (rev 22004) @@ -1,5 +1,6 @@ JSF.SetApplication.menu=Edit Application Settings... JSF.SetFactory.menu=Edit Factory Settings... +JSFProcess.AddRule.menu=New View... JSF.AddRule.menu=Rule... JSF.AddComponent.menu=Component... JSF.AddConverter.menu=Converter

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22003 - in trunk: drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2010-05-11 04:09:39 -0400 (Tue, 11 May 2010) New Revision: 22003 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java Log: Added small fixes to Drools SWTBot Tests. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -98,7 +98,8 @@ } catch (WidgetNotFoundException wnfe){ // Do nothing ignore this error } - eclipse.openPerspective(PerspectiveType.JAVA); + eclipse.openPerspective(PerspectiveType.JAVA); + eclipse.maximizeActiveShell(); } @AfterClass Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -20,6 +20,7 @@ import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; import org.jboss.tools.ui.bot.ext.types.EntityType; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.types.JobName; @@ -112,6 +113,8 @@ SWTBotEclipseEditor drlDroolsEditor = packageExplorer.openFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE, DroolsAllBotTests.SAMPLE_DROOLS_RULE_NAME).toTextEditor(); + SWTBotEditorExt ruleEditor = bot.swtBotEditorExtByTitle(DroolsAllBotTests.SAMPLE_DROOLS_RULE_NAME); + ruleEditor.selectPage(IDELabel.DroolsEditor.TEXT_EDITOR_TAB); // update drl file drlDroolsEditor.insertText(3,0,"\nexpander " + dslFileName + @@ -121,7 +124,9 @@ drlDroolsEditor.insertText(lineNumber,0,">"); } drlDroolsEditor.selectLine(18); + bot.sleep(Timing.time1S()); KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); + bot.sleep(Timing.time1S()); drlDroolsEditor.insertText(18, 0, " Message m of type Message.GOODBYE contains myMessage"); drlDroolsEditor.save(); util.waitForJobs(Timing.time10S(), JobName.BUILDING_WS); Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -98,7 +98,8 @@ DroolsAllBotTests.COM_SAMPLE_TREE_NODE}); console.clearConsole(); eclipse.debugTreeItemAsDroolsApplication(tiDroolsTest); - eclipse.closeConfirmPerspectiveSwitchShellIfOpened(true); + bot.sleep(Timing.time3S()); + eclipse.closeConfirmPerspectiveSwitchShellIfOpened(false); String consoleText = console.getConsoleText(3*1000L,3*1000L,true); assertTrue("Drools Rule was not debuged properly.\nConsole content should have been empty but is:\n" + consoleText, consoleText.length() == 0); Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -34,6 +34,7 @@ import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -99,7 +100,11 @@ // Test if Rule Flow RF File is opened in editor assertTrue("Rule Flow RF File is not opened properly. File " + ruleFlowFileName + " is not opened in editor", SWTEclipseExt.existEditorWithLabel(bot,ruleFlowFileName)); - + // Maximize editor + bot.menu(IDELabel.Menu.WINDOW) + .menu(IDELabel.Menu.NAVIGATION) + .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) + .click(); SWTGefBot gefBot = new SWTGefBot(); SWTBotGefEditor gefEditor = gefBot.gefEditor(ruleFlowFileName); final Control editorControl = (Control)gefEditor.getWidget(); @@ -137,11 +142,17 @@ // Delete each component gefEditor.activateTool("Select"); for (int toolIndex = 0;toolIndex < tools.length;toolIndex++){ - gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset + 5, - yspacing * (toolIndex / 3) + yoffset + 5); + gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset + 10, + yspacing * (toolIndex / 3) + yoffset + 10); KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); } + // Restore maximized editor + bot.menu(IDELabel.Menu.WINDOW) + .menu(IDELabel.Menu.NAVIGATION) + .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) + .click(); gefEditor.save(); + gefEditor.close(); checkEmptyRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileName); } /** Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -770,10 +770,11 @@ /** * Hide Warning Message if displayed static version */ - public static void hideWarningIfDisplayed(SWTBotExt bot) { + public static void hideWarningIfDisplayed(SWTBot bot) { try { - bot.shell(IDELabel.Shell.WARNING).activate(); - bot.button(IDELabel.Button.OK).click(); + SWTBot warningBot = bot.shell(IDELabel.Shell.WARNING).activate().bot(); + warningBot.sleep(Timing.time3S()); + warningBot.button(IDELabel.Button.OK).click(); } catch (WidgetNotFoundException wnfe) { // do nothing } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -246,6 +246,7 @@ SWTBotShell activeShell = bot.activeShell(); String activeShellStr = bot.activeShell().getText(); bot.button(finishButtonText).click(); + SWTEclipseExt.hideWarningIfDisplayed(bot); long time = System.currentTimeMillis(); while (true) { log.info("Waiting until shell '" + activeShellStr + "' closes"); Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -72,6 +72,8 @@ public static final String GUVNOR_ADD = "Add..."; public static final String GUVNOR_DELETE = "Delete..."; public static final String GUVNOR_DISCONNECT = "Disconnect"; + public static final String NAVIGATION = "Navigation"; + public static final String MAXIMIZE_ACTIVE_VIEW_OR_EDITOR = "Maximize Active View or Editor"; } public class Button {

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22002 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: utils and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-05-10 18:06:32 -0400 (Mon, 10 May 2010) New Revision: 22002 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSTestStatus.java Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java Log: OPEN - issue JBIDE-6253: Need a web service tester (JAX-WS and JAX-RS) in the tooling https://jira.jboss.org/jira/browse/JBIDE-6253 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-05-10 22:06:32 UTC (rev 22002) @@ -69,8 +69,12 @@ JAXRSWSTestView_Action_URL_Label=Action URL: JAXRSWSTestView_Configure_Monitor_Button=Configure Monitor +JAXRSWSTestView_Exception_Status=Exception: JAXRSWSTestView_HTTP_Method_Label=HTTP Method: JAXRSWSTestView_Invoke_Label=Invoke +JAXRSWSTestView_Invoking_WS_Status=Invoking web service... +JAXRSWSTestView_JAXRS_Success_Status=Successful JAX-RS Web Service Execution +JAXRSWSTestView_JAXWS_Success_Status=Successful JAX-WS Web Service Execution JAXRSWSTestView_Open_Monitor_Button=Open Monitor JAXRSWSTestView_Request_Body_Label=Request Body JAXRSWSTestView_Request_Header_Label=Request Header Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -92,8 +92,12 @@ public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message; public static String JAXRSWSTestView_Action_URL_Label; public static String JAXRSWSTestView_Configure_Monitor_Button; + public static String JAXRSWSTestView_Exception_Status; public static String JAXRSWSTestView_HTTP_Method_Label; public static String JAXRSWSTestView_Invoke_Label; + public static String JAXRSWSTestView_Invoking_WS_Status; + public static String JAXRSWSTestView_JAXRS_Success_Status; + public static String JAXRSWSTestView_JAXWS_Success_Status; public static String JAXRSWSTestView_Open_Monitor_Button; public static String JAXRSWSTestView_Request_Body_Label; public static String JAXRSWSTestView_Request_Header_Label; Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -0,0 +1,227 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ws.ui.utils; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.HttpURLConnection; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.URL; +import java.net.URLEncoder; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +/** + * Tester class for JAX-RS services + * @author bfitzpat + * + */ +public class JAXRSTester { + + // Result message to pass back + private String resultBody; + + // HTTP headers going in and out + private Map<?, ?> requestHeaders = null; + private Map<?, ?> resultHeaders = null; + + // utility constant + private String EMPTY_STRING = ""; //$NON-NLS-1$ + + /** + * Constructor + */ + public JAXRSTester() { + // empty + } + + /** + * Return the result message + * @return String + */ + public String getResultBody() { + return this.resultBody; + } + + /** + * Return the result HTTP headers + * @return Map + */ + public Map<?, ?> getResultHeaders() { + return resultHeaders; + } + + /** + * Return the request HTTP headers + * @return Map + */ + public Map<?, ?> getRequestHeaders() { + return requestHeaders; + } + + /* + * Start building the web query. Append parameters to URL + */ + private String buildWebQuery(Map<String, String> parameters) throws Exception { + if (!parameters.isEmpty()) { + StringBuilder sb = new StringBuilder(); + for (Map.Entry<String, String> entry : parameters.entrySet()) { + String key = URLEncoder.encode(entry.getKey(), "UTF-8"); //$NON-NLS-1$ + String value = URLEncoder.encode(entry.getValue(), "UTF-8"); //$NON-NLS-1$ + sb.append(key).append("=").append(value).append("&"); //$NON-NLS-1$ //$NON-NLS-2$ + } + return sb.toString().substring(0, sb.length() - 1); + } + return EMPTY_STRING; + } + + /** + * Simplest call for JAX-RS + * @param address + * @param parameters + * @param headers + * @throws Exception + */ + public void doTest (String address, Map<String, String> parameters, Map<String, String> headers) throws Exception { + doTest(address, parameters, headers, "GET", null, null, 0); //$NON-NLS-1$ + } + + /** + * Call a JAX-RS service + * @param address + * @param parameters + * @param headers + * @param methodType + * @param requestBody + * @throws Exception + */ + public void doTest (String address, Map<String, String> parameters, Map<String, String> headers, String methodType, String requestBody) throws Exception { + doTest (address, parameters, headers, methodType, requestBody, null, 0); + } + + /** + * Call a JAX-RS service + * @param address + * @param parameters + * @param headers + * @param methodType + * @param requestBody + * @param proxy + * @param port + * @throws Exception + */ + public void doTest(String address, Map<String, String> parameters, Map<String, String> headers, String methodType, String requestBody, String proxy, String port) throws Exception { + doTest(address, parameters, headers, methodType, requestBody, proxy, Integer.parseInt(port)); + } + + /** + * Call a JAX-RS service + * @param address + * @param parameters + * @param headers + * @param methodType + * @param requestBody + * @param proxy + * @param port + * @throws Exception + */ + public void doTest(String address, Map<String, String> parameters, Map<String, String> headers, String methodType, String requestBody, String proxy, int port) throws Exception { + + // handle the proxy + Proxy proxyObject = null; + if (proxy != null && proxy.length() > 0 && port > 0) { + InetSocketAddress proxyAddress = new InetSocketAddress(proxy, port); + proxyObject = new Proxy(Proxy.Type.HTTP, proxyAddress); + } + + // clear the returned results + resultBody = EMPTY_STRING; + + // get the parms string + String query = buildWebQuery(parameters); + + // build the complete URL + URL url = null; + if (query != null) { + // add the ? if there are parameters + if (!address.endsWith("?") && methodType.equalsIgnoreCase("GET") ) { //$NON-NLS-1$//$NON-NLS-2$ + address = address + "?"; //$NON-NLS-1$ + } + // add parms to the url if we have some + url = new URL(address + query); + } else { + url = new URL(address); + } + + // make connection + HttpURLConnection httpurlc = null; + if (proxyObject == null) { + httpurlc = (HttpURLConnection) url.openConnection(); + } else { + // if have proxy, pass it along + httpurlc = (HttpURLConnection) url.openConnection(proxyObject); + } + + // since we are expecting output back, set to true + httpurlc.setDoOutput(true); + + // not sure what this does - may be used for authentication? + httpurlc.setAllowUserInteraction(false); + + // set whether this is a GET or POST + httpurlc.setRequestMethod(methodType); + + // if we have headers to add + if (headers != null && !headers.isEmpty()) { + Iterator<?> iter = headers.entrySet().iterator(); + while (iter.hasNext()) { + Entry<?, ?> entry = (Entry<?, ?>)iter.next(); + if (entry.getKey() != null && entry.getKey() instanceof String) + httpurlc.addRequestProperty((String) entry.getKey(), (String) entry.getValue()); + } + } + + requestHeaders = httpurlc.getRequestProperties(); + + // CONNECT! + httpurlc.connect(); + + // If we are doing a POST and we have some request body to pass along, do it + if (requestBody != null && ( methodType.equalsIgnoreCase("POST") //$NON-NLS-1$ + || methodType.equalsIgnoreCase("PUT"))) { //$NON-NLS-1$ + requestBody = WSTestUtils.stripNLsFromXML(requestBody); + OutputStreamWriter out = new OutputStreamWriter(httpurlc.getOutputStream()); + out.write(requestBody); + out.close(); + } + + // retrieve result and put string results into the response + InputStream is = (InputStream) httpurlc.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));//$NON-NLS-1$ + StringBuilder sb = new StringBuilder(); + String line; + while ((line = br.readLine()) != null) { + sb.append(line); + sb.append("\n");//$NON-NLS-1$ + } + br.close(); + resultBody = sb.toString(); + + resultHeaders = httpurlc.getHeaderFields(); + + // disconnect explicitly (may not be necessary) + httpurlc.disconnect(); + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -0,0 +1,114 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ws.ui.utils; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.xml.soap.MimeHeader; +import javax.xml.soap.MimeHeaders; + +import org.apache.axis.Message; +import org.apache.axis.MessageContext; +import org.apache.axis.client.Call; +import org.apache.axis.client.Service; +import org.apache.axis.message.SOAPEnvelope; + +/** + * Tester class for JAX-WS services + * @author bfitzpat + * + */ +public class JAXWSTester { + + // the response message to pass back + private String resultBody; + + // the result HTTP headers to pass back + private HashMap<String, String> resultHeaders; + + // utility constant + private static final String EMPTY_STRING = ""; //$NON-NLS-1$ + + /** + * Constructor + */ + public JAXWSTester() { + // empty + } + + /** + * Return the response message + * @return + */ + public String getResultBody() { + return this.resultBody; + } + + /** + * Return a map of HTTP headers from the response + * @return + */ + public Map<String, String> getResultHeaders() { + return this.resultHeaders; + } + + /** + * Invoke the JAX-WS service + * @param endpointurl + * @param actionurl + * @param body + * @throws Exception + */ + public void doTest( String endpointurl, String actionurl, String body ) throws Exception { + /* + * the endpoint & action urls + the soap in are what we + * need to invoke the WS + */ + String endpoint = endpointurl; + String action = actionurl; + String soapIn = body; + + /* Use AXIS to call the WS */ + String document = WSTestUtils.stripNLsFromXML(soapIn); + Service service = new Service(); + Call call= (Call) service.createCall(); + call.setTargetEndpointAddress( new java.net.URL(endpoint) ); + call.setOperationStyle( org.apache.axis.constants.Style.MESSAGE ); + if ( action != null ) { + call.setProperty(Call.SOAPACTION_USE_PROPERTY,Boolean.TRUE); + call.setProperty(Call.SOAPACTION_URI_PROPERTY,action); + } + Message message = new Message(document); + SOAPEnvelope envelope = call.invoke( message ); + + // Get back the response message + this.resultBody = EMPTY_STRING; + if (envelope != null && envelope.getBody() != null) { + this.resultBody = envelope.getBody().toString(); + } + + // Get back the response HTTP headers and pass back as a Map + if (call != null && call.getMessageContext() != null) { + MessageContext mc = call.getMessageContext(); + if (mc.getMessage() != null && mc.getMessage().getMimeHeaders() != null) { + MimeHeaders mh = mc.getMessage().getMimeHeaders(); + Iterator<?> iter = mh.getAllHeaders(); + resultHeaders = new HashMap<String, String>(); + while (iter.hasNext()) { + MimeHeader next = (MimeHeader)iter.next(); + resultHeaders.put(next.getName(), next.getValue()); + } + } + } + } +} \ No newline at end of file Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -10,24 +10,6 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.utils; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.HttpURLConnection; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.net.URL; -import java.net.URLEncoder; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.axis.Message; -import org.apache.axis.client.Call; -import org.apache.axis.client.Service; -import org.apache.axis.message.SOAPEnvelope; - /** * Static utility methods for testing JAX-RS and JAX-WS web services * @author bfitzpat @@ -35,171 +17,6 @@ */ public class WSTestUtils { - private static Map<?, ?> requestHeaders = null; - private static Map<?, ?> resultHeaders = null; - private static String EMPTY_STRING = ""; //$NON-NLS-1$ - - public static Map<?, ?> getResultHeaders() { - return WSTestUtils.resultHeaders; - } - - public static Map<?, ?> getRequestHeaders() { - return WSTestUtils.requestHeaders; - } - - /* - * Start building the web query. Append parameters to URL - */ - private static String buildWebQuery(Map<String, String> parameters) throws Exception { - if (!parameters.isEmpty()) { - StringBuilder sb = new StringBuilder(); - for (Map.Entry<String, String> entry : parameters.entrySet()) { - String key = URLEncoder.encode(entry.getKey(), "UTF-8"); //$NON-NLS-1$ - String value = URLEncoder.encode(entry.getValue(), "UTF-8"); //$NON-NLS-1$ - sb.append(key).append("=").append(value).append("&"); //$NON-NLS-1$ //$NON-NLS-2$ - } - return sb.toString().substring(0, sb.length() - 1); - } - return EMPTY_STRING; - } - - // static simple call, pass in url, parms, and headers - public static String callRestfulWebService(String address, Map<String, String> parameters, Map<String, String> headers) throws Exception { - return callRestfulWebService(address, parameters, headers, "GET", null, null, 0); //$NON-NLS-1$ - } - - // static call - provide url, parms, headers, the method type, and request body - public static String callRestfulWebService(String address, Map<String, String> parameters, Map<String, String> headers, String methodType, String requestBody) throws Exception { - return callRestfulWebService(address, parameters, headers, methodType, requestBody, null, 0); - } - - // static call - provide url, parms, headers, the method type, request body, proxy string, and port # as string - public static String callRestfulWebService(String address, Map<String, String> parameters, Map<String, String> headers, String methodType, String requestBody, String proxy, String port) throws Exception { - return callRestfulWebService(address, parameters, headers, methodType, requestBody, proxy, Integer.parseInt(port)); - } - - // static call - provide url, parms, headers, the method type, request body, proxy string, port # - public static String callRestfulWebService(String address, Map<String, String> parameters, Map<String, String> headers, String methodType, String requestBody, String proxy, int port) throws Exception { - - // handle the proxy - Proxy proxyObject = null; - if (proxy != null && proxy.length() > 0 && port > 0) { - InetSocketAddress proxyAddress = new InetSocketAddress(proxy, port); - proxyObject = new Proxy(Proxy.Type.HTTP, proxyAddress); - } - - // clear the returned results - String response = EMPTY_STRING; - - // get the parms string - String query = buildWebQuery(parameters); - - // build the complete URL - URL url = null; - if (query != null) { - // add the ? if there are parameters - if (!address.endsWith("?") && methodType.equalsIgnoreCase("GET") ) { //$NON-NLS-1$//$NON-NLS-2$ - address = address + "?"; //$NON-NLS-1$ - } - // add parms to the url if we have some - url = new URL(address + query); - } else { - url = new URL(address); - } - - // make connection - HttpURLConnection httpurlc = null; - if (proxyObject == null) { - httpurlc = (HttpURLConnection) url.openConnection(); - } else { - // if have proxy, pass it along - httpurlc = (HttpURLConnection) url.openConnection(proxyObject); - } - - // since we are expecting output back, set to true - httpurlc.setDoOutput(true); - - // not sure what this does - may be used for authentication? - httpurlc.setAllowUserInteraction(false); - - // set whether this is a GET or POST - httpurlc.setRequestMethod(methodType); - - // if we have headers to add - if (headers != null && !headers.isEmpty()) { - Iterator<?> iter = headers.entrySet().iterator(); - while (iter.hasNext()) { - Entry<?, ?> entry = (Entry<?, ?>)iter.next(); - if (entry.getKey() != null && entry.getKey() instanceof String) - httpurlc.addRequestProperty((String) entry.getKey(), (String) entry.getValue()); - } - } - - requestHeaders = httpurlc.getRequestProperties(); - - // CONNECT! - httpurlc.connect(); - - // If we are doing a POST and we have some request body to pass along, do it - if (requestBody != null && ( methodType.equalsIgnoreCase("POST") //$NON-NLS-1$ - || methodType.equalsIgnoreCase("PUT"))) { //$NON-NLS-1$ - requestBody = stripNLsFromXML(requestBody); - OutputStreamWriter out = new OutputStreamWriter(httpurlc.getOutputStream()); - out.write(requestBody); - out.close(); - } - - // retrieve result and put string results into the response - InputStream is = (InputStream) httpurlc.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));//$NON-NLS-1$ - StringBuilder sb = new StringBuilder(); - String line; - while ((line = br.readLine()) != null) { - sb.append(line); - sb.append("\n");//$NON-NLS-1$ - } - br.close(); - response = sb.toString(); - - resultHeaders = httpurlc.getHeaderFields(); - - // disconnect explicitly (may not be necessary) - httpurlc.disconnect(); - - return response; - } - - /* - * Invokes the WS and returns a result - */ - public static String invokeWS( String endpointurl, String actionurl, String body ) throws Exception { - - /* - * the endpoint & action urls + the soap in are what we - * need to invoke the WS - */ - String endpoint = endpointurl; - String action = actionurl; - String soapIn = body; - - /* Use AXIS to call the WS */ - String document = stripNLsFromXML(soapIn); - Service service = new Service(); - Call call= (Call) service.createCall(); - call.setTargetEndpointAddress( new java.net.URL(endpoint) ); - call.setOperationStyle( org.apache.axis.constants.Style.MESSAGE ); - if ( action != null ) { - call.setProperty(Call.SOAPACTION_USE_PROPERTY,Boolean.TRUE); - call.setProperty(Call.SOAPACTION_URI_PROPERTY,action); - } - Message message = new Message(document); - SOAPEnvelope envelope = call.invoke( message ); - System.out.println(envelope.getHeaders().toString()); - - String cleanedUp = stripNLsFromXML(envelope.getBody().toString()); - return cleanedUp; - } - public static String addNLsToXML( String incoming ) { String outgoing = null; if (incoming != null) { Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -446,21 +446,27 @@ * @return */ private String[] parseString(String str_list) { - StringTokenizer tk = new StringTokenizer(str_list, this.mDelimiter); - String[] pieces = new String[tk.countTokens()]; - int index = 0; - while (tk.hasMoreTokens()) - pieces[index++] = tk.nextToken(); - return pieces; + if (str_list != null) { + StringTokenizer tk = new StringTokenizer(str_list, this.mDelimiter); + String[] pieces = new String[tk.countTokens()]; + int index = 0; + while (tk.hasMoreTokens()) + pieces[index++] = tk.nextToken(); + return pieces; + } + return new String[0]; } public static String[] parseString(String str_list, String delimiter) { - StringTokenizer tk = new StringTokenizer(str_list, delimiter); - String[] pieces = new String[tk.countTokens()]; - int index = 0; - while (tk.hasMoreTokens()) - pieces[index++] = tk.nextToken(); - return pieces; + if (str_list != null) { + StringTokenizer tk = new StringTokenizer(str_list, delimiter); + String[] pieces = new String[tk.countTokens()]; + int index = 0; + while (tk.hasMoreTokens()) + pieces[index++] = tk.nextToken(); + return pieces; + } + return new String[0]; } /** Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -18,6 +18,12 @@ import java.util.Map.Entry; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.IJobChangeListener; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; @@ -42,9 +48,17 @@ import org.eclipse.ui.part.ViewPart; import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor; import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore; +import org.jboss.tools.ws.ui.JBossWSUIPlugin; import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; +import org.jboss.tools.ws.ui.utils.JAXRSTester; +import org.jboss.tools.ws.ui.utils.JAXWSTester; import org.jboss.tools.ws.ui.utils.WSTestUtils; +/** + * View for testing web services (JAX-WS & JAX-RS) + * @author bfitzpat + * + */ @SuppressWarnings("restriction") public class JAXRSWSTestView extends ViewPart { @@ -56,6 +70,7 @@ private static final String JAX_WS = "JAX-WS"; //$NON-NLS-1$ private static final String JAX_RS = "JAX-RS"; //$NON-NLS-1$ private static final String EMPTY_STRING = ""; //$NON-NLS-1$ + private static final String RESULT_HEADER_DELIMITER = "%";//$NON-NLS-1$ /** * The ID of the view as specified by the extension. @@ -84,7 +99,7 @@ private DelimitedStringList parmsList; private Button openTCPIPMonitorButton; private Button addTCPIPMonitorButton; - + /** * The constructor. */ @@ -99,17 +114,17 @@ Composite innerComposite = new Composite (parent, SWT.NONE); innerComposite.setLayout(new FillLayout()); - + SashForm sashForm = new SashForm(innerComposite, SWT.BORDER); sashForm.setOrientation(SWT.HORIZONTAL); - - Composite topHalf = new Composite (sashForm, SWT.NONE); + + Composite topHalf = new Composite (sashForm, SWT.NONE); topHalf.setLayout(new GridLayout(2, false)); - + Label typeLabel = new Label(topHalf, SWT.NONE); typeLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Web_Service_Type_Label); typeLabel.setLayoutData(new GridData()); - + wsTypeCombo = new Combo(topHalf, SWT.DROP_DOWN | SWT.READ_ONLY); wsTypeCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); wsTypeCombo.add(JAX_WS); @@ -124,11 +139,11 @@ setControlsForSelectedURL(); } }); - + Label methodLabel = new Label(topHalf, SWT.NONE); methodLabel.setText(JBossWSUIMessages.JAXRSWSTestView_HTTP_Method_Label); methodLabel.setLayoutData(new GridData()); - + methodCombo = new Combo(topHalf, SWT.DROP_DOWN | SWT.READ_ONLY); methodCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); methodCombo.add(GET); @@ -144,11 +159,11 @@ setControlsForMethodType(methodCombo.getText()); } }); - + Label urlLabel = new Label(topHalf, SWT.NONE); urlLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Service_URL_Label); urlLabel.setLayoutData(new GridData()); - + urlCombo = new Combo(topHalf, SWT.BORDER | SWT.DROP_DOWN); urlCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); urlCombo.addSelectionListener(new SelectionListener() { @@ -166,15 +181,15 @@ public void keyReleased(KeyEvent e) { setControlsForSelectedURL(); if (e.keyCode == SWT.CR) { - handleTest(); + handleTest(wsTypeCombo.getText()); } } }); - + Label actionLabel = new Label(topHalf, SWT.NONE); actionLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Action_URL_Label); actionLabel.setLayoutData(new GridData()); - + actionText = new Text(topHalf, SWT.BORDER); actionText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); @@ -191,18 +206,18 @@ GridData parmsListGD = new GridData(SWT.FILL, SWT.FILL, true, true); parmsListGD.horizontalSpan = 2; parmsList.setLayoutData(parmsListGD); - + headerTab = new TabItem(tabGroup, SWT.NONE, 2); bodyText = new Text(tabGroup, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL); GridData btGridData = new GridData(SWT.FILL, SWT.FILL, true, true); bodyText.setLayoutData(btGridData); bodyTab.setControl(bodyText); - + headerTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Header_Label); GridData hgGridData = new GridData(SWT.FILL, SWT.FILL, true, true); hgGridData.horizontalSpan = 2; tabGroup.setLayoutData(hgGridData); - + dlsList = new DelimitedStringList(tabGroup, SWT.None); headerTab.setControl(dlsList); GridData dlsListGD = new GridData(SWT.FILL, SWT.FILL, true, true); @@ -214,22 +229,22 @@ buttonBarGD.horizontalSpan = 2; buttonBar.setLayoutData(buttonBarGD); buttonBar.setLayout(new RowLayout()); - + testButton = new Button (buttonBar, SWT.PUSH); testButton.setText(JBossWSUIMessages.JAXRSWSTestView_Invoke_Label); - + testButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { - handleTest(); + handleTest(wsTypeCombo.getText()); } public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } }); - + addTCPIPMonitorButton = new Button(buttonBar, SWT.PUSH); addTCPIPMonitorButton.setText(JBossWSUIMessages.JAXRSWSTestView_Configure_Monitor_Button); - + addTCPIPMonitorButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { configureMonitor(); @@ -241,7 +256,7 @@ openTCPIPMonitorButton = new Button(buttonBar, SWT.PUSH); openTCPIPMonitorButton.setText(JBossWSUIMessages.JAXRSWSTestView_Open_Monitor_Button); - + openTCPIPMonitorButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { openMonitor(); @@ -253,8 +268,8 @@ Button sampleButton = new Button(buttonBar, SWT.PUSH); sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_Label); - sampleButton.setVisible(false); - + sampleButton.setVisible(true); + sampleButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { setupSample(); @@ -277,7 +292,7 @@ resultsText = new Text(resultTabGroup, SWT.BORDER | SWT.V_SCROLL | SWT.WRAP | SWT.READ_ONLY ); resultsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); resultTab.setControl(resultsText); - + resultHeadersTab = new TabItem(resultTabGroup, SWT.NONE, 1); resultHeadersTab.setText(JBossWSUIMessages.JAXRSWSTestView_Results_Header_Label); resultHeadersList = new List(resultTabGroup, SWT.V_SCROLL); @@ -291,7 +306,7 @@ setControlsForMethodType(methodCombo.getText()); setControlsForSelectedURL(); } - + private void setControlsForSelectedURL() { if (urlCombo.getText().trim().length() > 0) { testButton.setEnabled(true); @@ -301,19 +316,19 @@ addTCPIPMonitorButton.setEnabled(false); } } - + /* * Open the TCP/IP Monitor View */ private void openMonitor() { try { PlatformUI.getWorkbench().getActiveWorkbenchWindow(). - getActivePage().showView(TCPIP_VIEW_ID); + getActivePage().showView(TCPIP_VIEW_ID); } catch (PartInitException e) { e.printStackTrace(); } } - + private IMonitor findMonitor(String urlToCheck) { IMonitor monitor = null; @@ -328,7 +343,7 @@ } return monitor; } - + /* * Configure a TCP/IP Monitor entry so we can monitor it */ @@ -337,7 +352,7 @@ String oldUrl = urlCombo.getText(); IMonitor monitor = findMonitor(oldUrl); if (monitor == null) { - + URL tempURL = null; try { tempURL = new URL(oldUrl); @@ -354,7 +369,7 @@ return; monitor = dialog.getMonitor(); } - + if (monitor != null) { monitor = findMonitor(oldUrl); if (monitor != null) { @@ -367,7 +382,7 @@ e.printStackTrace(); } } - + int port = monitor.getLocalPort(); int remotePort = monitor.getRemotePort(); String host = monitor.getRemoteHost(); @@ -397,7 +412,7 @@ bodyText.setEnabled(true); } } - + /* * Enable/disable controls based on the WS technology type * @param wsType @@ -414,13 +429,13 @@ methodCombo.setText(POST); String emptySOAP = "<?xml version=\"1.0\" standalone=\"yes\" ?>" + //$NON-NLS-1$ - "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " + //$NON-NLS-1$ - "xmlns:ns=\"INSERT_URL_HERE\">" + //$NON-NLS-1$ - "<soap:Body>" + //$NON-NLS-1$ - "</soap:Body>" + //$NON-NLS-1$ - "</soap:Envelope>"; //$NON-NLS-1$ + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " + //$NON-NLS-1$ + "xmlns:ns=\"INSERT_URL_HERE\">" + //$NON-NLS-1$ + "<soap:Body>" + //$NON-NLS-1$ + "</soap:Body>" + //$NON-NLS-1$ + "</soap:Envelope>"; //$NON-NLS-1$ emptySOAP = WSTestUtils.addNLsToXML(emptySOAP); - + if (bodyText.getText().trim().length() == 0) { bodyText.setText(emptySOAP); } @@ -436,7 +451,7 @@ methodCombo.setText(GET); } } - + /* * Sets up the controls to call a public sample RESTful WS that does * a postal code lookup or a JAX-WS service that does a @@ -455,16 +470,16 @@ } else if (wsTypeCombo.getText().equalsIgnoreCase(JAX_WS)) { String soapIn = "<?xml version=\"1.0\" standalone=\"yes\" ?>" + //$NON-NLS-1$ - "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " + //$NON-NLS-1$ - "xmlns:ns=\"http://xmlme.com/WebServices\">" + //$NON-NLS-1$ - "<soap:Body>" + //$NON-NLS-1$ - "<ns:GetSpeech>" + //$NON-NLS-1$ - "<ns:Request>slings and arrows</ns:Request>"+ //$NON-NLS-1$ - "</ns:GetSpeech>"+ //$NON-NLS-1$ - "</soap:Body>" + //$NON-NLS-1$ - "</soap:Envelope>"; //$NON-NLS-1$ + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " + //$NON-NLS-1$ + "xmlns:ns=\"http://xmlme.com/WebServices\">" + //$NON-NLS-1$ + "<soap:Body>" + //$NON-NLS-1$ + "<ns:GetSpeech>" + //$NON-NLS-1$ + "<ns:Request>slings and arrows</ns:Request>"+ //$NON-NLS-1$ + "</ns:GetSpeech>"+ //$NON-NLS-1$ + "</soap:Body>" + //$NON-NLS-1$ + "</soap:Envelope>"; //$NON-NLS-1$ soapIn = WSTestUtils.addNLsToXML(soapIn); - + urlCombo.setText("http://www.xmlme.com/WSShakespeare.asmx"); //$NON-NLS-1$ actionText.setText("http://xmlme.com/WebServices/GetSpeech"); //$NON-NLS-1$ bodyText.setText(soapIn); @@ -480,7 +495,8 @@ /* * Actually perform the test based on which type of activity it is */ - private void handleTest() { + private void handleTest(final String wsTech) { + if (urlCombo.getItemCount() > 0) { java.util.List<String> aList = Arrays.asList(urlCombo.getItems()); if (!aList.contains(urlCombo.getText())) { @@ -490,26 +506,82 @@ urlCombo.add(urlCombo.getText()); } - if (wsTypeCombo.getText().equalsIgnoreCase(JAX_RS)) { - handleRSTest(); - } - else if (wsTypeCombo.getText().equalsIgnoreCase(JAX_WS)) { - handleWSTest(); - } + final String url = urlCombo.getText(); + final String action = actionText.getText(); + final String body = bodyText.getText(); + final String method = methodCombo.getText(); + final String headers = dlsList.getSelection(); + final String parms = parmsList.getSelection(); + + Job aJob = new Job(JBossWSUIMessages.JAXRSWSTestView_Invoking_WS_Status) { + protected IStatus run(IProgressMonitor monitor) { + IStatus status = Status.OK_STATUS; + // execute the task ... + if (wsTech.equalsIgnoreCase(JAX_RS)) { + status = handleRSTest(monitor, url, method, body, parms, headers); + } + else if (wsTech.equalsIgnoreCase(JAX_WS)) { + status = handleWSTest(monitor, url, action, body); + } + monitor.done(); + return status; + } + }; + // true to indicate that this job was initiated by a UI end user + aJob.setUser(true); + aJob.schedule(); + aJob.addJobChangeListener(new IJobChangeListener() { + + public void sleeping(IJobChangeEvent event) {}; + public void scheduled(IJobChangeEvent event) {}; + public void running(IJobChangeEvent event) {}; + public void done(IJobChangeEvent event) { + if (event.getResult() instanceof WSTestStatus) { + final WSTestStatus status = (WSTestStatus) event.getResult(); + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + public void run() { + resultsText.setText(status.getResultsText()); + resultHeadersList.removeAll(); + String[] headers = + DelimitedStringList.parseString(status.getHeadersList(), RESULT_HEADER_DELIMITER); + if (headers != null && headers.length > 0) { + for (int i = 0; i < headers.length; i++) { + resultHeadersList.add(headers[i]); + } + } + } + }); + } + } + + public void awake(IJobChangeEvent event) {}; + public void aboutToRun(IJobChangeEvent event) {}; + }); + } - + /* * Actually call the WS and displays the result */ - private void handleWSTest() { + private IStatus handleWSTest(final IProgressMonitor monitor, String url, String action, String body) { try { - String result = WSTestUtils.invokeWS(urlCombo.getText(), actionText.getText(), bodyText.getText()); + + monitor.worked(10); + JAXWSTester tester = new JAXWSTester(); + tester.doTest(url, action, body); + monitor.worked(70); + String result = tester.getResultBody(); String cleanedUp = WSTestUtils.addNLsToXML(result); - resultsText.setText(cleanedUp); + + WSTestStatus status = new WSTestStatus(IStatus.OK, + JBossWSUIPlugin.PLUGIN_ID, + JBossWSUIMessages.JAXRSWSTestView_JAXWS_Success_Status); + status.setResultsText(cleanedUp); + monitor.worked(10); - resultHeadersList.removeAll(); - if (WSTestUtils.getResultHeaders() != null) { - Iterator<?> iter = WSTestUtils.getResultHeaders().entrySet().iterator(); + String listText = EMPTY_STRING; + if (tester.getResultHeaders() != null) { + Iterator<?> iter = tester.getResultHeaders().entrySet().iterator(); while (iter.hasNext()) { String text = EMPTY_STRING; Entry<?, ?> entry = (Entry<?, ?>) iter.next(); @@ -517,38 +589,42 @@ text = entry.getValue().toString(); else text = text + entry.toString(); - resultHeadersList.add(text); + listText = listText + text; + if (iter.hasNext()) { + listText = listText + RESULT_HEADER_DELIMITER; + } } } + status.setHeadersList(listText); + monitor.worked(10); + return status; } catch (Exception e) { - resultsText.setText(e.toString()); + WSTestStatus status = new WSTestStatus(IStatus.ERROR, + JBossWSUIPlugin.PLUGIN_ID, + JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage()); + status.setResultsText(e.toString()); e.printStackTrace(); + return status; } } /* * Actually call the RESTful WS to test it */ - private void handleRSTest() { - - // Get the service URL - String address = urlCombo.getText(); - - // Is this a GET or POST activity? - String method = methodCombo.getText(); - - // If it's a GET, what's the Request body text? - String body = EMPTY_STRING; - if (method.equalsIgnoreCase(GET)) - body = bodyText.getText(); - + private IStatus handleRSTest(final IProgressMonitor monitor, String address, String method, String body, String parms, String headersStr) { + + if (!method.equalsIgnoreCase(GET)) + body = EMPTY_STRING; + // if no actual text in the request body, set to null if (body.trim().length() == 0) body = null; - + + monitor.worked(10); + // Process parameters for web service call HashMap<String, String> parameters = new HashMap<String, String>(); - if (!parmsList.isDisposed() && parmsList.getSelection() != null && parmsList.getSelection().length() > 0) { - String[] parsedList = DelimitedStringList.parseString(parmsList.getSelection() , ","); //$NON-NLS-1$ + if (parms != null && parms.length() > 0) { + String[] parsedList = DelimitedStringList.parseString(parms , ","); //$NON-NLS-1$ if (parsedList != null && parsedList.length > 0) { for (int i = 0; i < parsedList.length; i++) { String nameValuePair = parsedList[i]; @@ -559,11 +635,12 @@ } } } - + + monitor.worked(10); // Process headers for web service call HashMap<String, String> headers = new HashMap<String, String>(); - if (!dlsList.isDisposed() && dlsList.getSelection() != null && dlsList.getSelection().length() > 0) { - String[] parsedList = DelimitedStringList.parseString(dlsList.getSelection() , ","); //$NON-NLS-1$ + if (headersStr != null && headersStr.length() > 0) { + String[] parsedList = DelimitedStringList.parseString(headersStr , ","); //$NON-NLS-1$ if (parsedList != null && parsedList.length > 0) { for (int i = 0; i < parsedList.length; i++) { String nameValuePair = parsedList[i]; @@ -574,40 +651,57 @@ } } } - + // now actually call it try { - // clear the results text - resultsText.setText(EMPTY_STRING); + JAXRSTester tester = new JAXRSTester(); + // call the service - String result = - WSTestUtils.callRestfulWebService(address, parameters, headers, method, body); + tester.doTest(address, parameters, headers, method, body); + String result = tester.getResultBody(); + // put the results in the result text field String cleanedUp = WSTestUtils.addNLsToXML(result); - resultsText.setText(cleanedUp); - resultHeadersList.removeAll(); - Iterator<?> iter = WSTestUtils.getResultHeaders().entrySet().iterator(); - while (iter.hasNext()) { - String text = EMPTY_STRING; - Entry<?, ?> entry = (Entry<?, ?>) iter.next(); - if (entry.getKey() == null) - text = entry.getValue().toString(); - else - text = text + entry.toString(); - resultHeadersList.add(text); + WSTestStatus status = new WSTestStatus(IStatus.OK, + JBossWSUIPlugin.PLUGIN_ID, + JBossWSUIMessages.JAXRSWSTestView_JAXRS_Success_Status); + status.setResultsText(cleanedUp); + + String listText = EMPTY_STRING; + if (tester.getResultHeaders() != null) { + Iterator<?> iter = tester.getResultHeaders().entrySet().iterator(); + while (iter.hasNext()) { + String text = EMPTY_STRING; + Entry<?, ?> entry = (Entry<?, ?>) iter.next(); + if (entry.getKey() == null) + text = entry.getValue().toString(); + else + text = text + entry.toString(); + listText = listText + text; + if (iter.hasNext()) { + listText = listText + RESULT_HEADER_DELIMITER; + } + } } + System.out.println(listText); + status.setHeadersList(listText); + monitor.worked(10); + return status; + } catch (Exception e) { - - // if we hit an error, put it in the results text - resultsText.setText(e.toString()); + WSTestStatus status = new WSTestStatus(IStatus.ERROR, + JBossWSUIPlugin.PLUGIN_ID, + JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage()); + status.setResultsText(e.toString()); e.printStackTrace(); + return status; } } - + /** * Passing the focus request to the control. */ @@ -615,4 +709,5 @@ // set initial focus to the URL text combo urlCombo.setFocus(); } + } \ No newline at end of file Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSTestStatus.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSTestStatus.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSTestStatus.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -0,0 +1,29 @@ +package org.jboss.tools.ws.ui.views; + +import org.eclipse.core.runtime.Status; + +public class WSTestStatus extends Status { + + private String resultsText; + private String headersList; + + public WSTestStatus(int severity, String pluginId, String message) { + super(severity, pluginId, message); + } + + public String getResultsText() { + return resultsText; + } + + public void setResultsText(String resultsText) { + this.resultsText = resultsText; + } + + public String getHeadersList() { + return headersList; + } + + public void setHeadersList(String headersList) { + this.headersList = headersList; + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSTestStatus.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22001 - trunk/vpe/plugins/org.jboss.tools.vpe/ve.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-05-10 18:05:03 -0400 (Mon, 10 May 2010) New Revision: 22001 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html Log: https://jira.jboss.org/jira/browse/JBIDE-5101 Resizer isn't shown correctly for buttons, imput fields. controls adjusted padding for body updated in VE host pageto have space for resizer elements Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2010-05-10 21:53:42 UTC (rev 22000) +++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2010-05-10 22:05:03 UTC (rev 22001) @@ -42,7 +42,7 @@ height:100%; min-height:50px; margin:0px; - padding:0px; + padding: 7px; /* resizer max(width,height)+2 */ -moz-user-modify: read-write; -moz-user-input: enabled; -moz-user-select: normal;

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r22000 - branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2010-05-10 17:53:42 -0400 (Mon, 10 May 2010) New Revision: 22000 Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java Log: https://jira.jboss.org/jira/browse/JBIDE-6272 Portletbridge 2.0.0.FINAL doesn't recognize the javax.faces.LIFECYCLE_ID parameter Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java =================================================================== --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java 2010-05-10 21:47:58 UTC (rev 21999) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java 2010-05-10 21:53:42 UTC (rev 22000) @@ -10,43 +10,21 @@ ************************************************************************************/ package org.jboss.tools.portlet.core.internal.project.facet; -import java.io.File; -import java.net.URL; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.emf.common.util.EList; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jst.j2ee.model.IModelProvider; import org.eclipse.jst.javaee.web.WebApp; import org.eclipse.jst.javaee.web.WebAppVersionType; -import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType; -import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; -import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; -import org.eclipse.jst.jsf.facesconfig.emf.StateManagerType; -import org.eclipse.jst.jsf.facesconfig.emf.ViewHandlerType; -import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit; -import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; -import org.eclipse.ui.wizards.datatransfer.ImportOperation; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.portlet.core.IJBossWebUtil; -import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.JBossWebUtil; import org.jboss.tools.portlet.core.JBossWebUtil25; import org.jboss.tools.portlet.core.Messages; @@ -137,11 +115,20 @@ util.configureContextParam(project, monitor, name, value, description); - // FIXME optional for Seam portlets version 2.1.x and up - name = "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ - value = "SEAM_PORTLET"; //$NON-NLS-1$ - util.configureContextParam(project, monitor, name, value, - description); + // optional for Seam portlets version 2.1.x and up + try { + IProjectFacet seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam"); //$NON-NLS-1$ + final IFacetedProject fproj = ProjectFacetsManager.create(project); + IProjectFacetVersion sfVersion = fproj.getProjectFacetVersion(seamFacet); + if (sfVersion.getVersionString().startsWith("1") || sfVersion.getVersionString().startsWith("2.0")) { //$NON-NLS-1$//$NON-NLS-2$ + name = "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ + value = "SEAM_PORTLET"; //$NON-NLS-1$ + util.configureContextParam(project, monitor, name, value, + description); + } + } catch (CoreException e) { + PortletCoreActivator.log(e); + } } }, modelPath); }

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21999 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2010-05-10 17:47:58 -0400 (Mon, 10 May 2010) New Revision: 21999 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java Log: https://jira.jboss.org/jira/browse/JBIDE-6272 Portletbridge 2.0.0.FINAL doesn't recognize the javax.faces.LIFECYCLE_ID parameter Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java 2010-05-10 21:16:22 UTC (rev 21998) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java 2010-05-10 21:47:58 UTC (rev 21999) @@ -10,43 +10,21 @@ ************************************************************************************/ package org.jboss.tools.portlet.core.internal.project.facet; -import java.io.File; -import java.net.URL; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.emf.common.util.EList; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jst.j2ee.model.IModelProvider; import org.eclipse.jst.javaee.web.WebApp; import org.eclipse.jst.javaee.web.WebAppVersionType; -import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType; -import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; -import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; -import org.eclipse.jst.jsf.facesconfig.emf.StateManagerType; -import org.eclipse.jst.jsf.facesconfig.emf.ViewHandlerType; -import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit; -import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; -import org.eclipse.ui.wizards.datatransfer.ImportOperation; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.portlet.core.IJBossWebUtil; -import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.JBossWebUtil; import org.jboss.tools.portlet.core.JBossWebUtil25; import org.jboss.tools.portlet.core.Messages; @@ -137,11 +115,20 @@ util.configureContextParam(project, monitor, name, value, description); - // FIXME optional for Seam portlets version 2.1.x and up - name = "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ - value = "SEAM_PORTLET"; //$NON-NLS-1$ - util.configureContextParam(project, monitor, name, value, - description); + // optional for Seam portlets version 2.1.x and up + try { + IProjectFacet seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam"); //$NON-NLS-1$ + final IFacetedProject fproj = ProjectFacetsManager.create(project); + IProjectFacetVersion sfVersion = fproj.getProjectFacetVersion(seamFacet); + if (sfVersion.getVersionString().startsWith("1") || sfVersion.getVersionString().startsWith("2.0")) { //$NON-NLS-1$//$NON-NLS-2$ + name = "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ + value = "SEAM_PORTLET"; //$NON-NLS-1$ + util.configureContextParam(project, monitor, name, value, + description); + } + } catch (CoreException e) { + PortletCoreActivator.log(e); + } } }, modelPath); }

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21998 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-10 17:16:22 -0400 (Mon, 10 May 2010) New Revision: 21998 Modified: branches/modular_build/build/build.xml Log: clean out old site/ folder and do a svn revert before update Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-10 20:55:51 UTC (rev 21997) +++ branches/modular_build/build/build.xml 2010-05-10 21:16:22 UTC (rev 21998) @@ -321,7 +321,12 @@ <if> <istrue value="${svnant.enabled}" /> <then> +  + <delete dir="${WORKINGDIR}/@{component}/site" includeemptydirs="true" quiet="true"/> <svn javahl="false" svnkit="true" failonerror="false"> + <revert recurse="${svn.recurse}" dir="@{component}" /> + </svn> + <svn javahl="false" svnkit="true" failonerror="false"> <update recurse="${svn.recurse}" dir="@{component}" /> </svn> </then>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21997 - branches/modular_build/build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-10 16:55:51 -0400 (Mon, 10 May 2010) New Revision: 21997 Modified: branches/modular_build/build/build.xml Log: add -Dhudson.managed.sources=true option (for running on Windows slave) Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-10 20:43:17 UTC (rev 21996) +++ branches/modular_build/build/build.xml 2010-05-10 20:55:51 UTC (rev 21997) @@ -127,7 +127,7 @@ <target name="test" description="run tests w/o first getting sources + list of components to build; assumes an upstream build job was already run" - depends="init, get.bootstrap.scripts, get.components.to.test, run.build, collect.all.test.results" + depends="init, get.bootstrap.scripts, get.all.components, run.build, collect.all.test.results" />  @@ -380,7 +380,7 @@ </echo> </then> </if> - <echo file="build.cfg" message="@{component}," append="true" /> + <echo file="${WORKINGDIR}/build.cfg" message="@{component}," append="true" /> </sequential> </macrodef> @@ -390,7 +390,7 @@ <isset property="COMPONENTS.to.build" /> </not> <then> - <echo file="build.cfg" message="COMPONENTS.to.build = " /> + <echo file="${WORKINGDIR}/build.cfg" message="COMPONENTS.to.build = " /> </then> </if>  @@ -486,7 +486,7 @@ <get src="${svn.root}/genpom.xml" dest="${WORKINGDIR}/genpom.xml" usetimestamp="true" /> </target> - <target name="get.components.to.test"> + <target name="get.all.components"> <var name="COMPONENTS.to.build" unset="true" /> <var name="COMPONENTS.to.build" value="" /> <for param="COMPONENT" list="${COMPONENTS}" delimiter="; "> @@ -497,28 +497,36 @@ </target> <target name="get.components.to.build"> - <property file="build.cfg" /> <if> - <equals arg1="${COMPONENTS.to.build}" arg2="" /> + <available file="${WORKINGDIR}/build.cfg" type="file" /> <then> - <echo level="warning">All components up to date: nothing to do! + <property file="${WORKINGDIR}/build.cfg" /> + <if> + <equals arg1="${COMPONENTS.to.build}" arg2="" /> + <then> + <echo level="warning">All components up to date: nothing to do! To force a build of unchanged components, use -Dbuild.if.sources.unchanged=true</echo> -  - <delete dir="${basedir}/surefire-reports/NoTestsRun" includeemptydirs="true" /> - <mkdir dir="${basedir}/surefire-reports/NoTestsRun" /> - <echo file="${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml"><?xml version="1.0" encoding="UTF-8" ?> +  + <delete dir="${basedir}/surefire-reports/NoTestsRun" includeemptydirs="true" /> + <mkdir dir="${basedir}/surefire-reports/NoTestsRun" /> + <echo file="${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml"><?xml version="1.0" encoding="UTF-8" ?> <testsuite failures="0" time="0.001" errors="0" skipped="0" tests="1" name="org.jboss.tools.NoTestsRun"> <testcase time="0.001" classname="org.jboss.tools.NoTestsRun" name="NoTestsRun"/> </testsuite> </echo> - <property name="no.tests.run" value="true" /> - <property name="no.overall" value="true" /> + <property name="no.tests.run" value="true" /> + <property name="no.overall" value="true" /> + </then> + <else> + <echo level="warning">The following components' sources have changed and will be built: + COMPONENTS.to.build = ${COMPONENTS.to.build} +</echo> + </else> + </if> </then> <else> - <echo level="warning">The following components' sources have changed and will be built: - COMPONENTS.to.build = ${COMPONENTS.to.build} -</echo> + <antcallback target="get.all.components" return="COMPONENTS.to.build"/> </else> </if> </target> @@ -1229,7 +1237,7 @@ <available file="/usr/bin/rsync" type="file" /> <then> <var name="deployCmd" - value="/usr/bin/rsync -arz --delete --include=*/*/*/target/ --include=*.xml --include=svn.info*.txt --include=build.cfg --exclude=eclipse/ ${sourceDir} ${deployDir}/" + value="/usr/bin/rsync -arz --delete --include=*/*/*/target/ --include=*.xml --include=svn.info*.txt --include=${WORKINGDIR}/build.cfg --exclude=eclipse/ ${sourceDir} ${deployDir}/" /> </then> <elseif> @@ -1269,7 +1277,7 @@  <property name="get.sources.expected.dirs" value="tests,common,xulrunner," /> - <property name="get.sources.expected.files" value="build.cfg" /> + <property name="get.sources.expected.files" value="${WORKINGDIR}/build.cfg" />  <property name="get.components.to.build.expected.2" value="tests,common,xulrunner," /> @@ -1281,8 +1289,8 @@ <property name="get.components.to.build.expected.4.all" value="tests,common,xulrunner," /> <property name="get.components.to.build.expected.6.all" value="tests,common,xulrunner," /> -  - <property name="get.components.to.test.expected" +  + <property name="get.all.components.expected" value="tests,common,flow,jbpm,jmx,archives,as,drools,bpel,smooks,freemarker,profiler,portlet,xulrunner,jst,vpe,jsf,esb,tptp,ws,cdi,struts,hibernatetools,seam,examples,birt,maven," /> @@ -1768,7 +1776,7 @@ <now level="info">info!</now> </target> - <target name="test.get.components.to.test" depends="init, test.expected.values"> + <target name="test.get.all.components" depends="init, test.expected.values"> <var name="COMPONENTS" unset="true" /> <var name="COMPONENTS" value="tests,common; @@ -1781,12 +1789,12 @@ examples,birt; maven" /> - <antcallback target="get.components.to.test" return="COMPONENTS.to.build" /> + <antcallback target="get.all.components" return="COMPONENTS.to.build" /> <assert failonerror="true" - message="expected: [${get.components.to.test.expected}] but got: [${COMPONENTS.to.build}]" + message="expected: [${get.all.components.expected}] but got: [${COMPONENTS.to.build}]" > <bool> - <equals arg1="${get.components.to.test.expected}" arg2="${COMPONENTS.to.build}" /> + <equals arg1="${get.all.components.expected}" arg2="${COMPONENTS.to.build}" /> </bool> </assert> </target>

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21996 - branches/modular_build.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-05-10 16:43:17 -0400 (Mon, 10 May 2010) New Revision: 21996 Modified: branches/modular_build/parent-pom.xml Log: add apache snapshots repo to resolve 2.3.1-SNAPSHOT version of maven-install-plugin Modified: branches/modular_build/parent-pom.xml =================================================================== --- branches/modular_build/parent-pom.xml 2010-05-10 18:52:15 UTC (rev 21995) +++ branches/modular_build/parent-pom.xml 2010-05-10 20:43:17 UTC (rev 21996) @@ -398,6 +398,16 @@ <enabled>true</enabled> </releases> </pluginRepository> + <pluginRepository> + <id>apache-snapshots</id> + <url>http://repository.apache.org/snapshots/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> </pluginRepositories> <!-- https://issues.sonatype.org/browse/TYCHO-413: does not work - doesn't

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21995 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-05-10 14:52:15 -0400 (Mon, 10 May 2010) New Revision: 21995 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeUtils.java Log: https://jira.jboss.org/jira/browse/JBIDE-5101 Resizer isn't shown correctly for buttons, imput fields. controls fixed by applying path from Volha Chukhutsina Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeUtils.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeUtils.java 2010-05-10 15:59:56 UTC (rev 21994) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerVpeUtils.java 2010-05-10 18:52:15 UTC (rev 21995) @@ -14,7 +14,6 @@ import org.eclipse.swt.graphics.Rectangle; import org.jboss.tools.vpe.xulrunner.BrowserPlugin; import org.mozilla.interfaces.nsIBoxObject; -import org.mozilla.interfaces.nsIDOMClientRect; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNSDocument; @@ -28,45 +27,85 @@ */ public class XulRunnerVpeUtils { - /** - * @param domElement - * @return Rectangle - */ - static public Rectangle getElementBounds(nsIDOMNode domNode) { - try { - nsIDOMElement domElement = (nsIDOMElement) domNode - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - nsIDOMNSElement htmlElement = (nsIDOMNSElement)domNode.queryInterface(nsIDOMNSElement.NS_IDOMNSELEMENT_IID); - nsIDOMNSHTMLElement domElement1 = (nsIDOMNSHTMLElement)domNode.queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID); - nsIDOMDocument document = domElement.getOwnerDocument(); - nsIDOMNSDocument nsDocument = (nsIDOMNSDocument) document - .queryInterface(nsIDOMNSDocument.NS_IDOMNSDOCUMENT_IID); - nsIBoxObject boxObject = nsDocument.getBoxObjectFor(domElement); - Rectangle rectangle = new Rectangle(boxObject.getX(), boxObject.getY(), boxObject.getWidth()-htmlElement.getClientLeft(), boxObject.getHeight()-htmlElement.getClientTop()); - if(BrowserPlugin.PRINT_ELEMENT_BOUNDS) { - System.out.println("getElementBounds(IDOMNode) returns " + rectangle); - System.out.println("nsIDOMNSHTMLElement getOffsetLeft,getOffsetTop,getOffsetWidth,getOffsetHeight" + new Rectangle( - domElement1.getOffsetLeft(), - domElement1.getOffsetTop(), - domElement1.getOffsetWidth(), - domElement1.getOffsetHeight())); - System.out.println("nsIDOMNSElement getClientLeft,getClientTop,getClientWidth,getClientHeight" + new Rectangle( - htmlElement.getClientLeft(), - htmlElement.getClientTop(), - htmlElement.getClientWidth(), - htmlElement.getClientHeight())); - System.out.println("nsIBoxObject getX,getY,getWidth,getHeight" + new Rectangle( - boxObject.getX(), - boxObject.getY(), - boxObject.getWidth(), - boxObject.getHeight())); - } - return rectangle; - - + private static int findPosX(nsIDOMNSHTMLElement boxObject) { + int curleft = 0; + + if (boxObject.getOffsetParent() != null) { + while (true) { + curleft += boxObject.getOffsetLeft(); + if ( boxObject.getOffsetParent() == null) + return curleft; + boxObject = (nsIDOMNSHTMLElement) boxObject.getOffsetParent().queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID); + } + } else { + curleft += boxObject.getOffsetLeft(); + } + return curleft; + } - } catch (XPCOMException xpcomException) { - return new Rectangle(0, 0, 0, 0); + private static int findPosY(nsIDOMNSHTMLElement boxObject) { + int curleft = 0; + + if (boxObject.getOffsetParent() != null) { + while (true) { + curleft += boxObject.getOffsetTop(); + if ( boxObject.getOffsetParent() == null) + return curleft; + boxObject = (nsIDOMNSHTMLElement) boxObject.getOffsetParent().queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID); + } + } else { + curleft += boxObject.getOffsetTop(); + } + return curleft; } - } + + /** + * @param domElement + * @return Rectangle + */ + static public Rectangle getElementBounds(nsIDOMNode domNode) { + try { + nsIDOMElement domElement = (nsIDOMElement) domNode + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + + nsIDOMNSElement htmlElement = (nsIDOMNSElement) domNode + .queryInterface(nsIDOMNSElement.NS_IDOMNSELEMENT_IID); + nsIDOMNSHTMLElement domNSHTMLElement = (nsIDOMNSHTMLElement) domNode + .queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID); + nsIDOMDocument document = domElement.getOwnerDocument(); + + nsIDOMNSDocument nsDocument = (nsIDOMNSDocument) document + .queryInterface(nsIDOMNSDocument.NS_IDOMNSDOCUMENT_IID); + nsIBoxObject boxObject = nsDocument.getBoxObjectFor(domElement); + Rectangle rectangle = new Rectangle(findPosX(domNSHTMLElement), + findPosY(domNSHTMLElement), + boxObject.getWidth(), + boxObject.getHeight()); + + if (BrowserPlugin.PRINT_ELEMENT_BOUNDS) { + System.out.println("getElementBounds(IDOMNode) returns " + + rectangle); + System.out + .println("nsIDOMNSHTMLElement getOffsetLeft,getOffsetTop,getOffsetWidth,getOffsetHeight" + + new Rectangle(domNSHTMLElement.getOffsetLeft(), + domNSHTMLElement.getOffsetTop(), domNSHTMLElement + .getOffsetWidth(), domNSHTMLElement + .getOffsetHeight())); + System.out + .println("nsIDOMNSElement getClientLeft,getClientTop,getClientWidth,getClientHeight" + + new Rectangle(htmlElement.getClientLeft(), + htmlElement.getClientTop(), htmlElement + .getClientWidth(), htmlElement + .getClientHeight())); + System.out.println("nsIBoxObject getX,getY,getWidth,getHeight" + + new Rectangle(boxObject.getX(), boxObject.getY(), + boxObject.getWidth(), boxObject.getHeight())); + + } + return rectangle; + + } catch (XPCOMException xpcomException) { + return new Rectangle(0, 0, 0, 0); + } + } }

15 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2010