July 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r23315 - trunk/build/util.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-08 09:53:03 -0400 (Thu, 08 Jul 2010) New Revision: 23315 Modified: trunk/build/util/checkPOMvsManifest.sh Log: check for non-SNAPSHOT plugins/features too Modified: trunk/build/util/checkPOMvsManifest.sh =================================================================== --- trunk/build/util/checkPOMvsManifest.sh 2010-07-08 13:45:32 UTC (rev 23314) +++ trunk/build/util/checkPOMvsManifest.sh 2010-07-08 13:53:03 UTC (rev 23315) @@ -12,19 +12,34 @@ if [[ $d == $f ]]; then #else feature d=${f/feature.xml/} artVersionLine=$(cat $f | egrep "version=\"[0-9]\.[0-9]\.[0-9]\.qualifier" | egrep "[0-9]\.[0-9]\.[0-9]") - artVersion=${artVersionLine##*version=\"} - artVersion=${artVersion%%.qualifier*} - artVersionLine=" "$(cat $f | egrep "version=\"[0-9]\.[0-9]\.[0-9]\.qualifier" | egrep "[0-9]\.[0-9]\.[0-9]") + if [[ ! $artVersionLine ]]; then # not a snapshot version + artVersionLine=$(cat $f | head -7 | egrep "version=\"[0-9]\.[0-9]\.[0-9].*\".*" | egrep "[0-9]\.[0-9]\.[0-9]" | tail -1) + artVersion=${artVersionLine##*version=\"} + artVersion=${artVersion%%\"*} + #echo "[WARNING] [$altVersion] ${d}feature.xml not .qualifier version." + else + artVersion=${artVersionLine##*version=\"} + artVersion=${artVersion%%.qualifier*} + fi + artVersionLine=" "$altVersionLine else artVersionLine=$(cat $f | egrep "Bundle-Version: " | egrep "[0-9]\.[0-9]\.[0-9]") artVersion=${artVersionLine##*: } artVersion=${artVersion%%.qualifier} artVersionLine=" "$artVersionLine fi + if [[ -f $d/pom.xml ]]; then pomVersionLine=$(cat $d/pom.xml | sed "s/\t//" | egrep ".0-SNAPSHOT" | egrep "[0-9]\.[0-9]\.[0-9]") - pomVersion=${pomVersionLine#*<version>} - pomVersion=${pomVersion%-SNAPSHOT*} + if [[ ! $pomVersionLine ]]; then # not a snapshot version + pomVersionLine=$(cat $d/pom.xml | sed "s/\t//" | egrep "<version>" | egrep "[0-9]\.[0-9]\.[0-9]" | tail -1) + pomVersion=${pomVersionLine%%</version>*} + pomVersion=${pomVersion#*<version>} + #echo "[WARNING] [$pomVersion] ${d}pom.xml not SNAPSHOT version." + else + pomVersion=${pomVersionLine%%-SNAPSHOT*} + pomVersion=${pomVersion#*<version>} + fi pomVersionLine=" "$pomVersionLine if [[ $artVersion != $pomVersion ]]; then

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23314 - in trunk/documentation/whatsnew/vpe: images and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-07-08 09:45:32 -0400 (Thu, 08 Jul 2010) New Revision: 23314 Added: trunk/documentation/whatsnew/vpe/images/3.2.0.M1/ trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M1.html Log: Template for "What's New Visual Page Editor 3.2.0.M1" Added: trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M1.html =================================================================== --- trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M1.html (rev 0) +++ trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M1.html 2010-07-08 13:45:32 UTC (rev 23314) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css" /> +<title>What's New Visual Page Editor 3.2.0.M1</title> +</head> +<body> +<h1>What's New Visual Page Editor 3.2.0.M1</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a + href="../cdi/cdi-news-3.2.0.M1.html">CDI Tools ></a></p> +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr /> + <h3>General</h3> + <hr /> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + <h3>Editor</h3> + <hr /> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + <h3>Templates</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Lorem ipsum</b></td> + <td valign="top"> + <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi posuere sodales convallis. Fusce nec erat id orci porttitor laoreet. Donec scelerisque eros ac urna lacinia sit amet pretium nunc pharetra. Vestibulum id arcu. </p> + <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-XXXX">Related + Jira</a></small></p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> +</table> + +</body> + +</html> Property changes on: trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M1.html ___________________________________________________________________ Name: svn:mime-type + text/html

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23313 - in branches/jbosstools-3.2.0.M1: seam/features/org.jboss.tools.seam.test.feature and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-07-08 09:32:33 -0400 (Thu, 08 Jul 2010) New Revision: 23313 Modified: branches/jbosstools-3.2.0.M1/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml branches/jbosstools-3.2.0.M1/seam/features/org.jboss.tools.seam.test.feature/pom.xml branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.core/pom.xml branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.ui/pom.xml branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.xml/pom.xml Log: fix versions Modified: branches/jbosstools-3.2.0.M1/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2010-07-08 13:19:50 UTC (rev 23312) +++ branches/jbosstools-3.2.0.M1/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2010-07-08 13:32:33 UTC (rev 23313) @@ -9,7 +9,7 @@ </parent> <groupId>org.jboss.tools.jsf.tests</groupId> <artifactId>org.jboss.tools.jsf.vpe.jbpm.test</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> <emma.filter>org.jboss.tools.jsf.vpe.jbpm*</emma.filter> Modified: branches/jbosstools-3.2.0.M1/seam/features/org.jboss.tools.seam.test.feature/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/seam/features/org.jboss.tools.seam.test.feature/pom.xml 2010-07-08 13:19:50 UTC (rev 23312) +++ branches/jbosstools-3.2.0.M1/seam/features/org.jboss.tools.seam.test.feature/pom.xml 2010-07-08 13:32:33 UTC (rev 23313) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools.seam.features</groupId> <artifactId>org.jboss.tools.seam.test.feature</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> Modified: branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.core/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.core/pom.xml 2010-07-08 13:19:50 UTC (rev 23312) +++ branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.core/pom.xml 2010-07-08 13:32:33 UTC (rev 23313) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.core</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml 2010-07-08 13:19:50 UTC (rev 23312) +++ branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml 2010-07-08 13:32:33 UTC (rev 23313) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.text.ext</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.ui/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-07-08 13:19:50 UTC (rev 23312) +++ branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-07-08 13:32:33 UTC (rev 23313) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.ui</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> Modified: branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.xml/pom.xml =================================================================== --- branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.xml/pom.xml 2010-07-08 13:19:50 UTC (rev 23312) +++ branches/jbosstools-3.2.0.M1/seam/plugins/org.jboss.tools.seam.xml/pom.xml 2010-07-08 13:32:33 UTC (rev 23313) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools.seam.plugins</groupId> <artifactId>org.jboss.tools.seam.xml</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23312 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2010-07-08 09:19:50 -0400 (Thu, 08 Jul 2010) New Revision: 23312 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java Log: Restore Maximazed Editors when test is finished. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-07-08 13:19:13 UTC (rev 23311) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-07-08 13:19:50 UTC (rev 23312) @@ -60,6 +60,8 @@ private static final int NODES_NODE_CHILDREN_COUNT = 7; private static final int CONNECTIONS_NODE_CHILDREN_COUNT = 1; private static final int ROOT_NODE_CHILDREN_COUNT = 3; + + private boolean isEditorMaximized = false; /** * Tests Rule Flow */ @@ -107,6 +109,7 @@ .menu(IDELabel.Menu.NAVIGATION) .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) .click(); + isEditorMaximized = true; SWTGefBot gefBot = new SWTGefBot(); SWTBotGefEditor gefEditor = gefBot.gefEditor(ruleFlowFileName); final Control editorControl = (Control)gefEditor.getWidget(); @@ -167,6 +170,7 @@ .menu(IDELabel.Menu.NAVIGATION) .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) .click(); + isEditorMaximized = false; gefEditor.save(); gefEditor.close(); checkEmptyRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileName); @@ -435,4 +439,20 @@ return errorDescription; } + + protected void tearDown(){ + if (isEditorMaximized){ + // Restore maximized editor + bot.menu(IDELabel.Menu.WINDOW) + .menu(IDELabel.Menu.NAVIGATION) + .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) + .click(); + isEditorMaximized = false; + } + try { + super.tearDown(); + } catch (Exception e) { + e.printStackTrace(); + } + } } \ No newline at end of file

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23311 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2010-07-08 09:19:13 -0400 (Thu, 08 Jul 2010) New Revision: 23311 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java Log: Fix test method names. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java 2010-07-08 12:47:41 UTC (rev 23310) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java 2010-07-08 13:19:13 UTC (rev 23311) @@ -25,7 +25,7 @@ * Tests Decision Table */ @Test - public void testRuleFlow() { + public void testDecisionTable() { runDecisionTable(DroolsAllBotTests.DECISION_TABLE_JAVA_TEST_FILE_NAME); } /** Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java 2010-07-08 12:47:41 UTC (rev 23310) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java 2010-07-08 13:19:13 UTC (rev 23311) @@ -36,7 +36,7 @@ * Test manage Drools Rules */ @Test - public void testManageDroolsProject() { + public void testManageDroolsRules() { createDroolsRule (DroolsAllBotTests.TEST_DROOLS_RULE_NAME); debugDroolsRule (DroolsAllBotTests.SAMPLE_DROOLS_RULE_NAME); }

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23310 - in trunk/documentation/whatsnew/hibernate: images and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2010-07-08 08:47:41 -0400 (Thu, 08 Jul 2010) New Revision: 23310 Added: trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.M1.html trunk/documentation/whatsnew/hibernate/images/brackets_highlight.png trunk/documentation/whatsnew/hibernate/images/ddl_generation.png trunk/documentation/whatsnew/hibernate/images/jpa2_0.png Log: 3.2.0.M1 Hibernate new and noteworthy Added: trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.M1.html =================================================================== --- trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.M1.html (rev 0) +++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.M1.html 2010-07-08 12:47:41 UTC (rev 23310) @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Hibernate tools 3.4.0.M1 What's New</title> +</head> +<body> +<h1>Hibernate tools 3.4.0.M1 What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../examples/examples-news-1.1.0.M4.html">Project Examples ></a></p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + <h3>Dali Integration</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Support Dali 2.3</b></td> + <td valign="top"> + <p>Hibernate tools 3.4.0 support Dali 2.3 version and don't support previous ones because of the API changes.</p> + +<p></p> + + + <p><small><a href="https://jira.jboss.org/browse/JBIDE-5847">Related jira</a></p> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Support Jpa 2.0 in jpa projects</b></td> + <td valign="top"> + <p>Jpa projects with Hibernate platform support now hibernate jpa 2.0 implementation.</p> + <p><img src="images/jpa2_0.png"/></p> +<p></p> + + + <p><small><a href="https://jira.jboss.org/browse/JBIDE-6473">Related jira</a></p> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + <h3>HQL Editor</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Brackets in HQL Editor</b></td> + <td valign="top"> + <p>HQL Editor now highlights matching brackets.</p> + <p><img src="images/brackets_highlight.png"/></p> + <p><small><a href="https://jira.jboss.org/browse/JBIDE-5805">Related jira</a></p> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + <h3>Code Generation</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>DDL script</b></td> + <td valign="top"> + <p>DDL script isn't executed after generation by default because it could clear the database data.</p> + <p><img src="images/ddl_generation.png"/></p> + <p>Related jiras:<small><a href="https://jira.jboss.org/browse/JBIDE-6115">1</a>, <a href="http://opensource.atlassian.com/projects/hibernate/browse/HBX-1161">2</a></p> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/hibernate/images/brackets_highlight.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/hibernate/images/brackets_highlight.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/hibernate/images/ddl_generation.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/hibernate/images/ddl_generation.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/hibernate/images/jpa2_0.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/hibernate/images/jpa2_0.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23309 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2010-07-08 06:33:18 -0400 (Thu, 08 Jul 2010) New Revision: 23309 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java Log: https://jira.jboss.org/browse/JBIDE-6594 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2010-07-08 10:01:35 UTC (rev 23308) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2010-07-08 10:33:18 UTC (rev 23309) @@ -84,7 +84,7 @@ public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); validateHibernateConfigurationFileExists(messages, reporter); - } + } protected void validateHibernateConfigurationFileExists(List<IMessage> messages, IReporter reporter) { String configFile = hibernateProperties.getConfigurationFile();

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23308 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template: util and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dvinnichek Date: 2010-07-08 06:01:35 -0400 (Thu, 08 Jul 2010) New Revision: 23308 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfAbstractTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfCellTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java Log: fix templates for seam components according to JBIDE-6542 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfAbstractTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfAbstractTemplate.java 2010-07-08 09:48:23 UTC (rev 23307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfAbstractTemplate.java 2010-07-08 10:01:35 UTC (rev 23308) @@ -43,24 +43,24 @@ protected final void copySizeAttrs(nsIDOMElement visualElement, Element sourceElement) { - String width = sourceElement.getAttribute(HTML.ATTR_WIDTH); - String height = sourceElement.getAttribute(HTML.ATTR_HEIGHT); - if (width != null) { - String styleAttrValue = visualElement.getAttribute(HTML.ATTR_STYLE); - if (styleAttrValue == null) { + if (sourceElement.hasAttribute(HTML.ATTR_WIDTH)) { + String width = sourceElement.getAttribute(HTML.ATTR_WIDTH); + if (visualElement.hasAttribute(HTML.ATTR_STYLE)) { + String styleAttrValue = visualElement.getAttribute(HTML.ATTR_STYLE); + visualElement.setAttribute(HTML.ATTR_STYLE, styleAttrValue + + "; width:" + width); //$NON-NLS-1$ + } else { visualElement.setAttribute(HTML.ATTR_STYLE, "width:" + width); //$NON-NLS-1$ - } else { - visualElement.setAttribute(HTML.ATTR_STYLE, styleAttrValue - + "; width:" + width); //$NON-NLS-1$ } } - if (height != null) { - String styleAttrValue = visualElement.getAttribute(HTML.ATTR_STYLE); - if (styleAttrValue == null) { - visualElement.setAttribute(HTML.ATTR_STYLE, "height:" + height); //$NON-NLS-1$ - } else { + if (sourceElement.hasAttribute(HTML.ATTR_HEIGHT)) { + String height = sourceElement.getAttribute(HTML.ATTR_HEIGHT); + if (visualElement.hasAttribute(HTML.ATTR_STYLE)) { + String styleAttrValue = visualElement.getAttribute(HTML.ATTR_STYLE); visualElement.setAttribute(HTML.ATTR_STYLE, styleAttrValue + "; height:" + height); //$NON-NLS-1$ + } else { + visualElement.setAttribute(HTML.ATTR_STYLE, "height:" + height); //$NON-NLS-1$ } } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfCellTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfCellTemplate.java 2010-07-08 09:48:23 UTC (rev 23307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfCellTemplate.java 2010-07-08 10:01:35 UTC (rev 23308) @@ -54,23 +54,25 @@ } private void copyAttrs(nsIDOMElement visualElement, Element sourceElement) { - String attr = sourceElement.getAttribute(HTML.ATTR_COLSPAN); - if (attr != null) { - visualElement.setAttribute(HTML.ATTR_COLSPAN, attr); + + if (sourceElement.hasAttribute(HTML.ATTR_COLSPAN)) { + String colspanAttr = sourceElement.getAttribute(HTML.ATTR_COLSPAN); + visualElement.setAttribute(HTML.ATTR_COLSPAN, colspanAttr); } - attr = sourceElement - .getAttribute(SeamUtil.SEAM_ATTR_HORIZONAL_ALIGNMENT); - if (attr != null) { - visualElement.setAttribute(HTML.ATTR_ALIGN, attr); + + if (sourceElement.hasAttribute(SeamUtil.SEAM_ATTR_HORIZONAL_ALIGNMENT)) { + String horAlAttr = sourceElement.getAttribute(SeamUtil.SEAM_ATTR_HORIZONAL_ALIGNMENT); + visualElement.setAttribute(HTML.ATTR_ALIGN, horAlAttr); } - attr = sourceElement - .getAttribute(SeamUtil.SEAM_ATTR_VERTICAL_ALIGNMENT); - if (attr != null) { - visualElement.setAttribute(HTML.ATTR_VALIGN, attr); + + if (sourceElement.hasAttribute(SeamUtil.SEAM_ATTR_VERTICAL_ALIGNMENT)) { + String vertAlAttr = sourceElement.getAttribute(SeamUtil.SEAM_ATTR_VERTICAL_ALIGNMENT); + visualElement.setAttribute(HTML.ATTR_VALIGN, vertAlAttr); } - attr = sourceElement.getAttribute("noWrap"); //$NON-NLS-1$ - if (attr != null) { - visualElement.setAttribute("nowrap", attr); //$NON-NLS-1$ + + if (sourceElement.hasAttribute("noWrap")) { + String noWrapAttr = sourceElement.getAttribute("noWrap"); //$NON-NLS-1$ + visualElement.setAttribute("nowrap", noWrapAttr); //$NON-NLS-1$ } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java 2010-07-08 09:48:23 UTC (rev 23307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfChapterTemplate.java 2010-07-08 10:01:35 UTC (rev 23308) @@ -40,15 +40,14 @@ sourceElement = (Element) sourceNode; visualElement = VisualDomUtil.createBorderlessContainer(visualDocument); nsIDOMNode headNode = visualDocument.createElement(HTML.TAG_H1); - String chapterNumber = sourceElement.getAttribute(NUMBER); - if (chapterNumber != null) { + String chapterNumber = "1"; //$NON-NLS-1$ + if (sourceElement.hasAttribute(NUMBER)) { try { + chapterNumber = sourceElement.getAttribute(NUMBER); Integer.parseInt(chapterNumber); } catch (NumberFormatException e) { chapterNumber = "1"; //$NON-NLS-1$ } - } else { - chapterNumber = "1"; //$NON-NLS-1$ } nsIDOMText chapterNumberNode = visualDocument .createTextNode(chapterNumber + ". "); //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java 2010-07-08 09:48:23 UTC (rev 23307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfSectionTemplate.java 2010-07-08 10:01:35 UTC (rev 23308) @@ -121,9 +121,10 @@ private int getChapterNumber(Node chapterNode) { int chapterNumber = 1; - String chapterNumberString = ((Element) chapterNode) - .getAttribute("number"); //$NON-NLS-1$ - if (chapterNumberString != null) { + Element chapterElement = (Element) chapterNode; + String numberAttrName = "number"; //$NON-NLS-1$ + if (chapterElement.hasAttribute(numberAttrName)) { + String chapterNumberString = chapterElement.getAttribute(numberAttrName); try { chapterNumber = Integer.parseInt(chapterNumberString); } catch (NumberFormatException e) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java 2010-07-08 09:48:23 UTC (rev 23307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamPdfTableTemplate.java 2010-07-08 10:01:35 UTC (rev 23308) @@ -71,10 +71,11 @@ private int getNumberOfColumns(Node sourceTableNode) { int columnsNumber = 1; - String columnsNumberString = ((Element) sourceTableNode) - .getAttribute("columns"); //$NON-NLS-1$ - if (columnsNumberString != null) { + Element sourceTableElement = (Element) sourceTableNode; + String columnsAttrName = "columns"; //$NON-NLS-1$ + if (sourceTableElement.hasAttribute(columnsAttrName)) { try { + String columnsNumberString = sourceTableElement.getAttribute(columnsAttrName); columnsNumber = Integer.parseInt(columnsNumberString); if (columnsNumber < 1) { columnsNumber = 1; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java 2010-07-08 09:48:23 UTC (rev 23307) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/util/SeamUtil.java 2010-07-08 10:01:35 UTC (rev 23308) @@ -69,8 +69,9 @@ public static void setAlignment(Element sourceElement, nsIDOMElement visualElement) { - String align = sourceElement.getAttribute(SeamUtil.SEAM_ATTR_ALIGNMENT); - if (align != null) { + + if (sourceElement.hasAttribute(SeamUtil.SEAM_ATTR_ALIGNMENT)) { + String align = sourceElement.getAttribute(SeamUtil.SEAM_ATTR_ALIGNMENT); visualElement.setAttribute(HTML.ATTR_ALIGN, HTML.VALUE_ALIGN_LEFT); for (int i = 0; i < SeamUtil.POSSIBLE_ALIGNS.length; i++) { if (SeamUtil.POSSIBLE_ALIGNS[i].equalsIgnoreCase(align)) { @@ -143,9 +144,9 @@ private static String parseFontStyleValue(Node sourceFontNode) { StringBuffer styleAttrValue = new StringBuffer(""); //$NON-NLS-1$ - String stringValueToParse = ((Element) sourceFontNode) - .getAttribute(HTML.ATTR_STYLE); - if (stringValueToParse != null) { + Element sourceFontElement = (Element) sourceFontNode; + if (sourceFontElement.hasAttribute(HTML.ATTR_STYLE)) { + String stringValueToParse = sourceFontElement.getAttribute(HTML.ATTR_STYLE); int boldPos = stringValueToParse.indexOf("bold"); //$NON-NLS-1$ if (boldPos != -1) { styleAttrValue.append(" font-weight : bold;"); //$NON-NLS-1$ @@ -168,30 +169,30 @@ private static String getFontFamily(Node sourceFontNode) { String fontFamily = "unknown"; //$NON-NLS-1$ - String stringName = ((Element) sourceFontNode) - .getAttribute(HTML.ATTR_NAME); - if (stringName != null) { + Element sourceFontElement = (Element) sourceFontNode; + if (sourceFontElement.hasAttribute(HTML.ATTR_NAME)) { + String stringName = sourceFontElement.getAttribute(HTML.ATTR_NAME); fontFamily = stringName; } return " font-family : " + fontFamily + ";"; //$NON-NLS-1$ //$NON-NLS-2$ } private static String getSize(Node sourceFontNode) { - String stringSizeAttr = ((Element) sourceFontNode) - .getAttribute(HTML.ATTR_SIZE); - if (stringSizeAttr != null) { + Element sourceFontElement = (Element) sourceFontNode; + if (sourceFontElement.hasAttribute(HTML.ATTR_SIZE)) { try { + String stringSizeAttr = sourceFontElement.getAttribute(HTML.ATTR_SIZE); int intSize = Integer.parseInt(stringSizeAttr); if (intSize < 0) { return ""; //$NON-NLS-1$ } + return " font-size : " + stringSizeAttr + "pt;"; //$NON-NLS-1$ //$NON-NLS-2$ } catch (NumberFormatException e) { return ""; //$NON-NLS-1$ } } else { return ""; //$NON-NLS-1$ - } - return " font-size : " + stringSizeAttr + "pt;"; //$NON-NLS-1$ //$NON-NLS-2$ + } } public static String getAbsoluteResourcePath(String resourcePathInPlugin) {

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23307 - in trunk/ws/tests/org.jboss.tools.ws.ui.test: META-INF and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jlukas(a)redhat.com Date: 2010-07-08 05:48:23 -0400 (Thu, 08 Jul 2010) New Revision: 23307 Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/imported.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/original.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/schema.xsd trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/x.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/y.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/imported.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/original.wsdl trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/schema.xsd trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/ trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/.classpath trunk/ws/tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF Log: test for sample soap message generation Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/.classpath =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/.classpath 2010-07-08 08:44:14 UTC (rev 23306) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/.classpath 2010-07-08 09:48:23 UTC (rev 23307) @@ -1,7 +1,8 @@ -<?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/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="resources"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF 2010-07-08 08:44:14 UTC (rev 23306) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/META-INF/MANIFEST.MF 2010-07-08 09:48:23 UTC (rev 23307) @@ -10,7 +10,8 @@ org.jboss.tools.tests, org.jboss.tools.ws.ui, org.jboss.tools.ws.core, - org.jboss.tools.common.ui + org.jboss.tools.common.ui, + javax.wsdl;bundle-version="1.6.2" Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/imported.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/imported.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/imported.wsdl 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<definitions xmlns:tns="http://www.ecubicle.net/webservices" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://www.ecubicle.net/webservices"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.ecubicle.net/webservices" schemaLocation="schema.xsd"/> + </xsd:schema> + </types> + <message name="GetSearchResults"> + <part name="parameters" element="tns:GetSearchResults"/> + </message> + <message name="GetSearchResultsResponse"> + <part name="parameters" element="tns:GetSearchResultsResponse"/> + </message> + <portType name="gsearch_rssSoap"> + <operation name="GetSearchResults"> + <input message="tns:GetSearchResults"/> + <output message="tns:GetSearchResultsResponse"/> + </operation> + </portType> +</definitions> \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/original.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/original.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/original.wsdl 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://webservices.www.ecubicle.net/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://webservices.www.ecubicle.net/" name="GsearchRssSoap"> + <import namespace="http://www.ecubicle.net/webservices" location="imported.wsdl"/> + <binding xmlns:ns1="http://www.ecubicle.net/webservices" name="gsearch_rssSoap" type="ns1:gsearch_rssSoap"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="GetSearchResults"> + <soap:operation soapAction="http://www.ecubicle.net/webservices/GetSearchResults" style="document"/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="gsearch_rss"> + <port name="gsearch_rssSoap" binding="tns:gsearch_rssSoap"> + <soap:address location="http://www.ecubicle.net/gsearch_rss.asmx"/> + </port> + </service> +</definitions> + \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/schema.xsd =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/schema.xsd (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6497/schema.xsd 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0" targetNamespace="http://www.ecubicle.net/webservices"> + + <xs:element name="GetSearchResults"> + <xs:complexType> + <xs:sequence> + <xs:element name="searchPage" type="xs:string" minOccurs="0"/> + <xs:element name="gQuery" type="xs:string" minOccurs="0"/> + <xs:element name="numOfResults" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="GetSearchResultsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element name="GetSearchResultsResult" minOccurs="0"> + <xs:complexType mixed="true"> + <xs:sequence> + <xs:any processContents="lax" namespace="##other" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> +</xs:schema> \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/x.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/x.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/x.wsdl 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,53 @@ +<definitions name='HelloWorldService' targetNamespace='http://webservices.samples.jboss.org/' + xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://webservices.samples.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://webservices.samples.jboss.org/' + version='1.0' xmlns:tns='http://webservices.samples.jboss.org/' + xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='sayHello'> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs='0' name='arg0' type='xs:string' /> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name='sayHelloResponse' type='tns:sayHelloResponse' /> + <xs:complexType name='sayHelloResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string' /> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='HelloWorld_sayHello'> + <part element='tns:sayHello' name='sayHello'></part> + </message> + <message name='HelloWorld_sayHelloResponse'> + <part element='tns:sayHelloResponse' name='sayHelloResponse'></part> + </message> + <portType name='HelloWorld'> + <operation name='sayHello' parameterOrder='sayHello'> + <input message='tns:HelloWorld_sayHello'></input> + <output message='tns:HelloWorld_sayHelloResponse'></output> + </operation> + </portType> + <binding name='HelloWorldBinding' type='tns:HelloWorld'> + <soap:binding style='document' + transport='http://schemas.xmlsoap.org/soap/http' /> + <operation name='sayHello'> + <soap:operation soapAction='' /> + <input> + <soap:body use='literal' /> + </input> + <output> + <soap:body use='literal' /> + </output> + </operation> + </binding> + <service name='HelloWorldService'> + <port binding='tns:HelloWorldBinding' name='HelloWorldPort'> + <soap:address location='http://localhost:8080/ws/HelloWorld' /> + </port> + </service> +</definitions> \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/y.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/y.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6558/y.wsdl 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,52 @@ +<definitions name='HelloWorldService' targetNamespace='http://webservices.samples.jboss.org/' + xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://webservices.samples.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://webservices.samples.jboss.org/' + version='1.0' xmlns:tns='http://webservices.samples.jboss.org/' + xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='sayHello' type="tns:sayHello"/> + <xs:element name='sayHelloResponse' type='tns:sayHelloResponse' /> + <xs:complexType name='sayHello'> + <xs:sequence> + <xs:element minOccurs='0' name='arg0' type='xs:string' /> + </xs:sequence> + </xs:complexType> + <xs:complexType name='sayHelloResponse'> + <xs:sequence> + <xs:element minOccurs='0' name='return' type='xs:string' /> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='HelloWorld_sayHello'> + <part element='tns:sayHello' name='sayHello'></part> + </message> + <message name='HelloWorld_sayHelloResponse'> + <part element='tns:sayHelloResponse' name='sayHelloResponse'></part> + </message> + <portType name='HelloWorld'> + <operation name='sayHello' parameterOrder='sayHello'> + <input message='tns:HelloWorld_sayHello'></input> + <output message='tns:HelloWorld_sayHelloResponse'></output> + </operation> + </portType> + <binding name='HelloWorldBinding' type='tns:HelloWorld'> + <soap:binding style='document' + transport='http://schemas.xmlsoap.org/soap/http' /> + <operation name='sayHello'> + <soap:operation soapAction='' /> + <input> + <soap:body use='literal' /> + </input> + <output> + <soap:body use='literal' /> + </output> + </operation> + </binding> + <service name='HelloWorldService'> + <port binding='tns:HelloWorldBinding' name='HelloWorldPort'> + <soap:address location='http://localhost:8080/ws/HelloWorld' /> + </port> + </service> +</definitions> Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/imported.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/imported.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/imported.wsdl 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<definitions xmlns:tns="http://www.ecubicle.net/webservices" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" + targetNamespace="http://www.ecubicle.net/webservices"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.ecubicle.net/webservices" + schemaLocation="schema.xsd" /> + </xsd:schema> + </types> + <message name="GetSearchResults"> + <part name="parameters" element="tns:GetSearchResults" /> + </message> + <message name="GetSearchResultsResponse"> + <part name="parameters" element="tns:GetSearchResultsResponse" /> + </message> + <portType name="gsearch_rssSoap"> + <operation name="GetSearchResults"> + <input message="tns:GetSearchResults" /> + <output message="tns:GetSearchResultsResponse" /> + </operation> + </portType> +</definitions> \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/original.wsdl =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/original.wsdl (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/original.wsdl 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://webservices.www.ecubicle.net/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:jb="http://test.jboss.org/ns" + targetNamespace="http://webservices.www.ecubicle.net/" name="GsearchRssSoap"> + <import namespace="http://www.ecubicle.net/webservices" location="imported.wsdl" /> + <types> + <xsd:schema elementFormDefault='qualified' targetNamespace='http://test.jboss.org/ns' version='1.0' xmlns:tns='http://test.jboss.org/ns'> + <xsd:element name="echo" type="tns:echo" /> + <xsd:element name="echoResponse" type="tns:echoResponse" /> + <xsd:complexType name="echo"> + <xsd:sequence> + <xsd:element name="p" type="tns:person" minOccurs="1" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="person"> + <xsd:sequence> + <xsd:element name="age" type="xsd:int" /> + <xsd:element name="login" type="xsd:string" minOccurs="1" /> + <xsd:element name="male" type="xsd:boolean" /> + <xsd:element name="nicks" type="xsd:string" nillable="false" minOccurs="1" maxOccurs="2" /> + <xsd:element name="tax" type="xsd:float" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="echoResponse"> + <xsd:sequence> + <xsd:element name="return" type="tns:person" minOccurs="1" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + </types> + <message name="echo"> + <part name="parameters" element="jb:echo" /> + </message> + <message name="echoResponse"> + <part name="parameters" element="jb:echoResponse" /> + </message> + <portType name="EchoPortType"> + <operation name="echo"> + <input message="tns:echo" /> + <output message="tns:echoResponse" /> + </operation> + </portType> + <binding xmlns:ns1="http://www.ecubicle.net/webservices" name="gsearch_rssSoap" type="ns1:gsearch_rssSoap"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="GetSearchResults"> + <soap:operation soapAction="http://www.ecubicle.net/webservices/GetSearchResults" style="document" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + <binding name="EchoPortBinding" type="tns:EchoPortType"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> + <operation name="echo"> + <soap:operation soapAction="" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + <service name="gsearch_rss"> + <port name="gsearch_rssSoap" binding="tns:gsearch_rssSoap"> + <soap:address location="http://www.ecubicle.net/gsearch_rss.asmx" /> + </port> + </service> + <service name="EchoService"> + <port name="EchoPort" binding="tns:EchoPortBinding"> + <soap:address location="http://localhost:8080/webws/EchoPortType" /> + </port> + </service> +</definitions> \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/schema.xsd =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/schema.xsd (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/resources/jbide6593/schema.xsd 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" version="1.0" + targetNamespace="http://www.ecubicle.net/webservices"> + + <xs:element name="GetSearchResults"> + <xs:complexType> + <xs:sequence> + <xs:element name="searchPage" type="xs:string" minOccurs="0" /> + <xs:element name="gQuery" type="xs:string" minOccurs="0" /> + <xs:element name="numOfResults" type="xs:string" + minOccurs="0" /> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="GetSearchResultsResponse"> + <xs:complexType> + <xs:sequence> + <xs:element name="GetSearchResultsResult" minOccurs="0"> + <xs:complexType mixed="true"> + <xs:sequence> + <xs:any processContents="lax" namespace="##other" + minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> +</xs:schema> Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/src/org/jboss/tools/ws/ui/test/utils/TesterWSDLUtilsTest.java 2010-07-08 09:48:23 UTC (rev 23307) @@ -0,0 +1,121 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.ws.ui.test.utils; + +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.net.URL; + +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; + +import org.jboss.tools.ws.ui.utils.TesterWSDLUtils; +import org.junit.Assert; +import org.junit.Test; + +public class TesterWSDLUtilsTest { + + @Test + public void testGetNSServiceNameAndMessageNameArray() { + Definition def = readWSDL("/jbide6558/x.wsdl"); + String[] r = TesterWSDLUtils.getNSServiceNameAndMessageNameArray(def, "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); + Assert.assertArrayEquals(new String[] {"http://webservices.samples.jboss.org/", "HelloWorldService", "HelloWorldPort"}, r); + + def = readWSDL("/jbide6593/original.wsdl"); + r = TesterWSDLUtils.getNSServiceNameAndMessageNameArray(def, "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); + Assert.assertArrayEquals(new String[] {"http://www.ecubicle.net/webservices", "gsearch_rss", "gsearch_rssSoap"}, r); + + r = TesterWSDLUtils.getNSServiceNameAndMessageNameArray(def, "EchoService", "EchoPort", "EchoPortBinding", "echo"); + Assert.assertArrayEquals(new String[] {"http://webservices.www.ecubicle.net/", "EchoService", "EchoPort"}, r); + } + + @Test + public void testGetEndpointURL() { + Definition def = readWSDL("/jbide6558/x.wsdl"); + String r = TesterWSDLUtils.getEndpointURL(def, "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); + Assert.assertEquals("http://localhost:8080/ws/HelloWorld", r); + + def = readWSDL("/jbide6593/original.wsdl"); + r = TesterWSDLUtils.getEndpointURL(def, "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); + Assert.assertEquals("http://www.ecubicle.net/gsearch_rss.asmx", r); + + r = TesterWSDLUtils.getEndpointURL(def, "EchoService", "EchoPort", "EchoPortBinding", "echo"); + Assert.assertEquals("http://localhost:8080/webws/EchoPortType", r); + } + + @Test + public void testGetActionURL() { + Definition def = readWSDL("/jbide6558/x.wsdl"); + String r = TesterWSDLUtils.getActionURL(def, "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); + Assert.assertEquals("", r); + + def = readWSDL("/jbide6593/original.wsdl"); + r = TesterWSDLUtils.getActionURL(def, "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); + Assert.assertEquals("http://www.ecubicle.net/webservices/GetSearchResults", r); + + r = TesterWSDLUtils.getActionURL(def, "EchoService", "EchoPort", "EchoPortBinding", "echo"); + Assert.assertEquals("", r); + } + + @Test + public void testJBIDE6497() { + String s1 = getSampleMessage("/jbide6497/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); + Assert.assertTrue("was: '" + s1, s1.contains("<GetSearchResults xmlns = \"http://www.ecubicle.net/webservices\">")); + Assert.assertTrue("was: '" + s1, s1.contains("<gQuery>?</gQuery>")); + + s1 = getSampleMessage("/jbide6593/original.wsdl", "EchoService", "EchoPort", "EchoPortBinding", "echo"); + Assert.assertTrue("was: '" + s1, s1.contains("<p><age>?</age>")); + Assert.assertTrue("was: '" + s1, s1.contains("<male>?</male>")); + Assert.assertTrue("was: '" + s1, s1.contains("<tax>?</tax>")); + Assert.assertTrue("was: '" + s1, s1.contains("<echo xmlns = \"http://test.jboss.org/ns\">")); + } + + @Test + public void testJBIDE6558() { + String s1 = getSampleMessage("/jbide6558/x.wsdl", "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); + Assert.assertTrue(s1.contains("xmlns = \"http://webservices.samples.jboss.org/\"")); + Assert.assertTrue(s1.contains("<arg0>?</arg0>")); + String s2 = getSampleMessage("/jbide6558/y.wsdl", "HelloWorldService", "HelloWorldPort", "HelloWorldBinding", "sayHello"); + Assert.assertEquals(s1, s2); + } + + @Test + public void testJBIDE6593() { + String s1 = getSampleMessage("/jbide6497/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); + Assert.assertTrue(s1.contains("<GetSearchResults xmlns = \"http://www.ecubicle.net/webservices\">")); + Assert.assertTrue(s1.contains("<gQuery>?</gQuery>")); + + String s2 = getSampleMessage("/jbide6593/original.wsdl", "gsearch_rss", "gsearch_rssSoap", "gsearch_rssSoap", "GetSearchResults"); + Assert.assertEquals(s1, s2); + } + + private String getSampleMessage(String res, String service, String port, String binding, String operation) { + Definition def = readWSDL(res); + return TesterWSDLUtils.getSampleSOAPInputMessage(def, service, port, binding, operation); + } + + private Definition readWSDL(String path) { + try { + URL url = TesterWSDLUtilsTest.class.getResource(path).toURI().toURL(); + return TesterWSDLUtils.readWSDLURL(url); + } catch (MalformedURLException e) { + e.printStackTrace(); + Assert.fail(e.getMessage()); + } catch (URISyntaxException e) { + e.printStackTrace(); + Assert.fail(e.getMessage()); + } catch (WSDLException e) { + e.printStackTrace(); + Assert.fail(e.getMessage()); + } + return null; + } +}

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r23306 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config.

by jbosstools-commits＠lists.jboss.org

Author: lzoubek(a)redhat.com Date: 2010-07-08 04:44:14 -0400 (Thu, 08 Jul 2010) New Revision: 23306 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java Log: SWTBot ext: do not print whole stack trace on error Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2010-07-08 08:31:34 UTC (rev 23305) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/TestConfigurator.java 2010-07-08 08:44:14 UTC (rev 23306) @@ -84,8 +84,8 @@ try { currentConfig = new TestConfiguration("default", ""); } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + // log only message, nothing + log.error(e.getMessage()); } }

15 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2010