July 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r23763 - trunk/hibernatetools/docs/task-reference/en-US.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-07-28 04:07:21 -0400 (Wed, 28 Jul 2010) New Revision: 23763 Added: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml.bak Removed: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml Log: https://jira.jboss.org/browse/JBIDE-6720 - the file sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml is renamed to sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml.bak to avoid name duplicating. Deleted: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml 2010-07-28 07:39:16 UTC (rev 23762) +++ trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml 2010-07-28 08:07:21 UTC (rev 23763) @@ -1,12 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -<!ENTITY % BOOK_ENTITIES SYSTEM "Hibernate_Tools_Reference_Guide.ent"> -%BOOK_ENTITIES; -]> -<section id="sect-Hibernate_Tools_Reference_Guide-Concepts-Hibernate_Configurations"> - <title>Hibernate Configurations</title> - <para> - - </para> - <para>&FEEDBACK-Concepts-Hibernate_Configurations;</para> -</section> \ No newline at end of file Copied: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml.bak (from rev 23762, trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml) =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml.bak (rev 0) +++ trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-Ant_Tasks-Hibernate_Configurations.xml.bak 2010-07-28 08:07:21 UTC (rev 23763) @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!ENTITY % BOOK_ENTITIES SYSTEM "Hibernate_Tools_Reference_Guide.ent"> +%BOOK_ENTITIES; +]> +<section id="sect-Hibernate_Tools_Reference_Guide-Concepts-Hibernate_Configurations"> + <title>Hibernate Configurations</title> + <para> + + </para> + <para>&FEEDBACK-Concepts-Hibernate_Configurations;</para> +</section> \ No newline at end of file

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23762 - trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2010-07-28 03:39:16 -0400 (Wed, 28 Jul 2010) New Revision: 23762 Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java Log: JBIDE-6591: modify the unit test for the bug Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java 2010-07-28 07:17:26 UTC (rev 23761) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSClientCommandTest.java 2010-07-28 07:39:16 UTC (rev 23762) @@ -84,6 +84,7 @@ IFile wsdlFile = fproject.getProject().getFile(wsdlFileName); ServiceModel model = new ServiceModel(); model.setWebProjectName(fproject.getProject().getName()); + model.setCustomPackage("org.apache.hello_world_soap_http"); // model.setWsdlURI(wsdlFile.getLocation().toOSString()); WebServiceClientInfo info = new WebServiceClientInfo(); @@ -101,7 +102,6 @@ assertTrue(model.getPortTypes().contains("Greeter")); assertEquals("org.apache.hello_world_soap_http", model .getCustomPackage()); - } public void testClientCodeGenerationCommand() throws ExecutionException { Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-07-28 07:17:26 UTC (rev 23761) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/JBossWSTopDownCommandTest.java 2010-07-28 07:39:16 UTC (rev 23762) @@ -96,6 +96,7 @@ IFile wsdlFile = fproject.getProject().getFile(wsdlFileName); ServiceModel model = new ServiceModel(); model.setWebProjectName(fproject.getProject().getName()); + model.setCustomPackage("org.apache.hello_world_soap_http"); //model.setWsdlURI(wsdlFile.getLocation().toOSString()); @@ -195,6 +196,7 @@ IFile wsdlFile = fproject.getProject().getFile(wsdlFileName); ServiceModel model = new ServiceModel(); model.setWebProjectName(fproject.getProject().getName()); + model.setCustomPackage("org.apache.hello_world_soap_http"); //model.setWsdlURI(wsdlFile.getLocation().toOSString());

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23761 - in trunk/ws/plugins: org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2010-07-28 03:17:26 -0400 (Wed, 28 Jul 2010) New Revision: 23761 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java Log: JBIDE-6591: commit to trunk for M2 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2010-07-28 06:29:05 UTC (rev 23760) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialClientCommand.java 2010-07-28 07:17:26 UTC (rev 23761) @@ -77,7 +77,7 @@ reader .readWSDL(wsClient.getWebServiceClientInfo() .getWsdlURL()); - model.setCustomPackage(reader.packageFromTargetNamespace()); + model.setCustomPackage(""); //$NON-NLS-1$ model.setServiceList(reader.getServiceList()); model.setPortTypeList(reader.getPortTypeList()); } catch (WSDLException e) { Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2010-07-28 06:29:05 UTC (rev 23760) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/InitialCommand.java 2010-07-28 07:17:26 UTC (rev 23761) @@ -37,16 +37,22 @@ throws ExecutionException { try { - String location = JBossWSCreationUtils.getJBossWSRuntimeLocation(JBossWSCreationUtils.getProjectByName(model.getWebProjectName())); + String location = JBossWSCreationUtils + .getJBossWSRuntimeLocation(JBossWSCreationUtils + .getProjectByName(model.getWebProjectName())); if (location.equals("")) { //$NON-NLS-1$ return StatusUtils .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); - } else if(!new Path(location).append(JBossWSCreationCoreMessages.Bin).append(JBossWSCreationCoreMessages.Command).toFile().exists()){ + } else if (!new Path(location) + .append(JBossWSCreationCoreMessages.Bin) + .append(JBossWSCreationCoreMessages.Command).toFile() + .exists()) { return StatusUtils - .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); + .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); } } catch (CoreException e1) { - return StatusUtils.errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); + return StatusUtils + .errorStatus(JBossWSCreationCoreMessages.Error_WS_Location); } model.setTarget(JBossWSCreationCoreMessages.Value_Target_0); if (scenario == WebServiceScenario.TOPDOWN) { @@ -54,10 +60,9 @@ model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL()); WSDLPropertyReader reader = new WSDLPropertyReader(); reader.readWSDL(ws.getWebServiceInfo().getWsdlURL()); - model.setCustomPackage(reader.packageFromTargetNamespace()); + model.setCustomPackage(""); //$NON-NLS-1$ model.setServiceList(reader.getServiceList()); model.setPortTypeList(reader.getPortTypeList()); - } catch (WSDLException e) { JBossWSCreationCorePlugin.getDefault().logError(e); return StatusUtils.errorStatus(e.getLocalizedMessage(), e); Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java 2010-07-28 06:29:05 UTC (rev 23760) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/WSDL2JavaCodeGenConfigWidget.java 2010-07-28 07:17:26 UTC (rev 23761) @@ -58,7 +58,7 @@ configCom.setLayoutData(new GridData(GridData.FILL_BOTH)); // custom package name - Label lblCustomPakage = new Label(configCom, SWT.NONE); + final Label lblCustomPakage = new Label(configCom, SWT.NONE); lblCustomPakage .setText(JBossWSCreationCoreMessages.Label_Custom_Package_Name); final Text txtCustomPkgName = new Text(configCom, SWT.BORDER); @@ -66,16 +66,16 @@ gd.horizontalSpan = 2; txtCustomPkgName.setLayoutData(gd); txtCustomPkgName.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - if (validatePackage(txtCustomPkgName.getText())) { + if ("".equals(txtCustomPkgName.getText()) //$NON-NLS-1$ + || validatePackage(txtCustomPkgName.getText())) { model.setCustomPackage(txtCustomPkgName.getText()); } statusListener.handleEvent(null); } }); txtCustomPkgName.setText(model.getCustomPackage()); - + // target new Label(configCom, SWT.NONE) .setText(JBossWSCreationCoreMessages.Label_JaxWS_Target); @@ -191,8 +191,7 @@ public void widgetSelected(SelectionEvent e) { model.setGenerateImplementatoin(btnGenDefaultImpl .getSelection()); - btnUpdateWebxml - .setEnabled(btnGenDefaultImpl.getSelection()); + btnUpdateWebxml.setEnabled(btnGenDefaultImpl.getSelection()); if (!btnGenDefaultImpl.getSelection()) { model.setUpdateWebxml(false); } else { @@ -223,7 +222,8 @@ } private void updateExtensionButtonStatus() { - boolean a = JBossWSCreationUtils.supportSOAP12(model.getWebProjectName()); + boolean a = JBossWSCreationUtils.supportSOAP12(model + .getWebProjectName()); btnExtension.setEnabled(a); btnExtension.setSelection(a); } @@ -243,7 +243,7 @@ e1.printStackTrace(); } if (status != null && status.getSeverity() == IStatus.ERROR) { - return false; + return false; } return true; }

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23760 - branches.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-07-28 02:29:05 -0400 (Wed, 28 Jul 2010) New Revision: 23760 Added: branches/vpe-spring/ Log: https://jira.jboss.org/browse/JBIDE-6711 https://jira.jboss.org/browse/JBIDE-6721 - a branch for VPE Spring plugin is created

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23759 - in trunk/hibernatetools/docs/task-reference: en-US and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: benlc Date: 2010-07-28 02:20:59 -0400 (Wed, 28 Jul 2010) New Revision: 23759 Added: trunk/hibernatetools/docs/task-reference/pom.xml Removed: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-_Hibernate_configuration.xml Modified: trunk/hibernatetools/docs/task-reference/en-US/Hibernate_Tools_Reference_Guide.xml trunk/hibernatetools/docs/task-reference/en-US/chap-Hibernate_Tools_Reference_Guide-Link_placeholder.xml trunk/hibernatetools/docs/task-reference/en-US/chap-Hibernate_Tools_Reference_Guide-Tasks.xml trunk/hibernatetools/docs/task-reference/en-US/proc-HIB-New_Hibernate_XML_Mapping_files.xml trunk/hibernatetools/docs/task-reference/en-US/proc-JBT-New_JPA_Project.xml trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-References-Perspectives-Hibernate_console.xml trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Basic_tasks-Open_hibernate_console_perspective.xml trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Hibernate_mapping-Hibernate_mapping_file-Create.xml trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Java_persistence_API-Project_creation.xml Log: 'committing changes to console perspective sections and adding pom' Modified: trunk/hibernatetools/docs/task-reference/en-US/Hibernate_Tools_Reference_Guide.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/Hibernate_Tools_Reference_Guide.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/Hibernate_Tools_Reference_Guide.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -4,7 +4,7 @@ %BOOK_ENTITIES; ]> <book> - <xi:include href="chap-Hibernate_Tools_Reference_Guide-Tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - - <xi:include href="chap-Hibernate_Tools_Reference_Guide-References.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - -  <xi:include href="chap-Hibernate_Tools_Reference_Guide-Link_placeholder.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <index /> Modified: trunk/hibernatetools/docs/task-reference/en-US/chap-Hibernate_Tools_Reference_Guide-Link_placeholder.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/chap-Hibernate_Tools_Reference_Guide-Link_placeholder.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/chap-Hibernate_Tools_Reference_Guide-Link_placeholder.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -5,12 +5,12 @@ ]> <chapter id="chap-Hibernate_Tools_Reference_Guide-Link_placeholder"> <title>Link Placeholder</title> - <formalpara id="new_server_runtime_placeholder"><title>New Target Runtime</title> + <formalpara id="TODO_new_server_runtime_placeholder"><title>TODO New Target Runtime</title> <para> TODO: Document new runtime server configuration. </para> </formalpara> - <formalpara id="query_parameters_view_placeholder"><title>Query Parameters View</title> + <formalpara id="TODO_query_parameters_view_placeholder"><title>TODO Query Parameters View</title> <para> TODO: Document query parameters view. </para> Modified: trunk/hibernatetools/docs/task-reference/en-US/chap-Hibernate_Tools_Reference_Guide-Tasks.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/chap-Hibernate_Tools_Reference_Guide-Tasks.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/chap-Hibernate_Tools_Reference_Guide-Tasks.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -10,10 +10,14 @@ </para> <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Basic_tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Hibernate_mapping.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Hibernate_configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Hibernate_query_language.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Code_generation_and_reverse_engineering.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Java_persistence_API.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Logging.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Ant_tasks.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="sect-Hibernate_Tools_Reference_Guide-Tasks-Controlling_POJO_code_generation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> Modified: trunk/hibernatetools/docs/task-reference/en-US/proc-HIB-New_Hibernate_XML_Mapping_files.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/proc-HIB-New_Hibernate_XML_Mapping_files.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/proc-HIB-New_Hibernate_XML_Mapping_files.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -8,9 +8,9 @@ <title>New Hibernate XML Mapping Files</title> <step> - <title>Access the Hibernate console</title> + <title>Access the Hibernate Console perspective</title> <para> - When performing Hibernate tasks, context sensitive menus will be available if the Hibernate console is the active perspective. Accessing the Hibernate console is described in <xref linkend="proc-JBT-Open_Perspective"></xref>. + When performing Hibernate tasks, context sensitive menus will be available if the Hibernate Console perspective is the active perspective. Accessing the Hibernate Console perspective is described in <xref linkend="proc-JBT-Open_Perspective"></xref>. </para> <para>&HORIZ_LINE;</para> </step> @@ -46,7 +46,7 @@ </figure> <note><title>Depth control</title> <para> - It is possible to specify the level to which object references are mapped relative to the selected class as indicated in <xref linkend="figure-HIB-New_Hibernate_XML_Mapping_files_001"></xref>. + It is possible to specify the level to which object references are mapped relative to the selected class as by clicking the checkbox in <xref linkend="figure-HIB-New_Hibernate_XML_Mapping_files_001"></xref>. </para> </note> <para>&HORIZ_LINE;</para> @@ -119,7 +119,7 @@ </figure> <note><title>Creating multiple mapping files</title> <para> - It is possible to select the project, src folder or an individual package to create multiple mapping files in a single action. All Java classes will be identified and listed in the display of <xref linkend="figure-HIB-New_Hibernate_XML_Mapping_files_003"></xref>. Individual classes may then be selected and deselected by using the appropriate checkbox. + It is possible to select the project, src folder or an individual package to create multiple mapping files in a single action. In this instance, all Java classes will be identified and listed in the display of <xref linkend="figure-HIB-New_Hibernate_XML_Mapping_files_003"></xref>. Individual classes may then be selected and deselected by clicking the appropriate checkbox. </para> </note> </step> Modified: trunk/hibernatetools/docs/task-reference/en-US/proc-JBT-New_JPA_Project.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/proc-JBT-New_JPA_Project.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/proc-JBT-New_JPA_Project.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -10,7 +10,7 @@ <orderedlist numeration ="loweralpha"> <listitem> <para> - Click on the <guilabel>JPA Project</guilabel> label by expanding the <menuchoice><guimenu>JPA</guimenu></menuchoice> folder. + Click the <guilabel>JPA Project</guilabel> label by expanding the <menuchoice><guimenu>JPA</guimenu></menuchoice> folder. </para> </listitem> <listitem> @@ -68,8 +68,8 @@ <row> <entry>Project location</entry> <entry>yes</entry> - <entry>Click the <guilabel>Use default location</guilabel> checkbox to define the project location as the workspace or define a custom path in the <guilabel>Location</guilabel> field.</entry> - <entry>The default location corresponds to the workspace location.</entry> + <entry>Click the <guilabel>Use default location</guilabel> checkbox to define the project location as the Eclipse workspace or define a custom path in the <guilabel>Location</guilabel> field.</entry> + <entry>The default location corresponds to the Eclipse workspace.</entry> </row> <row> <entry>Target runtime</entry> @@ -77,7 +77,7 @@ <entry>Select a pre-configured runtime from the available options or configure a new runtime environment.</entry> <entry> <para> - The target runtime defines the server to which the application will be deployed. Runtime configuration is described in <xref linkend="new_server_runtime_placeholder"/>. + The target runtime defines the server to which the application will be deployed. Runtime configuration is described in <xref linkend="TODO_new_server_runtime_placeholder"/>. </para> </entry> </row> @@ -229,14 +229,15 @@ <row> <entry>Platform</entry> <entry>yes</entry> - <entry>Select from the available platforms.</entry> - <entry>The project can be based on a variety of platforms as described in <xref linkend="table-JBT-New_JPA_Project_004"/></entry> + <entry>Select from the list of available vendor specific JPA implementations.</entry> + <entry>The project can be based on a variety of JPA implementations as described in <xref linkend="table-JBT-New_JPA_Project_004"/></entry> </row> <row> <entry>JPA implementation</entry> <entry>yes</entry> - <entry>Select from a user library or disable the library configuration. Selecting the user library option results in the ability to package the libraries within the application by checking the checkbox.</entry> - <entry>If a user library is selected, the libraries may be imported or created by clicking on the <guiicon>Manage libraries</guiicon> icon. Similarly, libraries may be downloaded by clicking on the <guiicon>Download libraries</guiicon> icon.</entry> + <entry>Select from a user library or disable the library configuration for the JPA implementation.</entry> + <entry>The libraries may be imported or created by clicking the <guiicon>Manage libraries</guiicon> icon. + Similarly, libraries may be downloaded by clicking the <guiicon>Download libraries</guiicon> icon. The libraries also may be packaged within the application.</entry> </row> <row> <entry>Connection</entry> @@ -244,7 +245,7 @@ <entry>The database connection for the project is defined here. Select from <guilabel>None</guilabel> or <guilabel>BIRT Classic Model Sample Database</guilabel>.</entry> <entry> <para> - Clicking on the <guilabel>Add connection</guilabel> link will display a list of database conections. Selecting the appropriate type and proceeding by selecting the driver will configure the connection for the project. + Clicking the <guilabel>Add connection</guilabel> link will display a list of database conections. Selecting the appropriate type and proceeding by selecting the driver will configure the connection for the project. </para> </entry> </row> @@ -264,7 +265,7 @@ <entry>Check the box to generate a mapping file which will be stored in the <filename>META-INF</filename> folder.</entry> <entry> <para> - An orm.xml file specifies the persistence of classes in the form of meta-data rather than using annotated classes. TODO: Anything else here. + An orm.xml file specifies the persistence of classes in the form of meta-data rather than using annotated classes. </para> </entry> </row> @@ -286,23 +287,23 @@ <tbody> <row> <entry>EclipseLink 2.0.x</entry> - <entry>TODO explanation here.</entry> + <entry>The project will be based on an Eclipse Persistence Services Project (EclipseLink) 2.0.x JPA implementation.</entry> </row> <row> <entry>EclipseLink 2.1.x</entry> - <entry>TODO explanation here.</entry> + <entry>The project will be based on an EclipseLink 2.1.x configuration.</entry> </row> <row> <entry>Generic 2.0</entry> - <entry>TODO explanation here.</entry> + <entry>The project will be based on a Generic JPA 2.0 configuration.</entry> </row> <row> <entry>Hibernate</entry> - <entry>TODO explanation here.</entry> + <entry>The project will be based on a Hibernate configuration.</entry> </row> <row> <entry>Hibernate jpa 2.0</entry> - <entry>TODO explanation here.</entry> + <entry>The project will be based on a Hibernate jpa 2.0 configuration.</entry> </row> </tbody> </tgroup> Deleted: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-_Hibernate_configuration.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-_Hibernate_configuration.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Concepts-_Hibernate_configuration.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -1,14 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -<!ENTITY % BOOK_ENTITIES SYSTEM "Hibernate_Tools_Reference_Guide.ent"> -%BOOK_ENTITIES; -]> -<section id="sect-Hibernate_Tools_Reference_Guide-Concepts-_Hibernate_configuration"> - <title> Hibernate configuration</title> - <para> - - </para> - <xi:include href="sect-Hibernate_Tools_Reference_Guide-Concepts-_Hibernate_configuration-hibernate.properties.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="sect-Hibernate_Tools_Reference_Guide-Concepts-_Hibernate_configuration-hibernate.cfg.xml.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - -</section> \ No newline at end of file Modified: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-References-Perspectives-Hibernate_console.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-References-Perspectives-Hibernate_console.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-References-Perspectives-Hibernate_console.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -6,17 +6,17 @@ <section id="sect-Hibernate_Tools_Reference_Guide-References-Hibernate_console"> <title>Hibernate console</title> <para> - The relevant perspective for Hibernate Tools is the Hibernate console perspective. This perspective can be accessed according to <xref linkend="proc-JBT-Open_Perspective"/>. + The relevant perspective for Hibernate Tools is the Hibernate Console perspective. This perspective can be accessed according to <xref linkend="proc-JBT-Open_Perspective"/>. </para> <figure id="figure-HIB-Hibernate_Console_Perspective_001"> - <title>The Hibernate Console Perspective</title> + <title>The Hibernate Console</title> <mediaobject> <imageobject> <imagedata fileref="images/image-HIB-Hibernate_Console_Perspective_001.png" format="PNG"/> </imageobject> <textobject> - <para>The Hibernate Console Perspective</para> + <para>The Hibernate Console</para> </textobject> </mediaobject> </figure> @@ -26,7 +26,7 @@ <formalpara><title>Perspective Views</title> <para> - The <guilabel>Hibernate</guilabel> console perspective is made up of the following views: + The <guilabel>Hibernate</guilabel> Console perspective is made up of the following views: </para> </formalpara> <itemizedlist> @@ -40,7 +40,7 @@ <para><xref linkend="sect-Hibernate_Tools_Reference_Guide-References-Hibernate_query_result"></xref>.</para> </listitem> <listitem> - <para><xref linkend="query_parameters_view_placeholder"></xref>.</para> + <para><xref linkend="TODO_query_parameters_view_placeholder"></xref>.</para> </listitem> </itemizedlist> <para>&FEEDBACK-References-Hibernate_console;</para> Modified: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Basic_tasks-Open_hibernate_console_perspective.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Basic_tasks-Open_hibernate_console_perspective.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Basic_tasks-Open_hibernate_console_perspective.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -6,7 +6,7 @@ <section id="sect-Hibernate_Tools_Reference_Guide-Tasks-Open_hibernate_console_perspective"> <title>Open hibernate console perspective</title> <para> - <xref linkend="proc-JBT-Open_Perspective"/> describes the steps to open the Hibernate perspective. + <xref linkend="proc-JBT-Open_Perspective"/> describes the steps to open the Hibernate Console perspective. </para> <xi:include href="proc-JBT-Open_Perspective.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <para>&FEEDBACK-Tasks-Open_hibernate_console_perspective;</para> Modified: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Hibernate_mapping-Hibernate_mapping_file-Create.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Hibernate_mapping-Hibernate_mapping_file-Create.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Hibernate_mapping-Hibernate_mapping_file-Create.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -6,7 +6,7 @@ <section id="sect-Hibernate_Tools_Reference_Guide-Tasks-Hibernate_mapping_file-Create"> <title>Create</title> <para> - Hibernate mapping files can be created by following the procedure in <xref linkend="proc-HIB-New_Hibernate_XML_Mapping_files"></xref> + Hibernate mapping files can be created by following the procedure in <xref linkend="proc-HIB-New_Hibernate_XML_Mapping_files"></xref>. </para> <xi:include href="proc-HIB-New_Hibernate_XML_Mapping_files.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <para>&FEEDBACK-Tasks-Hibernate_mapping_file-Create;</para> Modified: trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Java_persistence_API-Project_creation.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Java_persistence_API-Project_creation.xml 2010-07-28 00:49:51 UTC (rev 23758) +++ trunk/hibernatetools/docs/task-reference/en-US/sect-Hibernate_Tools_Reference_Guide-Tasks-Java_persistence_API-Project_creation.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -6,9 +6,9 @@ <section id="sect-Hibernate_Tools_Reference_Guide-Tasks-Project_creation"> <title>Project creation</title> <para> -  + <xref linkend="proc-JBT-New_Project"/> describes the steps to create a new project in JBoss Tools. </para> -  + <xi:include href="proc-JBT-New_Project.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <para> Continue by defining a JPA project type as described in <xref linkend="proc-JBT-New_JPA_Project"/>: </para> Added: trunk/hibernatetools/docs/task-reference/pom.xml =================================================================== --- trunk/hibernatetools/docs/task-reference/pom.xml (rev 0) +++ trunk/hibernatetools/docs/task-reference/pom.xml 2010-07-28 06:20:59 UTC (rev 23759) @@ -0,0 +1,218 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.project</groupId> + <artifactId>${docname}-${translation}</artifactId> + <version>1.0</version> + <packaging>jdocbook</packaging> + <name>${bookname}-(${translation})</name> + + <properties> + <translation>en-US</translation> + <docname>Hibernate_Tools_Reference_Guide</docname> + <bookname>Hibernate Tools Reference Guide</bookname> + </properties> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + + <profiles> + +  + <profile> + <id>jbds-release-documentation</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.2.0</version> + <extensions>true</extensions> + <configuration> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>${docname}.pdf</finalName> + </format> + + <format> + <formatName>eclipse</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/eclipse.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>html</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.2.0</version> + <extensions>true</extensions> + <configuration> + <formats> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>html-single</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.2.0</version> + <extensions>true</extensions> + <configuration> + <formats> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>pdf</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.2.0</version> + <extensions>true</extensions> + <configuration> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource> + <finalName>${docname}.pdf</finalName> + </format> + </formats> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.2.0</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-docbook-xslt</artifactId> + <version>1.1.0</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossorg-jdocbook-style</artifactId> + <version>1.1.0</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>${docname}.xml</sourceDocumentName> + <sourceDirectory>.</sourceDirectory> + <imageResource> + <directory>${translation}</directory> + <includes> + <include>images/*</include> + </includes> + </imageResource> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> +  +  + <docbookVersion>1.72.0</docbookVersion> + <transformerParameters> + <property> + <name>javax.xml.parsers.DocumentBuilderFactory</name> + <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value> + </property> + <property> + <name>javax.xml.parsers.SAXParserFactory</name> + <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value> + </property> + </transformerParameters> + </options> + </configuration> + </plugin> + </plugins> + </build> +</project> +

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23758 - trunk/build.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-07-27 20:49:51 -0400 (Tue, 27 Jul 2010) New Revision: 23758 Modified: trunk/build/pom.xml Log: profiles for components are added to aggregate project build/pom.xml to build everything checkout trunk and run mvn -f build/parent/pom.xml -Phelios-no-target -Dmaven.repo.local=../.repository mvn -f build/pom.xml -Phelios-no-target -Dmaven.repo.local=../.repository -Dmaven.test.skip if you want tests to be executed remove last -Dmaven.test.skip Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-07-27 21:57:01 UTC (rev 23757) +++ trunk/build/pom.xml 2010-07-28 00:49:51 UTC (rev 23758) @@ -1,13 +1,553 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> +<modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools</groupId> <artifactId>build</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <profiles> + <profile> + <id>libs</id> + <activation> + <property> + <name>coverage</name> + </property> + </activation> + <modules> + <module>libs</module> + </modules> + </profile> + + <profile> + <id>tests</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>as-bootstrap</name> + </property> + </activation> + <modules> + <module>../tests</module> + </modules> + </profile> + + <profile> + <id>jmx</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../jmx</module> + </modules> + </profile> + + <profile> + <id>jmx-bootstrap</id> + <modules> + <module>../tests</module> + <module>../jmx</module> + </modules> + </profile> + + <profile> + <id>archives</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>as-bootstrap</name> + </property> + </activation> + <modules> + <module>../archives</module> + </modules> + </profile> + + <profile> + <id>archives-bootstrap</id> + <modules> + <module>../tests</module> + <module>../archives</module> + </modules> + </profile> + + <profile> + <id>as</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>as-bootstrap</name> + </property> + </activation> + <modules> + <module>../as</module> + </modules> + </profile> + + <profile> + <id>as-bootstrap</id> + <modules> + <module>../tests</module> + <module>../archives</module> + <module>../jmx</module> + <module>../as</module> + </modules> + </profile> + + <profile> + <id>common</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../common</module> + </modules> + </profile> + + <profile> + <id>common-bootstrap</id> + <modules> + <module>../tests</module> + <module>../common</module> + </modules> + </profile> + + <profile> + <id>jst</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../jst</module> + </modules> + </profile> + + <profile> + <id>jst-bootstrap</id> + <modules> + <module>../tests</module> + <module>../common</module> + <module>../jst</module> + </modules> + </profile> + + + <profile> + <id>xulrunner</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../xulrunner</module> + </modules> + </profile> + + <profile> + <id>xulrunner-bootstrap</id> + <modules> + <module>../xulrunner</module> + </modules> + </profile> + + <profile> + <id>vpe</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../vpe</module> + </modules> + </profile> + + <profile> + <id>vpe-bootstrap</id> + <modules> + <module>../tests</module> + <module>../common</module> + <module>../jst</module> + <module>../xulrunner</module> + <module>../vpe</module> + </modules> + </profile> + + <profile> + <id>jsf</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../jsf</module> + </modules> + </profile> + + <profile> + <id>jsf-bootstrap</id> + <modules> + <module>../tests</module> + <module>../common</module> + <module>../jst</module> + <module>../xulrunner</module> + <module>../vpe</module> + <module>../jsf</module> + </modules> + </profile> + + <profile> + <id>freemarker</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../freemarker</module> + </modules> + </profile> + + <profile> + <id>freemarker-bootstrap</id> + <modules> + <module>../tests</module> + <module>../freemarker</module> + </modules> + </profile> + + <profile> + <id>hibernatetools</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../hibernatetools</module> + </modules> + </profile> + + <profile> + <id>hibernatetools-bootstrap</id> + <modules> + <module>../tests</module> + <module>../freemarker</module> + <module>../hibernatetools</module> + </modules> + </profile> + + <profile> + <id>portlet</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../portlet</module> + </modules> + </profile> + + <profile> + <id>portlet-bootstrap</id> + <modules> + <module>../tests</module> + <module>../portlet</module> + </modules> + </profile> + + <profile> + <id>workingset</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../portlet</module> + </modules> + </profile> + + <profile> + <id>workingset-bootstrap</id> + <modules> + <module>../tests</module> + <module>../workingset</module> + </modules> + </profile> + + <profile> + <id>struts</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../jsf</module> + </modules> + </profile> + + <profile> + <id>struts-bootstrap</id> + <modules> + <module>../tests</module> + <module>../common</module> + <module>../jst</module> + <module>../xulrunner</module> + <module>../vpe</module> + <module>../struts</module> + </modules> + </profile> + + <profile> + <id>profiler</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../portlet</module> + </modules> + </profile> + + <profile> + <id>profiler-bootstrap</id> + <modules> + <module>../tests</module> + <module>../profiler</module> + </modules> + </profile> + + <profile> + <id>smooks</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../smooks</module> + </modules> + </profile> + + <profile> + <id>smooks-bootstrap</id> + <modules> + <module>../tests</module> + <module>../smooks</module> + </modules> + </profile> + + <profile> + <id>cdi</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../cdi</module> + </modules> + </profile> + + <profile> + <id>cdi-bootstrap</id> + <modules> + <module>../tests</module> + <module>../common</module> + <module>../jst</module> + <module>../cdi</module> + </modules> + </profile> + + <profile> + <id>birt</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../birt</module> + </modules> + </profile> + + <profile> + <id>birt-bootstrap</id> + <modules> + <module>../tests</module> + <module>../birt</module> + </modules> + </profile> + + <profile> + <id>bpel</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../bpel</module> + </modules> + </profile> + + <profile> + <id>bpel-bootstrap</id> + <modules> + <module>../tests</module> + <module>../bpel</module> + </modules> + </profile> + + <profile> + <id>esb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../esb</module> + </modules> + </profile> + + <profile> + <id>esb-bootstrap</id> + <modules> + <module>../tests</module> + <module>../esb</module> + </modules> + </profile> + + <profile> + <id>seam</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../seam</module> + </modules> + </profile> + + <profile> + <id>seam-bootstrap</id> + <modules> + <module>../tests</module> + <module>../common</module> + <module>../jst</module> + <module>../xulrunner</module> + <module>../vpe</module> + <module>../jsf</module> + <module>../seam</module> + </modules> + </profile> + + <profile> + <id>examples</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../examples</module> + </modules> + </profile> + + <profile> + <id>examples-bootstrap</id> + <modules> + <module>../tests</module> + <module>../examples</module> + </modules> + </profile> + + <profile> + <id>maven</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../maven</module> + </modules> + </profile> + + <profile> + <id>maven-bootstrap</id> + <modules> + <module>../tests</module> + <module>../maven</module> + </modules> + </profile> + + <profile> + <id>tptp</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../ws</module> + </modules> + </profile> + + <profile> + <id>tptp-bootstrap</id> + <modules> + <module>../tests</module> + <module>../tptp</module> + </modules> + </profile> + + <profile> + <id>ws</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../ws</module> + </modules> + </profile> + + <profile> + <id>ws-bootstrap</id> + <modules> + <module>../tests</module> + <module>../ws</module> + </modules> + </profile> + + <profile> + <id>modeshape</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../modeshape</module> + </modules> + </profile> + + <profile> + <id>modeshape-bootstrap</id> + <modules> + <module>../tests</module> + <module>../modeshape</module> + </modules> + </profile> + + <profile> + <id>flow</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../flow</module> + </modules> + </profile> + + <profile> + <id>flow-bootstrap</id> + <modules> + <module>../tests</module> + <module>../flow</module> + </modules> + </profile> + + <profile> + <id>jbpm</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>../jbpm</module> + </modules> + </profile> + + <profile> + <id>jbpm-bootstrap</id> + <modules> + <module>../tests</module> + <module>../jbpm</module> + </modules> + </profile> + + <profile> <id>emma-coverage</id> <activation> <property> @@ -15,18 +555,42 @@ </property> </activation> <modules> - <module>libs</module> <module>reports/emma-coverage</module> </modules> </profile> + + <profile> + <id>drools</id> + <activation> + <property> + <name>drools</name> + </property> + </activation> + <modules> + <module>../drools</module> + </modules> + </profile> + + <profile> + <id>site</id> + <activation> + <property> + <name>drools</name> + </property> + </activation> + <modules> + <module>../drools</module> + <module>../site</module> + </modules> + </profile> + </profiles> - <modules>   - <module>../tests</module> +    - <module>../drools</module>> +  - <module>../site</module> +  + </modules> </project>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23757 - trunk/download.jboss.org/jbosstools/requirements/helios.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-27 17:57:01 -0400 (Tue, 27 Jul 2010) New Revision: 23757 Modified: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt trunk/download.jboss.org/jbosstools/requirements/helios/index.html Log: update to Helios release deps Modified: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt =================================================================== --- trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010-07-27 21:05:29 UTC (rev 23756) +++ trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010-07-27 21:57:01 UTC (rev 23757) @@ -1,52 +1,53 @@ -Total of 21 req'd tgzs/zips/jars. +Total of 22 req'd tgzs/zips/jars. BIRT 2.6 -> http://www.eclipse.org/downloads/download.php?file=/birt/downloads/build_... -> -http://www.eclipse.org/downloads/download.php?file=/birt/downloads/build.php?build=M-R1-2.6RC1-201005181142 -wget "http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/..." \ - "http://www.eclipse.org/downloads/download.php?file=/birt/downloads/drops/..." +wget http://ftp.osuosl.org/pub/eclipse/birt/downloads/drops/R-R1-2_6_0-2010061... +wget http://ftp.osuosl.org/pub/eclipse/birt/downloads/drops/R-R1-2_6_0-2010061... DTP 1.8 -> http://www.eclipse.org/datatools/downloads.php wget "http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/d..." +http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/1.8/dtp_1.8.0.zip&url=http://d2u376ub0heus3.cloudfront.net/datatools/downloads/1.8/dtp_1.8.0.zip&mirror_id=581 Eclipse 3.6 + ETF -> http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/ -> -http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/S-3.6RC2-201005201744/linPlatform.php#EclipseSDK -wget "http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/dro..." \ -"http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/dro..." \ -"http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/dro..." \ -"http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/dro..." \ -"http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/dro..." \ -"http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/dro..." +ftp://ftp.ussg.iu.edu/pub/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ +eclipse-SDK-3.6-win32.zip +eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz +eclipse-SDK-3.6-linux-gtk.tar.gz +eclipse-SDK-3.6-macosx-cocoa.tar.gz +eclipse-SDK-3.6-macosx-carbon.tar.gz +eclipse-test-framework-3.6RC2.zip EMF & XSD 2.6 -> http://www.eclipse.org/modeling/emf/downloads/?project=emf&showAll=0&show... -wget "http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/down..." \ -"http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/down..." +wget "http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/down..." \ + "http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/down..." & GEF 3.6 -> http://www.eclipse.org/gef/downloads/?project=&showAll=0&showMax=5&sortBy... -wget "http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/d..." \ -"http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/d..." +wget "http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/d..." \ + "http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/d..." & Equinox 3.6 -> http://www.eclipse.org/downloads/download.php?file=/equinox/ -wget "http://www.eclipse.org/downloads/download.php?file=/equinox/drops/S-3.6RC..." \ -"http://www.eclipse.org/downloads/download.php?file=/equinox/drops/S-3.6RC..." + http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.6-201006080911/ +wget http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.6-201006080911/org.ec... +wget http://ftp.osuosl.org/pub/eclipse/equinox/drops/R-3.6-201006080911/org.ec... TPTP 4.7 -> http://eclipse.org/tptp/home/downloads/?buildId=TPTP-4.7.0RC1-201005171900 -wget "http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.0/TPTP-4.7.0..." +wget "http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.0/TPTP-4.7.0..." WTP 3.2 -> -http://friends.eclipse.org/downloads/webtools/downloads/drops/R3.2.0/S-3.2.0RC2-20100520232028/ -wget "http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/dr..." +wget "http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/dr..." SWTBot 2.0 e36 -> http://www.eclipse.org/swtbot/downloads.php -> -wget "http://www.eclipse.org/downloads/download.php?r=1&file=/technology/swtbot..." \ - "http://www.eclipse.org/downloads/download.php?r=1&file=/technology/swtbot..." \ -"http://www.eclipse.org/downloads/download.php?r=1&file=/technology/swtbot..." \ -"http://www.eclipse.org/downloads/download.php?r=1&file=/technology/swtbot..." +wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..." & +wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..." & +wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..." & +wget "http://www.eclipse.org/downloads/download.php?file=/technology/swtbot/hel..." +wget "http://www.eclipse.org/downloads/download.php?r=1&file=/athena/repos/swtb..." ------------ Modified: trunk/download.jboss.org/jbosstools/requirements/helios/index.html =================================================================== --- trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010-07-27 21:05:29 UTC (rev 23756) +++ trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010-07-27 21:57:01 UTC (rev 23757) @@ -48,36 +48,39 @@ <ul> <li><a class=link href=README.txt>README.txt</a></li> -<li><a class=link href=birt-report-framework-2.6RC1.zip>birt-report-framework-2.6RC1.zip</a></li> -<li><a class=link href=birt-wtp-integration-sdk-2.6RC1.zip>birt-wtp-integration-sdk-2.6RC1.zip</a></li> - <li><a class=link href=b3.aggregator-repo-0.1.0.r01001_e36.zip>b3.aggregator-repo-0.1.0.r01001_e36.zip</a></li> <li><a class=link href=buckminster-updates-3.5_20100125-r11098.zip>buckminster-updates-3.5_20100125-r11098.zip</a></li> <li><a class=link href=buckminster-repo-1.3.0.r11439_e36.zip>buckminster-repo-1.3.0.r11439_e36.zip</a></li> -<li><a class=link href=dtp-1.8.0RC2-201005210500.zip>dtp-1.8.0RC2-201005210500.zip</a></li> -<li><a class=link href=eclipse-SDK-3.6RC2-linux-gtk-x86_64.tar.gz>eclipse-SDK-3.6RC2-linux-gtk-x86_64.tar.gz</a></li> -<li><a class=link href=eclipse-SDK-3.6RC2-linux-gtk.tar.gz>eclipse-SDK-3.6RC2-linux-gtk.tar.gz</a></li> -<li><a class=link href=eclipse-SDK-3.6RC2-macosx-carbon.tar.gz>eclipse-SDK-3.6RC2-macosx-carbon.tar.gz</a></li> -<li><a class=link href=eclipse-SDK-3.6RC2-macosx-cocoa.tar.gz>eclipse-SDK-3.6RC2-macosx-cocoa.tar.gz</a></li> -<li><a class=link href=eclipse-SDK-3.6RC2-win32.zip>eclipse-SDK-3.6RC2-win32.zip</a></li> -<li><a class=link href=eclipse-test-framework-3.6RC2.zip>eclipse-test-framework-3.6RC2.zip</a></li> -<li><a class=link href=emf-runtime-2.6.0RC2.zip>emf-runtime-2.6.0RC2.zip</a></li> -<li><a class=link href=GEF-runtime-3.6.0RC2.zip>GEF-runtime-3.6.0RC2.zip</a></li> -<li><a class=link href=GEF-zest-3.6.0RC2.zip>GEF-zest-3.6.0RC2.zip</a></li> <li><a class=link href=m2eclipse/build.xml>m2eclipse/build.xml</a></li> <li><a class=link href=m2eclipse-0.10.0.20100209-0800.zip>m2eclipse-0.10.0.20100209-0800.zip</a></li> -<li><a class=link href=org.eclipse.equinox.transforms.hook_1.0.200.v20100503.jar>org.eclipse.equinox.transforms.hook_1.0.200.v20100503.jar</a></li> -<li><a class=link href=org.eclipse.equinox.transforms.xslt_1.0.200.v20100503.jar>org.eclipse.equinox.transforms.xslt_1.0.200.v20100503.jar</a></li> <li><a class=link href=org.eclipse.releng.basebuilder_R36_RC1.zip>org.eclipse.releng.basebuilder_R36_RC1.zip</a></li> -<li><a class=link href=org.eclipse.swtbot.eclipse-2.0.0.568-dev-e36.zip>org.eclipse.swtbot.eclipse-2.0.0.568-dev-e36.zip</a></li> -<li><a class=link href=org.eclipse.swtbot.eclipse.gef-2.0.0.568-dev-e36.zip>org.eclipse.swtbot.eclipse.gef-2.0.0.568-dev-e36.zip</a></li> -<li><a class=link href=org.eclipse.swtbot.eclipse.test.junit4-2.0.0.568-dev-e36.zip>org.eclipse.swtbot.eclipse.test.junit4-2.0.0.568-dev-e36.zip</a></li> <li><a class=link href=svn/build.xml>svn/build.xml</a></li> <li><a class=link href=Subvsve079.I201005121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_ECF310.v201005082345-Update.zip>Subvsve079.I201005121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_ECF310.v201005082345-Update.zip</a></li> -<li><a class=link href=tptp.runtime-TPTP-4.7.0RC1.zip>tptp.runtime-TPTP-4.7.0RC1.zip</a></li> -<li><a class=link href=wtp-S-3.2.0RC2-20100520232028.zip>wtp-S-3.2.0RC2-20100520232028.zip</a></li> -<li><a class=link href=xsd-runtime-2.6.0RC2.zip>xsd-runtime-2.6.0RC2.zip</a></li> +<li><a class=link href=birt-report-framework-2_6_0.zip>birt-report-framework-2_6_0.zip</a></li> +<li><a class=link href=birt-wtp-integration-sdk-2_6_0.zip>birt-wtp-integration-sdk-2_6_0.zip</a></li> +<li><a class=link href=buckminster-repo-1.3.0.r11439_e36.zip>buckminster-repo-1.3.0.r11439_e36.zip</a></li> +<li><a class=link href=buckminster-updates-3.5_20100125-r11098.zip>buckminster-updates-3.5_20100125-r11098.zip</a></li> +<li><a class=link href=dtp_1.8.0.zip>dtp_1.8.0.zip</a></li> +<li><a class=link href=eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz>eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz</a></li> +<li><a class=link href=eclipse-SDK-3.6-linux-gtk.tar.gz>eclipse-SDK-3.6-linux-gtk.tar.gz</a></li> +<li><a class=link href=eclipse-SDK-3.6-macosx-carbon.tar.gz>eclipse-SDK-3.6-macosx-carbon.tar.gz</a></li> +<li><a class=link href=eclipse-SDK-3.6-macosx-cocoa.tar.gz>eclipse-SDK-3.6-macosx-cocoa.tar.gz</a></li> +<li><a class=link href=eclipse-SDK-3.6-win32.zip>eclipse-SDK-3.6-win32.zip</a></li> +<li><a class=link href=eclipse-test-framework-3.6.zip>eclipse-test-framework-3.6.zip</a></li> +<li><a class=link href=emf-runtime-2.6.0.zip>emf-runtime-2.6.0.zip</a></li> +<li><a class=link href=GEF-runtime-M201007121555.zip>GEF-runtime-M201007121555.zip</a></li> +<li><a class=link href=GEF-zest-M201007121555.zip>GEF-zest-M201007121555.zip</a></li> +<li><a class=link href=org.eclipse.equinox.transforms.hook_1.0.200.v20100503.jar>org.eclipse.equinox.transforms.hook_1.0.200.v20100503.jar</a></li> +<li><a class=link href=org.eclipse.equinox.transforms.xslt_1.0.200.v20100503.jar>org.eclipse.equinox.transforms.xslt_1.0.200.v20100503.jar</a></li> +<li><a class=link href=org.eclipse.swtbot-2.0.0.595-dev-e36.zip>org.eclipse.swtbot-2.0.0.595-dev-e36.zip</a></li> +<li><a class=link href=org.eclipse.swtbot.eclipse-2.0.0.595-dev-e36.zip>org.eclipse.swtbot.eclipse-2.0.0.595-dev-e36.zip</a></li> +<li><a class=link href=org.eclipse.swtbot.eclipse.gef-2.0.0.595-dev-e36.zip>org.eclipse.swtbot.eclipse.gef-2.0.0.595-dev-e36.zip</a></li> +<li><a class=link href=org.eclipse.swtbot.eclipse.test.junit4-2.0.0.595-dev-e36.zip>org.eclipse.swtbot.eclipse.test.junit4-2.0.0.595-dev-e36.zip</a></li> +<li><a class=link href=swtbot-update-site-2.0.0.595-dev-e36.zip>swtbot-update-site-2.0.0.595-dev-e36.zip</a></li> +<li><a class=link href=tptp.runtime-TPTP-4.7.0.zip>tptp.runtime-TPTP-4.7.0.zip</a></li> +<li><a class=link href=wtp-R-3.2.0-20100615235519.zip>wtp-R-3.2.0-20100615235519.zip</a></li> +<li><a class=link href=xsd-runtime-2.6.0.zip>xsd-runtime-2.6.0.zip</a></li> </ul> <br/> </td>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23756 - in trunk/ws/plugins/org.jboss.tools.ws.ui: .settings and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-07-27 17:05:29 -0400 (Tue, 27 Jul 2010) New Revision: 23756 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistory.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistoryEntry.java Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/.classpath trunk/ws/plugins/org.jboss.tools.ws.ui/.settings/org.eclipse.jdt.core.prefs trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 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/JAXWSTester2.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/TesterWSDLUtils.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java Log: [JBIDE-6702] [JBIDE-6693] Fixes to handle hand-typed entries and SOAP 1.2 message generation Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/.classpath =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/.classpath 2010-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/.classpath 2010-07-27 21:05:29 UTC (rev 23756) @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/.settings/org.eclipse.jdt.core.prefs 2010-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/.settings/org.eclipse.jdt.core.prefs 2010-07-27 21:05:29 UTC (rev 23756) @@ -1,8 +1,9 @@ -#Thu Apr 17 13:45:00 CST 2008 +#Mon Jul 26 15:15:24 MDT 2010 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-07-27 21:05:29 UTC (rev 23756) @@ -33,7 +33,8 @@ javax.xml.ws, org.eclipse.ui.forms, org.eclipse.emf.common, - org.eclipse.jdt.ui + org.eclipse.jdt.ui, + org.eclipse.osgi Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.ui, org.jboss.tools.ws.ui.messages, @@ -42,7 +43,7 @@ org.jboss.tools.ws.ui.views, org.jboss.tools.ws.ui.wizards Bundle-Vendor: %PLUGIN_PROVIDER -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: javax.xml.ws, org.eclipse.jst.javaee.web, org.jboss.tools.ws.creation.core.commands, 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-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-07-27 21:05:29 UTC (rev 23756) @@ -121,8 +121,13 @@ JAXRSWSTestView2_SaveResponseText_tooltip=Save to File JAXRSWSTestView2_ShowInBrowser_Tooltip=Show in Browser JAXRSWSTestView2_ShowRaw_Tooltip=Show Raw +JAXRSWSTestView2_Text_Msg_May_Be_Out_of_Date=Should we replace the existing request message with one generated by your WSDL service/port/binding/operation selection? +JAXRSWSTestView2_Title_Msg_May_Be_Out_of_Date=Message May Be Incorrect for Selected WSDL ResultsXMLStorageInput_WS_Invocation_Results_Prefix=Web Service Invocation Results\: WSDLBrowseDialog_Dialog_Title=Select WSDL +WSDLBrowseDialog_Error_Msg_Invalid_URL=Invalid URL specified for WSDl. +WSDLBrowseDialog_Error_Msg_Parse_Error=Encountered an error while parsing the selected WSDL. +WSDLBrowseDialog_Error_Retrieving_WSDL=Error Retrieving WSDL WSDLBrowseDialog_FS_Browse=File system... WSDLBrowseDialog_Group_Title=Select the service operation: WSDLBrowseDialog_Message=Select the source WSDL in the workspace or file system, or provide a URL from which to download the WSDL. @@ -130,6 +135,7 @@ WSDLBrowseDialog_Port_Field=Port: WSDLBrowseDialog_Service_Field=Service: WSDLBrowseDialog_Status_Invalid_URL=Invalid URL +WSDLBrowseDialog_Status_ParsingWSDLFromURL=Parsing WSDL from URL... WSDLBrowseDialog_Status_WSDL_Unavailable=WSDL unavailable WSDLBrowseDialog_Title=Specify the Source WSDL for the Web Service WSDLBrowseDialog_URL_Browse=URL... 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-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-07-27 21:05:29 UTC (rev 23756) @@ -152,9 +152,14 @@ public static String JAXRSWSTestView2_SaveResponseText_tooltip; public static String JAXRSWSTestView2_ShowInBrowser_Tooltip; public static String JAXRSWSTestView2_ShowRaw_Tooltip; + public static String JAXRSWSTestView2_Text_Msg_May_Be_Out_of_Date; + public static String JAXRSWSTestView2_Title_Msg_May_Be_Out_of_Date; public static String ResultsXMLStorageInput_WS_Invocation_Results_Prefix; public static String WSDLBrowseDialog_Dialog_Title; + public static String WSDLBrowseDialog_Error_Msg_Invalid_URL; + public static String WSDLBrowseDialog_Error_Msg_Parse_Error; + public static String WSDLBrowseDialog_Error_Retrieving_WSDL; public static String WSDLBrowseDialog_FS_Browse; public static String WSDLBrowseDialog_Group_Title; public static String WSDLBrowseDialog_Message; @@ -162,6 +167,7 @@ public static String WSDLBrowseDialog_Port_Field; public static String WSDLBrowseDialog_Service_Field; public static String WSDLBrowseDialog_Status_Invalid_URL; + public static String WSDLBrowseDialog_Status_ParsingWSDLFromURL; public static String WSDLBrowseDialog_Status_WSDL_Unavailable; public static String WSDLBrowseDialog_Title; public static String WSDLBrowseDialog_URL_Browse; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester2.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester2.java 2010-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXWSTester2.java 2010-07-27 21:05:29 UTC (rev 23756) @@ -19,6 +19,7 @@ import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPMessage; import javax.xml.ws.BindingProvider; import javax.xml.ws.Dispatch; @@ -91,15 +92,23 @@ URL serviceURL = new URL (endpointurl); //"http://www.ecubicle.net/gsearch_rss.asmx" QName serviceQName = new QName (ns, serviceName); // "http://www.ecubicle.net/webservices", "gsearch_rss" Service s = Service.create(serviceURL, serviceQName); + + boolean isSOAP12 = TesterWSDLUtils.isRequestBodySOAP12(body); QName messageQName = new QName(ns, messageName); //"http://www.ecubicle.net/webservices", "gsearch_rssSoap" Dispatch<SOAPMessage> d = s.createDispatch(messageQName, SOAPMessage.class, Mode.MESSAGE); - d.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, actionurl); //"http://www.ecubicle.net/webservices/GetSearchResults"); MessageFactory mf = MessageFactory.newInstance(); + if (isSOAP12) { + mf = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL); + } else { + d.getRequestContext().put(BindingProvider.SOAPACTION_USE_PROPERTY, true); + d.getRequestContext().put(BindingProvider.SOAPACTION_URI_PROPERTY, actionurl); //"http://www.ecubicle.net/webservices/GetSearchResults"); + } + SOAPMessage m = mf.createMessage( null, new ByteArrayInputStream(body.getBytes())); m.saveChanges(); - + Response<SOAPMessage> response = d.invokeAsync(m); while (!response.isDone()){ //go off and do some work @@ -138,18 +147,5 @@ //note interruptions throw ie; } -// SOAPMessage o = d.invoke(m); -// -// ByteArrayOutputStream baos = new ByteArrayOutputStream(); -// o.writeTo(baos); -// this.resultBody = baos.toString(); -// this.resultSOAPBody = o.getSOAPBody(); -// -// if (d.getResponseContext() != null) { -// Object responseHeaders = d.getResponseContext().get(MessageContext.HTTP_RESPONSE_HEADERS); -// if ( responseHeaders != null && responseHeaders instanceof Map) { -// this.resultHeaders = (Map<String, String>) responseHeaders; -// } -// } } } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/TesterWSDLUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/TesterWSDLUtils.java 2010-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/TesterWSDLUtils.java 2010-07-27 21:05:29 UTC (rev 23756) @@ -35,6 +35,7 @@ import javax.wsdl.Service; import javax.wsdl.Types; import javax.wsdl.WSDLException; +import javax.wsdl.extensions.ExtensibilityElement; import javax.wsdl.extensions.schema.Schema; import javax.wsdl.extensions.schema.SchemaImport; import javax.wsdl.extensions.soap.SOAPAddress; @@ -91,6 +92,12 @@ "javax.wsdl.factory.DefinitionFactory"; //$NON-NLS-1$ private final static String PRIVATE_DEF_FACTORY_CLASS = "org.apache.wsif.wsdl.WSIFWSDLFactoryImpl"; //$NON-NLS-1$ + + public final static String SOAP_NS_URI = "http://schemas.xmlsoap.org/soap/envelope/"; //$NON-NLS-1$ + public final static String SOAP12_ENVELOPE_NS_URI = "http://www.w3.org/2003/05/soap-envelope"; //$NON-NLS-1$ + public final static String SOAP12_NS_URI = "http://schemas.xmlsoap.org/wsdl/soap12/"; //$NON-NLS-1$ + public final static String SOAP12_PREFIX = "soap12"; //$NON-NLS-1$ + public final static String SOAP_PREFIX = "soap"; //$NON-NLS-1$ public static Definition readWSDLURL(URL contextURL, String wsdlLoc) throws WSDLException { Properties props = System.getProperties(); @@ -115,7 +122,7 @@ return def; } - public static Definition readWSDLURL(URL contextURL) throws WSDLException { + public static Definition readWSDLURL(URL contextURL) throws WSDLException, NullPointerException { Properties props = System.getProperties(); String oldPropValue = props.getProperty(DEF_FACTORY_PROPERTY_NAME); @@ -138,6 +145,35 @@ return def; } + public static boolean isSOAP12 (Definition wsdlDefinition, String serviceName, String portName) { + Map<?, ?> services = wsdlDefinition.getServices(); + Set<?> serviceKeys = services.keySet(); + for( Iterator<?> it = serviceKeys.iterator(); it.hasNext(); ) { + QName serviceKey = (QName) it.next(); + if (serviceName != null && serviceKey.getLocalPart().contentEquals(serviceName)) { + Service service = (Service) services.get( serviceKey ); + Map<?, ?> ports = service.getPorts(); + Set<?> portKeys = ports.keySet(); + for( Iterator<?> it2 = portKeys.iterator(); it2.hasNext(); ) { + String portKey = (String) it2.next(); + if (portName != null && portKey.contentEquals(portName)) { + Port port = (Port) ports.get( portKey ); + List<?> extElements = port.getExtensibilityElements(); + for (Iterator<?> it3 = extElements.iterator(); it3.hasNext(); ) { + ExtensibilityElement element = (ExtensibilityElement) it3.next(); + String nsURI = element.getElementType().getNamespaceURI(); + if (nsURI.contentEquals(SOAP12_NS_URI)) { + return true; + } + return false; + } + } + } + } + } + return false; + } + public static String getSampleSOAPInputMessage ( Definition wsdlDefinition, String serviceName, String portName, String bindingName, String opName ) { Map<?, ?> services = wsdlDefinition.getServices(); Set<?> serviceKeys = services.keySet(); @@ -734,4 +770,12 @@ } return null; } + + public static boolean isRequestBodySOAP12 ( String body ) { + boolean isSOAP12 = false; + if (body.indexOf('<' + SOAP12_PREFIX + ":Envelope") > -1) { //$NON-NLS-1$ + isSOAP12 = true; + } + return isSOAP12; + } } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2010-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2010-07-27 21:05:29 UTC (rev 23756) @@ -10,18 +10,36 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.views; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.wsdl.Binding; +import javax.wsdl.BindingOperation; import javax.wsdl.Definition; +import javax.wsdl.Port; +import javax.wsdl.PortType; +import javax.wsdl.Service; +import javax.wsdl.WSDLException; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.soap.SOAPOperation; +import javax.wsdl.extensions.soap12.SOAP12Operation; +import javax.xml.namespace.QName; +import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import org.apache.axis.soap.MessageFactoryImpl; import org.apache.axis.utils.XMLUtils; import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.IProgressMonitor; @@ -47,6 +65,8 @@ import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.SelectionEvent; @@ -140,7 +160,7 @@ private MenuItem copyResultHeaderMenuAction; private String[] serviceNSMessage = null; - private String actionText = null; +// private String actionText = null; private FormToolkit toolkit; private ScrolledForm form; @@ -159,6 +179,9 @@ private ScrolledPageBook pageBook; private ShowRawAction rawAction; private ShowInBrowserAction browserAction; + + private TestHistory history = new TestHistory(); + private TestHistoryEntry currentHistoryEntry = null; /** * The constructor. @@ -298,7 +321,212 @@ return JAX_WS; return JAX_RS; } + + private boolean getWSDLSpecifics( String opName ) { + + if (opName != null) { + String opNameInBody = getOpNameFromRequestBody(); + if (opNameInBody != null) { + boolean isRequestSOAP12 = + TesterWSDLUtils.isRequestBodySOAP12(getCurrentHistoryEntry().getBody()); + String urlText = urlCombo.getText(); + if (urlText != null) { + try { + URL tempURL = new URL(urlText); + Definition wsdlDef = + TesterWSDLUtils.readWSDLURL(tempURL); + Map<?, ?> bindings = wsdlDef.getAllBindings(); + Iterator<?> iter = bindings.entrySet().iterator(); + while (iter.hasNext()) { + Entry<?, ?> mapEntry = (Entry<?, ?>) iter.next(); + Binding binding = (Binding) mapEntry.getValue(); + Iterator<?> iter2 = binding.getBindingOperations().iterator(); + while (iter2.hasNext()) { + BindingOperation bindOp = (BindingOperation) iter2.next(); + if (bindOp.getName().contentEquals(opNameInBody)) { + Iterator<?> iter3 = bindOp.getExtensibilityElements().iterator(); + while (iter3.hasNext()) { + ExtensibilityElement extEl = (ExtensibilityElement) iter3.next(); + if (extEl.getElementType().getLocalPart().contentEquals("operation")) { //$NON-NLS-1$ + String actionURL = null; + String[] nsArray = null; + if (!isRequestSOAP12 && extEl instanceof SOAPOperation) { + SOAPOperation soapOp = (SOAPOperation) extEl; + actionURL = soapOp.getSoapActionURI(); + } else if (isRequestSOAP12 && extEl instanceof SOAP12Operation) { + SOAP12Operation soapOp = (SOAP12Operation) extEl; + actionURL = soapOp.getSoapActionURI(); + } + if (actionURL != null) { + PortType portType = binding.getPortType(); + String ns = portType.getQName().getNamespaceURI(); + + QName bindingQName = binding.getQName(); + Map<?,?> services = wsdlDef.getAllServices(); + Iterator<?> iter4 = services.entrySet().iterator(); + while (iter4.hasNext()) { + Entry<?, ?> serviceEntry = (Entry<?, ?>) iter4.next(); + Service service = (Service) serviceEntry.getValue(); + Iterator<?> iter5 = service.getPorts().entrySet().iterator(); + while (iter5.hasNext()) { + Entry<?, ?> portEntry = (Entry<?, ?>) iter5.next(); + Port port = (Port) portEntry.getValue(); + if (port.getBinding().getQName().equals(bindingQName)) { + String serviceName = service.getQName().getLocalPart(); + String portName = port.getName(); + nsArray = new String[] {ns, serviceName, portName}; + if (actionURL != null && nsArray != null) { + getCurrentHistoryEntry().setAction(actionURL); + getCurrentHistoryEntry().setServiceNSMessage(nsArray); + return true; + } + } + } + } + } + } + } + } + } + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } catch (WSDLException e) { + e.printStackTrace(); + } + } + } + } + + WSDLBrowseDialog wbDialog = new WSDLBrowseDialog(getSite().getShell()); + if (urlCombo.getText().length() > 0) { + wbDialog.setURLText(urlCombo.getText()); + } + if (opName != null) { + wbDialog.setInitialOperationTextValue(opName); + } + int rtnCode = wbDialog.open(); + if (rtnCode == Window.OK){ + + getCurrentHistoryEntry().setServiceNSMessage(null); + getCurrentHistoryEntry().setAction(null); + getCurrentHistoryEntry().setWsdlDef(null); + getCurrentHistoryEntry().setServiceName(null); + getCurrentHistoryEntry().setPortName(null); + getCurrentHistoryEntry().setBindingName(null); + getCurrentHistoryEntry().setOperationName(null); + serviceNSMessage = null; +// actionText = null; + + Definition wsdlDef = wbDialog.getWSDLDefinition(); + getCurrentHistoryEntry().setWsdlDef(wsdlDef); + getCurrentHistoryEntry().setServiceName(wbDialog.getServiceTextValue()); + getCurrentHistoryEntry().setPortName(wbDialog.getPortTextValue()); + getCurrentHistoryEntry().setBindingName(wbDialog.getBindingValue()); + getCurrentHistoryEntry().setOperationName(wbDialog.getOperationTextValue()); + getCurrentHistoryEntry().setUrl(wbDialog.getWSDLText()); + urlCombo.setText(wbDialog.getWSDLText()); + + String output = TesterWSDLUtils.getSampleSOAPInputMessage(wsdlDef, + wbDialog.getServiceTextValue(), + wbDialog.getPortTextValue(), + wbDialog.getBindingValue(), + wbDialog.getOperationTextValue()); + + String endpointURL = TesterWSDLUtils.getEndpointURL(wsdlDef, + wbDialog.getServiceTextValue(), + wbDialog.getPortTextValue(), + wbDialog.getBindingValue(), + wbDialog.getOperationTextValue()); + getCurrentHistoryEntry().setUrl(endpointURL); + + String actionURL = TesterWSDLUtils.getActionURL(wsdlDef, + wbDialog.getServiceTextValue(), + wbDialog.getPortTextValue(), + wbDialog.getBindingValue(), + wbDialog.getOperationTextValue()); + getCurrentHistoryEntry().setAction(actionURL); + + serviceNSMessage = TesterWSDLUtils.getNSServiceNameAndMessageNameArray(wsdlDef, + wbDialog.getServiceTextValue(), + wbDialog.getPortTextValue(), + wbDialog.getBindingValue(), + wbDialog.getOperationTextValue()); + getCurrentHistoryEntry().setServiceNSMessage(serviceNSMessage); + + boolean isSOAP12 = TesterWSDLUtils.isSOAP12(wsdlDef, + wbDialog.getServiceTextValue(), + wbDialog.getPortTextValue()); + getCurrentHistoryEntry().setSOAP12(isSOAP12); + + String soapIn = generateSampleSOAP(output, isSOAP12); + if (opName != null) { + if (bodyText.getText().length() > 0) { + + String opNameInBody = getOpNameFromRequestBody(); + if (opNameInBody == null) { + bodyText.setText(soapIn); + getCurrentHistoryEntry().setBody(soapIn); + getCurrentHistoryEntry().setAction(actionURL); + } else if (opNameInBody.contentEquals(getCurrentHistoryEntry().getOperationName())) { + // ignore + } else { + if (MessageDialog.openQuestion(getSite().getShell(), + JBossWSUIMessages.JAXRSWSTestView2_Title_Msg_May_Be_Out_of_Date, + JBossWSUIMessages.JAXRSWSTestView2_Text_Msg_May_Be_Out_of_Date)) { + + bodyText.setText(soapIn); + getCurrentHistoryEntry().setBody(soapIn); + getCurrentHistoryEntry().setAction(actionURL); + + } + } + } +// if (MessageDialog.openQuestion(getSite().getShell(), +// JBossWSUIMessages.JAXRSWSTestView2_Title_Msg_May_Be_Out_of_Date, +// JBossWSUIMessages.JAXRSWSTestView2_Text_Msg_May_Be_Out_of_Date)) { +// +// bodyText.setText(soapIn); +// getCurrentHistoryEntry().setBody(soapIn); +// getCurrentHistoryEntry().setAction(actionURL); +// +// } + } else if (bodyText.getText().length() > 0) { + + String opNameInBody = getOpNameFromRequestBody(); + boolean isRequestSOAP12 = TesterWSDLUtils.isRequestBodySOAP12(getCurrentHistoryEntry().getBody()); + + if (opNameInBody == null || isSOAP12 != isRequestSOAP12 ) { + bodyText.setText(soapIn); + getCurrentHistoryEntry().setBody(soapIn); + getCurrentHistoryEntry().setAction(actionURL); + } else if (opNameInBody.contentEquals(getCurrentHistoryEntry().getOperationName())) { + // ignore + } else { + if (MessageDialog.openQuestion(getSite().getShell(), + JBossWSUIMessages.JAXRSWSTestView2_Title_Msg_May_Be_Out_of_Date, + JBossWSUIMessages.JAXRSWSTestView2_Text_Msg_May_Be_Out_of_Date)) { + + bodyText.setText(soapIn); + getCurrentHistoryEntry().setBody(soapIn); + getCurrentHistoryEntry().setAction(actionURL); + + } + } + } + +// urlCombo.setText(endpointURL); +// actionText = actionURL; + + setControlsForWSType(getCurrentTestType()); + setControlsForMethodType(methodCombo.getText()); + setControlsForSelectedURL(); + return true; + } + return false; + } + private void createURLAndToolbar( ) { urlCombo = new Combo(form.getBody(), SWT.BORDER | SWT.DROP_DOWN); GridData gdURL = new GridData(SWT.FILL, SWT.NONE, true, false); @@ -311,6 +539,8 @@ public void keyReleased(KeyEvent e) { setControlsForSelectedURL(); + getCurrentHistoryEntry().setUrl(urlCombo.getText()); + getCurrentHistoryEntry().setAction(null); if (e.keyCode == SWT.CR && e.stateMask == SWT.CTRL) { handleTest(getCurrentTestType()); } @@ -321,6 +551,8 @@ widgetSelected(e); } public void widgetSelected(SelectionEvent e) { + getCurrentHistoryEntry().setUrl(urlCombo.getText()); + getCurrentHistoryEntry().setAction(null); setControlsForSelectedURL(); } }); @@ -347,6 +579,7 @@ widgetSelected(e); } public void widgetSelected(SelectionEvent e) { + getCurrentHistoryEntry().setMethod(methodCombo.getText()); setControlsForWSType(getCurrentTestType()); setControlsForMethodType(methodCombo.getText()); setControlsForSelectedURL(); @@ -363,40 +596,7 @@ openWSDLToolItem.setToolTipText(JBossWSUIMessages.JAXRSWSTestView2_GetFromWSDL_Tooltip); openWSDLToolItem.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { - WSDLBrowseDialog wbDialog = new WSDLBrowseDialog(getSite().getShell()); - int rtnCode = wbDialog.open(); - if (rtnCode == Window.OK){ - serviceNSMessage = null; - actionText = null; - Definition wsdlDef = wbDialog.getWSDLDefinition(); - String output = TesterWSDLUtils.getSampleSOAPInputMessage(wsdlDef, - wbDialog.getServiceTextValue(), - wbDialog.getPortTextValue(), - wbDialog.getBindingValue(), - wbDialog.getOperationTextValue()); - String endpointURL = TesterWSDLUtils.getEndpointURL(wsdlDef, - wbDialog.getServiceTextValue(), - wbDialog.getPortTextValue(), - wbDialog.getBindingValue(), - wbDialog.getOperationTextValue()); - String actionURL = TesterWSDLUtils.getActionURL(wsdlDef, - wbDialog.getServiceTextValue(), - wbDialog.getPortTextValue(), - wbDialog.getBindingValue(), - wbDialog.getOperationTextValue()); - serviceNSMessage = TesterWSDLUtils.getNSServiceNameAndMessageNameArray(wsdlDef, - wbDialog.getServiceTextValue(), - wbDialog.getPortTextValue(), - wbDialog.getBindingValue(), - wbDialog.getOperationTextValue()); - String soapIn = generateSampleSOAP(output); - bodyText.setText(soapIn); - urlCombo.setText(endpointURL); - actionText = actionURL; - setControlsForWSType(getCurrentTestType()); - setControlsForMethodType(methodCombo.getText()); - setControlsForSelectedURL(); - } + getWSDLSpecifics(null); } public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); @@ -437,6 +637,12 @@ ExpandableComposite.CLIENT_INDENT); ec.setText(JBossWSUIMessages.JAXRSWSTestView2_Headers_Section); dlsList = new DelimitedStringList(ec, SWT.None, false, false); + dlsList.addChangeListener(new ChangeListener(){ + public void stateChanged(ChangeEvent e) { + getCurrentHistoryEntry().setHeaders(dlsList.getSelection()); + getCurrentHistoryEntry().setAction(null); + } + }); ec.setClient(dlsList); toolkit.adapt(dlsList); GridData gd2 = new GridData(SWT.FILL, SWT.FILL, true, false); @@ -449,6 +655,12 @@ ec3.setText(JBossWSUIMessages.JAXRSWSTestView2_Parameters_Section); parmsList = new DelimitedStringList(ec3, SWT.None, false, false); parmsList.setShowUpDown(false); + parmsList.addChangeListener(new ChangeListener(){ + public void stateChanged(ChangeEvent e) { + getCurrentHistoryEntry().setParms(parmsList.getSelection()); + getCurrentHistoryEntry().setAction(null); + } + }); ec3.setClient(parmsList); toolkit.adapt(parmsList); GridData gd4 = new GridData(SWT.FILL, SWT.FILL, true, false); @@ -461,6 +673,23 @@ ExpandableComposite.EXPANDED); ec5.setText(JBossWSUIMessages.JAXRSWSTestView2_BodyText_Section); bodyText = toolkit.createText(ec5, EMPTY_STRING, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL); + bodyText.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + getCurrentHistoryEntry().setBody(bodyText.getText()); +// getCurrentHistoryEntry().setAction(null); + } + }); + bodyText.addKeyListener(new KeyListener() { + public void keyPressed(KeyEvent e) { + } + + public void keyReleased(KeyEvent e) { + getCurrentHistoryEntry().setBody(bodyText.getText()); + if (e.keyCode == SWT.CR && e.stateMask == SWT.CTRL) { + handleTest(getCurrentTestType()); + } + } + }); ec5.setClient(bodyText); GridData gd9 = new GridData(SWT.FILL, SWT.FILL, true, true); gd9.minimumHeight = 200; @@ -470,6 +699,13 @@ section.addExpansionListener(new FormExpansionAdapter()); section.setClient(sectionClient); } + + private TestHistoryEntry getCurrentHistoryEntry() { + if (this.currentHistoryEntry == null) { + this.currentHistoryEntry = new TestHistoryEntry(); + } + return this.currentHistoryEntry; + } private void createResponseSide ( SashForm sashForm ) { Section section2 = toolkit.createSection(sashForm, @@ -731,18 +967,24 @@ super.dispose(); } - private String generateSampleSOAP ( String innerText ) { + private String generateSampleSOAP ( String innerText, boolean isSOAP12 ) { + String prefix = TesterWSDLUtils.SOAP_PREFIX; + String soapURI = TesterWSDLUtils.SOAP_NS_URI; + if (isSOAP12) { + prefix = TesterWSDLUtils.SOAP12_PREFIX; + soapURI = TesterWSDLUtils.SOAP12_ENVELOPE_NS_URI; + } String soapIn = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n" + //$NON-NLS-1$ - "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " + //$NON-NLS-1$ + "<" + prefix + ":Envelope xmlns:" + prefix + "=\"" + soapURI + "\" " + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " + //$NON-NLS-1$ "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" " + //$NON-NLS-1$ ">\n" + //$NON-NLS-1$ - "<soap:Body>\n";//$NON-NLS-1$ + "<" + prefix + ":Body>\n";//$NON-NLS-1$ //$NON-NLS-2$ if (innerText != null) soapIn = soapIn + innerText; soapIn = soapIn + - "</soap:Body>\n" + //$NON-NLS-1$ - "</soap:Envelope>"; //$NON-NLS-1$ + "</" + prefix + ":Body>\n" + //$NON-NLS-1$ //$NON-NLS-2$ + "</" + prefix + ":Envelope>"; //$NON-NLS-1$ //$NON-NLS-2$ return soapIn; } @@ -827,7 +1069,7 @@ dlsList.setEnabled(false); String emptySOAP = - generateSampleSOAP(null); + generateSampleSOAP(null, false); emptySOAP = WSTestUtils.addNLsToXML(emptySOAP); if (bodyText.getText().trim().length() == 0) { @@ -848,6 +1090,26 @@ setMenusForCurrentState(); } + private String getOpNameFromRequestBody () { + MessageFactory factory = new MessageFactoryImpl(); + String lookForOpName = null; + try { + SOAPMessage message = + factory.createMessage(null, new ByteArrayInputStream(getCurrentHistoryEntry().getBody().getBytes())); + SOAPBody body = message.getSOAPBody(); + Iterator<?> elements = body.getChildElements(); + if (elements.hasNext()) { + Element element = (Element) elements.next(); + lookForOpName = element.getNodeName(); + } + } catch (IOException e) { + e.printStackTrace(); + } catch (SOAPException e) { + e.printStackTrace(); + } + return lookForOpName; + } + /* * Actually perform the test based on which type of activity it is */ @@ -861,6 +1123,19 @@ return; } + String lookForOpName = null; + + if (wsTech.contentEquals(JAX_WS)) { + lookForOpName = getOpNameFromRequestBody(); + + if (getCurrentHistoryEntry().getAction() == null ) { + boolean result = getWSDLSpecifics(lookForOpName); + if (!result) + return; + } + + } + if (urlCombo.getItemCount() > 0) { java.util.List<String> aList = Arrays.asList(urlCombo.getItems()); if (!aList.contains(urlCombo.getText())) { @@ -869,13 +1144,22 @@ } else { urlCombo.add(urlCombo.getText()); } + + getCurrentHistoryEntry().setWsTech(wsTech); + + final String url = getCurrentHistoryEntry().getUrl(); + final String action = getCurrentHistoryEntry().getAction(); + final String body = getCurrentHistoryEntry().getBody(); + final String method = getCurrentHistoryEntry().getMethod(); + final String headers = getCurrentHistoryEntry().getHeaders(); + final String parms = getCurrentHistoryEntry().getParms(); - final String url = urlCombo.getText(); - final String action = actionText; - final String body = bodyText.getText(); - final String method = methodCombo.getText(); - final String headers = dlsList.getSelection(); - final String parms = parmsList.getSelection(); +// final String url = urlCombo.getText(); +// final String action = actionText; +// 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) { @@ -904,11 +1188,13 @@ PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { public void run() { if (status.getResultsText() != null) { + getCurrentHistoryEntry().setResultText(status.getResultsText()); JAXRSWSTestView2.this.resultsText.setText(status.getResultsText()); JAXRSWSTestView2.this.resultsBrowser.setText(status.getResultsText()); JAXRSWSTestView2.this.form.reflow(true); } else if (status.getMessage() != null) { + getCurrentHistoryEntry().setResultText(status.getMessage()); JAXRSWSTestView2.this.resultsText.setText(status.getMessage()); JAXRSWSTestView2.this.resultsBrowser.setText(status.getMessage()); JAXRSWSTestView2.this.form.reflow(true); @@ -921,6 +1207,8 @@ resultHeadersList.add(headers[i]); } } + getCurrentHistoryEntry().setResultHeadersList(headers); + history.getEntries().add(getCurrentHistoryEntry()); } }); } @@ -945,6 +1233,7 @@ monitor.worked(10); JAXWSTester2 tester = new JAXWSTester2(); boolean itRan = false; + serviceNSMessage = getCurrentHistoryEntry().getServiceNSMessage(); while (!monitor.isCanceled()) { try { if (!itRan && serviceNSMessage != null && serviceNSMessage.length == 3) { Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistory.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistory.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistory.java 2010-07-27 21:05:29 UTC (rev 23756) @@ -0,0 +1,16 @@ +package org.jboss.tools.ws.ui.views; + +import java.util.Stack; + +public class TestHistory { + + private Stack<TestHistoryEntry> entries = null; + + public TestHistory() { + entries = new Stack<TestHistoryEntry>(); + } + + public Stack<TestHistoryEntry> getEntries() { + return entries; + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistoryEntry.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistoryEntry.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistoryEntry.java 2010-07-27 21:05:29 UTC (rev 23756) @@ -0,0 +1,174 @@ +package org.jboss.tools.ws.ui.views; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; + +import org.jboss.tools.ws.ui.JBossWSUIPlugin; +import org.jboss.tools.ws.ui.utils.TesterWSDLUtils; + +public class TestHistoryEntry { + + private String url; + private String action; + private String body; + private String method; + private String headers; + private String parms; + private String[] resultHeadersList; + private String resultText; + private String wsTech; + private String serviceName; + private String portName; + private String bindingName; + private String operationName; +// private String wsMethod; + private Definition wsdlDef = null; + private String[] serviceNSMessage = null; + private boolean isSOAP12 = false; + + public TestHistoryEntry() { + // empty + } + + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public void setResultHeadersList(String[] resultHeadersList) { + this.resultHeadersList = resultHeadersList; + } + + public String[] getResultHeadersList() { + return resultHeadersList; + } + + public String getAction() { + return action; + } + public void setAction(String action) { + this.action = action; + } + public String getBody() { + return body; + } + public void setBody(String body) { + this.body = body; + } + public String getMethod() { + return method; + } + public void setMethod(String method) { + this.method = method; + } + public String getHeaders() { + return headers; + } + public void setHeaders(String headers) { + this.headers = headers; + } + public String getParms() { + return parms; + } + public void setParms(String parms) { + this.parms = parms; + } + + public void setResultText(String resultText) { + this.resultText = resultText; + } + + public String getResultText() { + return resultText; + } + + public void setWsTech(String wsTech) { + this.wsTech = wsTech; + } + + public String getWsTech() { + return wsTech; + } + + public String getServiceName() { + return serviceName; + } + + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + public String getPortName() { + return portName; + } + + public void setPortName(String portName) { + this.portName = portName; + } + + public String getBindingName() { + return bindingName; + } + + public void setBindingName(String bindingName) { + this.bindingName = bindingName; + } + + public String getOperationName() { + return operationName; + } + + public void setOperationName(String operationName) { + this.operationName = operationName; + } + +// public void setWsMethod(String wsMethod) { +// this.wsMethod = wsMethod; +// } +// +// public String getWsMethod() { +// return wsMethod; +// } + + public void setWsdlDef(Definition wsdlDef) { + this.wsdlDef = wsdlDef; + } + + public Definition getWsdlDef() { + if (this.wsdlDef == null && this.url != null && this.url.length() > 0) { + try { + URL tempURL = new URL(this.url); + wsdlDef = + TesterWSDLUtils.readWSDLURL(tempURL); + } catch (MalformedURLException e) { + JBossWSUIPlugin.log(e); + return null; + } catch (WSDLException e) { + JBossWSUIPlugin.log(e); + return null; + } + } + return wsdlDef; + } + + public void setServiceNSMessage(String[] serviceNSMessage) { + this.serviceNSMessage = serviceNSMessage; + } + + public String[] getServiceNSMessage() { + return serviceNSMessage; + } + + public void setSOAP12(boolean isSOAP12) { + this.isSOAP12 = isSOAP12; + } + + public boolean isSOAP12() { + return isSOAP12; + } + +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/TestHistoryEntry.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java 2010-07-27 21:01:19 UTC (rev 23755) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/WSDLBrowseDialog.java 2010-07-27 21:05:29 UTC (rev 23756) @@ -11,6 +11,7 @@ package org.jboss.tools.ws.ui.views; import java.io.File; +import java.lang.reflect.InvocationTargetException; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -31,11 +32,16 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.InputDialog; +import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -49,6 +55,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; @@ -80,6 +87,7 @@ private String serviceTextValue = null; private String portTextValue = null; private String operationTextValue = null; + private String initialOperationTextValue = null; private String bindingValue = null; private Definition wsdlDefinition = null; @@ -123,10 +131,18 @@ public String getOperationTextValue() { return operationTextValue; } + + public void setInitialOperationTextValue( String value ) { + initialOperationTextValue = value; + } public Definition getWSDLDefinition(){ return this.wsdlDefinition; } + + public void setURLText(String urlText) { + wsdlTextValue = urlText; + } @SuppressWarnings("unchecked") @Override @@ -167,11 +183,14 @@ locationCombo.setLayoutData(gridData); locationCombo.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent arg0) { - IStatus status = validate(); + setMessage(JBossWSUIMessages.WSDLBrowseDialog_Message); + IStatus status = validate(false); if (status != Status.OK_STATUS) { + setMessage(status.getMessage(), IMessageProvider.WARNING); if (showServicePortOperaton) setGroupEnabled(false); } else { + setMessage(JBossWSUIMessages.WSDLBrowseDialog_Message); if (showServicePortOperaton) setGroupEnabled(true); } @@ -305,16 +324,21 @@ if (rtnCode == Window.OK) { locationCombo.setText(inDialog.getValue()); try { - URL testURL = new URL(inDialog.getValue()); + final URL testURL = new URL(inDialog.getValue()); locationCombo.setText(testURL.toExternalForm()); - wsdlDefinition = - TesterWSDLUtils.readWSDLURL(testURL); - if (showServicePortOperaton) - updateServiceCombo(); + IStatus status = parseWSDLFromURL(testURL, true); + if (status != null && !status.isOK()) { + setMessage(status.getMessage()); + } else { + setMessage(JBossWSUIMessages.WSDLBrowseDialog_Message); + if (showServicePortOperaton) + updateServiceCombo(); + } } catch (MalformedURLException e) { JBossWSUIPlugin.log(e); - } catch (WSDLException e) { - JBossWSUIPlugin.log(e); + ErrorDialog.openError(getShell(), JBossWSUIMessages.WSDLBrowseDialog_Error_Retrieving_WSDL, + JBossWSUIMessages.WSDLBrowseDialog_Error_Msg_Invalid_URL, + StatusUtils.errorStatus(e)); } } } @@ -377,9 +401,71 @@ } mainComposite.pack(); - + return mainComposite; } + + class ReadWSDLProgress implements IRunnableWithProgress { + + private URL testURL = null; + private IStatus result = null; + + public void setTestURL ( URL url ) { + this.testURL = url; + } + + public IStatus getResult() { + return this.result; + } + + public void run(IProgressMonitor monitor) { + monitor + .beginTask(JBossWSUIMessages.WSDLBrowseDialog_Status_ParsingWSDLFromURL, + 100); + try { + wsdlDefinition = + TesterWSDLUtils.readWSDLURL(testURL); + } catch (WSDLException e) { + result = StatusUtils.errorStatus( + JBossWSUIMessages.WSDLBrowseDialog_Error_Msg_Parse_Error, e); + } + monitor.done(); + } + } + + private IStatus parseWSDLFromURL ( final URL testURL, boolean showProgress) { + + if (showProgress) { + ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell()); + try { + ReadWSDLProgress readWSDLProgress = new ReadWSDLProgress(); + readWSDLProgress.setTestURL(testURL); + dialog.run(true, true, readWSDLProgress); + return readWSDLProgress.getResult(); + } catch (InvocationTargetException e) { + return StatusUtils.errorStatus( + JBossWSUIMessages.WSDLBrowseDialog_Error_Msg_Parse_Error, e); + } catch (InterruptedException e) { + return StatusUtils.errorStatus( + JBossWSUIMessages.WSDLBrowseDialog_Error_Msg_Parse_Error, e); + } catch (NullPointerException e) { + return StatusUtils.errorStatus( + JBossWSUIMessages.WSDLBrowseDialog_Error_Msg_Parse_Error, e); + } + } else { + try { + wsdlDefinition = + TesterWSDLUtils.readWSDLURL(testURL); + } catch (WSDLException e) { + return StatusUtils.errorStatus( + JBossWSUIMessages.WSDLBrowseDialog_Error_Msg_Parse_Error, e); + } catch (NullPointerException e) { + return StatusUtils.errorStatus( + JBossWSUIMessages.WSDLBrowseDialog_Error_Msg_Parse_Error, e); + } + } + return Status.OK_STATUS; + } private void updateOperationList(){ if (portCombo.getSelectionIndex() > -1) { @@ -402,7 +488,19 @@ opList.setData(operation.getName(), operation); } if (opList.getItemCount() > 0) { - opList.select(0); + boolean foundIt = false; + if (initialOperationTextValue != null) { + String[] thelist = opList.getItems(); + for (int i = 0; i < thelist.length; i++) { + if (thelist[i].contentEquals(initialOperationTextValue)) { + opList.select(i); + foundIt = true; + break; + } + } + } + if (!foundIt) + opList.select(0); this.operationTextValue = opList.getSelection()[0]; } } @@ -444,17 +542,19 @@ portCombo.removeAll(); opList.removeAll(); - Iterator<?> iter = wsdlDefinition.getServices().values().iterator(); - while (iter.hasNext()) { - Service service = (Service) iter.next(); - serviceCombo.add(service.getQName().getLocalPart()); - serviceCombo.setData(service.getQName().getLocalPart(), service); + if (wsdlDefinition != null && wsdlDefinition.getServices() != null && !wsdlDefinition.getServices().isEmpty()) { + Iterator<?> iter = wsdlDefinition.getServices().values().iterator(); + while (iter.hasNext()) { + Service service = (Service) iter.next(); + serviceCombo.add(service.getQName().getLocalPart()); + serviceCombo.setData(service.getQName().getLocalPart(), service); + } + if (serviceCombo.getItemCount() > 0) { + serviceCombo.select(0); + serviceTextValue = serviceCombo.getText(); + } + updatePortCombo(); } - if (serviceCombo.getItemCount() > 0) { - serviceCombo.select(0); - serviceTextValue = serviceCombo.getText(); - } - updatePortCombo(); } @Override @@ -484,18 +584,23 @@ } } - private IStatus validate(){ + private IStatus validate(boolean showProgress){ String urlText = locationCombo.getText(); try { - URL testURL = new URL(urlText); - wsdlDefinition = - TesterWSDLUtils.readWSDLURL(testURL); + final URL testURL = new URL(urlText); + IStatus status = parseWSDLFromURL(testURL, false); + if (status != null && !status.isOK()) { + return status; + } +// parseWSDLFromURL(testURL); +// wsdlDefinition = +// TesterWSDLUtils.readWSDLURL(testURL); if (showServicePortOperaton) updateServiceCombo(); } catch (MalformedURLException e) { return StatusUtils.errorStatus(JBossWSUIMessages.WSDLBrowseDialog_Status_Invalid_URL, e); - } catch (WSDLException e) { - return StatusUtils.errorStatus(JBossWSUIMessages.WSDLBrowseDialog_Status_WSDL_Unavailable, e); +// } catch (WSDLException e) { +// return StatusUtils.errorStatus(JBossWSUIMessages.WSDLBrowseDialog_Status_WSDL_Unavailable, e); } return Status.OK_STATUS; } @@ -509,7 +614,7 @@ if (WSDLBrowseDialog.wsdlTextValue != null) { this.locationCombo.setText(wsdlTextValue); - IStatus status = validate(); + IStatus status = validate(false); if (status != Status.OK_STATUS) { if (showServicePortOperaton) setGroupEnabled(false);

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23755 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-07-27 17:01:19 -0400 (Tue, 27 Jul 2010) New Revision: 23755 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java Log: 2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new message for disconnect cloud action. * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (makeActions): Add new cloud disconnect action. (fillLocalPullDown): Ditto. (.run): New action to disconnect from cloud and remove from tree viewer. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-07-27 20:27:48 UTC (rev 23754) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-07-27 21:01:19 UTC (rev 23755) @@ -1,5 +1,14 @@ 2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new message + for disconnect cloud action. + * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (makeActions): Add + new cloud disconnect action. + (fillLocalPullDown): Ditto. + (.run): New action to disconnect from cloud and remove from tree viewer. + +2010-07-27 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/ui/views/CloudViewContentProvider.java (createElements): Add viewer argument and use this when creating a CVCloudElement. (inputChanged): Pass the viewer to createElements. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-07-27 20:27:48 UTC (rev 23754) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-07-27 21:01:19 UTC (rev 23755) @@ -14,4 +14,6 @@ PropertyURL.title=URL PropertyUsername.title=User -CollapseAll.label=Collapse All \ No newline at end of file +CollapseAll.label=Collapse All + +RemoveCloud.label=Disconnect Cloud \ No newline at end of file Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-07-27 20:27:48 UTC (rev 23754) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-07-27 21:01:19 UTC (rev 23755) @@ -24,6 +24,8 @@ import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudManager; import org.jboss.tools.deltacloud.ui.SWTImagesFactory; @@ -34,11 +36,14 @@ */ public static final String ID = "org.jboss.tools.deltacloud.ui.views.DeltaCloudView"; - public static final String COLLAPSE_ALL = "CollapseAll.label"; + private static final String REMOVE_CLOUD = "RemoveCloud.label"; //$NON-NLS-1$ + + public static final String COLLAPSE_ALL = "CollapseAll.label"; //$NON-NLS-1$ private TreeViewer viewer; private Action action1; private Action action2; + private Action removeCloud; private Action collapseall; private Action doubleClickAction; @@ -107,7 +112,7 @@ private void fillLocalPullDown(IMenuManager manager) { manager.add(action1); manager.add(new Separator()); - manager.add(action2); + manager.add(removeCloud); } private void fillContextMenu(IMenuManager manager) { @@ -122,6 +127,33 @@ } private void makeActions() { + removeCloud = new Action() { + public void run() { + IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); + CloudViewElement element = (CloudViewElement)selection.getFirstElement(); + while (element != null && !(element instanceof CVCloudElement)) { + element = (CloudViewElement)element.getParent(); + } + if (element != null) { + CVCloudElement cve = (CVCloudElement)element; + DeltaCloudManager.getDefault().removeCloud((DeltaCloud)element.getElement()); + CloudViewContentProvider p = (CloudViewContentProvider)viewer.getContentProvider(); + Object[] elements = p.getElements(getViewSite()); + int index = -1; + for (int i = 0; i < elements.length; ++i) { + if (elements[i] == cve) + index = i; + } + if (index >= 0) + ((TreeViewer)cve.getViewer()).remove(getViewSite(), index); + } + } + }; + removeCloud.setText(CVMessages.getString(REMOVE_CLOUD)); + removeCloud.setToolTipText(CVMessages.getString(REMOVE_CLOUD)); + removeCloud.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages(). + getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK)); + action1 = new Action() { public void run() { showMessage("Action 1 executed");

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r23754 - trunk/build.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-07-27 16:27:48 -0400 (Tue, 27 Jul 2010) New Revision: 23754 Modified: trunk/build/pom.xml Log: https://jira.jboss.org/browse/JBIDE-6724 Move aggregator pom.xml and parent-pom.xml from root of project to build component emma-coverage profile moved up libs module moved inside emma-coverage profile because it is required only when coverage is enabled Modified: trunk/build/pom.xml =================================================================== --- trunk/build/pom.xml 2010-07-27 20:22:00 UTC (rev 23753) +++ trunk/build/pom.xml 2010-07-27 20:27:48 UTC (rev 23754) @@ -1,12 +1,28 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> -<groupId>org.jboss</groupId> -<artifactId>jbosstools</artifactId> +<groupId>org.jboss.tools</groupId> +<artifactId>build</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> + +<profiles> + <profile> + <id>emma-coverage</id> + <activation> + <property> + <name>coverage</name> + </property> + </activation> + <modules> + <module>libs</module> + <module>reports/emma-coverage</module> + </modules> + </profile> +</profiles> + + <modules> - <module>../build/libs</module>   @@ -45,22 +61,9 @@ ant -q -->  -  + <module>../drools</module>> -  + <module>../site</module> </modules> -<profiles> - <profile> - <id>emma-coverage</id> - <activation> - <property> - <name>coverage</name> - </property> - </activation> - <modules> - <module>reports/emma-coverage</module> - </modules> - </profile> -</profiles> </project>

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2010